workaround gcc bug on alpha

4 files changed, 177 insertions, 3 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index bf845312ab6c..5628083da03b 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.31 2003/02/12 06:48:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.32 2003/02/18 22:22:37 agriffis Exp $
 
-  07 Feb 2003; Aron Griffis <agriffis@gentoo.org> control-center-2.2.0.1.ebuild :
-  Add ~alpha to KEYWORDS
+*control-center-2.2.0.1-r1 (18 Feb 2003)
+
+  18 Feb 2003; Aron Griffis <agriffis@gentoo.org> control-center-2.2.0.1-r1.ebuild files/control-center-2.2.0.1-alpha_hack.patch files/digest-control-center-2.2.0.1-r1 :
+  Add control-center-2.2.0.1-alpha_hack.patch to workaround alpha gcc bug
 
 *control-center-2.2.0.1 (05 Feb 2003)
 
+  07 Feb 2003; Aron Griffis <agriffis@gentoo.org> control-center-2.2.0.1.ebuild :
+  Add ~alpha to KEYWORDS
+
   05 Feb 2003; foser <foser@gentoo.org> control-center-2.2.0.1.ebuild :
   minor bump
 
diff --git a/gnome-base/control-center/control-center-2.2.0.1-r1.ebuild b/gnome-base/control-center/control-center-2.2.0.1-r1.ebuild
new file mode 100644
index 000000000000..4fcecbcf40f7
--- /dev/null
+++ b/gnome-base/control-center/control-center-2.2.0.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.2.0.1-r1.ebuild,v 1.1 2003/02/18 22:22:37 agriffis Exp $
+
+inherit gnome2 eutils
+
+S=${WORKDIR}/${P}
+DESCRIPTION="the gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha"
+
+MAKEOPTS="-j1"
+
+RDEPEND=">=x11-libs/gtk+-2.2
+	>=gnome-base/gconf-1.2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/gnome-desktop-2.2
+	>=gnome-base/libgnomeui-2.2
+	dev-libs/libxml2
+	media-sound/esound
+	>=x11-wm/metacity-2.4.5"
+																		
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/pkgconfig-0.12.0" 
+
+DOCS="AUTHORS ChangeLog COPYING README TODO INSTALL NEWS"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
+	# what this is about.
+	use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch
+}
diff --git a/gnome-base/control-center/files/control-center-2.2.0.1-alpha_hack.patch b/gnome-base/control-center/files/control-center-2.2.0.1-alpha_hack.patch
new file mode 100644
index 000000000000..beb42d2f6a38
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.2.0.1-alpha_hack.patch
@@ -0,0 +1,126 @@
+--- capplets/common/gconf-property-editor.c.old	2002-07-16 18:07:40.000000000 -0400
++++ capplets/common/gconf-property-editor.c	2003-02-18 16:55:14.000000000 -0500
+@@ -101,6 +101,7 @@
+ 					       GConfChangeSet        *changeset,
+ 					       GObject               *ui_control,
+ 					       const gchar           *first_prop_name,
++					       int                    alpha_hack,
+ 					       va_list                var_args,
+ 					       const gchar	     *first_custom,
+ 					       ...);
+@@ -341,6 +342,7 @@
+ 		   GConfChangeSet        *changeset,
+ 		   GObject               *ui_control,
+ 		   const gchar           *first_prop_name,
++		   int                    alpha_hack,
+ 		   va_list                var_args,
+ 		   const gchar		 *first_custom,
+ 		   ...) 
+@@ -452,7 +454,7 @@
+ 		 changeset,
+ 		 G_OBJECT (checkbox),
+ 		 first_property_name,
+-		 var_args,
++		 0, var_args, 
+ 		 NULL);
+ 
+ 	va_end (var_args);
+@@ -526,7 +528,7 @@
+ 		 changeset,
+ 		 G_OBJECT (entry),
+ 		 first_property_name,
+-		 var_args, NULL);
++		 0, var_args,  NULL);
+ 
+ 	g_signal_connect_swapped (G_OBJECT (entry), "changed",
+ 				  (GCallback) peditor_integer_widget_changed, peditor);
+@@ -618,7 +620,7 @@
+ 		 changeset,
+ 		 G_OBJECT (entry),
+ 		 first_property_name,
+-		 var_args, NULL);
++		 0, var_args,  NULL);
+ 
+ 	g_signal_connect_swapped (G_OBJECT (entry), "changed",
+ 				  (GCallback) peditor_string_widget_changed, peditor);
+@@ -748,7 +750,7 @@
+ 		 changeset,
+ 		 G_OBJECT (cp),
+ 		 first_property_name,
+-		 var_args, NULL);
++		 0, var_args,  NULL);
+ 
+ 	va_end (var_args);
+ 
+@@ -902,7 +904,7 @@
+ 		 changeset,
+ 		 G_OBJECT (option_menu),
+ 		 first_property_name,
+-		 var_args, NULL);
++		 0, var_args,  NULL);
+ 
+ 	va_end (var_args);
+ 
+@@ -943,7 +945,7 @@
+ 		 changeset,
+ 		 G_OBJECT (option_menu),
+ 		 first_property_name,
+-		 var_args,
++		 0, var_args, 
+ 		 "conv-to-widget-cb",
+ 		 peditor_enum_conv_to_widget,
+ 		 "conv-from-widget-cb",
+@@ -1041,7 +1043,7 @@
+ 		 changeset,
+ 		 G_OBJECT (first_button),
+ 		 first_property_name,
+-		 var_args, NULL);
++		 0, var_args,  NULL);
+ 
+ 	va_end (var_args);
+ 
+@@ -1116,7 +1118,7 @@
+ 		 changeset,
+ 		 G_OBJECT (adjustment),
+ 		 first_property_name,
+-		 var_args, NULL);
++		 0, var_args,  NULL);
+ 
+ 	va_end (var_args);
+ 
+@@ -1351,7 +1353,7 @@
+ 		 changeset,
+ 		 G_OBJECT (font_picker),
+ 		 first_property_name,
+-		 var_args,
++		 0, var_args, 
+ 		 "data", GUINT_TO_POINTER (font_type),
+ 		 NULL);
+ 
+@@ -1445,7 +1447,7 @@
+ 		 changeset,
+ 		 G_OBJECT (checkbox),
+ 		 first_property_name,
+-		 var_args,
++		 0, var_args, 
+ 		 "conv-to-widget-cb",
+ 		 peditor_enum_toggle_conv_to_widget,
+ 		 "conv-from-widget-cb",
+@@ -1670,7 +1672,7 @@
+ 		 changeset,
+ 		 G_OBJECT (button),
+ 		 first_property_name,
+-		 var_args, NULL);
++		 0, var_args,  NULL);
+ 
+ 	va_end (var_args);
+ 
+@@ -1715,7 +1717,7 @@
+ 		 changeset,
+ 		 G_OBJECT (first_button),
+ 		 first_property_name,
+-		 var_args,
++		 0, var_args,
+ 		 "conv-to-widget-cb",
+ 		 peditor_enum_conv_to_widget,
+ 		 "conv-from-widget-cb",
diff --git a/gnome-base/control-center/files/digest-control-center-2.2.0.1-r1 b/gnome-base/control-center/files/digest-control-center-2.2.0.1-r1
new file mode 100644
index 000000000000..7c99e5c397e2
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.2.0.1-r1
@@ -0,0 +1 @@
+MD5 b17bc2ecf9a38614310c54c5f88ffc55 control-center-2.2.0.1.tar.bz2 146238