From 128fb06c4477792b4a4f58f21c66a50e5ab4fd0e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 27 Feb 2017 11:15:29 +0100 Subject: [PATCH 3/3] gnu: php: Update to 7.1.2. * gnu/packages/php.scm (php): Update to 7.1.2. --- .../patches/gd-php-73968-Fix-109-XBM-reading.patch | 7 ++++-- gnu/packages/php.scm | 27 +++++++++++----------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/gnu/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch b/gnu/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch index bfaa4ff..3fedba3 100644 --- a/gnu/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch +++ b/gnu/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch @@ -6,8 +6,11 @@ Subject: [PATCH] Fix #109: XBM reading fails with printed error When calculating the number of required bytes of an XBM image, we have to take the line padding into account. -This patch has been taken from the gd repository and binary files have been -removed from the patch because our patch procedure doesn't support that format. +This bug was first reported to php on https://bugs.php.net/bug.php?id=73968. +php then reported it to gd in https://github.com/libgd/libgd/issues/109. This +patch is taken from commit 082c5444838ea0d84f9fb6441aefdb44d78d9bba of gd. +Binary files have been removed from the patch because our patch procedure +doesn't support that format. --- src/gd_xbm.c | 2 +- tests/xbm/CMakeLists.txt | 1 + diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 16b0985..0dfee36 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -50,21 +50,10 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:)) -;; This fixes PHP bugs 73155 and 73159. Remove when gd -;; is updated to > 2.2.3. -(define gd-for-php - (package (inherit gd) - (source - (origin - (inherit (package-source gd)) - (patches (search-patches - "gd-fix-truecolor-format-correction.patch" - "gd-fix-chunk-size-on-boundaries.patch")))))) - (define-public php (package (name "php") - (version "7.0.14") + (version "7.1.2") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -72,7 +61,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "12ccgbrfchgvmcfb88rcknq7xmrf19c5ysdr4v8jxk51j9izy78g")) + "0wg9ng230w724rpwsrhcg4pw41xm1xhz0zx76haanyymkz1s05fq")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -179,6 +168,13 @@ "ext/standard/tests/general_functions/bug44667.phpt" "ext/standard/tests/general_functions/proc_open.phpt") (("/bin/cat") (which "cat"))) + + ;; These tests fail because they include a file whose modification + ;; time is 0. Touch them to make the test pass. The issue is reported + ;; upstream as #74137. + (utime "sapi/phpdbg/tests/include.inc" 1 1) + (utime "sapi/phpdbg/tests/phpdbg_get_executable_stream_wrapper.inc" 1 1) + ;; The encoding of this file is not recognized, so we simply drop it. (delete-file "ext/mbstring/tests/mb_send_mail07.phpt") @@ -257,8 +253,10 @@ ;; The test expects an Array, but instead get the contents(?). "ext/gd/tests/bug43073.phpt" ;; imagettftext() returns wrong coordinates. + "ext/gd/tests/bug48732-mb.phpt" "ext/gd/tests/bug48732.phpt" ;; Similarly for imageftbbox(). + "ext/gd/tests/bug48801-mb.phpt" "ext/gd/tests/bug48801.phpt" ;; Different expected output from imagecolorallocate(). "ext/gd/tests/bug53504.phpt" @@ -291,10 +289,11 @@ ("curl" ,curl) ("cyrus-sasl" ,cyrus-sasl) ("freetype" ,freetype) - ("gd" ,gd-for-php) + ("gd" ,gd) ("gdbm" ,gdbm) ("glibc" ,glibc) ("gmp" ,gmp) + ("gnutls" ,gnutls) ("libgcrypt" ,libgcrypt) ("libjpeg" ,libjpeg) ("libpng" ,libpng) -- 2.7.4