Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7c3940d15a5d3614d9f4c880599bb88b9783ff7d

commit 7c3940d15a5d3614d9f4c880599bb88b9783ff7d
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sat Aug 8 00:21:54 2009 +0200

php-pecl-ncurses-1.0.0-4-i686

- add patches for php-5.3

diff --git a/source/devel-extra/php-pecl-ncurses/FrugalBuild 
b/source/devel-extra/php-pecl-ncurses/FrugalBuild
index 5f14ee1..4fec5b7 100644
--- a/source/devel-extra/php-pecl-ncurses/FrugalBuild
+++ b/source/devel-extra/php-pecl-ncurses/FrugalBuild
@@ -4,10 +4,13 @@
_F_pecl_name="ncurses"
pkgver=1.0.0
pkgdesc="Terminal screen handling and optimization package for PHP."
-depends=('php>=5.2.6' 'ncurses')
+depends=('php>=5.3.0' 'ncurses')
Finclude pecl
archs=('i686' 'x86_64')
-pkgrel=3
-sha1sums=('bd57c58806d72baa23c20f4d078c0196f7c2c309')
+pkgrel=4
+source=($source ncurses-1.0.0-{php53,static}.patch)
+sha1sums=('bd57c58806d72baa23c20f4d078c0196f7c2c309' \
+          '56a8397897fbce6db334a875cee7fec5f81aa288' \
+          '6663fcfd9df26cfc3117437bd10748b65166e9d2')

# optimization OK
diff --git a/source/devel-extra/php-pecl-ncurses/ncurses-1.0.0-php53.patch 
b/source/devel-extra/php-pecl-ncurses/ncurses-1.0.0-php53.patch
new file mode 100644
index 0000000..de5f509
--- /dev/null
+++ b/source/devel-extra/php-pecl-ncurses/ncurses-1.0.0-php53.patch
@@ -0,0 +1,24 @@
+diff -up ncurses-1.0.0/ncurses_fe.c.orig ncurses-1.0.0/ncurses_fe.c
+--- ncurses-1.0.0/ncurses_fe.c.orig    2008-07-19 08:07:17.000000000 +0200
++++ ncurses-1.0.0/ncurses_fe.c 2008-07-19 08:16:40.000000000 +0200
+@@ -25,6 +25,20 @@
+ #include "php_ini.h"
+ #include "php_ncurses.h"
+
++#if ZEND_MODULE_API_NO >= 20071006
++// No more define with PHP 5.3.0
++static
++      ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0)
++              ZEND_ARG_PASS_INFO(1)
++      ZEND_END_ARG_INFO();
++
++static
++      ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0)
++              ZEND_ARG_PASS_INFO(0)
++              ZEND_ARG_PASS_INFO(1)
++      ZEND_END_ARG_INFO();
++#endif
++
+ static
+       ZEND_BEGIN_ARG_INFO(firstandsecond_args_force_ref, 0)
+               ZEND_ARG_PASS_INFO(1)
diff --git a/source/devel-extra/php-pecl-ncurses/ncurses-1.0.0-static.patch 
b/source/devel-extra/php-pecl-ncurses/ncurses-1.0.0-static.patch
new file mode 100644
index 0000000..2fbaea3
--- /dev/null
+++ b/source/devel-extra/php-pecl-ncurses/ncurses-1.0.0-static.patch
@@ -0,0 +1,50 @@
+Fixes:
+
+/var/tmp/fst/src/ncurses-1.0.0/ncurses_fe.c:31: error: duplicate 'static'
+/var/tmp/fst/src/ncurses-1.0.0/ncurses_fe.c:36: error: duplicate 'static'
+/var/tmp/fst/src/ncurses-1.0.0/ncurses_fe.c:43: error: duplicate 'static'
+/var/tmp/fst/src/ncurses-1.0.0/ncurses_fe.c:49: error: duplicate 'static'
+/var/tmp/fst/src/ncurses-1.0.0/ncurses_fe.c:56: error: duplicate 'static'
+make: *** [ncurses_fe.lo] Error 1
+
+diff -Naur ncurses-1.0.0.orig/ncurses_fe.c ncurses-1.0.0/ncurses_fe.c
+--- ncurses-1.0.0.orig/ncurses_fe.c    2009-08-08 00:18:48.000000000 +0200
++++ ncurses-1.0.0/ncurses_fe.c 2009-08-08 00:19:03.000000000 +0200
+@@ -27,32 +27,32 @@
+
+ #if ZEND_MODULE_API_NO >= 20071006
+ // No more define with PHP 5.3.0
+-static
++
+       ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0)
+               ZEND_ARG_PASS_INFO(1)
+       ZEND_END_ARG_INFO();
+
+-static
++
+       ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0)
+               ZEND_ARG_PASS_INFO(0)
+               ZEND_ARG_PASS_INFO(1)
+       ZEND_END_ARG_INFO();
+ #endif
+
+-static
++
+       ZEND_BEGIN_ARG_INFO(firstandsecond_args_force_ref, 0)
+               ZEND_ARG_PASS_INFO(1)
+               ZEND_ARG_PASS_INFO(1)
+       ZEND_END_ARG_INFO();
+
+-static
++
+       ZEND_BEGIN_ARG_INFO(secondandthird_args_force_ref, 0)
+               ZEND_ARG_PASS_INFO(0)
+               ZEND_ARG_PASS_INFO(1)
+               ZEND_ARG_PASS_INFO(1)
+       ZEND_END_ARG_INFO();
+
+-static
++
+       ZEND_BEGIN_ARG_INFO(second_thru_fourth_args_force_ref, 0)
+               ZEND_ARG_PASS_INFO(0)
+               ZEND_ARG_PASS_INFO(1)
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to