From 1ab7e71d05c777ba0557688e1ff791328510c488 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 1 Nov 2018 03:23:42 +0100 Subject: [PATCH] pngquant: Update frmo 2.12.1 to 2.12.2 --- packages/pngquant/build.sh | 6 +++--- packages/pngquant/configure.patch | 19 ------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/packages/pngquant/build.sh b/packages/pngquant/build.sh index 2edf53e55..f9b03213e 100644 --- a/packages/pngquant/build.sh +++ b/packages/pngquant/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://pngquant.org TERMUX_PKG_DESCRIPTION="PNG image optimising utility" -TERMUX_PKG_VERSION=2.12.1 -TERMUX_PKG_SHA256=(352ff60420fd5ab7a94f548be6f87dbdfa15eb28e3cc8f61c089f4e0be7ee1a0 - c0f6ddfb1ed214a520b18f6fff16fe09f39d427caf9679b05657e32dfdc2cb27) +TERMUX_PKG_VERSION=2.12.2 +TERMUX_PKG_SHA256=(5edf7c5bffd07e5d28fcc6d4d94a187c30b532c52ac986b3e45aff3dce0567dc + 34036379d3b68de79b5f180b3fe3989b9d2e81c1909ee3f85acaedb74f46003b) # If both archives are .tar.gz then they overwrite eachother since they are the same version and hence the same name. # Work around this by using .zip for one of them... TERMUX_PKG_SRCURL=(https://github.com/pornel/pngquant/archive/$TERMUX_PKG_VERSION.tar.gz diff --git a/packages/pngquant/configure.patch b/packages/pngquant/configure.patch index d0c3ee307..3110c6f20 100644 --- a/packages/pngquant/configure.patch +++ b/packages/pngquant/configure.patch @@ -1,25 +1,6 @@ -First part has been submitted upstream: -https://github.com/kornelski/pngquant/pull/303 - diff -u -r ../pngquant-2.12.1/configure ./configure --- ../pngquant-2.12.1/configure 2018-06-04 11:30:47.000000000 +0000 +++ ./configure 2018-07-02 11:53:11.547417517 +0000 -@@ -159,10 +159,11 @@ - - find_pkgconfig() { - local LIBNAME=$1 -- if pkg-config --exists "$LIBNAME" &> /dev/null; then -- cflags "$(pkg-config --cflags "$LIBNAME")" -- lflags "$(pkg-config --libs "$LIBNAME")" -- LIBRARY_FOUND_VERSION=$(pkg-config --modversion "$LIBNAME") -+ PKG_CONFIG=${PKG_CONFIG:-pkg-config} -+ if $PKG_CONFIG --exists "$LIBNAME" &> /dev/null; then -+ cflags "$($PKG_CONFIG --cflags "$LIBNAME")" -+ lflags "$($PKG_CONFIG --libs "$LIBNAME")" -+ LIBRARY_FOUND_VERSION=$($PKG_CONFIG --modversion "$LIBNAME") - status "$LIBNAME" "shared ($LIBRARY_FOUND_VERSION)" - return 0 - fi @@ -360,12 +361,6 @@ DIRS+=("$LIQSRCDIR" "$LIQSRCDIR") # local libimagequant fi