diff options
Diffstat (limited to 'gnome-base')
4 files changed, 89 insertions, 14 deletions
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog index a04044d0e7db..28d3e7c4959e 100644 --- a/gnome-base/gnome-settings-daemon/ChangeLog +++ b/gnome-base/gnome-settings-daemon/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/gnome-settings-daemon # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.69 2011/02/08 23:08:01 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.70 2011/02/09 17:59:20 ssuominen Exp $ + + 09 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> + gnome-settings-daemon-2.32.1.ebuild, + +files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7 wrt #354133 by Diego Elio + Pettenò. 08 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> -gnome-settings-daemon-2.30.2.ebuild, -gnome-settings-daemon-2.32.0.ebuild, diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 8a07311971f0..cdbe302c5674 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,20 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gnome-settings-daemon-2.32.1-lcdfilter.patch 1749 RMD160 3c3ac3aab62db8c963bb46f89b5ddc42ae699f82 SHA1 de66d2a6a5e8b7fd66def022338ba482dce4d62d SHA256 6aaf4fe50034de4c403850df25a93e371a94486af9629f4d3cc70863abbfb3ae +AUX gnome-settings-daemon-2.32.1-libnotify-0.7.patch 3490 RMD160 f02271a40dd6f22e0041db8eff79441513b24ddd SHA1 ec981586bddcbe35269583b4a50827b57e31d55d SHA256 da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d AUX gnome-settings-daemon-2.32.1-netfs-monitor.patch 1753 RMD160 af98d9b35a2f9748fc86654d4f9a90a85c1c1537 SHA1 b8606ac345e367619838466d5883c0595cd6bcc8 SHA256 ba30e87b4815dca4bae74076b787a3fb9bd083923a1a8e6dee2cd95e8f4ca4e9 DIST gnome-settings-daemon-2.30.0-gst-vol-control-support.patch 27189 RMD160 77e44583894977b6255fba168d565c5948481401 SHA1 8db1dde75b1866619d6589e989ed27fc45050c50 SHA256 0858e7fdb97086f7f0a284d535d642c23f06fb7d9fc71d9f7477dc856439a158 DIST gnome-settings-daemon-2.30.2-gst-vol-control-support.patch.bz2 7255 RMD160 cc5c5a0f095dd0fdb321a338f0939f42f62133cd SHA1 1ece288911360df06d4f1d97166621a5e5d076c7 SHA256 0ddc872fccfd14cfac7620ca76c4333145dc67b541b6554f276c69bef267c394 DIST gnome-settings-daemon-2.30.2.tar.bz2 1250365 RMD160 a4547cdb13c2c5dc8f690cf198853129514adaab SHA1 75fe75eaa7d6197514c1de8b8c47c869f2bade2c SHA256 7cd22dab52f52900ee13a5bc0c1a186e91d33e77f5333c4622f84d85e4eb71f4 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 RMD160 71aef9419eeca5f9fa59bb55990327c307f9ca31 SHA1 f2550acb4a9fd8f96ead1263ba5739915c303f6e SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86 EBUILD gnome-settings-daemon-2.30.2-r1.ebuild 2272 RMD160 ca048b85b1c216c1411e6005b571dc8ce5aa0be9 SHA1 6c682db14368e446a3aba650567843b4a4329367 SHA256 dee9c6b8fae18b26fb5dc5b35a17beeabe31e76b2a98b24d611e7c2d615c209c -EBUILD gnome-settings-daemon-2.32.1.ebuild 3098 RMD160 ea886353293b0da070afeb794098232e40af832a SHA1 bd873b1f127d4e825b88749c63c4271744c0ccb4 SHA256 bd1ce8f806b469e563bb60a08eb8af96442ef7c4f421a33733dc3d8b3da4ffe4 -MISC ChangeLog 13207 RMD160 54171e6cc8b6eec2fa1e2dcf64829af873a6f1bf SHA1 3b9ca3aabdcd37436573c809e6b04600952a126a SHA256 b4298bdf2b0b9f920469409061eef20a7164e5ad00719b25858e2179fa0eaf17 +EBUILD gnome-settings-daemon-2.32.1.ebuild 3152 RMD160 6b164adea2f0e1c06e28a29dc4fbfcbfd68f91a8 SHA1 2f986c0c19d2ff78676d195c92d9e3e56e4d3e77 SHA256 a4883930a109d52701a9db8f9d6fec18bfd2fabe7baef3e75ddd4a5a1bbd27d9 +MISC ChangeLog 13450 RMD160 87ebdf8cd20a9ff7778d98fad526849c5d66167f SHA1 2499e4c176a68349ee2bb1c00dbe652f24598351 SHA256 63be48bc70ed358c01b8aadb458699e3f0cdfe986ae98cd09c4b51ff261139f4 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk1RzN0ACgkQ1fmVwcYIWAZXVgCdGltHPAclgxqO7GeYUbW9UwJq -jPEAmQE0VgfXEQG1I5wwq5mJRiy2I5n0 -=YSFU ------END PGP SIGNATURE----- diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch new file mode 100644 index 000000000000..f755f24acddf --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch @@ -0,0 +1,76 @@ +--- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c ++++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c +@@ -48,6 +48,9 @@ + + #ifdef HAVE_LIBNOTIFY + #include <libnotify/notify.h> ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif + #endif /* HAVE_LIBNOTIFY */ + + #include "gnome-settings-profile.h" +@@ -608,9 +611,13 @@ + gsd_a11y_keyboard_manager_ensure_status_icon (manager); + manager->priv->notification = notify_notification_new (title, + message, +- "preferences-desktop-accessibility", +- NULL); ++ "preferences-desktop-accessibility" ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); + notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon); ++#endif + notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000); + + notify_notification_add_action (manager->priv->notification, +@@ -747,9 +754,13 @@ + gsd_a11y_keyboard_manager_ensure_status_icon (manager); + manager->priv->notification = notify_notification_new (title, + message, +- "preferences-desktop-accessibility", +- NULL); ++ "preferences-desktop-accessibility" ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); + notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon); ++#endif + notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000); + + notify_notification_add_action (manager->priv->notification, +--- plugins/xrandr/gsd-xrandr-manager.c ++++ plugins/xrandr/gsd-xrandr-manager.c +@@ -48,6 +48,9 @@ + + #ifdef HAVE_LIBNOTIFY + #include <libnotify/notify.h> ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif + #endif + + #include "gnome-settings-profile.h" +@@ -1086,6 +1089,11 @@ + + g_assert (error_to_display == NULL || secondary_text == NULL); + ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ notification = notify_notification_new (primary_text, ++ error_to_display ? error_to_display->message : secondary_text, ++ GSD_XRANDR_ICON_NAME); ++#else + if (priv->status_icon) + notification = notify_notification_new_with_status_icon (primary_text, + error_to_display ? error_to_display->message : secondary_text, +@@ -1096,6 +1104,7 @@ + error_to_display ? error_to_display->message : secondary_text, + GSD_XRANDR_ICON_NAME, + NULL); ++#endif + + notify_notification_show (notification, NULL); /* NULL-GError */ + #else diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1.ebuild index d91921927f66..2ec7fdadb988 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1.ebuild,v 1.2 2011/02/08 23:08:01 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1.ebuild,v 1.3 2011/02/09 17:59:20 ssuominen Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -76,6 +76,8 @@ pkg_setup() { src_prepare() { gnome2_src_prepare + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch + # Restore gstreamer volume control support, upstream bug #571145 # Keep using old patch as it doesn't cause problems like bug #339732 #epatch "${WORKDIR}/${PN}-2.30.2-gst-vol-control-support.patch" |