| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263 |
- From 37db53fef0be5acdddfadcba9baab0cf95bce3c7 Mon Sep 17 00:00:00 2001
- From: Thomas Guillem <thomas@gllm.fr>
- Date: Tue, 18 Apr 2017 17:24:03 +0200
- Subject: [PATCH 11/18] Revert "Contribs: update libpng to 1.6.29"
- This reverts commit 8891af2d84de3caa5c4f2a51acbb2b47647ed62d.
- ---
- contrib/src/png/SHA512SUMS | 2 +-
- contrib/src/png/bins.patch | 15 ++++++---------
- contrib/src/png/rules.mak | 2 +-
- 3 files changed, 8 insertions(+), 11 deletions(-)
- diff --git a/contrib/src/png/SHA512SUMS b/contrib/src/png/SHA512SUMS
- index b07b35b341..83d7d029b9 100644
- --- a/contrib/src/png/SHA512SUMS
- +++ b/contrib/src/png/SHA512SUMS
- @@ -1 +1 @@
- -070393423ec11f19e3264a0200959ae09238aa005615571586987253028b4ffb7e6b7c734a132f65180252b0259f79add03896d79fdc7dcfd8773b82c82a5ffc libpng-1.6.29.tar.xz
- +166377ce4f8abfcae0e76bafbdbe94aebef60b9a12c1820eda392e63a8ba7a9e8d7ef4840d8d4853cd487418edd2c4515a889cd9f830d4223a13315e1db4c3b8 libpng-1.6.19.tar.xz
- diff --git a/contrib/src/png/bins.patch b/contrib/src/png/bins.patch
- index 660437c71b..317f9c85ea 100644
- --- a/contrib/src/png/bins.patch
- +++ b/contrib/src/png/bins.patch
- @@ -1,18 +1,15 @@
- ---- libpng-1.6.29/Makefile.am.orig 2017-04-08 12:12:49.688261183 +0200
- -+++ libpng-1.6.29/Makefile.am 2017-04-08 12:13:27.148259514 +0200
- -@@ -12,13 +12,13 @@
- +--- libpng-1.6.10/Makefile.am.orig 2014-05-24 18:11:01.881964331 +0200
- ++++ libpng-1.6.10/Makefile.am 2014-05-24 18:12:02.839819773 +0200
- +@@ -7,10 +7,10 @@
- ACLOCAL_AMFLAGS = -I scripts
-
- # test programs - run on make check, make distcheck
- --check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage pngcp
- -+check_PROGRAMS=
- - if HAVE_CLOCK_GETTIME
- - check_PROGRAMS += timepng
- - endif
- +-check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage
- ++check_PROGRAMS=
-
- # Utilities - installed
- -bin_PROGRAMS= pngfix png-fix-itxt
- -+bin_PROGRAMS=
- ++bin_PROGRAMS=
-
- # This ensures that pnglibconf.h gets built at the start of 'make all' or
- # 'make check', but it does not add dependencies to the individual programs,
- diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
- index 9a05170afc..c18cfdf214 100644
- --- a/contrib/src/png/rules.mak
- +++ b/contrib/src/png/rules.mak
- @@ -1,5 +1,5 @@
- # PNG
- -PNG_VERSION := 1.6.29
- +PNG_VERSION := 1.6.19
- PNG_URL := $(SF)/libpng/libpng16/$(PNG_VERSION)/libpng-$(PNG_VERSION).tar.xz
-
- PKGS += png
- --
- 2.13.2
|
