aboutsummaryrefslogtreecommitdiffstats
path: root/meta-xfce/recipes-xfce
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-12-23 13:02:37 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2012-12-27 16:14:22 +0100
commit59a700bb1dcc13307d46ec59632c4d2a06052cfd (patch)
tree945628b57f536d0d314dd53cbefe7746a439ad43 /meta-xfce/recipes-xfce
parent7b35cdc554ee3f42f9619996604d4674126711c1 (diff)
downloadmeta-openembedded-contrib-59a700bb1dcc13307d46ec59632c4d2a06052cfd.tar.gz
xfce4-session: remove gnome-keyring dependency
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce/recipes-xfce')
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch82
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb6
2 files changed, 86 insertions, 2 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch b/meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch
new file mode 100644
index 0000000000..6d5e9c8865
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch
@@ -0,0 +1,82 @@
+From 7a75a8a0f7089b716e702e6bb0cf13fc3194e3db Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Sun, 29 Apr 2012 13:35:37 +0200
+Subject: [PATCH] Remove gnome-keyring remains.
+
+Not required anymore. gnome_keyring_daemon_prepare_environment_sync
+is a stub function that does nothing.
+
+Upstream-status: backport [1]
+
+[1] http://git.xfce.org/xfce/xfce4-session/commit/?id=7a75a8a0f7089b716e702e6bb0cf13fc3194e3db
+---
+ configure.in | 5 -----
+ xfce4-session/Makefile.am | 2 --
+ xfce4-session/xfsm-compat-gnome.c | 8 --------
+ 3 files changed, 0 insertions(+), 15 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index f8684b3..9aa4f8f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -96,11 +96,6 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
+ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
+ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
+
+-dnl Check for gnome support
+-XDT_CHECK_OPTIONAL_PACKAGE([GNOME_KEYRING], [gnome-keyring-1], [2.22],
+- [libgnome-keyring],
+- [Extra gnome-keyring compatibility support], [no])
+-
+ dnl Check for debugging support
+ XDT_FEATURE_DEBUG([xfsm_debug_default])
+
+diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
+index 5e8343a..c015154 100644
+--- a/xfce4-session/Makefile.am
++++ b/xfce4-session/Makefile.am
+@@ -66,7 +66,6 @@ xfce4_session_SOURCES = \
+ xfsm-upower.h
+
+ xfce4_session_CFLAGS = \
+- $(GNOME_KEYRING_CFLAGS) \
+ $(LIBSM_CFLAGS) \
+ $(LIBX11_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
+@@ -93,7 +92,6 @@ xfce4_session_LDADD = \
+ $(DBUS_GLIB_LIBS) \
+ $(LIBWNCK_LIBS) \
+ $(XFCONF_LIBS) \
+- $(GNOME_KEYRING_LIBS) \
+ -lm
+
+ xfce4_session_DEPENDENCIES = \
+diff --git a/xfce4-session/xfsm-compat-gnome.c b/xfce4-session/xfsm-compat-gnome.c
+index b5b4a99..e1fa16f 100644
+--- a/xfce4-session/xfsm-compat-gnome.c
++++ b/xfce4-session/xfsm-compat-gnome.c
+@@ -59,10 +59,6 @@
+
+ #include <libxfce4util/libxfce4util.h>
+
+-#ifdef HAVE_GNOME_KEYRING
+-#include <gnome-keyring.h>
+-#endif
+-
+ #include <xfce4-session/xfsm-compat-gnome.h>
+
+ #define GNOME_KEYRING_DAEMON "gnome-keyring-daemon"
+@@ -154,10 +150,6 @@ gnome_keyring_daemon_startup (void)
+ }
+
+ g_strfreev (lines);
+-
+-#ifdef HAVE_GNOME_KEYRING
+- gnome_keyring_daemon_prepare_environment_sync ();
+-#endif
+ }
+ else
+ {
+--
+1.7.4.4
+
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
index 4df9894951..3bd374381d 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
@@ -2,14 +2,16 @@ DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop Environment
SECTION = "x11"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
-DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf gnome-keyring"
+DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf"
RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower"
+PR = "r1"
inherit xfce
SRC_URI[md5sum] = "4768e1a41a0287af6aad18b329a0f230"
SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce"
-SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch"
+SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch \
+ file://0002-Remove-gnome-keyring-remains.patch"
# protect from frightening message that xfce might not work correctly
pkg_postinst_${PN} () {