New release: 2.11.92

Package-Manager: portage-2.0.51.22-r2

7 files changed, 65 insertions, 33 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 82aa3262773e..7d06f3e32c4e 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.123 2005/08/22 22:41:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.124 2005/08/25 05:54:57 leonardop Exp $
+
+*control-center-2.11.92 (25 Aug 2005)
+
+  25 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/control-center-2.11-gentoo_xcursor.patch,
+  +files/control-center-2.11-xcursor_fix.patch,
+  -control-center-2.11.91.ebuild, +control-center-2.11.92.ebuild:
+  New version.
 
   22 Aug 2005; Aron Griffis <agriffis@gentoo.org>
   control-center-2.10.1-r1.ebuild:
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 2d61e6bab9be..e2aee037042b 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,28 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 1ef975fae0e62b0c43bee8d18c3aec3e ChangeLog 16150
 MD5 aa3234dd1a36f666ba5ace0047cdd8b9 control-center-1.4.0.5-r1.ebuild 1258
 MD5 812a4e6112ccb65d2753560d1c5f2b07 control-center-2.10.2.ebuild 1988
-MD5 dc6bec12b08a945e500e2ccdff5a0540 control-center-2.11.91.ebuild 2376
-MD5 63d40166766fb5bc828bb2bad93e6422 control-center-2.10.0.ebuild 1905
 MD5 5af1d1aad2b9b7fef198abb27b604c35 control-center-2.10.1-r1.ebuild 2036
-MD5 a07ad9b46df4a0e8f71f91fe6f45f94f ChangeLog 15874
-MD5 df56f95627cf72b75af64878020d041d files/digest-control-center-2.11.91 76
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 63d40166766fb5bc828bb2bad93e6422 control-center-2.10.0.ebuild 1905
+MD5 b0f1214c7aad7a7bf070fdb4d5317501 control-center-2.11.92.ebuild 2609
+MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
+MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1-r1 75
-MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
 MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
+MD5 dd226cb871fbe3b10ff84c37acbda960 files/digest-control-center-2.11.92 76
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
-MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
-MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
 MD5 ecb1936df2b744bffc2f450bfb844e81 files/control-center-2.11.91-xft_check.patch 503
-MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
+MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
 MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC8vBgIKl8Uu19MoRAuCHAJsH9ivTIKuYJC5f4R1/gR5usOPWsQCdHJCH
-0pilzo8v/LbEq9pYUiLPXDs=
-=C05Z
------END PGP SIGNATURE-----
+MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
+MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
+MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1-r1 75
+MD5 975ffa9d50cadbd034c4dd6c3ffe0cac files/control-center-2.11-xcursor_fix.patch 646
diff --git a/gnome-base/control-center/control-center-2.11.91.ebuild b/gnome-base/control-center/control-center-2.11.92.ebuild
index 19f632a2e2d2..5f0d721032c7 100644
--- a/gnome-base/control-center/control-center-2.11.91.ebuild
+++ b/gnome-base/control-center/control-center-2.11.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.11.91.ebuild,v 1.1 2005/08/18 00:24:40 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.11.92.ebuild,v 1.1 2005/08/25 05:54:57 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -12,11 +12,10 @@ SLOT="2"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa eds gstreamer static"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 RDEPEND=">=gnome-base/gnome-vfs-2.2
 	>=media-libs/fontconfig-1
 	virtual/xft
+	virtual/x11
 	>=x11-libs/gtk+-2.6
 	>=gnome-base/libbonobo-2
 	>=gnome-base/libgnomeui-2.2
@@ -47,16 +46,18 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 USE_DESTDIR="1"
 
+MAKEOPTS="${MAKEOPTS} -j1"
+
 
 pkg_setup() {
-	G2CONF="--disable-schemas-install --enable-vfs-methods \
-		$(use_enable alsa) $(use_enable gstreamer) $(use_enable static) \
-		$(use_enable eds aboutme)"
+	G2CONF="--disable-schemas-install --disable-scrollkeeper \
+		--enable-vfs-methods $(use_enable alsa) $(use_enable gstreamer) \
+		$(use_enable static) $(use_enable eds aboutme)"
 }
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack "${A}"
+	cd "${S}"
 
 	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
 	# what this is about.
@@ -75,9 +76,13 @@ src_unpack() {
 
 	# Remove unnecessary check for bleeding-edge version of Xft. Gentoo's
 	# xorg-x11 already includes the patch that this check tries to enforce.
-	epatch ${FILESDIR}/${P}-xft_check.patch
+	epatch ${FILESDIR}/${PN}-2.11.91-xft_check.patch
 
-	autoconf || die "autoconf failed"
+	# Gentoo-specific support for xcursor themes. See bug #103638.
+	epatch ${FILESDIR}/${PN}-2.11-gentoo_xcursor.patch
+
+	# Avoid segfault after calling XcursorLibraryLoadImage
+	epatch ${FILESDIR}/${PN}-2.11-xcursor_fix.patch
 
-	gnome2_omf_fix ${S}/help/Makefile.in
+	autoconf || die "autoconf failed"
 }
diff --git a/gnome-base/control-center/files/control-center-2.11-gentoo_xcursor.patch b/gnome-base/control-center/files/control-center-2.11-gentoo_xcursor.patch
new file mode 100644
index 000000000000..e3ee78f84f58
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.11-gentoo_xcursor.patch
@@ -0,0 +1,15 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	2005-08-25 00:33:26.000000000 +0100
++++ capplets/mouse/gnome-mouse-properties.c	2005-08-25 00:39:48.000000000 +0100
+@@ -650,9 +650,11 @@
+ 	// add the XCursor themes - paths taken from <xc/lib/Xcursor.library.c>
+ 	const gchar* const paths[] = {
+ 		"%s/.icons/",
++		"%s/.cursors/",
+ 		"/usr/share/icons/",
+ 		"/usr/share/pixmaps/",
+-		"/usr/X11R6/lib/X11/icons/",
++		"/usr/share/cursors/xorg-x11/",
++		"/usr/share/pixmaps/xorg-x11/",
+ 		NULL
+ 	};
+ 	const gchar* const * iterator;
diff --git a/gnome-base/control-center/files/control-center-2.11-xcursor_fix.patch b/gnome-base/control-center/files/control-center-2.11-xcursor_fix.patch
new file mode 100644
index 000000000000..b351682cbead
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.11-xcursor_fix.patch
@@ -0,0 +1,12 @@
+diff -NurdB control-center-2.11.92/capplets/mouse/gnome-mouse-properties.c control-center-2.11.92-patched/capplets/mouse/gnome-mouse-properties.c
+--- control-center-2.11.92/capplets/mouse/gnome-mouse-properties.c	2005-08-01 10:59:43.000000000 -0500
++++ control-center-2.11.92-patched/capplets/mouse/gnome-mouse-properties.c	2005-08-24 22:17:28.000000000 -0500
+@@ -690,7 +690,7 @@
+ 			
+ 			for (i = 0; sizes[i] != 0; i++) {
+ 				cursor = XcursorLibraryLoadImage("left_ptr", name, sizes[i]);
+-				if (cursor->size != sizes[i]) {
++				if (cursor != NULL && cursor->size != sizes[i]) {
+ 					XcursorImageDestroy (cursor);
+ 					cursor = NULL;
+ 				}
diff --git a/gnome-base/control-center/files/digest-control-center-2.11.91 b/gnome-base/control-center/files/digest-control-center-2.11.91
deleted file mode 100644
index 2938e9abeff7..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.11.91
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a429f605878160e2660725bad2ee1e17 control-center-2.11.91.tar.bz2 1901962
diff --git a/gnome-base/control-center/files/digest-control-center-2.11.92 b/gnome-base/control-center/files/digest-control-center-2.11.92
new file mode 100644
index 000000000000..58967df04e35
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.11.92
@@ -0,0 +1 @@
+MD5 9572d1033c1103c2ed57e802c24b5a5c control-center-2.11.92.tar.bz2 1906135