Fix compilation with gcc-4.4; bug #276742

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 35 insertions, 11 deletions

diff --git a/dev-php5/pecl-sca_sdo/ChangeLog b/dev-php5/pecl-sca_sdo/ChangeLog
index 3ae5365479ff..505b7ce16fdb 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/ChangeLog,v 1.5 2008/03/17 09:56:39 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/ChangeLog,v 1.6 2009/07/25 22:15:29 halcy0n Exp $
+
+  25 Jul 2009; Mark Loeser <halcy0n@gentoo.org> pecl-sca_sdo-1.2.4.ebuild,
+  +files/pecl-sca_sdo-1.2.4-gcc44.patch:
+  Fix compilation with gcc-4.4; bug #276742
 
 *pecl-sca_sdo-1.2.4 (17 Mar 2008)
 
diff --git a/dev-php5/pecl-sca_sdo/Manifest b/dev-php5/pecl-sca_sdo/Manifest
index 3c70dfb58fc1..43acfa596184 100644
--- a/dev-php5/pecl-sca_sdo/Manifest
+++ b/dev-php5/pecl-sca_sdo/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pecl-sca_sdo-1.2.4-gcc44.patch 490 RMD160 37d318ff3e2247247affc88648c43b5762b35925 SHA1 6f3f3c5a6fd778c5919c2912ec41b03043314776 SHA256 074898829dfd864537c93970e55ed5a63fd8836607013f927f92b4f961f960b7
 DIST SCA_SDO-1.2.3.tgz 516350 RMD160 3cdc5f8998af118d057c5ec020e5a8ade197d3c5 SHA1 e4f9daaaf480e5eea5bff742515244ede1a54859 SHA256 6a7ae19bc0acae8e35275d234cd631a51812289813bebb56441a5445f8808052
 DIST SCA_SDO-1.2.4.tgz 576531 RMD160 92a5fcc546833c327e459057dff89a4a5ddef63c SHA1 00ed0bfef0d65a2d4caccef3e23e3243b438fe25 SHA256 25443f9cca0c628207d32d7936db586597d826e4b789057780bf18042066e464
 EBUILD pecl-sca_sdo-1.2.3.ebuild 798 RMD160 754f724a093371c2400ea4b5beed5a2d47d3bb6a SHA1 12e0032cb501cfc54efd3e085cf14ebdad7c7902 SHA256 ec16718a9c2598bb1316744e67e22c7d313f4d7ebf82b90955a439c26eed46be
-EBUILD pecl-sca_sdo-1.2.4.ebuild 716 RMD160 d9dfcdc032e6e613770c425b1e5c8dba10ad3c73 SHA1 051443d2acb69976fef0f71b7a9cba69273f2e23 SHA256 d43f07c972fb880146329375edd87bfa83dec567aa5182b8667cf4c923921a10
-MISC ChangeLog 1426 RMD160 a9a73d7758b6b47a51c0831ab2305337356eb68a SHA1 bd1ca07cf531da11b12166b5129ec941804c95ba SHA256 df3e855135c91675317ff308ebc827f4f26868eb41a56a1d2f93a5bf5895b23b
+EBUILD pecl-sca_sdo-1.2.4.ebuild 824 RMD160 0ee8e87b5c793216ba40139ac6c5ec19f6a2b6f8 SHA1 d4a8bb975e3c725a59e976d99737119f5aad7295 SHA256 4a8349dd70eea299a14402697ebe509f200fbd6158212fa59da13b6a83261f24
+MISC ChangeLog 1589 RMD160 49c93bf3459add0e758a7599f939981b2029433c SHA1 7ad8a67d40a00e4670ec4f0a070d772e5629aec8 SHA256 d5824cf58191c5411ea9b87caed049f2fb82e29c6821366d8ecde93c2a6d2434
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD4DBQFH3kBdz974XjDVpbkRAqtVAJ4jYB2xQN08b5rxXxau482qLxrPMgCYzsZX
-sGLhMdf7/GwGlWCW4R6J5g==
-=42lh
+iEYEARECAAYFAkprhAYACgkQCRZPokWLroQyMQCfdsKkjLQ9cJGdhngRZXBtCqy8
+Mu4Ani9qwZ/C4ZlmFQGQJYWkj0r0k6cB
+=uTc6
 -----END PGP SIGNATURE-----
diff --git a/dev-php5/pecl-sca_sdo/files/pecl-sca_sdo-1.2.4-gcc44.patch b/dev-php5/pecl-sca_sdo/files/pecl-sca_sdo-1.2.4-gcc44.patch
new file mode 100644
index 000000000000..95fddb2f1434
--- /dev/null
+++ b/dev-php5/pecl-sca_sdo/files/pecl-sca_sdo-1.2.4-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur SCA_SDO-1.2.4-orig/commonj/sdo/SDODataConverter.cpp SCA_SDO-1.2.4/commonj/sdo/SDODataConverter.cpp
+--- SCA_SDO-1.2.4-orig/commonj/sdo/SDODataConverter.cpp	2009-07-25 18:09:10.000000000 -0400
++++ SCA_SDO-1.2.4/commonj/sdo/SDODataConverter.cpp	2009-07-25 18:09:42.000000000 -0400
+@@ -17,6 +17,7 @@
+ 
+ /* $Rev: 509991 $ $Date: 2009/07/25 22:15:28 $ */
+ 
++#include <cstdio>
+ #include <string.h>
+ #include "commonj/sdo/SDODataConverter.h"
+ #include "commonj/sdo/SDORuntimeException.h"
+
diff --git a/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild b/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild
index 011dc1e97c0c..23e5a57713c0 100644
--- a/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild
+++ b/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.ebuild,v 1.1 2008/03/17 09:56:39 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild,v 1.2 2009/07/25 22:15:29 halcy0n Exp $
 
 PHP_EXT_NAME="sdo"
 PHP_EXT_PECL_PKG="SCA_SDO"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-inherit php-ext-pecl-r1 depend.php
+inherit eutils php-ext-pecl-r1 depend.php
 
 KEYWORDS="~amd64 ~x86"
 
@@ -25,6 +25,13 @@ pkg_setup() {
 	require_php_with_use json reflection soap spl xml
 }
 
+src_unpack() {
+	php-ext-source-r1_src_unpack
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
 src_install() {
 	php-ext-pecl-r1_src_install