commit 19c76606506c240d8d0808a96bd4178cb44dab86 Author: Adam Gołębiowski <ad...@pld-linux.org> Date: Sat Nov 24 19:57:14 2018 +0100
- php-7.3 support cups-filters-php73.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++ cups-filters.spec | 2 ++ 2 files changed, 48 insertions(+) --- diff --git a/cups-filters.spec b/cups-filters.spec index f0c55d1..a840e59 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -29,6 +29,7 @@ Source0: http://www.openprinting.org/download/cups-filters/%{name}-%{version}.ta Patch0: %{name}-dbus.patch Patch1: %{name}-php.patch Patch2: %{name}-php7.patch +Patch3: %{name}-php73.patch URL: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters BuildRequires: autoconf >= 2.65 BuildRequires: automake >= 1:1.11 @@ -248,6 +249,7 @@ Moduł PHP do ogólnego systemu druku dla Uniksa. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__aclocal} diff --git a/cups-filters-php73.patch b/cups-filters-php73.patch new file mode 100644 index 0000000..570a754 --- /dev/null +++ b/cups-filters-php73.patch @@ -0,0 +1,46 @@ +since php-7.3.0 array_init() and array_init_size() are converted into macros +calling zend_new_array(). They are not functions anymore and don't return +any values. + +this change was introduced in following commit: +https://github.com/php/php-src/commit/44e0b79ac64b344fc1335c126e548f00d8308602 + +--- cups-filters-1.21.4/scripting/php/phpcups.c 2018-11-24 19:42:09.905418408 +0100 ++++ cups-filters-1.21.4.orig/scripting/php/phpcups.c 2018-11-24 19:40:21.903078482 +0100 +@@ -297,7 +297,11 @@ + RETURN_NULL(); + } + ++#if PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 3 ++ array_init(return_value); ++#else + if (array_init(return_value) == SUCCESS) ++#endif + { + for (i = 0, dest = dests; i < num_dests; i ++, dest ++) + { +@@ -329,7 +333,11 @@ + MAKE_STD_ZVAL(optionsobj); + #endif + ++#if PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 3 ++ array_init(optionsobj); ++#else + if (array_init(optionsobj) == SUCCESS) ++#endif + { + for (j = 0, option = dest->options; + j < dest->num_options; +@@ -383,7 +391,12 @@ + RETURN_NULL(); + } + ++ ++#if PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 3 ++ array_init(return_value); ++#else + if (array_init(return_value) == SUCCESS) ++#endif + { + for (i = 0, job = jobs; i < num_jobs; i ++, job ++) + { ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/cups-filters.git/commitdiff/19c76606506c240d8d0808a96bd4178cb44dab86 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit