Added patch to fix compile failure with gcc-4, bug #101970.

Package-Manager: portage-2.0.53_rc6

7 files changed, 54 insertions, 12 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index 356050610c86..1ad57f76d237 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.149 2005/10/10 11:40:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.150 2005/10/27 22:19:02 ka0ttic Exp $
+
+  27 Oct 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/libgtkhtml-3.0.10-no-extern-cluealigned.diff,
+  libgtkhtml-3.0.10.ebuild, libgtkhtml-3.0.10-r1.ebuild,
+  libgtkhtml-3.2.4.ebuild, libgtkhtml-3.2.5.ebuild:
+  Added patch to fix compile failure with gcc-4, bug #101970.
 
   10 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
   +files/libgtkhtml-3.6.2-fbsd.patch, libgtkhtml-3.6.2.ebuild:
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index b96aa172e8c8..b3770f15124e 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,4 +1,7 @@
-MD5 3ad4ee6d78f3a5593f6f29836e136802 ChangeLog 18485
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 adac852d7799de3e1c89adb4e8ddd965 ChangeLog 18759
 MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
 MD5 9b8c5022b2135422ff58e52a18662863 files/digest-libgtkhtml-2.6.3 69
 MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10 68
@@ -10,18 +13,26 @@ MD5 dec731b7d8ca685be1de143a447a827f files/digest-libgtkhtml-3.6.2 67
 MD5 07685a56f4c7d6172c5760032f3d2679 files/digest-libgtkhtml-3.8.0 67
 MD5 90c59d0d5d58451a570c4345cf208b9e files/digest-libgtkhtml-3.8.1 67
 MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
+MD5 ccd71f8847f9cd60a587dd91fa691341 files/libgtkhtml-3.0.10-no-extern-cluealigned.diff 423
 MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
 MD5 b954bf799749526cc35e4d73e5ebbaba files/libgtkhtml-3.2-i18n.patch 1411
 MD5 c90554e1679e74f013b1c8a914c26a48 files/libgtkhtml-3.6.2-fbsd.patch 319
 MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
 MD5 ee6c5393adb84e80761124e6ac8a8ebe libgtkhtml-2.6.0.ebuild 933
 MD5 1f0435489c5f1124038a1295fdc0d474 libgtkhtml-2.6.3.ebuild 940
-MD5 2f37b914dd85d24cac501dd8c3ebb1bd libgtkhtml-3.0.10-r1.ebuild 1337
-MD5 4bf313e04919f0ae012881a308032db4 libgtkhtml-3.0.10.ebuild 1203
-MD5 0cd0fe6431f6d18963274b2f51e31b3a libgtkhtml-3.2.4.ebuild 1180
-MD5 f75eecc58fc39bea1305864cd93d5fe0 libgtkhtml-3.2.5.ebuild 1182
+MD5 d22b9b90ff956087d0d6e64ee85f091e libgtkhtml-3.0.10-r1.ebuild 1405
+MD5 cb34d9cb6e251d71fe30f3f3260813f4 libgtkhtml-3.0.10.ebuild 1310
+MD5 43514fcb8504e6824e0387f0b9521743 libgtkhtml-3.2.4.ebuild 1234
+MD5 3e2961d3d2b60a703dbccba6346606c3 libgtkhtml-3.2.5.ebuild 1257
 MD5 922e87ae1bd10c87e936a4cde85fea60 libgtkhtml-3.6.1.ebuild 1097
 MD5 0699ab760baff035a4dccf3c5be7b315 libgtkhtml-3.6.2.ebuild 1274
 MD5 b54afb9e748dc2a5bf13f7e1ca028c8f libgtkhtml-3.8.0.ebuild 1124
 MD5 b7695b4cc5e0efa4e81a12b21cc311b3 libgtkhtml-3.8.1.ebuild 1119
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYVJiEZCkKN40op4RAuj0AJ9nnrS6+5dTdEl9MRaWuHAFemK4SwCgksxd
+zRIgwLaTQTkU2jzHySfcbZk=
+=hQAY
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.10-no-extern-cluealigned.diff b/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.10-no-extern-cluealigned.diff
new file mode 100644
index 000000000000..ba6875c22afa
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.10-no-extern-cluealigned.diff
@@ -0,0 +1,11 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN gtkhtml-3.0.10.orig/src/htmlcluealigned.h gtkhtml-3.0.10/src/htmlcluealigned.h
+--- gtkhtml-3.0.10.orig/src/htmlcluealigned.h	2005-08-10 00:27:22.000000000 -0400
++++ gtkhtml-3.0.10/src/htmlcluealigned.h	2005-08-10 08:03:00.000000000 -0400
+@@ -38,7 +38,6 @@
+ };
+ 
+ 
+-extern HTMLClueAlignedClass html_cluealigned_class;
+ 
+ 
+ void        html_cluealigned_type_init   (void);
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild
index 96ec7f3625a8..b0021b6af643 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.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-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild,v 1.14 2005/08/24 01:24:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild,v 1.15 2005/10/27 22:19:02 ka0ttic Exp $
 
 inherit gnome2 eutils versionator
 
@@ -40,8 +40,11 @@ ELTCONF="--reverse-deps"
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}/src
+
+	# bug 101970
+	epatch ${FILESDIR}/${P}-no-extern-cluealigned.diff
+
 	# bug 54244, patch for cjk input methods
 	epatch ${FILESDIR}/${PN}-fix_preedit.patch
 }
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild
index 633457e28da6..48414df52ba5 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.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-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild,v 1.17 2005/08/24 01:24:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10.ebuild,v 1.18 2005/10/27 22:19:02 ka0ttic Exp $
 
 inherit gnome2 eutils versionator
 
@@ -37,6 +37,13 @@ USE_DESTDIR="1"
 SCROLLKEEPER_UPDATE="0"
 ELTCONF="--reverse-deps"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# bug 101970
+	epatch ${FILESDIR}/${P}-no-extern-cluealigned.diff
+}
+
 src_compile() {
 	gnome2_src_configure
 
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild
index c4efdff535dd..3b97a5fad226 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.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-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild,v 1.12 2005/08/24 01:24:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild,v 1.13 2005/10/27 22:19:02 ka0ttic Exp $
 
 inherit gnome2 versionator eutils
 
@@ -41,6 +41,8 @@ ELTCONF="--reverse-deps"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
+	# bug 101970
+	epatch ${FILESDIR}/${PN}-3.0.10-no-extern-cluealigned.diff
+	epatch ${FILESDIR}/${PN}-3.2-i18n.patch
 }
 
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild
index 2ef34abbf9da..d2f53e3f7d5b 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.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-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild,v 1.10 2005/05/25 04:09:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild,v 1.11 2005/10/27 22:19:02 ka0ttic Exp $
 
 inherit gnome2 versionator eutils
 
@@ -41,6 +41,8 @@ ELTCONF="--reverse-deps"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	# bug 101970
+	epatch ${FILESDIR}/${PN}-3.0.10-no-extern-cluealigned.diff
 	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
 }