gcc4 patch

Package-Manager: portage-2.0.51.22-r1

5 files changed, 46 insertions, 36 deletions

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 36d3084cccf8..874a344bf3b7 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,33 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 f594dba31b026413a31e97c619dab9da ChangeLog 6155
+MD5 e5e2dd7e8c0e613975275ddc9d74be6f evolution-data-server-1.0.1.ebuild 887
 MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
+MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
+MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 1097e1ac343ae36a49a3da3824b3d624 evolution-data-server-1.2.0.ebuild 1249
-MD5 8f0d535918175320417782ad0939d531 ChangeLog 5967
-MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
-MD5 a3403c6784d7ed4349529e607a836411 evolution-data-server-1.2.1.ebuild 2366
 MD5 4dbe4199e9831b2797fb93b7a19c42fb evolution-data-server-1.2.0-r1.ebuild 2365
-MD5 e5e2dd7e8c0e613975275ddc9d74be6f evolution-data-server-1.0.1.ebuild 887
-MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
+MD5 a3403c6784d7ed4349529e607a836411 evolution-data-server-1.2.1.ebuild 2366
 MD5 d786b6026273913891147dc06bd53929 evolution-data-server-1.2.1-r1.ebuild 2417
-MD5 f0e10430c507a253942d0b5deb346a87 evolution-data-server-1.2.3.ebuild 2457
-MD5 bbc32ff03cbc0bac1c13b71aacbcdf80 files/digest-evolution-data-server-1.2.0-r1 81
-MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
-MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
-MD5 035a24e01dccf6365e41d4544b019f03 files/digest-evolution-data-server-1.2.3 82
-MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1-r1 81
-MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1 81
-MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
-MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
-MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
+MD5 227d7f0f0d107201ac7657204897fd9f evolution-data-server-1.2.3.ebuild 2523
+MD5 9d35355b61cdb08f0f918e3f106ce953 files/digest-evolution-data-server-1.0.1 81
 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
+MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
+MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
+MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
 MD5 bbc32ff03cbc0bac1c13b71aacbcdf80 files/digest-evolution-data-server-1.2.0 81
-MD5 9d35355b61cdb08f0f918e3f106ce953 files/digest-evolution-data-server-1.0.1 81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCqKnDKRy60XGEcJIRAtMXAJ9DLILhf3qYI855TgL9/BUz7+B00gCgsJIK
-xoi++r2XwROq7wT7mY8lhug=
-=3SGn
------END PGP SIGNATURE-----
+MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
+MD5 bbc32ff03cbc0bac1c13b71aacbcdf80 files/digest-evolution-data-server-1.2.0-r1 81
+MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1 81
+MD5 9301f93589ecd825aa39e32465a707a3 files/evolution-data-server-1.2.3-gcc4.patch 558
+MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1-r1 81
+MD5 035a24e01dccf6365e41d4544b019f03 files/digest-evolution-data-server-1.2.3 82
+MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 0d5f3af55217..f7e71bb60039 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gtkhtml
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.42 2004/08/25 06:39:22 sekretarz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.43 2005/06/10 02:23:59 halcy0n Exp $
+
+  10 Jun 2005; Mark Loeser <halcy0n@gentoo.org> +files/gtkhtml-gcc4.patch,
+  gtkhtml-1.1.10-r1.ebuild:
+  Patch to fix compilation with GCC4
 
   25 Aug 2004; Karol Wojtaszek <sekretarz@gentoo.org>
   gtkhtml-1.1.10-r1.ebuild:
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 343faa3a0159..acba226997e8 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3c635656fff7fb845d147e99044d792d ChangeLog 5904
-MD5 38ba514ac42d50a81ff0284c6623315c gtkhtml-1.1.10-r1.ebuild 4177
+MD5 ac905a99885cc4a1a6ed27eac5b7162d ChangeLog 6043
+MD5 56443f4e4e101b848dfa5f7b71dbfdcb gtkhtml-1.1.10-r1.ebuild 4212
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 beee6dc1f9b01326aec9a28c8959c395 files/digest-gtkhtml-1.1.10-r1 68
 MD5 bc6bf91c4d69c7c6933885588f46eab3 files/gtkhtml-gcc34.patch 484
+MD5 9ccd59aedc67c72d6991971b74de2d6a files/gtkhtml-gcc4.patch 485
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFBeWC8Rkyva5PS18kRAqlmAJ9PFay/1Cx/UTnQ7NcZJFWujsf2ygCfQysk
-sPXJwUkGiEjWgOcK6NnmfGw=
-=ofKS
+iD8DBQFCqPnQCRZPokWLroQRAsE4AKC8J8rU02MWlEPwpE7gZrKIazwsyQCff4oE
+bsHsSZk79Z9fJFo+Hn7Fltw=
+=7ubE
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-gcc4.patch b/gnome-extra/gtkhtml/files/gtkhtml-gcc4.patch
new file mode 100644
index 000000000000..d01353ce2e73
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-gcc4.patch
@@ -0,0 +1,13 @@
+diff -urN ../tmp-orig/gtkhtml3.1-3.1.20/src/htmlcluealigned.h ./src/htmlcluealigned.h
+--- ../tmp-orig/gtkhtml3.1-3.1.20/src/htmlcluealigned.h	2001-05-21 14:47:11.000000000 +0200
++++ ./src/htmlcluealigned.h	2004-12-23 00:11:07.458004704 +0100
+@@ -38,9 +38,6 @@
+ };
+ 
+ 
+-extern HTMLClueAlignedClass html_cluealigned_class;
+-
+-
+ void        html_cluealigned_type_init   (void);
+ void        html_cluealigned_class_init  (HTMLClueAlignedClass *klass,
+ 					  HTMLType              type,
diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild
index 999beb077408..817b9ab58e5f 100644
--- a/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild,v 1.6 2004/08/25 06:39:22 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild,v 1.7 2005/06/10 02:23:59 halcy0n Exp $
 
 inherit gnome.org libtool eutils
 
@@ -36,6 +36,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${PN}-gcc34.patch
+	epatch ${FILESDIR}/${PN}-gcc4.patch
 }
 
 src_compile() {