From f87adee20f16e306a68245843d6d6fa73b826f71 Mon Sep 17 00:00:00 2001 From: Gwanglim Lee Date: Fri, 13 Apr 2018 16:06:53 +0900 Subject: [PATCH] changed to use xdg-shell-unstable-v6 instead of xdg-shell unknown version and removed unnecessary dependency for the xdg-shell server lib Change-Id: I7b61520811f8bca91c65d2df266a6b116cc3cbd4 --- configure.ac | 7 +------ packaging/libeom.spec | 3 +-- src/eom-wayland.c | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 6578c4e..e2dd72a 100755 --- 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-client) +PKG_CHECK_MODULES(XDG_SHELL_CLIENT, xdg-shell-unstable-v6-client) LIBEOM_CFLAGS="$LIBEOM_CFLAGS $WAYLAND_CLIENT_CFLAGS $XDG_SHELL_CLIENT_CFLAGS" LIBEOM_LIBS="$LIBEOM_LIBS $WAYLAND_CLIENT_LIBS $XDG_SHELL_CLIENT_LIBS" @@ -89,11 +89,6 @@ 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 f8756e5..65b03a6 100644 --- a/packaging/libeom.spec +++ b/packaging/libeom.spec @@ -11,8 +11,7 @@ Source1001: %name.manifest BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(ecore-wl2) -BuildRequires: pkgconfig(xdg-shell-client) -BuildRequires: pkgconfig(xdg-shell-server) +BuildRequires: pkgconfig(xdg-shell-unstable-v6-client) 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 37e085a..86b4c30 100644 --- 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-client-protocol.h" +#include "xdg-shell-unstable-v6-client-protocol.h" #include typedef struct _EomWaylandClientInfo { -- 2.7.4