Upstream patch for fixing upstream bug 577133

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

5 files changed, 337 insertions, 3 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index aeb6a646e45c..1dc2374cb56d 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/gnome-screensaver
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.103 2009/12/03 17:09:11 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.104 2010/01/16 21:54:13 pacho Exp $
+
+*gnome-screensaver-2.28.0-r1 (16 Jan 2010)
+*gnome-screensaver-2.26.1-r1 (16 Jan 2010)
+
+  16 Jan 2010; Pacho Ramos <pacho@gentoo.org>
+  +gnome-screensaver-2.26.1-r1.ebuild,
+  +files/gnome-screensaver-2.26.1-remove-inhibitors.patch,
+  +gnome-screensaver-2.28.0-r1.ebuild:
+  Upstream patch for fixing upstream bug 577133 related with screensaver not
+  being locked due inhibitors left by other apps
 
   03 Dec 2009; Brent Baude <ranger@gentoo.org>
   gnome-screensaver-2.26.1.ebuild:
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index b7832adf878a..e6c3aa4dc641 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,12 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-screensaver-2.20.0-fix-gamma.patch 1637 RMD160 1bda5b646edb2b38218c93ac05b6f592e1366bca SHA1 243191a5c59be9badbba440ef364483a83d69fae SHA256 20c5afb7c058e1a4acf308eee466bbf81fb01e2df9a238fc48b0e89384521005
 AUX gnome-screensaver-2.22.2-fix-copy-themes-include.patch 566 RMD160 ebcac26112014e9465a6b706d40ab345f1c40c73 SHA1 9d05b510248f71c3deee0cb98225eaed1f1d0f2e SHA256 bee314d9a2a6c0e7fdd7fd2c26ea7c8d8525e6fe14283e3db47ad34cc868f95a
 AUX gnome-screensaver-2.24.1-pixmap-leak.patch 575 RMD160 87e26737ce5d93414987ea69f158c14864971be5 SHA1 c8d183c584a253c7bbbe4260a5b9e0fad01db9b8 SHA256 8406021577855a7abcb5b8c986a8b8221cedacb10de716e1f7d7028711b3aeff
+AUX gnome-screensaver-2.26.1-remove-inhibitors.patch 3207 RMD160 88ebb0f695f7703f2d325e28d92052fb8e02eac3 SHA1 b04cfceb57bf6e01b1665156878cb35ea801012f SHA256 3949e6177b579809a59db6dfcbbcceea395ff1e38ff33678bc5aff768c375a85
 AUX xss-conversion-2.txt 1026 RMD160 5a1810d1f41999907ff39adf0e6396d1d6f5c5d7 SHA1 477743e8fd025cff16c1b2ed538a57ce9550a9cf SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8
 DIST gnome-screensaver-2.24.1.tar.bz2 2058780 RMD160 14744c9eb5b139691e9fc33256e9093ae605bd6d SHA1 36cbdc1d614200a85391795fe8e3c3b827f792df SHA256 c8cf26fc1d402269b7030abadfdf2c6103391cf30466b3d30bc99671f4c89f7e
 DIST gnome-screensaver-2.26.1.tar.bz2 2031739 RMD160 0ed7655bc9c5a90e0959693cfa2fab119072d202 SHA1 a71f35aaa72d13f641fe30e8eb576e9c0d19eb76 SHA256 14b68dc59646b5a53487c311d770ccc8458581480c201faf003349119d340830
 DIST gnome-screensaver-2.28.0.tar.bz2 4779450 RMD160 3e29efc67cafd66c6aac7c2b4d17b0c2d42b4edb SHA1 7981b09f75076ebb8cd55032696f12ed06b224ca SHA256 4e1a9c1054a8473b73f2bf3e9adee778e0918e793df6e1c2fa6230485f895412
 EBUILD gnome-screensaver-2.24.1-r1.ebuild 2936 RMD160 78a9df0eeab43e22ffb1f35400ad3a247a0b72f8 SHA1 acec5afb6470e913d7b0e1a5c437abc1926a0450 SHA256 512b687e7e261497efdf6e0914b0a7f81dfdf6eb1893e1d86dac9e3ed27a1311
+EBUILD gnome-screensaver-2.26.1-r1.ebuild 3232 RMD160 2196b4813171167cde3317ff93fd09ccff3e2203 SHA1 ad4a4a089459422078164827e9f17bf256ba158c SHA256 344fa244b89b4e895f286dc929f26b4c3e5e24210836659cf7c55cf1c6ffa177
 EBUILD gnome-screensaver-2.26.1.ebuild 3059 RMD160 a650742f900ca094fa94a16edd3b27255a96397c SHA1 07a49b3b2c7b6b4dee4d68f7ea75875e36b40ac9 SHA256 2a74d90101e2a3f788393b122c3e6503af25c8cd98b4927686ce426de0d59c3b
+EBUILD gnome-screensaver-2.28.0-r1.ebuild 3375 RMD160 c6f2cef5bad4930167cc69e5e0c0c3b1926848f3 SHA1 941063e1e4782a65327a7e974cdd47e2c0096eca SHA256 170b3403f3ffba5c533bfb1bb805db70b4048ac07929c14cf3b4fd7c823de78b
 EBUILD gnome-screensaver-2.28.0.ebuild 3242 RMD160 079602b24f9c771b09b5ff259d697fb07a1ad945 SHA1 004ce601d6645fa6ad7b96f99c9602882ec1de3a SHA256 8e6645c590de841c79b63a0378ee4176800cc5c6b9b9a937451fa4cca4f266cf
-MISC ChangeLog 16334 RMD160 13b60f04936b209c65db2b1089bf5c8e672c7cc4 SHA1 88575151cf0f6853dce19823abbc03450a9b9155 SHA256 e52c7e5b83276a0134757ecf5acfd30d0dc122a24fc493fe7ec1adb4e8d5fd44
+MISC ChangeLog 16730 RMD160 a4788a75e37270462a92a36cf0950b3a8a842735 SHA1 2df23031cef15150c91427483ce4256616e2d166 SHA256 eb586688609d6347c20157082214a309ed557694abac0ceb2fb4fc236c864dd3
 MISC metadata.xml 371 RMD160 dfd5191336607cf3a6693f63252b562406e1a356 SHA1 b44c1782c057b3258bb13f9e5cfe1bc5235edac1 SHA256 082f57713bdf91aa34c880c0172500802e78dde1c461d88478e957691f4b7699
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktSNZAACgkQCaWpQKGI+9Qi6gCcDKaEguc/j9nsfNsnQ71RxY5t
+KyYAnjJZbo7Trbd2qx12sEv4oyienGhr
+=d9z7
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.26.1-remove-inhibitors.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.26.1-remove-inhibitors.patch
new file mode 100644
index 000000000000..dbe67042ff20
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.26.1-remove-inhibitors.patch
@@ -0,0 +1,85 @@
+From 284c9924969a49dbf2d5fae1d680d3310c4df4a3 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 02 Nov 2009 23:15:13 +0000
+Subject: Remove session inhibitors if the originator falls of the bus
+
+This fixes a problem where totem leaves inhibitors behind, see
+bug 600488.
+---
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index e7690a5..7bd3a62 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -986,47 +986,40 @@ listener_dbus_remove_ref_entry (GSListener     *listener,
+ }
+ 
+ static gboolean
+-listener_ref_entry_has_connection (gpointer key,
+-                                   gpointer value,
+-                                   gpointer user_data)
+-{
+-        GSListenerRefEntry *entry;
+-        const char         *connection;
+-        gboolean            matches;
+-
+-        entry = (GSListenerRefEntry *)value;
+-        connection = (const char *) user_data;
+-
+-        matches = FALSE;
+-        if (connection != NULL && entry->connection != NULL) {
+-                matches = (strcmp (connection, entry->connection) == 0);
+-                if (matches) {
+-                        gs_debug ("removing %s from %s for reason '%s' on connection %s",
+-                                  get_name_for_entry_type (entry->entry_type),
+-                                  entry->application,
+-                                  entry->reason,
+-                                  entry->connection);
+-                }
+-        }
+-
+-        return matches;
+-}
+-
+-static gboolean
+ listener_ref_entry_remove_for_connection (GSListener  *listener,
+                                           int          entry_type,
+                                           const char  *connection)
+ {
+         gboolean    removed;
+-        guint       n_removed;
+         GHashTable *hash;
++        GHashTableIter iter;
++        GSListenerRefEntry *entry;
++
++        if (connection == NULL)
++                return FALSE;
+ 
+         hash = get_hash_for_entry_type (listener, entry_type);
+ 
+         removed = FALSE;
+-        n_removed = g_hash_table_foreach_remove (hash, listener_ref_entry_has_connection, (gpointer)connection);
++        g_hash_table_iter_init (&iter, hash);
++        while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&entry)) {
++                if (entry->connection != NULL &&
++                    strcmp (connection, entry->connection) == 0) {
++                        gs_debug ("removing %s from %s for reason '%s' on connection %s",
++                                  get_name_for_entry_type (entry->entry_type),
++                                  entry->application,
++                                  entry->reason,
++                                  entry->connection);
++
++                        if (entry->entry_type == REF_ENTRY_TYPE_INHIBIT) {
++                                /* remove inhibit from gnome session */
++                                remove_session_inhibit (listener, entry);
++                        }
+ 
+-        removed = (n_removed > 0);
++                        g_hash_table_iter_remove (&iter);
++                        removed = TRUE;
++                }
++        }
+ 
+         return removed;
+ }
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild
new file mode 100644
index 000000000000..873fbc286dcd
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild,v 1.1 2010/01/16 21:54:13 pacho Exp $
+
+inherit eutils gnome2 multilib
+
+DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
+HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KERNEL_IUSE="kernel_linux"
+IUSE="debug doc libnotify opengl pam $KERNEL_IUSE"
+
+RDEPEND=">=gnome-base/gconf-2.6.1
+	>=x11-libs/gtk+-2.14.0
+	>=gnome-base/libglade-2.5.0
+	>=gnome-base/gnome-desktop-2.23.2
+	>=gnome-base/gnome-menus-2.12
+	>=dev-libs/glib-2.15
+	>=gnome-base/libgnomekbd-0.1
+	>=dev-libs/dbus-glib-0.71
+	libnotify? ( x11-libs/libnotify )
+	opengl? ( virtual/opengl )
+	pam? ( virtual/pam )
+	!pam? ( kernel_linux? ( sys-apps/shadow ) )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	doc? (
+		app-text/xmlto
+		~app-text/docbook-xml-dtd-4.1.2
+		~app-text/docbook-xml-dtd-4.4 )
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable doc docbook-docs)
+		$(use_enable debug)
+		$(use_with libnotify)
+		$(use_with opengl libgl)
+		$(use_enable pam)
+		--enable-locking
+		--with-xf86gamma-ext
+		--with-kbd-layout-indicator
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	# Fix screensaver not locking due inhibitors, upstream bug #600488
+	epatch "${FILESDIR}/${PN}-2.26.1-remove-inhibitors.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Install the conversion script in the documentation
+	dodoc "${S}/data/migrate-xscreensaver-config.sh"
+	dodoc "${S}/data/xscreensaver-config.xsl"
+
+	# Conversion information
+	sed -e "s:\${PF}:${PF}:" \
+		< "${FILESDIR}/xss-conversion-2.txt" > "${S}/xss-conversion.txt"
+
+	dodoc "${S}/xss-conversion.txt"
+
+	# Non PAM users will need this suid to read the password hashes.
+	# OpenPAM users will probably need this too when
+	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# is fixed.
+	if ! use pam ; then
+		fperms u+s /usr/libexec/gnome-screensaver-dialog
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
+		ewarn "You have a too old xorg-server installation. This will cause"
+		ewarn "gnome-screensaver to eat up your CPU. Please consider upgrading."
+		echo
+	fi
+
+	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
+		ewarn "You have xscreensaver installed, you probably want to disable it."
+		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
+		ewarn "build xscreensaver with -gnome in the USE flags."
+		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
+
+		echo
+	fi
+
+	elog "Information for converting screensavers is located in "
+	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
+}
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild
new file mode 100644
index 000000000000..f1184d02b72e
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild,v 1.1 2010/01/16 21:54:13 pacho Exp $
+
+EAPI="2"
+
+inherit eutils gnome2 multilib
+
+DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
+HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KERNEL_IUSE="kernel_linux"
+IUSE="debug doc libnotify opengl pam $KERNEL_IUSE"
+
+RDEPEND=">=gnome-base/gconf-2.6.1
+	>=x11-libs/gtk+-2.14.0
+	>=gnome-base/gnome-desktop-2.23.2
+	>=gnome-base/gnome-menus-2.12
+	>=dev-libs/glib-2.15
+	>=gnome-base/libgnomekbd-0.1
+	>=dev-libs/dbus-glib-0.71
+	libnotify? ( x11-libs/libnotify )
+	opengl? ( virtual/opengl )
+	pam? ( virtual/pam )
+	!pam? ( kernel_linux? ( sys-apps/shadow ) )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	doc? (
+		app-text/xmlto
+		~app-text/docbook-xml-dtd-4.1.2
+		~app-text/docbook-xml-dtd-4.4 )
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable doc docbook-docs)
+		$(use_enable debug)
+		$(use_with libnotify)
+		$(use_with opengl gl)
+		$(use_enable pam)
+		--enable-locking
+		--with-xf86gamma-ext
+		--with-kbd-layout-indicator
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix screensaver not locking due inhibitors, upstream bug #600488
+	epatch "${FILESDIR}/${PN}-2.26.1-remove-inhibitors.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Install the conversion script in the documentation
+	dodoc "${S}/data/migrate-xscreensaver-config.sh"
+	dodoc "${S}/data/xscreensaver-config.xsl"
+
+	# Conversion information
+	sed -e "s:\${PF}:${PF}:" < "${FILESDIR}/xss-conversion-2.txt" \
+		> "${S}/xss-conversion.txt" || die "sed failed"
+
+	dodoc "${S}/xss-conversion.txt"
+
+	# Non PAM users will need this suid to read the password hashes.
+	# OpenPAM users will probably need this too when
+	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# is fixed.
+	if ! use pam ; then
+		fperms u+s /usr/libexec/gnome-screensaver-dialog
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
+		ewarn "You have a too old xorg-server installation. This will cause"
+		ewarn "gnome-screensaver to eat up your CPU. Please consider upgrading."
+		echo
+	fi
+
+	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
+		ewarn "You have xscreensaver installed, you probably want to disable it."
+		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
+		ewarn "build xscreensaver with -gnome in the USE flags."
+		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
+
+		echo
+	fi
+
+	elog "Information for converting screensavers is located in "
+	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
+}