diff mbox series

[bug#36025] Update php to 7.3.6

Message ID 87h89an7wy.fsf@gmail.com
State Accepted
Headers show
Series [bug#36025] Update php to 7.3.6 | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Alex Sassmannshausen May 31, 2019, 12:08 p.m. UTC 
Hello,

Please find attached.  I had to disable a test for a newly solved bug
because the upstream version of GD we use differs from the version used
with PHP itself normally.

Best wishes,

Alex

Comments

Julien Lepiller May 31, 2019, 12:43 p.m. UTC | #1 
Le Fri, 31 May 2019 13:08:13 +0100,
Alex Sassmannshausen <alex.sassmannshausen@gmail.com> a écrit :

> Hello,
> 
> Please find attached.  I had to disable a test for a newly solved bug
> because the upstream version of GD we use differs from the version
> used with PHP itself normally.
> 
> Best wishes,
> 
> Alex
> 

Too late, I already pushed my own version of the update in
27489e7f73b812e13f52e4c9026b1175103ba7e7 :p
Alex Sassmannshausen May 31, 2019, 1:38 p.m. UTC | #2 
Excellent ;-)

Julien Lepiller <julien@lepiller.eu> writes:

> Le Fri, 31 May 2019 13:08:13 +0100,
> Alex Sassmannshausen <alex.sassmannshausen@gmail.com> a écrit :
>
>> Hello,
>> 
>> Please find attached.  I had to disable a test for a newly solved bug
>> because the upstream version of GD we use differs from the version
>> used with PHP itself normally.
>> 
>> Best wishes,
>> 
>> Alex
>> 
>
> Too late, I already pushed my own version of the update in
> 27489e7f73b812e13f52e4c9026b1175103ba7e7 :p
diff mbox series

Patch

From 98e354c2d43c1b62c28ec549ffd0c70f64338f60 Mon Sep 17 00:00:00 2001
From: Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
Date: Fri, 31 May 2019 13:01:16 +0100
Subject: [PATCH] gnu: php: Update to 7.3.6.

* gnu/packages/php.scm (php): Update to 7.3.6.
---
 gnu/packages/php.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 68043051b5..792bcbc948 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -58,7 +58,7 @@ 
 (define-public php
   (package
     (name "php")
-    (version "7.3.5")
+    (version "7.3.6")
     (home-page "https://secure.php.net/")
     (source (origin
               (method url-fetch)
@@ -66,7 +66,7 @@ 
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0wi4vd1c3ylsv7cs5b74pkspybb22qwk6fs5r2as3m3glhw1h0g1"))
+                "0r51aiff2abbr3d2swhvja0wm56sjxzqbciabcvvq3m3v9kqkz7y"))
               (modules '((guix build utils)))
               (snippet
                '(with-directory-excursion "ext"
@@ -198,8 +198,8 @@ 
 
              ;; Drop tests that are known to fail.
              (for-each delete-file
-                       '("ext/posix/tests/posix_getgrgid.phpt"    ; Requires /etc/group.
-                         "ext/sockets/tests/bug63000.phpt"        ; Fails to detect OS.
+                       '("ext/posix/tests/posix_getgrgid.phpt" ; Requires /etc/group.
+                         "ext/sockets/tests/bug63000.phpt" ; Fails to detect OS.
                          "ext/sockets/tests/socket_shutdown.phpt" ; Requires DNS.
                          "ext/sockets/tests/socket_send.phpt"     ; Likewise.
                          "ext/sockets/tests/mcast_ipv4_recv.phpt" ; Requires multicast.
@@ -255,6 +255,9 @@ 
                          ;; but the bug report suggests the issue was in
                          ;; the bundled gd, not upstream.
                          "ext/gd/tests/bug77272.phpt"
+                         ;; Test has correct result but fails on different
+                         ;; error message.
+                         "ext/gd/tests/bug77973.phpt"
 
                          ;; XXX: These iconv tests have the expected outcome,
                          ;; but with different error messages.
-- 
2.21.0