Revert "changed to use xdg-sthell-unstable-v6 instead of xdg-shell unknown version"

This reverts commit f87adee20f16e306a68245843d6d6fa73b826f71.

Change-Id: Ibb03d3ed4cd410132f39c7932a9ef7af4d815dd1

diff --git a/configure.ac b/configure.ac
index e2dd72a..6578c4e 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ LIBEOM_SERVER_LIBS="$DBUS_LIBS $GLIB_LIBS "
 PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
 
 PKG_CHECK_MODULES(WAYLAND_CLIENT, wayland-client)
-PKG_CHECK_MODULES(XDG_SHELL_CLIENT, xdg-shell-unstable-v6-client)
+PKG_CHECK_MODULES(XDG_SHELL_CLIENT, xdg-shell-client)
 LIBEOM_CFLAGS="$LIBEOM_CFLAGS $WAYLAND_CLIENT_CFLAGS $XDG_SHELL_CLIENT_CFLAGS"
 LIBEOM_LIBS="$LIBEOM_LIBS $WAYLAND_CLIENT_LIBS $XDG_SHELL_CLIENT_LIBS"
 
@@ -89,6 +89,11 @@ LIBEOM_CFLAGS="$LIBEOM_CFLAGS -DEFL_BETA_API_SUPPORT "
 #    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],,
 #                  [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
 
+
+PKG_CHECK_MODULES(XDG_SHELL_SERVER, xdg-shell-server)
+LIBEOM_SERVER_CFLAGS="$LIBEOM_SERVER_CFLAGS $XDG_SHELL_SERVER_CFLAGS"
+LIBEOM_SERVER_LIBS="$LIBEOM_SERVER_LIBS $XDG_SHELL_SERVER_LIBS"
+
 PKG_CHECK_MODULES(CAPI, [capi-base-common >= 0.1.1], [CAPI_VER="yes"], [CAPI_VER="no"])
 if test "x$CAPI_VER" = "xyes"; then
     AC_DEFINE(HAVE_CAPI_0_1_1,1,[The version of capi-base-common is over 0.1.1])

diff --git a/packaging/libeom.spec b/packaging/libeom.spec
index a6ac40e..c2037d9 100644 (file)
--- a/packaging/libeom.spec
+++ b/packaging/libeom.spec
@@ -11,7 +11,8 @@ Source1001:   %name.manifest
 
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(ecore-wl2)
-BuildRequires:  pkgconfig(xdg-shell-unstable-v6-client)
+BuildRequires:  pkgconfig(xdg-shell-client)
+BuildRequires:  pkgconfig(xdg-shell-server)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)

diff --git a/src/eom-wayland.c b/src/eom-wayland.c
index 86b4c30..37e085a 100644 (file)
--- a/src/eom-wayland.c
+++ b/src/eom-wayland.c
@@ -39,7 +39,7 @@
 #include "eom-wayland.h"
 #include "eom-private.h"
 #include "eom-client-protocol.h"
-#include "xdg-shell-unstable-v6-client-protocol.h"
+#include "xdg-shell-client-protocol.h"
 #include <Ecore_Wl2.h>
 
 typedef struct _EomWaylandClientInfo {