Re: update php

[Leo Famulari <leo@famulari.name>]

On Fri, Feb 17, 2017 at 05:27:58PM +0100, julien lepiller wrote:
> Hi,
> 
> A new version of php has been released. I'm a bit confused by the way
> grafting works and as the gd update from last time is still not in master,
> gd-for-php will try to build using gd-2.2.3, which I don't want (2.2.4 fixes
> issues that would otherwise be detected by the php tests). I have no idea
> how to make it work correctly and will not be able to work on it this
> week-end, so feel free to do whatever is necessary to get this update. I
> have attached a patch that removes the graft so that gd is now 2.2.4 by
> default.

Whenever I am confused about how a graft is working in practice, I check
the references of the package I am wondering about:

$ ./pre-inst-env guix build -e '(@@ (gnu packages php) gd-for-php)'              
/gnu/store/f46x9yplpq0dymm3kp4hrl3rv1ijlajx-gd-2.2.4                      
$ ./pre-inst-env guix build -e '(@@ (gnu packages php) gd-for-php)' --no-grafts
/gnu/store/ir4ldfw5paaf7xg34xckysl8xy9sjpmg-gd-2.2.3
$ guix gc --references $(./pre-inst-env guix build php --fallback --no-grafts) | grep -- -gd-
/gnu/store/ir4ldfw5paaf7xg34xckysl8xy9sjpmg-gd-2.2.3
$ guix gc --references $(./pre-inst-env guix build php --fallback) | grep -- -gd- 
/gnu/store/f46x9yplpq0dymm3kp4hrl3rv1ijlajx-gd-2.2.4

gd-for-php is using gd-2.2.4, and php is using the correct gd-for-php.
If the new patch fails to apply to gd@2.2.3, we can apply it to
gd-2.2.4, right?

> From: Julien Lepiller <julien@lepiller.eu>
> Date: Thu, 16 Feb 2017 17:47:51 +0100
> Subject: [PATCH] gnu: php: Update to 7.1.2.
> 
> * gnu/packages/php.scm (php): Update to 7.1.2.

The commit message needs to describe the changes noted below ↓

> ---
>  gnu/local.mk                                       |   1 +
>  gnu/packages/gd.scm                                |  46 +++------
>  .../patches/gd-php-73968-Fix-109-XBM-reading.patch | 111 +++++++++++++++++++++
>  gnu/packages/php.scm                               |  20 ++--
>  4 files changed, 140 insertions(+), 38 deletions(-)
>  create mode 100644 gnu/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch

>  (define-public gd
>    (package
>      (name "gd")
> -    (replacement gd-2.2.4)
>  
>      ;; Note: With libgd.org now pointing to github.com, genuine old
>      ;; tarballs are no longer available.  Notably, versions 2.0.x are
>      ;; missing.
> -    (version "2.2.3")
> +    (version "2.2.4")

`guix refresh --list-dependent gd` shows that this update will require
735 package rebuilds, which is more than we do on the master branch.
This update is ready to be built with the other major changes on the
core-updates branch.

> 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
> new file mode 100644
> index 0000000..ce69a73
> --- /dev/null
> +++ b/gnu/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch
> @@ -0,0 +1,111 @@
> +From 082c5444838ea0d84f9fb6441aefdb44d78d9bba Mon Sep 17 00:00:00 2001
> +From: "Christoph M. Becker" <cmbecker69@gmx.de>
> +Date: Fri, 20 Jan 2017 22:48:20 +0100
> +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.

Can you add a link to the source of these patches? We should make it
easy for those reading the code to reproduce the patch from its source.

> +                         ;; XXX: These tests fail.  The output is correct, but
> +                         ;; the tests segfault at the end. This seems to be
> +                         ;; related to Zend closing.
> +                         "sapi/phpdbg/tests/include_once.phpt"
> +                         "sapi/phpdbg/tests/phpdbg_get_executable_stream_wrapper.phpt"

Let's report this upstream.