add patch to remove Wextra. Fixes #114533.

Package-Manager: portage-2.0.51.22-r3

5 files changed, 39 insertions, 15 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 45b87c0a5c1f..1c2dede69054 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,13 @@
 # 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.142 2005/12/04 23:59:07 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.143 2005/12/06 04:15:03 allanonjl Exp $
+
+*control-center-2.12.2-r1 (06 Dec 2005)
+
+  06 Dec 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/control-center-2.12.2-gcc-Wextra.patch,
+  -control-center-2.12.2.ebuild, +control-center-2.12.2-r1.ebuild:
+  add patch to remove Wextra.  Fixes #114533.
 
 *control-center-2.12.2 (04 Dec 2005)
 
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 39131a629a24..603d148c1a24 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,19 +1,20 @@
-MD5 9806863ea44fecb5077fb9c4ee67ab43 ChangeLog 18573
-MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333
 MD5 c2f9837fa0e285c242254804a8980bc4 control-center-1.4.0.5-r2.ebuild 1411
-MD5 411bb0502e1a779a850ab4bb0d582e5c control-center-2.10.2.ebuild 2015
 MD5 fb5ca50373f5813456ab01b99119916c control-center-2.12.1.ebuild 2523
-MD5 bc4de8af09fbe54fc30ea0bab546eaba control-center-2.12.2.ebuild 2527
+MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333
+MD5 b981de1d3e97acba3ffd733321930257 control-center-2.12.2-r1.ebuild 2643
+MD5 411bb0502e1a779a850ab4bb0d582e5c control-center-2.10.2.ebuild 2015
+MD5 30570e7523d158de018596f90f114ebb ChangeLog 18834
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
+MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75
+MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
+MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
+MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
+MD5 ffaf30fdb4e8f79169e8a8c8bbe22283 files/control-center-2.12.2-gcc-Wextra.patch 359
+MD5 dac847149ae0099bb34f493727bed270 files/control-center-2.12.2-pathfix.patch 6758
 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
 MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
-MD5 dac847149ae0099bb34f493727bed270 files/control-center-2.12.2-pathfix.patch 6758
-MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
-MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r2 76
-MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
-MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75
-MD5 ee57d7f95478cf42c392dd7c457d4fe7 files/digest-control-center-2.12.2 75
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 ee57d7f95478cf42c392dd7c457d4fe7 files/digest-control-center-2.12.2-r1 75
diff --git a/gnome-base/control-center/control-center-2.12.2.ebuild b/gnome-base/control-center/control-center-2.12.2-r1.ebuild
index 35fe2c148d37..6ac5d2a19a2e 100644
--- a/gnome-base/control-center/control-center-2.12.2.ebuild
+++ b/gnome-base/control-center/control-center-2.12.2-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.12.2.ebuild,v 1.1 2005/12/04 23:59:07 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.2-r1.ebuild,v 1.1 2005/12/06 04:15:04 allanonjl Exp $
 
-inherit eutils gnome2
+inherit eutils gnome2 autotools
 
 DESCRIPTION="The gnome2 Desktop configuration tool"
 HOMEPAGE="http://www.gnome.org/"
@@ -91,4 +91,9 @@ src_unpack() {
 
 	# Gentoo-specific support for xcursor themes. See bug #103638.
 	epatch ${FILESDIR}/${PN}-2.11-gentoo_xcursor.patch
+
+	# Fix for -Wextra gcc error #114533
+	epatch ${FILESDIR}/${PN}-2.12.2-gcc-Wextra.patch
+
+	eautoreconf
 }
diff --git a/gnome-base/control-center/files/control-center-2.12.2-gcc-Wextra.patch b/gnome-base/control-center/files/control-center-2.12.2-gcc-Wextra.patch
new file mode 100644
index 000000000000..b4ac825cd0f2
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.12.2-gcc-Wextra.patch
@@ -0,0 +1,11 @@
+--- control-center-2.12.2/configure.in	2005-11-29 16:12:38.000000000 -0500
++++ control-center-2.12.2.new/configure.in	2005-12-05 22:59:45.000000000 -0500
+@@ -33,7 +33,7 @@
+ if test "x$GCC" = "xyes"; then
+   case " $CFLAGS " in
+   *[\ \	]-Wall[\ \	]*) ;;
+-  *) CFLAGS="$CFLAGS -Wall -Wextra" ;;
++  *) CFLAGS="$CFLAGS -Wall" ;;
+   esac
+ fi
+ changequote([,])dnl
diff --git a/gnome-base/control-center/files/digest-control-center-2.12.2 b/gnome-base/control-center/files/digest-control-center-2.12.2-r1
index f30782b9bd43..f30782b9bd43 100644
--- a/gnome-base/control-center/files/digest-control-center-2.12.2
+++ b/gnome-base/control-center/files/digest-control-center-2.12.2-r1