[packages/php-pecl-adodb] - php5.3 compile fix from gentoo; rel 2
glen
glen at pld-linux.org
Mon Nov 19 11:01:24 CET 2012
commit ed4a9bd20251f66e63f497f3bc89aa66579409b7
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Nov 19 12:01:12 2012 +0200
- php5.3 compile fix from gentoo; rel 2
php-pecl-adodb.spec | 8 +++++---
php53.patch | 24 ++++++++++++++++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/php-pecl-adodb.spec b/php-pecl-adodb.spec
index 9c31784..5ce4015 100644
--- a/php-pecl-adodb.spec
+++ b/php-pecl-adodb.spec
@@ -3,18 +3,19 @@
Summary: ADOdb PHP extension
Name: php-pecl-%{modname}
Version: 5.0.4
-Release: 2
+Release: 3
License: BSD
Group: Development/Languages/PHP
Source0: http://phplens.com/lens/dl/adodb-ext-%{ver}.zip
# Source0-md5: 4efb3fc1f5a347f20be9222885779688
+Patch0: php53.patch
URL: http://adodb.sourceforge.net/
BuildRequires: php-devel >= 3:5.0.0
BuildRequires: rpmbuild(macros) >= 1.553
BuildRequires: sed >= 4.0
BuildRequires: unzip
%{?requires_php_extension}
-Requires: php-common >= 4:5.0.4
+Requires: php(core) >= 5.0.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -25,7 +26,8 @@ installed and use it automatically.
%prep
%setup -q -c
mv %{modname}-%{ver}/* .
-%undos README.txt
+%undos -f c,txt
+%patch0 -p1
%build
phpize
diff --git a/php53.patch b/php53.patch
new file mode 100644
index 0000000..0cbce9b
--- /dev/null
+++ b/php53.patch
@@ -0,0 +1,24 @@
+--- a/adodb.c 2005-11-25 20:00:56.000000000 +0100
++++ b/adodb.c 2011-03-06 22:27:06.000000000 +0100
+@@ -159,11 +159,7 @@
+
+ static void adodb_init_zval(zval *v, char *s)
+ {
+- v->type = IS_STRING;
+- v->value.str.val = s;
+- v->value.str.len = strlen(s);
+- v->is_ref = 0;
+- v->refcount = 1;
++ ZVAL_STRING(v, s, 0);
+ }
+
+ /* {{{ PHP_MINIT_FUNCTION
+@@ -277,7 +273,7 @@
+ fci.function_table = EG(function_table);
+ fci.function_name = &adodb_zvals[zval_ocifetch];
+ fci.symbol_table = NULL;
+- fci.object_pp = NULL;
++ /* fci.object_pp = NULL; */
+ fci.retval_ptr_ptr = &retval;
+ fci.param_count = 2;
+ fci.params = ¶ms[1];
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-adodb.git/commitdiff/ed4a9bd20251f66e63f497f3bc89aa66579409b7
More information about the pld-cvs-commit
mailing list