Fix bug 299242

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

4 files changed, 95 insertions, 2 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index b7c3679bbc4d..067ad94c5579 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.268 2010/01/16 17:13:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.269 2010/03/06 18:43:26 pacho Exp $
+
+*gnome-desktop-2.28.2-r1 (06 Mar 2010)
+
+  06 Mar 2010; Pacho Ramos <pacho@gentoo.org>
+  +gnome-desktop-2.28.2-r1.ebuild,
+  +files/gnome-desktop-2.28.2-slideshow-fix.patch:
+  Fix bug 299242 (slideshow don't animate), thanks to Ian Whyman for
+  reporting.
 
   16 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   gnome-desktop-2.26.3.ebuild:
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index bd996b10c198..86ee32a0e0f2 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-desktop-2.24.2-background.patch 886 RMD160 032349d5797ce2333a961a214bf078138ab16010 SHA1 6e271f942e130cf1f5020d1d7ab9f64f81903fc0 SHA256 cbe72e1e9f8b4891cbbe321ab7f6e16ca98fbdf05a5c833dbf5dfb8135173457
+AUX gnome-desktop-2.28.2-slideshow-fix.patch 532 RMD160 1375805b210900059169bf590dacac3116fad16d SHA1 050ad2cd4ffb7096f5de0bfb1b78f1d5dfb82ebc SHA256 0d0bc1b3788ebba0d8ed78e217117f5687772f976791020a15157c9fee53ba33
 DIST gnome-desktop-2.24.3.tar.bz2 1509505 RMD160 b6489965a0baa6056b5c7826418401459ffbf0b9 SHA1 2ebbf2475bb741131b523819fb46e71d4489fa79 SHA256 03b1e08ee1318820f538864e8db492a245848bd727da1412a62de51d4cb76e89
 DIST gnome-desktop-2.26.3.tar.bz2 3107987 RMD160 04e0de4e9e31e2994e1a3220f2183f25ac780399 SHA1 5b1090354ee775392d8faf4ee667a84c9c7a9e79 SHA256 37b7278d3132bb97f70ba2d5c5c06f5a219433d886e3f85e9a16c1f05c3726b7
 DIST gnome-desktop-2.28.1.tar.bz2 1639948 RMD160 4bcbb7e3c743e864afa1895c363427586b70be19 SHA1 27909d67d4f8d1116d106ef65f612cf673d6802a SHA256 21bb7d3b4aa9b452ecf1b27d6fe61b824f60f76d7c5f3b78b59f0fd3eedfd461
@@ -6,6 +10,14 @@ DIST gnome-desktop-2.28.2.tar.bz2 1611325 RMD160 1d7291a38f981887c61564ad0ad9039
 EBUILD gnome-desktop-2.24.3-r1.ebuild 1931 RMD160 62ce2601950b45cd88e5c44c7530147b7fa81e14 SHA1 a0930d5fa2a45caad03a96163eef92087ba33d31 SHA256 cda0460212dec55d56ba180f17a8dda7e33ef346668538c47a4a958b23f4c8e7
 EBUILD gnome-desktop-2.26.3.ebuild 1680 RMD160 fb7271903761b3d458050943b5bd4ce3ae935bb3 SHA1 1932d3652c7ecd4cfe03cc3cb1af71e738889d40 SHA256 5fbb364137006ddf856c5e6713a6606df17231da0b9be7e66bde11372d255b0d
 EBUILD gnome-desktop-2.28.1-r1.ebuild 1299 RMD160 3b5e08ab7e526b2b8227e2524c548e4b75e9fc56 SHA1 bc77440c1ad97edc9919632765bc82c620cf8f40 SHA256 509c2737c255225aef8931ed9d4a6afacb70f8b3514b8a657f21b431bed987fe
+EBUILD gnome-desktop-2.28.2-r1.ebuild 1643 RMD160 e36169e62123645b403811868d0783cd3cc7cde2 SHA1 4dd051cb9708acbda755045e7810d8639fec6728 SHA256 bca4e7ced3a9ae51481e02b9c7d26b2d9c35a0191987dcff612a3d011d1fc130
 EBUILD gnome-desktop-2.28.2.ebuild 1527 RMD160 53b69d609dc16baca99aa29b52ce9702211e806f SHA1 1ad63147e70e914740ca2af9f7ccfceb27df2fb1 SHA256 9e015bef2bde75c45bb94f7cf0c71dcf7af7b021909035ce0bf6882a923d5679
-MISC ChangeLog 34611 RMD160 2c841e394faadcca653a1dbb58ae2e3213aefb40 SHA1 b9ee4c3e42459c3641220e14f8a472ed8a50114d SHA256 1c3154a2714dadb5c69e15074317b4023704841a416d5a6e6fab321faf3366c1
+MISC ChangeLog 34864 RMD160 cfaa404a0c167d36378492297947bed69d1d982e SHA1 de38cc9da2c2ab65db24ad43a2bc83c471821770 SHA256 bd65ebe4784576273481dfc1499d181144a26edd9d1ce3f8d71bd88574bdcd70
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuSolQACgkQCaWpQKGI+9QvowCbB1ZQ3BmucbNFGebHiHWJjREp
+160An2GVO0DG+P7Jv/4bgrex1YIReLQm
+=pxIq
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.28.2-slideshow-fix.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.28.2-slideshow-fix.patch
new file mode 100644
index 000000000000..5b70a5ba9cd9
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.28.2-slideshow-fix.patch
@@ -0,0 +1,18 @@
+# slideshow backgrounds don't animate
+#
+# http://bugs.gentoo.org/show_bug.cgi?id=299242
+# https://bugzilla.gnome.org/show_bug.cgi?id=601753
+--- gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c	2009-11-12 18:23:30.393878825 -0500
++++ hacked/libgnome-desktop/gnome-bg.c	2009-11-12 18:18:32.296606140 -0500
+@@ -309,6 +309,11 @@
+ {
+ 	bg->transitioned_id = 0;
+ 
++	if (bg->pixbuf_cache) {
++		g_object_unref (bg->pixbuf_cache);
++		bg->pixbuf_cache = NULL;
++	}
++
+ 	g_signal_emit (G_OBJECT (bg), signals[TRANSITIONED], 0);
+ 
+ 	return FALSE;
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.28.2-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.28.2-r1.ebuild
new file mode 100644
index 000000000000..98c7ea895ec4
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.28.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.28.2-r1.ebuild,v 1.1 2010/03/06 18:43:26 pacho Exp $
+
+EAPI="2"
+
+inherit gnome2 eutils
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/gtk+-2.14.0
+	>=dev-libs/glib-2.19.1
+	>=x11-libs/libXrandr-1.2
+	>=gnome-base/gconf-2
+	>=x11-libs/startup-notification-0.5"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	~app-text/docbook-xml-dtd-4.1.2
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2"
+PDEPEND=">=dev-python/pygtk-2.8
+	>=dev-python/pygobject-2.14"
+
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
+# eventually libXrandr shouldn't RDEPEND on randrproto)
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-gnome-distributor=Gentoo
+		--disable-scrollkeeper
+		--disable-static"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix slideshow regression, see upstream #601753
+	epatch "${FILESDIR}/${PN}-2.28.2-slideshow-fix.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+}