[groonga] Add a patch to compile the PHP extension with PHP 5.4.

Daiki Ueno ueno at fedoraproject.org
Wed Feb 1 06:11:50 UTC 2012


commit 25cf91c201c2bf03f0fb0366906db9e1dff23fbf
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Wed Feb 1 15:11:31 2012 +0900

    Add a patch to compile the PHP extension with PHP 5.4.

 groonga-php5.4.patch |   12 ++++++++++++
 groonga.spec         |    3 +++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/groonga-php5.4.patch b/groonga-php5.4.patch
new file mode 100644
index 0000000..0984ec6
--- /dev/null
+++ b/groonga-php5.4.patch
@@ -0,0 +1,12 @@
+diff -ru groonga-1.3.0.orig/bindings/php/groonga.c groonga-1.3.0/bindings/php/groonga.c
+--- groonga-1.3.0.orig/bindings/php/groonga.c	2011-01-27 20:45:31.748650900 +0900
++++ groonga-1.3.0/bindings/php/groonga.c	2012-02-01 15:06:44.810633374 +0900
+@@ -10,7 +10,7 @@
+   grn_ctx_close(ctx);
+ }
+ 
+-function_entry groonga_functions[] = {
++zend_function_entry groonga_functions[] = {
+   PHP_FE(grn_ctx_init        , grn_ctx_init_arg_info)
+   PHP_FE(grn_ctx_close       , grn_ctx_close_arg_info)
+   PHP_FE(grn_ctx_connect      , grn_ctx_connect_arg_info)
diff --git a/groonga.spec b/groonga.spec
index ae9b2cc..a430295 100644
--- a/groonga.spec
+++ b/groonga.spec
@@ -11,6 +11,7 @@ URL:		http://groonga.org/
 Source0:	http://packages.groonga.org/source/groonga/groonga-%{version}.tar.gz
 Source1:	groonga.service
 Source2:	groonga.sysconfig
+Patch0:		groonga-php5.4.patch
 
 BuildRequires:	mecab-devel
 BuildRequires:	zlib-devel
@@ -134,6 +135,7 @@ PHP language binding for groonga
 %prep
 #% define optflags -O0
 %setup -q
+%patch0 -p1 -b .php5.4
 
 
 %build
@@ -328,6 +330,7 @@ fi
 * Mon Jan 30 2012 Daiki Ueno <dueno at redhat.com> - 1.3.0-1
 - built in Fedora
 - migrate groonga-server initscript to systemd service (#781503)
+- add groonga-php5.4.patch to compile PHP extension with PHP 5.4
 
 * Sun Jan 29 2012 Kouhei Sutou <kou at clear-code.com> - 1.3.0-0
 - new upstream release.


More information about the scm-commits mailing list