gcc4 patch; bug #94282

(Portage version: 2.0.51.22-r1)

4 files changed, 42 insertions, 24 deletions

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 1871aa8708a4..cf349272a5b4 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.156 2005/05/19 20:21:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.157 2005/06/04 02:53:46 halcy0n Exp $
+
+  04 Jun 2005; Mark Loeser <halcy0n@gentoo.org> +files/php-5.0.3-gcc4.patch,
+  php-5.0.3-r1.ebuild:
+  Patch to fix compilation with GCC4 ; bug #94282
 
   19 May 2005; Robin H. Johnson <robbat2@gentoo.org> php-5.0.2-r1.ebuild,
   php-5.0.3.ebuild, php-5.0.3-r1.ebuild:
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 739fcbb2f085..b80f240abdc4 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,34 +1,35 @@
+MD5 012326a7ba1fe96a9398c4428a74d545 ChangeLog 21153
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 fbba8d77e8712b6026b0815967281540 php-4.3.10.ebuild 1137
-MD5 05777ac6270afee3f317ba6fa3ccdd86 php-5.0.3-r1.ebuild 793
-MD5 a477b4bbabe5481c1f3ce596a407201a php-5.0.1.ebuild 540
-MD5 30ee00b03a957aa320e736ba94ddec84 php-5.0.3.ebuild 748
-MD5 8617878370179a48e3e24a92e6c3e9af php-5.0.2-r1.ebuild 591
-MD5 1d25a66511eb4e2ed454554525f21139 php-5.0.0.ebuild 520
+MD5 db2a030a2f6d34869c4e46d0b3d79761 php-4.3.8.ebuild 1071
 MD5 35529685a3e1830ead5cacfad90c737b php-4.3.9.ebuild 1076
-MD5 228f5304b8b0dedb94087ad6f555bad9 php-4.3.11.ebuild 1217
 MD5 8ae4ced093c22d77265dc452f24ee631 php-4.3.9_rc1.ebuild 1135
-MD5 bb72d15f50c43726d3e53dc821addf2b php-5.0.2.ebuild 557
-MD5 012326a7ba1fe96a9398c4428a74d545 ChangeLog 21153
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 8a5dced6630e496f509c8c89ce64a66e php-5.0.0-r1.ebuild 538
-MD5 db2a030a2f6d34869c4e46d0b3d79761 php-4.3.8.ebuild 1071
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
-MD5 3d9b5ebf0a273b87c7a9355fa0d0676d files/digest-php-4.3.9_rc1 134
-MD5 f7a7898637874593f519c336db79fa45 files/php-5.0.3-missing-arches.patch 524
-MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
-MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0-r1 63
-MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2-r1 63
-MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-5.0.3-r1 63
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 1d25a66511eb4e2ed454554525f21139 php-5.0.0.ebuild 520
+MD5 a477b4bbabe5481c1f3ce596a407201a php-5.0.1.ebuild 540
+MD5 8617878370179a48e3e24a92e6c3e9af php-5.0.2-r1.ebuild 591
+MD5 bb72d15f50c43726d3e53dc821addf2b php-5.0.2.ebuild 557
+MD5 593b8fc76b0337f3ed1f8a3619263010 php-5.0.3-r1.ebuild 867
+MD5 30ee00b03a957aa320e736ba94ddec84 php-5.0.3.ebuild 748
+MD5 228f5304b8b0dedb94087ad6f555bad9 php-4.3.11.ebuild 1217
+MD5 8c692a66d1aeba1f84a35386e6bec47e files/digest-php-4.3.10 210
 MD5 ae48d9701424c6ba150e00304b5d84b1 files/digest-php-4.3.8 208
 MD5 205c1cd94cbb81c772fa366163faff0a files/digest-php-4.3.9 208
+MD5 3d9b5ebf0a273b87c7a9355fa0d0676d files/digest-php-4.3.9_rc1 134
 MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0 63
+MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0-r1 63
 MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-5.0.1 63
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2 63
+MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2-r1 63
 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-5.0.3 63
-MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
-MD5 8c692a66d1aeba1f84a35386e6bec47e files/digest-php-4.3.10 210
+MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-5.0.3-r1 63
+MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
+MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
+MD5 f7a7898637874593f519c336db79fa45 files/php-5.0.3-missing-arches.patch 524
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
 MD5 e1385dbdad960ad1d13116d33814dacd files/digest-php-4.3.11 210
 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
+MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 6fb14885b5124b2bb92eb7a02ac24b01 files/php-5.0.3-gcc4.patch 432
diff --git a/dev-php/php/files/php-5.0.3-gcc4.patch b/dev-php/php/files/php-5.0.3-gcc4.patch
new file mode 100644
index 000000000000..fdee5f406b31
--- /dev/null
+++ b/dev-php/php/files/php-5.0.3-gcc4.patch
@@ -0,0 +1,11 @@
+diff -ur php-5.0.3-orig/Zend/zend_modules.h php-5.0.3/Zend/zend_modules.h
+--- php-5.0.3-orig/Zend/zend_modules.h	2005-05-28 16:57:04.000000000 -0400
++++ php-5.0.3/Zend/zend_modules.h	2005-05-28 16:59:59.000000000 -0400
+@@ -23,6 +23,7 @@
+ #define MODULES_H
+ 
+ #include "zend.h"
++#include "zend_compile.h"
+ 
+ #define INIT_FUNC_ARGS		int type, int module_number TSRMLS_DC
+ #define INIT_FUNC_ARGS_PASSTHRU	type, module_number TSRMLS_CC
diff --git a/dev-php/php/php-5.0.3-r1.ebuild b/dev-php/php/php-5.0.3-r1.ebuild
index 41a0939020e5..c875d4a0b478 100644
--- a/dev-php/php/php-5.0.3-r1.ebuild
+++ b/dev-php/php/php-5.0.3-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/dev-php/php/php-5.0.3-r1.ebuild,v 1.2 2005/05/19 20:21:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.3-r1.ebuild,v 1.3 2005/06/04 02:53:46 halcy0n Exp $
 
 PHPSAPI="cli"
 MY_P="${PN}-${PV}"
@@ -21,6 +21,8 @@ src_unpack() {
 	[ "${ARCH}" == "sparc" ] && epatch ${FILESDIR}/stdint.diff
 	epatch ${FILESDIR}/${P}-missing-arches.patch
 	epatch ${FILESDIR}/libmbfl-headers.patch
+	#GCC4 compilation patch ; bug #94282
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }
 
 src_compile () {