fix: workaround syspopup's header

Also define WAYLAND symbol used in syspop, could be removed once
syspop and projects using it switch to conventions detailed at :

https://wiki.tizen.org/wiki/X11_equivalent_Wayland_calls_and_notes

Bug-Tizen: PTREL-653
Change-Id: I2501e7275f9bd04e67028f12c5b066c22e3f0a18
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a9cbaf..671ecc6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,13 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
 
+IF(WAYLAND_SUPPORT)
+  ADD_DEFINITIONS(
+    "-DHAVE_WAYLAND"
+    "-DWAYLAND" # used by syspopup
+    )
+ENDIF(WAYLAND_SUPPORT)
+
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})

diff --git a/packaging/org.tizen.bt-syspopup.spec b/packaging/org.tizen.bt-syspopup.spec
index 4b1b2bc..2b34668 100644 (file)
--- a/packaging/org.tizen.bt-syspopup.spec
+++ b/packaging/org.tizen.bt-syspopup.spec
@@ -1,3 +1,5 @@
+%bcond_with wayland
+
 %define _optdir /opt
 %define _usrdir /usr
 %define _appdir %{_optdir}/apps
@@ -45,7 +47,15 @@ bluetooth system-popup application (bluetooth system popup).
 export CFLAGS+=" -fpie -fvisibility=hidden"
 export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_appdir}/org.tizen.bt-syspopup
+cmake . \
+    -DCMAKE_INSTALL_PREFIX=%{_appdir}/org.tizen.bt-syspopup \
+%if %{with wayland}
+    -DWAYLAND_SUPPORT=On \
+%else
+    -DWAYLAND_SUPPORT=Off \
+%endif
+    #eol
+
 make %{?jobs:-j%jobs}
 
 %install

diff --git a/src/bt-syspopup.c b/src/bt-syspopup.c
index 0609d90..20ea70c 100644 (file)
--- a/src/bt-syspopup.c
+++ b/src/bt-syspopup.c
@@ -24,6 +24,7 @@
 #include <aul.h>
 #include <bluetooth-api.h>
 #include <feedback.h>
+#include <linux/input.h>
 
 #include "bt-syspopup.h"