packages: php-pecl-fdf/php-pecl-fdf.spec, php-pecl-fdf/php-pecl-fdf-tsrm.pa...
qboosh
qboosh at pld-linux.org
Sat Oct 30 09:34:35 CEST 2010
Author: qboosh Date: Sat Oct 30 07:34:35 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- added tsrm,update patches (now builds with php 5.3)
---- Files affected:
packages/php-pecl-fdf:
php-pecl-fdf.spec (1.4 -> 1.5) , php-pecl-fdf-tsrm.patch (NONE -> 1.1) (NEW), php-pecl-fdf-update.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/php-pecl-fdf/php-pecl-fdf.spec
diff -u packages/php-pecl-fdf/php-pecl-fdf.spec:1.4 packages/php-pecl-fdf/php-pecl-fdf.spec:1.5
--- packages/php-pecl-fdf/php-pecl-fdf.spec:1.4 Sat Oct 30 07:36:49 2010
+++ packages/php-pecl-fdf/php-pecl-fdf.spec Sat Oct 30 09:34:30 2010
@@ -15,6 +15,9 @@
# Source0-md5: d47e547e7247cfd260ec611c44fc8184
# not yet
#Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz
+Patch0: %{name}-tsrm.patch
+Patch1: %{name}-update.patch
+# not yet
#URL: http://pecl.php.net/package/Fdf/
URL: http://pecl.php.net/
BuildRequires: fdftk-devel >= 5
@@ -38,6 +41,8 @@
%prep
%setup -q -c
+%patch0 -p0
+%patch1 -p0
%build
cd fdf
@@ -81,6 +86,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2010/10/30 07:34:30 qboosh
+- added tsrm,update patches (now builds with php 5.3)
+
Revision 1.4 2010/10/30 05:36:49 qboosh
- fixed PHP license version
================================================================
Index: packages/php-pecl-fdf/php-pecl-fdf-tsrm.patch
diff -u /dev/null packages/php-pecl-fdf/php-pecl-fdf-tsrm.patch:1.1
--- /dev/null Sat Oct 30 09:34:35 2010
+++ packages/php-pecl-fdf/php-pecl-fdf-tsrm.patch Sat Oct 30 09:34:30 2010
@@ -0,0 +1,11 @@
+--- fdf/fdf.c.orig 2010-10-26 08:33:15.000000000 +0200
++++ fdf/fdf.c 2010-10-30 09:17:54.163741043 +0200
+@@ -1818,7 +1818,7 @@
+
+ ZEND_FETCH_RESOURCE(fdf, FDFDoc *, &r_fdf, -1, "fdf", le_fdf);
+
+- if (!zend_is_callable(callback, 0, &name)) {
++ if (!zend_is_callable(callback, 0, &name TSRMLS_CC)) {
+ php_error_docref1(NULL TSRMLS_CC, name, E_WARNING, "Second argument is expected to be a valid callback");
+ efree(name);
+ RETURN_FALSE;
================================================================
Index: packages/php-pecl-fdf/php-pecl-fdf-update.patch
diff -u /dev/null packages/php-pecl-fdf/php-pecl-fdf-update.patch:1.1
--- /dev/null Sat Oct 30 09:34:36 2010
+++ packages/php-pecl-fdf/php-pecl-fdf-update.patch Sat Oct 30 09:34:30 2010
@@ -0,0 +1,226 @@
+--- fdf/fdf.c.orig 2010-10-30 09:20:42.895740205 +0200
++++ fdf/fdf.c 2010-10-30 09:23:06.743734339 +0200
+@@ -48,33 +48,27 @@
+ SAPI_POST_HANDLER_FUNC(fdf_post_handler);
+
+ /* {{{ arginfo */
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_open, 0)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_open_string, 0)
+ ZEND_ARG_INFO(0, fdf_data)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_create, 0)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_close, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_fdf_get_value, 0, 0, 2)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+ ZEND_ARG_INFO(0, which)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_fdf_set_value, 0, 0, 3)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+@@ -82,13 +76,11 @@
+ ZEND_ARG_INFO(0, isname)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_fdf_next_field_name, 0, 0, 1)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_set_ap, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+@@ -97,7 +89,6 @@
+ ZEND_ARG_INFO(0, pagenr)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_get_ap, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+@@ -105,46 +96,38 @@
+ ZEND_ARG_INFO(0, filename)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_get_encoding, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_set_status, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, status)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_get_status, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_fdf_set_file, 0, 0, 2)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, target_frame)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_get_file, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_fdf_save, 0, 0, 1)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_save_string, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_add_template, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, newpage)
+@@ -153,7 +136,6 @@
+ ZEND_ARG_INFO(0, rename)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_set_flags, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+@@ -161,14 +143,12 @@
+ ZEND_ARG_INFO(0, newflags)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_get_flags, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+ ZEND_ARG_INFO(0, whichflags)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_set_opt, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+@@ -177,14 +157,12 @@
+ ZEND_ARG_INFO(0, name)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_fdf_get_opt, 0, 0, 2)
+ ZEND_ARG_INFO(0, fdfdof)
+ ZEND_ARG_INFO(0, fieldname)
+ ZEND_ARG_INFO(0, element)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_set_submit_form_action, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+@@ -193,7 +171,6 @@
+ ZEND_ARG_INFO(0, flags)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_set_javascript_action, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+@@ -201,74 +178,62 @@
+ ZEND_ARG_INFO(0, script)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_set_encoding, 0)
+ ZEND_ARG_INFO(0, fdf_document)
+ ZEND_ARG_INFO(0, encoding)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_errno, 0)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_error, 0)
+ ZEND_ARG_INFO(0, errno)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_fdf_get_version, 0, 0, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_set_version, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, version)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_add_doc_javascript, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, scriptname)
+ ZEND_ARG_INFO(0, script)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_set_on_import_javascript, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, script)
+ ZEND_ARG_INFO(0, before_data_import)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_set_target_frame, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, target)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_remove_item, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+ ZEND_ARG_INFO(0, item)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_get_attachment, 0)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, fieldname)
+ ZEND_ARG_INFO(0, savepath)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_fdf_enum_values, 0, 0, 2)
+ ZEND_ARG_INFO(0, fdfdoc)
+ ZEND_ARG_INFO(0, function)
+ ZEND_ARG_INFO(0, userdata)
+ ZEND_END_ARG_INFO()
+
+-static
+ ZEND_BEGIN_ARG_INFO(arginfo_fdf_header, 0)
+ ZEND_END_ARG_INFO()
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pecl-fdf/php-pecl-fdf.spec?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list