From 6201e033076a2d78415727711d71ea605d7839ec Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Tue, 12 May 2020 00:10:49 +0300 Subject: [PATCH] netpbm: update to 10.73.31 Closes https://github.com/termux/termux-packages/issues/5242. --- packages/netpbm/build.sh | 11 +++----- .../netpbm/buildtools-installnetpbm.pl.patch | 26 +++++++++++++------ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/packages/netpbm/build.sh b/packages/netpbm/build.sh index b8fffe026..b9b9e6215 100644 --- a/packages/netpbm/build.sh +++ b/packages/netpbm/build.sh @@ -1,14 +1,9 @@ TERMUX_PKG_HOMEPAGE=http://netpbm.sourceforge.net/ TERMUX_PKG_DESCRIPTION="Toolkit for manipulation of graphic images of different formats" TERMUX_PKG_LICENSE="LGPL-2.0" -# The netpbm releases are described at http://netpbm.sourceforge.net/release.html -# and are divided among (1) Development, (2) Advanced, (3) Stable and (4) Super Stable. -# Only Super Stable is distributed as a tar ball, but is outdated and does not compile with modern libpng. -# So use revisions from http://svn.code.sf.net/p/netpbm/code/advanced for packages. -TERMUX_PKG_VERSION=3094 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/netpbm-advanced-r${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=2f4d8c245f174e391a4cf2418075c06532aee8a5fcc8dbbb8f2e7012cd9d52a4 +TERMUX_PKG_VERSION=1:10.73.31 +TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/netpbm/super_stable/${TERMUX_PKG_VERSION:2}/netpbm-${TERMUX_PKG_VERSION:2}.tgz +TERMUX_PKG_SHA256=584c95f1ccdcd66d5ca68d7d5501728ae1184cba324d713f6b2a3ca86424243b TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff, zlib" TERMUX_PKG_BREAKS="netpbm-dev" TERMUX_PKG_REPLACES="netpbm-dev" diff --git a/packages/netpbm/buildtools-installnetpbm.pl.patch b/packages/netpbm/buildtools-installnetpbm.pl.patch index c0a68f45f..7e0c97e42 100644 --- a/packages/netpbm/buildtools-installnetpbm.pl.patch +++ b/packages/netpbm/buildtools-installnetpbm.pl.patch @@ -1,10 +1,11 @@ -diff -u -r ../netpbm-advanced-r3084/buildtools/installnetpbm.pl ./buildtools/installnetpbm.pl ---- ../netpbm-advanced-r3084/buildtools/installnetpbm.pl 2017-10-06 07:49:15.000000000 +0200 -+++ ./buildtools/installnetpbm.pl 2017-10-06 12:18:07.809552955 +0200 -@@ -32,16 +32,7 @@ +diff -uNr netpbm-10.73.31/buildtools/installnetpbm.pl netpbm-10.73.31.mod/buildtools/installnetpbm.pl +--- netpbm-10.73.31/buildtools/installnetpbm.pl 2019-06-29 02:07:55.000000000 +0300 ++++ netpbm-10.73.31.mod/buildtools/installnetpbm.pl 2020-05-12 00:06:51.166788332 +0300 +@@ -31,17 +31,7 @@ + sub prompt($$) { my ($prompt, $default) = @_; - +- - print("$prompt ($default) ==> "); - - my $response = ; @@ -19,16 +20,16 @@ diff -u -r ../netpbm-advanced-r3084/buildtools/installnetpbm.pl ./buildtools/ins } -@@ -185,7 +176,7 @@ +@@ -123,7 +113,7 @@ $default = "/usr/local/netpbm"; } -- my $response = fsObjPrompt("install prefix", $default); +- my $response = prompt("install prefix", $default); + my $response = "@TERMUX_PREFIX@"; my $prefix; -@@ -573,7 +564,7 @@ +@@ -511,7 +501,7 @@ $done = $FALSE; while (!$done) { @@ -37,3 +38,12 @@ diff -u -r ../netpbm-advanced-r3084/buildtools/installnetpbm.pl ./buildtools/ins if (uc($response) eq "Y") { execLdconfig(); +@@ -967,8 +957,6 @@ + + removeObsoleteManPage($manDir); + +- makeInManwebPath("$manDir/web"); +- + $$mandirR = $manDir; + } +