fix compilation with php-5.3 (bug #324833)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 124 insertions, 8 deletions

diff --git a/dev-php5/pecl-sca_sdo/ChangeLog b/dev-php5/pecl-sca_sdo/ChangeLog
index e7b409188c53..ead7d58b3a78 100644
--- a/dev-php5/pecl-sca_sdo/ChangeLog
+++ b/dev-php5/pecl-sca_sdo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/pecl-sca_sdo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/ChangeLog,v 1.7 2010/05/29 18:48:46 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/ChangeLog,v 1.8 2010/09/19 16:40:53 mabi Exp $
+
+  19 Sep 2010; Matti Bickel <mabi@gentoo.org> pecl-sca_sdo-1.2.4-r1.ebuild,
+  +files/pecl-sca_sdo-1.2.4-php53.patch:
+  fix compilation with php-5.3 (bug #324833)
 
 *pecl-sca_sdo-1.2.4-r1 (29 May 2010)
 
diff --git a/dev-php5/pecl-sca_sdo/Manifest b/dev-php5/pecl-sca_sdo/Manifest
index dabe9f884b60..f5bf831e0d88 100644
--- a/dev-php5/pecl-sca_sdo/Manifest
+++ b/dev-php5/pecl-sca_sdo/Manifest
@@ -1,5 +1,6 @@
 AUX pecl-sca_sdo-1.2.4-gcc44.patch 490 RMD160 37d318ff3e2247247affc88648c43b5762b35925 SHA1 6f3f3c5a6fd778c5919c2912ec41b03043314776 SHA256 074898829dfd864537c93970e55ed5a63fd8836607013f927f92b4f961f960b7
+AUX pecl-sca_sdo-1.2.4-php53.patch 3892 RMD160 a2195c7e4701ac234a9332ac27ad80cf85e4de96 SHA1 5a8d1511bfe47bb257cde5f77262f9f6e760e3df SHA256 a130ca32fca04e7570f8b1d4f829976471c8902829768a8b56d7a8211414335e
 DIST SCA_SDO-1.2.4.tgz 576531 RMD160 92a5fcc546833c327e459057dff89a4a5ddef63c SHA1 00ed0bfef0d65a2d4caccef3e23e3243b438fe25 SHA256 25443f9cca0c628207d32d7936db586597d826e4b789057780bf18042066e464
-EBUILD pecl-sca_sdo-1.2.4-r1.ebuild 869 RMD160 5c60246881c0b62959c724f77dd3d46e6ae0f260 SHA1 3e2e2165be0fe6b10afc0dea36d284bfc5d912ee SHA256 664c4e86f654c1a6d7833faeb5ba77fb98d9b0c75f6b15a4b62882221eadf87c
-MISC ChangeLog 1794 RMD160 0b14c53072a9ad60ad5314114622888e8591c249 SHA1 ae63600433e1b610d3194bb6c29fa77285e10729 SHA256 74192e5dcb2bb0a2eee79080f0bc1bd6678e5781aa1bdd6f79457cbd5e981871
+EBUILD pecl-sca_sdo-1.2.4-r1.ebuild 867 RMD160 8e7021f1dca562c24785e7e440e1fe3c0e6caef8 SHA1 55c767b3d115af75aa82e68ba0ba183ff3d6ee9d SHA256 5e52c578ed9c9df81b3a11a20fc079c2d5759a31a88d8426554bc4ddefbe9af2
+MISC ChangeLog 1957 RMD160 d108431ca857c9799783eee201cfeeecf504d319 SHA1 94f848a1b81e5ee343dc0897847ebcf5f77e169b SHA256 a429e649920b90fd31c66921f39d429156661751a64418e48a73faecfb3bba0e
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
diff --git a/dev-php5/pecl-sca_sdo/files/pecl-sca_sdo-1.2.4-php53.patch b/dev-php5/pecl-sca_sdo/files/pecl-sca_sdo-1.2.4-php53.patch
new file mode 100644
index 000000000000..b64c89f8cc9e
--- /dev/null
+++ b/dev-php5/pecl-sca_sdo/files/pecl-sca_sdo-1.2.4-php53.patch
@@ -0,0 +1,113 @@
+--- SCA_SDO-1.2.4.orig/sdo.cpp	2006-09-29 17:04:22.000000000 +0200
++++ SCA_SDO-1.2.4/sdo.cpp	2010-09-19 17:58:27.000000000 +0200
+@@ -77,17 +77,17 @@
+ /* }}} */
+ 
+ /* {{{ single SDO_DataObject parameter */
+-static ZEND_BEGIN_ARG_INFO(arginfo_sdo_dataobject, 0)
++ZEND_BEGIN_ARG_INFO(arginfo_sdo_dataobject, 0)
+     ZEND_ARG_OBJ_INFO(0, data_object, SDO_DataObject, 0)
+ ZEND_END_ARG_INFO();
+ /* }}} */
+ 
+ /* {{{ SDO_PropertyAccess methods */
+-static ZEND_BEGIN_ARG_INFO(arginfo___get, 0)
++ZEND_BEGIN_ARG_INFO(arginfo___get, 0)
+     ZEND_ARG_INFO(0, name)
+ ZEND_END_ARG_INFO();
+ 
+-static ZEND_BEGIN_ARG_INFO(arginfo___set, 0)
++ZEND_BEGIN_ARG_INFO(arginfo___set, 0)
+     ZEND_ARG_INFO(0, name)
+     ZEND_ARG_INFO(0, value)
+ ZEND_END_ARG_INFO();
+@@ -100,7 +100,7 @@
+ /* }}} */
+ 
+ /* {{{ SDO_DataObject methods */
+-static ZEND_BEGIN_ARG_INFO(arginfo_sdo_dataobject_createdataobject, 0)
++ZEND_BEGIN_ARG_INFO(arginfo_sdo_dataobject_createdataobject, 0)
+     ZEND_ARG_INFO(0, identifier)
+ ZEND_END_ARG_INFO();
+ 
+@@ -116,16 +116,16 @@
+ /* }}} */
+ 
+ /* {{{ SDO_Sequence methods */
+-static ZEND_BEGIN_ARG_INFO(arginfo_sdo_sequence_getproperty, 0)
++ZEND_BEGIN_ARG_INFO(arginfo_sdo_sequence_getproperty, 0)
+     ZEND_ARG_INFO(0, sequence_index)
+ ZEND_END_ARG_INFO();
+ 
+-static ZEND_BEGIN_ARG_INFO(arginfo_sdo_sequence_move, 0)
++ZEND_BEGIN_ARG_INFO(arginfo_sdo_sequence_move, 0)
+     ZEND_ARG_INFO(0, to_index)
+     ZEND_ARG_INFO(0, from_index)
+ ZEND_END_ARG_INFO();
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(arginfo_sdo_sequence_insert, 0, ZEND_RETURN_VALUE, 1)
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sdo_sequence_insert, 0, ZEND_RETURN_VALUE, 1)
+     ZEND_ARG_INFO(0, value)
+     ZEND_ARG_INFO(0, sequence_index)
+ 	ZEND_ARG_INFO(0, property_identifier)
+@@ -141,7 +141,7 @@
+ /* }}} */
+ 
+ /* {{{ SDO_List methods */
+-static ZEND_BEGIN_ARG_INFO_EX(arginfo_sdo_list_insert, 0, ZEND_RETURN_VALUE, 1)
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sdo_list_insert, 0, ZEND_RETURN_VALUE, 1)
+     ZEND_ARG_INFO(0, value)
+     ZEND_ARG_INFO(0, index)
+ ZEND_END_ARG_INFO();
+@@ -155,7 +155,7 @@
+ /* }}} */
+ 
+ /* {{{ SDO_DataFactory methods */
+-static ZEND_BEGIN_ARG_INFO(arginfo_sdo_datafactory_create, 0)
++ZEND_BEGIN_ARG_INFO(arginfo_sdo_datafactory_create, 0)
+     ZEND_ARG_INFO(0, type_namespace_uri)
+     ZEND_ARG_INFO(0, type_name)
+ ZEND_END_ARG_INFO();
+@@ -174,13 +174,13 @@
+ /* }}} */
+ 
+ /* {{{ SDO_DAS_DataFactory methods */
+-static ZEND_BEGIN_ARG_INFO_EX(arginfo_sdo_das_datafactory_addType, 0, ZEND_RETURN_VALUE, 2)
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sdo_das_datafactory_addType, 0, ZEND_RETURN_VALUE, 2)
+     ZEND_ARG_INFO(0, type_namespace_uri)
+     ZEND_ARG_INFO(0, type_name)
+     ZEND_ARG_INFO(0, options)
+ ZEND_END_ARG_INFO();
+ 
+-static ZEND_BEGIN_ARG_INFO_EX(arginfo_sdo_das_datafactory_addPropertyToType, 0, ZEND_RETURN_VALUE, 5)
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sdo_das_datafactory_addPropertyToType, 0, ZEND_RETURN_VALUE, 5)
+     ZEND_ARG_INFO(0, parent_type_namespace_uri)
+     ZEND_ARG_INFO(0, parent_type_name)
+     ZEND_ARG_INFO(0, property_name)
+@@ -260,7 +260,7 @@
+ /* }}} */
+ 
+ /* {{{ SDO_Model_Type methods */
+-static ZEND_BEGIN_ARG_INFO(arginfo_sdo_model_type_identifier, 0)
++ZEND_BEGIN_ARG_INFO(arginfo_sdo_model_type_identifier, 0)
+     ZEND_ARG_INFO(0, identifier)
+ ZEND_END_ARG_INFO();
+ 
+@@ -322,7 +322,7 @@
+ /* }}} */
+ 
+ /* {{{ SDO_Model_ReflectionDataObject methods */
+-static ZEND_BEGIN_ARG_INFO_EX(arginfo_sdo_model_reflectiondataobject_export, 0, ZEND_RETURN_VALUE, 1)
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sdo_model_reflectiondataobject_export, 0, ZEND_RETURN_VALUE, 1)
+     ZEND_ARG_OBJ_INFO(0, reflector, Reflector, 0)
+     ZEND_ARG_INFO(0, return_output)
+ ZEND_END_ARG_INFO();
+@@ -379,7 +379,7 @@
+ /* {{{ sdo_deps
+ */
+ #if ZEND_MODULE_API_NO >= 20050922
+-static zend_module_dep sdo_deps[] = {
++zend_module_dep sdo_deps[] = {
+ 	ZEND_MOD_REQUIRED("libxml")
+ 	ZEND_MOD_REQUIRED("spl")
+ 	ZEND_MOD_REQUIRED("Reflection")
diff --git a/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4-r1.ebuild b/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4-r1.ebuild
index f94e175aa7c3..4a377802324d 100644
--- a/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4-r1.ebuild
+++ b/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4-r1.ebuild,v 1.1 2010/05/29 18:48:46 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4-r1.ebuild,v 1.2 2010/09/19 16:40:53 mabi Exp $
 
 EAPI="2"
 
@@ -24,11 +24,9 @@ RDEPEND="${DEPEND}"
 
 need_php_by_category
 
-src_unpack() {
-	php-ext-source-r1_src_unpack
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}/${P}-php53.patch"
 }
 
 src_install() {