From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: bug#27556: libpng has wrong hash. [Fwd: Re: why has the hash for libpng-apng 1.6.28 changed?] Date: Tue, 1 Aug 2017 15:47:08 +0000 Message-ID: <20170801154708.z7jyfjyoaqyr5ucw@abyayala> References: <20170702201344.dvqpopouvpbzr4c2@abyayala> <20170723101547.3oi5uu2xhi625njp@abyayala> <20170725184936.GA32001@jasmine.lan> <20170726065651.qvsz25b44txl6et7@abyayala> <20170726084040.GE12553@macbook42.flashner.co.il> <20170730093722.xqhesfpmbpmussag@abyayala> <20170731143420.GA10829@jasmine.lan> <20170731143932.lvd6q4sbccg5tpbp@abyayala> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="avnfvwe2u5x4m6yt" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dcZOw-0006do-Gs for bug-guix@gnu.org; Tue, 01 Aug 2017 11:48:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dcZOs-0000up-NJ for bug-guix@gnu.org; Tue, 01 Aug 2017 11:48:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34459) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dcZOs-0000ue-Gy for bug-guix@gnu.org; Tue, 01 Aug 2017 11:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dcZOs-0002LP-8f for bug-guix@gnu.org; Tue, 01 Aug 2017 11:48:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: Content-Disposition: inline In-Reply-To: <20170731143932.lvd6q4sbccg5tpbp@abyayala> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Leo Famulari , Efraim Flashner , 27556@debbugs.gnu.org --avnfvwe2u5x4m6yt Content-Type: multipart/mixed; boundary="u4ggowfh5treyhep" Content-Disposition: inline --u4ggowfh5treyhep Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable ng0 transcribed 2.5K bytes: > Leo Famulari transcribed 2.2K bytes: > > On Sun, Jul 30, 2017 at 09:37:22AM +0000, ng0 wrote: > > > Efraim Flashner transcribed 4.1K bytes: > > > > On Wed, Jul 26, 2017 at 06:56:51AM +0000, ng0 wrote: > > > > > My really strong guess is that we never updated the hash for > > > > > libpng-apng when the libpng was updated fron which libpng-apng > > > > > inherits its version. > >=20 > > [...] > >=20 > > > > git blame shows that back in February I updated libpng to 1.6.28 fr= om > > > > 1.6.25, but that the last time libpng-apng was touched was by ng0 b= ack > > > > in January. > > > >=20 > > > > commit: 864738baaa7bb75c08647ccfc684736479e67f7f > >=20 > > Aha, that must be it! > >=20 > > > Okay, so I will send the update for libpng-apng (which due to its > > > inheritance of libpng is just the hash) and I will also add a second > > > commit which adds a comment above libpng that we must update libpng-a= png > > > when we update libpng, if that's already possible (libpng-apng might = not > > > immediately be up to date, but we don't update libpng immediately asw= ell > > > due to it being a core-updates candidate). > >=20 > > I think we should give libpng-apng its own version because, as you said, > > libpng-apng may not be developed at the same pace as libpng. This way, > > we won't end up with a broken libpng-apng again. I appended a patch how I understood your idea. --=20 ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://n0is.noblogs.org/my-keys https://www.infotropique.org https://krosos.org --u4ggowfh5treyhep Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-libpng-apng-Update-to-1.6.28.patch" Content-Transfer-Encoding: quoted-printable =46rom 4326cad38700df43909eb6f430217fdfa4eca89f Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Tue, 1 Aug 2017 15:37:28 +0000 Subject: [PATCH] gnu: libpng-apng: Update to 1.6.28. Fixes . * gnu/packages/image.scm (libpng-apng): Update to 1.6.28. Remove inherit of 'libpng'. (version): Use own version, remove 'package-version libpng'. (source): Add it. (arguments): Update hash of libpng-apng source. --- gnu/packages/image.scm | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 139be6281..3be675fc2 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -14,7 +14,7 @@ ;;; Copyright =C2=A9 2016 Eric Bavier ;;; Copyright =C2=A9 2016 Arun Isaac ;;; Copyright =C2=A9 2016, 2017 Kei Kebreau -;;; Copyright =C2=A9 2017 ng0 +;;; Copyright =C2=A9 2017 ng0 ;;; Copyright =C2=A9 2017 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. @@ -91,11 +91,27 @@ library. It supports almost all PNG features and is ex= tensible.") (license license:zlib) (home-page "http://www.libpng.org/pub/png/libpng.html"))) =20 +;; libpng-apng could be not in sync with libpng, +;; reference bug: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D27556 (define-public libpng-apng (package - (inherit libpng) (name "libpng-apng") - (version (package-version libpng)) + (version "1.6.28") + (source + (origin + (method url-fetch) + (uri (list (string-append "mirror://sourceforge/libpng/libpng16/" + version "/libpng-" version ".tar.xz") + (string-append + "ftp://ftp.simplesystems.org/pub/libpng/png/src" + "/libpng16/libpng-" version ".tar.xz") + (string-append + "ftp://ftp.simplesystems.org/pub/libpng/png/src/history" + "/libpng16/libpng-" version ".tar.xz"))) + (sha256 + (base32 + "0ylgyx93hnk38haqrh8prd3ax5ngzwvjqw5cxw7p9nxmwsfyrlyq")))) + (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -111,7 +127,7 @@ library. It supports almost all PNG features and is ex= tensible.") (and (apply-patch "the-patch") (for-each apply-patch (find-files "\\.patch")))) - #t)) + #t)) (add-before 'configure 'no-checks (lambda _ (substitute* "Makefile.in" @@ -126,15 +142,19 @@ library. It supports almost all PNG features and is = extensible.") version "/libpng-" version "-apng.patch.= gz")) (sha256 (base32 - "026r0gbkf6d6v54wca02cdxln8sj4m2c1yk62sj2aasv2ki2ffh5"= )))))) + "0m5nv70n9903x3xzxw9qqc6sgf2rp106ha0x6gix0xf8wcrljaab"= )))))) (native-inputs `(("libtool" ,libtool))) + ;; libpng.la says "-lz", so propagate it. + (propagated-inputs + `(("zlib" ,zlib))) (synopsis "APNG patch for libpng") (description "APNG (Animated Portable Network Graphics) is an unofficial extension of the APNG (Portable Network Graphics) format. APNG patch provides APNG support to libpng.") - (home-page "https://sourceforge.net/projects/libpng-apng/"))) + (home-page "https://sourceforge.net/projects/libpng-apng/") + (license license:zlib))) =20 (define-public libpng-1.2 (package --=20 2.13.3 --u4ggowfh5treyhep-- --avnfvwe2u5x4m6yt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlmAonwACgkQ4i+bv+40 hYhRRA/8C+FYyNJ1fNfW6fz8brWVyvYvD4sleRE+hINV0Wra2LFF/cUvLvaTSHRo wIYrCjPrzt2zmfZ7zxxXZPIjaq7uBBFqIhP2hrgi9BIy64bRn1U6tUh0uZSOF/84 bWF/4CA9ank4LfC7ZevHRrchsQYlGsQUPbHr1uygIOTmIPYg3H8k2xi2XAqQ7nDz yVRsliDPkbrWFZIOla04Ch01n6FYCDtw8ottaYbLeUWROgeN9xGxqtuKRE4VY6d1 XPFOBPWPrpVhYumEUXEq6PUXzsGm7rOagCRLJW9JeTySPr4WclCDi7FJi0td8Vip VanYHUnhCgfv/zhPfCdanKZEYrLMi4QV+OTUh13cFIzZpDk7/7aKBO4GXFYlpcYg CnaWow4y77nrZydeGWjy/ZkYBViOE4Uuhm7h/vCmD0Em7ScD2RWbrtB05DCfYaYI Bl5LoyTzzae8GggMkUuY5/DoNHAHR9k0WpbLNRaNo0zR2dp95h9pQnr6W75TPluJ /KAIpMOBTcNgLETWI26c7v9k7ikvcNnBsPh7YWow8hqiPX+X+MJFO/tOijreurnm 9AbZIfgCeQcHJtenQk3GxLSf2y7oAF+rVzN4YegoiYY/FUZiK4tjCHy2cyN/FAti 9UWKeF54GYL5yPUedEcKnQTeaH9grueZvDDPC0w6slZlk/UB+YA= =qTeO -----END PGP SIGNATURE----- --avnfvwe2u5x4m6yt--