[php-pear-CodeGen-PECL] Added patch to generate PHP 5.4 compilable C code

Robert Scheck robert at fedoraproject.org
Sun Jul 22 00:36:32 UTC 2012


commit 5d5942d15c114b5d06c5a89a258bb56eb75d9c1d
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 22 02:36:17 2012 +0200

    Added patch to generate PHP 5.4 compilable C code

 php-pear-CodeGen-PECL-1.1.3-php54.patch |   26 ++++++++++++++++++++++++++
 php-pear-CodeGen-PECL.spec              |    9 +++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/php-pear-CodeGen-PECL-1.1.3-php54.patch b/php-pear-CodeGen-PECL-1.1.3-php54.patch
new file mode 100644
index 0000000..fc7d77a
--- /dev/null
+++ b/php-pear-CodeGen-PECL-1.1.3-php54.patch
@@ -0,0 +1,26 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for CodeGen_PECL >= 1.1.3, which replaces
+the deprecated alias function_entry by zend_function_entry. This allows generated C code to
+be compiled using PHP 5.4.
+
+--- CodeGen_PECL-1.1.3/PECL/Extension.php		2010-09-27 13:53:30.000000000 +0200
++++ CodeGen_PECL-1.1.3/PECL/Extension.php.php54		2012-07-21 23:41:56.000000000 +0200
+@@ -1174,7 +1174,7 @@
+     function generateFunctionRegistrations()
+     {
+         $code  = "/* {{{ {$this->name}_functions[] */\n";
+-        $code .= "function_entry {$this->name}_functions[] = {\n";
++        $code .= "zend_function_entry {$this->name}_functions[] = {\n";
+         foreach ($this->functions as $function) {
+             $code.= $function->functionEntry();
+         }
+--- package.xml						2010-09-27 13:53:30.000000000 +0200
++++ package.xml.php54					2012-07-22 02:29:16.000000000 +0200
+@@ -126,7 +126,7 @@
+    <file baseinstalldir="CodeGen" md5sum="6b97e1fcb5ab96a8fdec223e7059db56" name="PECL/Tools/ProtoParser.php" role="php" />
+    <file baseinstalldir="CodeGen" md5sum="434d9ff71cb9aed4623f29028dd314dc" name="PECL/Command.php" role="php" />
+    <file baseinstalldir="CodeGen" md5sum="b9f06641880c7d8a825e1a0ce2595f24" name="PECL/Element.php" role="php" />
+-   <file baseinstalldir="CodeGen" md5sum="d63982ac842855a6f212882d5c3b8df2" name="PECL/Extension.php" role="php">
++   <file baseinstalldir="CodeGen" md5sum="cd7d51cd6d1fed5923a20d9b19e0cf95" name="PECL/Extension.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
+    <file baseinstalldir="CodeGen" md5sum="79fb945b73123f8e0858472f6f9cd866" name="PECL/Cli.php" role="php" />
diff --git a/php-pear-CodeGen-PECL.spec b/php-pear-CodeGen-PECL.spec
index 1bb275f..fb198d9 100644
--- a/php-pear-CodeGen-PECL.spec
+++ b/php-pear-CodeGen-PECL.spec
@@ -4,11 +4,12 @@
 Summary:           Tool to generate PECL extensions from an XML description
 Name:              php-pear-CodeGen-PECL
 Version:           1.1.3
-Release:           5%{?dist}
+Release:           6%{?dist}
 License:           PHP
 Group:             Development/Languages
 URL:               http://pear.php.net/package/%{pear_name}
 Source:            http://pear.php.net/get/%{pear_name}-%{version}.tgz
+Patch0:            php-pear-CodeGen-PECL-1.1.3-php54.patch
 Requires:          php-common >= 5.0.0, php-pear(CodeGen) >= 1.0.7
 Requires(post):    %{__pear}
 Requires(postun):  %{__pear}
@@ -26,6 +27,7 @@ extension.
 
 %prep
 %setup -qc
+%patch0 -p0 -b .php54
 
 # Create a "localized" php.ini to avoid build warning
 cp -pf /etc/php.ini .
@@ -74,13 +76,16 @@ fi
 %{pear_phpdir}/CodeGen/PECL/
 
 %changelog
+* Sun Jul 22 2012 Robert Scheck <robert at fedoraproject.org> 1.1.3-6
+- Added patch to generate PHP 5.4 compilable C code
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Thu Feb 24 2011 Robert Scheck <robert at fedoraproject.org> 1.0.7-3
+* Thu Feb 24 2011 Robert Scheck <robert at fedoraproject.org> 1.1.3-3
 - Changed requirements to php-common/-pear(PEAR) (#662257 #c2)
 
 * Sat Dec 11 2010 Robert Scheck <robert at fedoraproject.org> 1.1.3-2


More information about the scm-commits mailing list