Azarah's patch to correct issues with gcc-2.

4 files changed, 50 insertions, 9 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 199063e93c93..e77c6afd3a66 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/galeon
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.65 2003/10/26 18:39:58 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.66 2003/11/12 04:07:49 leonardop Exp $
+
+  11 Nov 2003; <root@gentoo.org> galeon-1.3.10.ebuild:
+  Added patch to make galeon compile with gcc-2.
 
 *galeon-1.3.10 (26 Oct 2003)
 
diff --git a/net-www/galeon/Manifest b/net-www/galeon/Manifest
index a2f07fbe51b8..d32756c93243 100644
--- a/net-www/galeon/Manifest
+++ b/net-www/galeon/Manifest
@@ -1,18 +1,19 @@
-MD5 6debf9a1120d61f5daac3d2078009116 galeon-1.2.11.ebuild 3403
-MD5 3137979242dd0efe900dea67829a6a05 ChangeLog 10142
-MD5 d7140fb5f41ff4c713b995a1f102e77d galeon-1.3.10.ebuild 1578
-MD5 efc7f93d6d434b63396a368e1f663a95 galeon-1.2.10a.ebuild 3296
+MD5 6d9c7508c383853bf31f3c5bf4f69231 ChangeLog 10250
 MD5 442452f7bfebb0acafa3c3bfb4a349ec galeon-1.3.6.ebuild 1555
 MD5 5f03f6469c31e45d5b0b4c3eee6b13d0 galeon-1.3.7.ebuild 1571
 MD5 f51d76877c4c755010a203c6d2426ba5 galeon-1.3.8.ebuild 1578
 MD5 c374d7a4340230a98c1ef9517b517675 galeon-1.3.9.ebuild 1585
+MD5 1b51cc31a8f8e928fde98170a7c206e6 galeon-1.3.10.ebuild 1671
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 c72506690307bdae2ceec562ac7fdbd9 files/galeon-1.2.7-google-UTF8.patch 1594
-MD5 8a4f5575c0225821b55e84ba7e75ae05 files/digest-galeon-1.2.10a 67
-MD5 ac03f7ff1c8c933092c3ff11d59e998c files/digest-galeon-1.2.11 66
+MD5 6debf9a1120d61f5daac3d2078009116 galeon-1.2.11.ebuild 3403
+MD5 efc7f93d6d434b63396a368e1f663a95 galeon-1.2.10a.ebuild 3296
 MD5 4b04a9c0dc0217c87db1aa94efea4747 files/digest-galeon-1.3.6 66
 MD5 cac60ede25616b6306b53a878da624eb files/digest-galeon-1.3.7 66
 MD5 567b21a924ca9a86e3573ffc51f9d4d5 files/digest-galeon-1.3.8 66
 MD5 3979067b9c358b8391972ddaf731176e files/digest-galeon-1.3.9 66
 MD5 db8a0894d9e2b9bbd8ad10e2a10e0928 files/digest-galeon-1.3.10 67
+MD5 ac03f7ff1c8c933092c3ff11d59e998c files/digest-galeon-1.2.11 66
 MD5 d7f05d8c910cd3bc11b799ef300ae13f files/galeon-1.2.6-to-printpreview.patch 448
+MD5 c72506690307bdae2ceec562ac7fdbd9 files/galeon-1.2.7-google-UTF8.patch 1594
+MD5 f4cef0104387767ea14b057e4fcd0cdc files/galeon-1.3.10-gcc2_fixes.patch 1262
+MD5 8a4f5575c0225821b55e84ba7e75ae05 files/digest-galeon-1.2.10a 67
diff --git a/net-www/galeon/files/galeon-1.3.10-gcc2_fixes.patch b/net-www/galeon/files/galeon-1.3.10-gcc2_fixes.patch
new file mode 100644
index 000000000000..4d6ca327e3e7
--- /dev/null
+++ b/net-www/galeon/files/galeon-1.3.10-gcc2_fixes.patch
@@ -0,0 +1,30 @@
+--- galeon-1.3.10/bookmarks/xbel.c	2003-11-06 13:06:57.000000000 +0200
++++ galeon-1.3.10.az/bookmarks/xbel.c	2003-11-06 13:07:05.000000000 +0200
+@@ -1065,7 +1065,7 @@ static void
+ xbel_save_galeon_metadata_remove_metadata (xmlNodePtr node)
+ {
+         xmlNodePtr infoNode;
+-        xmlNodePtr metaNode;;
++        xmlNodePtr metaNode;
+ 	xmlNodePtr first_info = NULL;
+ 	xmlNodePtr found = NULL;
+ 	
+--- galeon-1.3.10/src/galeon-shell.c	2003-11-06 13:16:03.000000000 +0200
++++ galeon-1.3.10.az/src/galeon-shell.c	2003-11-06 13:21:07.000000000 +0200
+@@ -185,6 +185,7 @@ galeon_shell_init (GaleonShell *gs)
+ 	gs->priv->automation_factory = galeon_automation_factory_new ();
+ 	if (gs->priv->automation_factory == NULL)
+ 	{
++		char *text = NULL;
+ 		GtkWidget *dialog;
+ 
+ 		dialog = hig_alert_new (NULL,
+@@ -195,7 +196,7 @@ galeon_shell_init (GaleonShell *gs)
+ 					GTK_STOCK_OK,
+ 					GTK_RESPONSE_OK,
+ 					NULL);
+-		char * text = g_strdup_printf (_("Bonobo couldn't locate the file %s."),
++		text = g_strdup_printf (_("Bonobo couldn't locate the file %s."),
+ 					       "<tt>\"GNOME_Galeon_Automation.server\"</tt>");
+ 		hig_alert_set_secondary_printf (HIG_ALERT (dialog), "%s\n\n%s", text,
+ 			      _("Usually this is an indication of an incomplete installation. "
diff --git a/net-www/galeon/galeon-1.3.10.ebuild b/net-www/galeon/galeon-1.3.10.ebuild
index 8b5fc70bfb0c..86afe00e346a 100644
--- a/net-www/galeon/galeon-1.3.10.ebuild
+++ b/net-www/galeon/galeon-1.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.10.ebuild,v 1.1 2003/10/26 18:40:00 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.10.ebuild,v 1.2 2003/11/12 04:07:49 leonardop Exp $
 
 inherit gnome2 debug libtool
 
@@ -34,6 +34,13 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	>=sys-devel/gettext-0.11"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-${PV}-gcc2_fixes.patch
+}
+
 pkg_setup () {
 	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
 	then