sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netpbm: update to 10.73.31

Browse Source 
Closes https://github.com/termux/termux-packages/issues/5242.
This commit is contained in:
Leonid Pliushch 2020-05-12 00:10:49 +03:00
parent 655753cac0
commit 6201e03307
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/netpbm/build.sh
View File

@ -1,14 +1,9 @@
TERMUX_PKG_HOMEPAGE=http://netpbm.sourceforge.net/ TERMUX_PKG_HOMEPAGE=http://netpbm.sourceforge.net/
TERMUX_PKG_DESCRIPTION="Toolkit for manipulation of graphic images of different formats" TERMUX_PKG_DESCRIPTION="Toolkit for manipulation of graphic images of different formats"
TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_LICENSE="LGPL-2.0"
# The netpbm releases are described at http://netpbm.sourceforge.net/release.html TERMUX_PKG_VERSION=1:10.73.31
# and are divided among (1) Development, (2) Advanced, (3) Stable and (4) Super Stable. TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/netpbm/super_stable/${TERMUX_PKG_VERSION:2}/netpbm-${TERMUX_PKG_VERSION:2}.tgz
# Only Super Stable is distributed as a tar ball, but is outdated and does not compile with modern libpng. TERMUX_PKG_SHA256=584c95f1ccdcd66d5ca68d7d5501728ae1184cba324d713f6b2a3ca86424243b
# 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_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff, zlib" TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff, zlib"
TERMUX_PKG_BREAKS="netpbm-dev" TERMUX_PKG_BREAKS="netpbm-dev"
TERMUX_PKG_REPLACES="netpbm-dev" TERMUX_PKG_REPLACES="netpbm-dev"

26
packages/netpbm/buildtools-installnetpbm.pl.patch
View File

@ -1,10 +1,11 @@
diff -u -r ../netpbm-advanced-r3084/buildtools/installnetpbm.pl ./buildtools/installnetpbm.pl diff -uNr netpbm-10.73.31/buildtools/installnetpbm.pl netpbm-10.73.31.mod/buildtools/installnetpbm.pl
--- ../netpbm-advanced-r3084/buildtools/installnetpbm.pl 2017-10-06 07:49:15.000000000 +0200 --- netpbm-10.73.31/buildtools/installnetpbm.pl 2019-06-29 02:07:55.000000000 +0300
+++ ./buildtools/installnetpbm.pl 2017-10-06 12:18:07.809552955 +0200 +++ netpbm-10.73.31.mod/buildtools/installnetpbm.pl 2020-05-12 00:06:51.166788332 +0300
@@ -32,16 +32,7 @@ @@ -31,17 +31,7 @@
sub prompt($$) {
my ($prompt, $default) = @_; my ($prompt, $default) = @_;
-
- print("$prompt ($default) ==> "); - print("$prompt ($default) ==> ");
- -
- my $response = <STDIN>; - my $response = <STDIN>;
@ -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"; $default = "/usr/local/netpbm";
} }
- my $response = fsObjPrompt("install prefix", $default); - my $response = prompt("install prefix", $default);
+ my $response = "@TERMUX_PREFIX@"; + my $response = "@TERMUX_PREFIX@";
my $prefix; my $prefix;
@@ -573,7 +564,7 @@ @@ -511,7 +501,7 @@
$done = $FALSE; $done = $FALSE;
while (!$done) { while (!$done) {
@ -37,3 +38,12 @@ diff -u -r ../netpbm-advanced-r3084/buildtools/installnetpbm.pl ./buildtools/ins
if (uc($response) eq "Y") { if (uc($response) eq "Y") {
execLdconfig(); execLdconfig();
@@ -967,8 +957,6 @@
removeObsoleteManPage($manDir);
- makeInManwebPath("$manDir/web");
-
$$mandirR = $manDir;
}