From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWocV-0007TC-Fm for guix-patches@gnu.org; Tue, 11 Dec 2018 15:27:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWocQ-0008Uz-ET for guix-patches@gnu.org; Tue, 11 Dec 2018 15:27:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:39964) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWocQ-0008Uq-A8 for guix-patches@gnu.org; Tue, 11 Dec 2018 15:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gWocQ-00077c-1r for guix-patches@gnu.org; Tue, 11 Dec 2018 15:27:02 -0500 Subject: [bug#33706] [PATCH] gnu: php: Update to 7.3.0. Resent-Message-ID: Date: Tue, 11 Dec 2018 21:25:07 +0100 In-Reply-To: <20181211164214.26945-1-go.wigust@gmail.com> References: <20181211164214.26945-1-go.wigust@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Julien Lepiller Message-ID: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Oleg Pykhalov , 33706@debbugs.gnu.org Hi, Thanks for the patch! I haven't tested it yet, but I was wondering why upd= ate pcre to pcre2 while not stripping pcrelib anymore=2E Is thc directory n= ot available anymore? Le 11 d=C3=A9cembre 2018 17:42:14 GMT+01:00, Oleg Pykhalov a =C3=A9crit : >* gnu/packages/php=2Escm (php)[version]: Update to 7=2E3=2E0=2E >[arguments]: Delete "sapi/cli/tests/upload_2G=2Ephpt" substitution and >delete "ext/pcre/tests/bug76909=2Ephpt" file=2E >[inputs]: Replace 'pcre' with 'pcre2'=2E >--- > gnu/packages/php=2Escm | 17 +++++++---------- > 1 file changed, 7 insertions(+), 10 deletions(-) > >diff --git a/gnu/packages/php=2Escm b/gnu/packages/php=2Escm >index a28cb31e5=2E=2E491e08481 100644 >--- a/gnu/packages/php=2Escm >+++ b/gnu/packages/php=2Escm >@@ -53,7 +53,7 @@ > (define-public php > (package > (name "php") >- (version "7=2E2=2E12") >+ (version "7=2E3=2E0") > (home-page "https://secure=2Ephp=2Enet/") > (source (origin > (method url-fetch) >@@ -61,7 +61,7 @@ > name "-" version "=2Etar=2Exz")) > (sha256 > (base32 >- =20 >"1qbz2j9kzqxxp0mmx02zavvz20ji7izqdnri25g1mrwyhz60974q")) >+ =20 >"1db0lm84hynilrjj3k1s7skp1y2gl4ip1ihr7662i2xgannmq6bx")) > (modules '((guix build utils))) > (snippet > '(with-directory-excursion "ext" >@@ -74,7 +74,6 @@ > ;;"fileinfo/libmagic" ; This is a patched version of libmagic=2E > '("gd/libgd" > "mbstring/oniguruma" >- "pcre/pcrelib" > "sqlite3/libsqlite" > "xmlrpc/libxmlrpc" > "zip/lib")) >@@ -176,11 +175,6 @@ > (substitute* "ext/standard/tests/streams/bug60602=2Ephpt" > (("'ls'") (string-append "'" (which "ls") "'"))) >=20 >- ;; The expected output is slightly different from what is >given, >- ;; in a section that's not related to the actual test >- (substitute* "sapi/cli/tests/upload_2G=2Ephpt" >- (("Test\\\\n") "Test\n\n")) >- > ;; Drop tests that are known to fail=2E > (for-each delete-file > '("ext/posix/tests/posix_getgrgid=2Ephpt" ; Requires /etc/group= =2E >@@ -291,7 +285,10 @@ > "ext/ldap/tests/ldap_set_option_error=2Ephpt" >=20 > ;; Sometimes cannot start the LDAP server=2E >- "ext/ldap/tests/bug76248=2Ephpt")) >+ "ext/ldap/tests/bug76248=2Ephpt" >+ >+ ;; Bug #76909 preg_match difference between >7=2E3 and < 7=2E3 >+ "ext/pcre/tests/bug76909=2Ephpt")) >=20 > ;; Skip tests requiring network access=2E > (setenv "SKIP_ONLINE_TESTS" "1") >@@ -324,7 +321,7 @@ > ("oniguruma" ,oniguruma-5) > ("openldap" ,openldap) > ("openssl" ,openssl) >- ("pcre" ,pcre) >+ ("pcre" ,pcre2) > ("postgresql" ,postgresql) > ("readline" ,readline) > ("sqlite" ,sqlite)