diff options
author | Pacho Ramos <pacho@gentoo.org> | 2011-03-17 21:30:07 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2011-03-17 21:30:07 +0000 |
commit | 3ca359679eb33d441084a22d045cd090500ecad6 (patch) | |
tree | e1f0125a3ad3ce7849c15ed0dfbace9407212ed3 /gnome-base/gnome-settings-daemon | |
parent | x86 stable per bug 358783 (diff) | |
download | historical-3ca359679eb33d441084a22d045cd090500ecad6.tar.gz historical-3ca359679eb33d441084a22d045cd090500ecad6.tar.bz2 historical-3ca359679eb33d441084a22d045cd090500ecad6.zip |
Fix runtime problems with libnotify-0.7 (bug #358535 by Justin Lecher and patch by Ionut), use debian patch for restoring gst volume control as it fixes volume popup problems (bug #327609 by Morse).
Package-Manager: portage-2.1.9.43/cvs/Linux x86_64
Diffstat (limited to 'gnome-base/gnome-settings-daemon')
4 files changed, 152 insertions, 2 deletions
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog index c6366545841e..1942a422a55f 100644 --- a/gnome-base/gnome-settings-daemon/ChangeLog +++ b/gnome-base/gnome-settings-daemon/ChangeLog @@ -1,6 +1,15 @@ # 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.74 2011/03/16 10:46:56 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.75 2011/03/17 21:30:07 pacho Exp $ + +*gnome-settings-daemon-2.32.1-r1 (17 Mar 2011) + + 17 Mar 2011; Pacho Ramos <pacho@gentoo.org> + +gnome-settings-daemon-2.32.1-r1.ebuild, + +files/gnome-settings-daemon-2.32.1-libnotify-init.patch: + Fix runtime problems with libnotify-0.7 (bug #358535 by Justin Lecher and + patch by Ionut), use debian patch for restoring gst volume control as it + fixes volume popup problems (bug #327609 by Morse). 16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gnome-settings-daemon-2.30.2-r1.ebuild, diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index dbc544dba730..8d2903432002 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,11 +1,24 @@ +-----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-libnotify-init.patch 602 RMD160 90aee270093da761f587b25cd71956fdc6bbb435 SHA1 42c7b245b5842cdb1b47ede959c79e7852f49e71 SHA256 3f81b1bf76b4e01fe6264be0de987fe9d346eee305a898dca630dea7d77b61f3 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-gst-vol-control-support.patch 26788 RMD160 059f8e3e69990cf7f6f3e63159ab8d43f2f4f78a SHA1 5a734843d2094dccdb17014485ac20171193e130 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933 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 2292 RMD160 02f0e35e165c302aa3d0ed5167b95f0fd3fa77b8 SHA1 239e3be903b1ec8a6508129afd718b18e84a0d40 SHA256 61accc8291609c47a4cdb2489a19f70491763342c694700c660e7a7d0a90a94d +EBUILD gnome-settings-daemon-2.32.1-r1.ebuild 3530 RMD160 28db26fc6b67bcd2314648107ff7eec1276bcd03 SHA1 78f5ff6beded7cd1bfaa0a9625d0d7bb35c29f2e SHA256 b770242889cac0dc8368f266acc22cc842637ceb76860aa35ba3b98f56862fb7 EBUILD gnome-settings-daemon-2.32.1.ebuild 3156 RMD160 702c793487169a0a5c6ef6f7094f99fb794c892d SHA1 92ff12e5c85df4adcd38cdeac861329f9f2f7216 SHA256 bde305fbb2ec2607435c96cdf0e6455b64b699ee0aa7792707fda45b3b3e7b69 -MISC ChangeLog 14000 RMD160 f7f69a5af199eb60079cc06cf652c07593539e02 SHA1 103d00e96e42d99314e4a26d0a0f47f0fdc1e8f9 SHA256 9f4235987db559aecfd8b18cf02253a27ca2b65b0a5d1ffc34e524eeebe043f9 +MISC ChangeLog 14400 RMD160 99d79e3e47c1238bd0ac014618d30d0cb93fb248 SHA1 0e2d4fd75946152ecc2a392d5c3dc9f67030a22f SHA256 38d38c8211f31e8465b53b44586a2098fe43e21100b86783c887938a91cb5d16 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk2CfWUACgkQCaWpQKGI+9QCFQCfXKNWp9QtrKBzvFBg1Z4Hpg7m +h9MAn3Rtinagb25HPaaGB375hDtkMcUR +=srZz +-----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch new file mode 100644 index 000000000000..b1e644f5d51b --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch @@ -0,0 +1,14 @@ +diff -Nur gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c +--- gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c 2010-11-15 05:11:00.000000000 -0800 ++++ gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c 2011-03-17 11:52:57.516694024 -0700 +@@ -2530,6 +2530,10 @@ + + manager->priv->current_fn_f7_config = -1; + manager->priv->fn_f7_configs = NULL; ++ ++#ifdef HAVE_LIBNOTIFY ++ notify_init ("gnome-settings-daemon"); ++#endif /* HAVE_LIBNOTIFY */ + } + + static void diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r1.ebuild new file mode 100644 index 000000000000..fee1d5ffa580 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r1.ebuild @@ -0,0 +1,114 @@ +# 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-r1.ebuild,v 1.1 2011/03/17 21:30:07 pacho Exp $ + +EAPI="3" +GCONF_DEBUG="yes" + +inherit autotools eutils gnome2 + +DESCRIPTION="Gnome Settings Daemon" +HOMEPAGE="http://www.gnome.org" +SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/gnome-settings-daemon-2.32.1-gst-vol-control-support.patch" + +# Old patches: +# mirror://gentoo/${PN}-2.30.0-gst-vol-control-support.patch" -> this causes bug #327609 +# mirror://gentoo/${PN}-2.30.2-gst-vol-control-support.patch.bz2" -> this patch has worse problems like bug #339732 + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="debug libnotify policykit pulseaudio smartcard" + +RDEPEND=">=dev-libs/dbus-glib-0.74 + >=dev-libs/glib-2.18:2 + >=x11-libs/gtk+-2.21.2:2 + >=gnome-base/gconf-2.6.1:2 + >=gnome-base/libgnomekbd-2.31.2 + >=gnome-base/gnome-desktop-2.29.92:2 + + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXext + x11-libs/libXxf86misc + >=x11-libs/libxklavier-5.0 + media-libs/fontconfig + + libnotify? ( >=x11-libs/libnotify-0.4.3 ) + policykit? ( + >=sys-auth/polkit-0.91 + >=dev-libs/dbus-glib-0.71 + >=sys-apps/dbus-1.1.2 ) + pulseaudio? ( + >=media-sound/pulseaudio-0.9.15 + media-libs/libcanberra[gtk] ) + !pulseaudio? ( + >=media-libs/gstreamer-0.10.1.2:0.10 + >=media-libs/gst-plugins-base-0.10.1.2:0.10 ) + smartcard? ( >=dev-libs/nss-3.11.2 )" + +DEPEND="${RDEPEND} + !<gnome-base/gnome-control-center-2.22 + sys-devel/gettext + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.19 + x11-proto/inputproto + x11-proto/xproto" + +pkg_setup() { + # README is empty + DOCS="AUTHORS NEWS ChangeLog MAINTAINERS" + G2CONF="${G2CONF} + --disable-static + $(use_enable debug) + $(use_with libnotify) + $(use_enable policykit polkit) + $(use_enable pulseaudio pulse) + $(use_enable !pulseaudio gstreamer) + $(use_enable smartcard smartcard-support)" + + if use pulseaudio; then + elog "Building volume media keys using Pulseaudio" + else + elog "Building volume media keys using GStreamer" + fi +} + +src_prepare() { + gnome2_src_prepare + + # libnotify-0.7.1 compatibility patches + epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch + epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-init.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" +# echo "plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c" >> po/POTFILES.in + # We use now debian patch as looks to fix bug #327609 +# epatch "${DISTDIR}/${PN}-2.30.0-gst-vol-control-support.patch" + epatch "${DISTDIR}/${PN}-2.32.1-gst-vol-control-support.patch" + + # More network filesystems not to monitor, upstream bug #606421 + epatch "${FILESDIR}/${PN}-2.32.1-netfs-monitor.patch" + + # xsettings: Export Xft.lcdfilter for OO.o's benefit, upstream bug #631924 + epatch "${FILESDIR}/${PN}-2.32.1-lcdfilter.patch" + + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf +} + +src_install() { + gnome2_src_install + find "${ED}" -name "*.la" -delete +} + +pkg_postinst() { + gnome2_pkg_postinst + + if ! use pulseaudio; then + elog "GStreamer volume control support is a feature powered by Gentoo GNOME Team" + elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gentoo.org instead" + fi +} |