diff options
Diffstat (limited to 'meta-xfce/recipes-xfce/xfce4-session')
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch | 82 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb | 6 |
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 000000000..6d5e9c886 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | From 7a75a8a0f7089b716e702e6bb0cf13fc3194e3db Mon Sep 17 00:00:00 2001 | ||
2 | From: Nick Schermer <nick@xfce.org> | ||
3 | Date: Sun, 29 Apr 2012 13:35:37 +0200 | ||
4 | Subject: [PATCH] Remove gnome-keyring remains. | ||
5 | |||
6 | Not required anymore. gnome_keyring_daemon_prepare_environment_sync | ||
7 | is a stub function that does nothing. | ||
8 | |||
9 | Upstream-status: backport [1] | ||
10 | |||
11 | [1] http://git.xfce.org/xfce/xfce4-session/commit/?id=7a75a8a0f7089b716e702e6bb0cf13fc3194e3db | ||
12 | --- | ||
13 | configure.in | 5 ----- | ||
14 | xfce4-session/Makefile.am | 2 -- | ||
15 | xfce4-session/xfsm-compat-gnome.c | 8 -------- | ||
16 | 3 files changed, 0 insertions(+), 15 deletions(-) | ||
17 | |||
18 | diff --git a/configure.in b/configure.in | ||
19 | index f8684b3..9aa4f8f 100644 | ||
20 | --- a/configure.in | ||
21 | +++ b/configure.in | ||
22 | @@ -96,11 +96,6 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0]) | ||
23 | XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) | ||
24 | XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) | ||
25 | |||
26 | -dnl Check for gnome support | ||
27 | -XDT_CHECK_OPTIONAL_PACKAGE([GNOME_KEYRING], [gnome-keyring-1], [2.22], | ||
28 | - [libgnome-keyring], | ||
29 | - [Extra gnome-keyring compatibility support], [no]) | ||
30 | - | ||
31 | dnl Check for debugging support | ||
32 | XDT_FEATURE_DEBUG([xfsm_debug_default]) | ||
33 | |||
34 | diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am | ||
35 | index 5e8343a..c015154 100644 | ||
36 | --- a/xfce4-session/Makefile.am | ||
37 | +++ b/xfce4-session/Makefile.am | ||
38 | @@ -66,7 +66,6 @@ xfce4_session_SOURCES = \ | ||
39 | xfsm-upower.h | ||
40 | |||
41 | xfce4_session_CFLAGS = \ | ||
42 | - $(GNOME_KEYRING_CFLAGS) \ | ||
43 | $(LIBSM_CFLAGS) \ | ||
44 | $(LIBX11_CFLAGS) \ | ||
45 | $(LIBXFCE4UI_CFLAGS) \ | ||
46 | @@ -93,7 +92,6 @@ xfce4_session_LDADD = \ | ||
47 | $(DBUS_GLIB_LIBS) \ | ||
48 | $(LIBWNCK_LIBS) \ | ||
49 | $(XFCONF_LIBS) \ | ||
50 | - $(GNOME_KEYRING_LIBS) \ | ||
51 | -lm | ||
52 | |||
53 | xfce4_session_DEPENDENCIES = \ | ||
54 | diff --git a/xfce4-session/xfsm-compat-gnome.c b/xfce4-session/xfsm-compat-gnome.c | ||
55 | index b5b4a99..e1fa16f 100644 | ||
56 | --- a/xfce4-session/xfsm-compat-gnome.c | ||
57 | +++ b/xfce4-session/xfsm-compat-gnome.c | ||
58 | @@ -59,10 +59,6 @@ | ||
59 | |||
60 | #include <libxfce4util/libxfce4util.h> | ||
61 | |||
62 | -#ifdef HAVE_GNOME_KEYRING | ||
63 | -#include <gnome-keyring.h> | ||
64 | -#endif | ||
65 | - | ||
66 | #include <xfce4-session/xfsm-compat-gnome.h> | ||
67 | |||
68 | #define GNOME_KEYRING_DAEMON "gnome-keyring-daemon" | ||
69 | @@ -154,10 +150,6 @@ gnome_keyring_daemon_startup (void) | ||
70 | } | ||
71 | |||
72 | g_strfreev (lines); | ||
73 | - | ||
74 | -#ifdef HAVE_GNOME_KEYRING | ||
75 | - gnome_keyring_daemon_prepare_environment_sync (); | ||
76 | -#endif | ||
77 | } | ||
78 | else | ||
79 | { | ||
80 | -- | ||
81 | 1.7.4.4 | ||
82 | |||
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 4df989495..3bd374381 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 | |||
2 | SECTION = "x11" | 2 | SECTION = "x11" |
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" |
5 | DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf gnome-keyring" | 5 | DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf" |
6 | RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower" | 6 | RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower" |
7 | PR = "r1" | ||
7 | 8 | ||
8 | inherit xfce | 9 | inherit xfce |
9 | 10 | ||
10 | SRC_URI[md5sum] = "4768e1a41a0287af6aad18b329a0f230" | 11 | SRC_URI[md5sum] = "4768e1a41a0287af6aad18b329a0f230" |
11 | SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce" | 12 | SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce" |
12 | SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch" | 13 | SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch \ |
14 | file://0002-Remove-gnome-keyring-remains.patch" | ||
13 | 15 | ||
14 | # protect from frightening message that xfce might not work correctly | 16 | # protect from frightening message that xfce might not work correctly |
15 | pkg_postinst_${PN} () { | 17 | pkg_postinst_${PN} () { |