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

netpbm: Update from 2935 to 3084

Browse Source
This commit is contained in:
Fredrik Fornwall 2017-10-06 13:26:25 +02:00
parent 7a82033d1e
commit 58a0a51f5a
2 changed files with 25 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/netpbm/build.sh
View File

@ -4,9 +4,9 @@ TERMUX_PKG_DESCRIPTION="Toolkit for manipulation of graphic images, including co
# and are divided among (1) Development, (2) Advanced, (3) Stable and (4) Super Stable. # 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. # 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. # So use revisions from http://svn.code.sf.net/p/netpbm/code/advanced for packages.
TERMUX_PKG_VERSION=2935 TERMUX_PKG_VERSION=3084
TERMUX_PKG_SHA256=07ab08350a3afcf11e500893f3ad49c1cd7143f389c83af9cc20aa8450c5bfe4
TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/netpbm-advanced-r${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/netpbm-advanced-r${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=8a09acbc8438dc44ffb3f7a6482dd390f8c17fc55ba61cb7531ca16f9bc54530
TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo" TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo"
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes

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

@ -1,43 +1,34 @@
diff -u -r ../netpbm-advanced-r2935/buildtools/installnetpbm.pl ./buildtools/installnetpbm.pl diff -u -r ../netpbm-advanced-r3084/buildtools/installnetpbm.pl ./buildtools/installnetpbm.pl
--- ../netpbm-advanced-r2935/buildtools/installnetpbm.pl 2017-03-30 23:03:27.000000000 +0200 --- ../netpbm-advanced-r3084/buildtools/installnetpbm.pl 2017-10-06 07:49:15.000000000 +0200
+++ ./buildtools/installnetpbm.pl 2017-03-30 23:07:53.748201627 +0200 +++ ./buildtools/installnetpbm.pl 2017-10-06 12:18:07.809552955 +0200
@@ -59,7 +59,7 @@ @@ -32,16 +32,7 @@
"'make package'?\n");
my $default = "/tmp/netpbm";
- my $response = prompt("package directory", $default);
+ my $response = $default;
if (!-f("$response/pkginfo")) { my ($prompt, $default) = @_;
print("This does not appear to be a Netpbm install package. \n");
@@ -123,7 +123,7 @@ - print("$prompt ($default) ==> ");
-
- my $response = <STDIN>;
-
- chomp($response);
- if ($response eq "") {
- $response = $default;
- }
-
- return $response;
+ return $default;
}
@@ -185,7 +176,7 @@
$default = "/usr/local/netpbm"; $default = "/usr/local/netpbm";
} }
- my $response = prompt("install prefix", $default); - my $response = fsObjPrompt("install prefix", $default);
+ my $response = "@TERMUX_PREFIX@"; + my $response = "@TERMUX_PREFIX@";
my $prefix; my $prefix;
@@ -185,7 +185,7 @@ @@ -573,7 +564,7 @@
while (!$binDir) {
my $default = "$prefix/bin";
- my $response = prompt("program directory", $default);
+ my $response = $default;
if (-d($response)) {
$binDir = $response;
@@ -243,7 +243,7 @@
while (!$libDir) {
my $default = "$prefix/lib";
- my $response = prompt("shared library directory", $default);
+ my $response = $default;
if (-d($response)) {
$libDir = $response;
@@ -511,7 +511,7 @@
$done = $FALSE; $done = $FALSE;
while (!$done) { while (!$done) {
@ -46,39 +37,3 @@ diff -u -r ../netpbm-advanced-r2935/buildtools/installnetpbm.pl ./buildtools/ins
if (uc($response) eq "Y") { if (uc($response) eq "Y") {
execLdconfig(); execLdconfig();
@@ -574,7 +574,7 @@
while (!$linkDir) {
my $default = "$prefix/lib";
- my $response = prompt("static library directory", $default);
+ my $response = $default;
if (-d($response)) {
$linkDir = $response;
@@ -637,7 +637,7 @@
while (!$dataDir) {
my $default = "$prefix/lib";
- my $response = prompt("data file directory", $default);
+ my $response = $default;
if (-d($response)) {
$dataDir = $response;
@@ -674,7 +674,7 @@
while (!$hdrDir) {
my $default = "$prefix/include";
- my $response = prompt("header directory", $default);
+ my $response = $default;
if (-d($response)) {
$hdrDir = $response;
@@ -877,7 +877,7 @@
while (!$pkgconfigDir) {
my $default = "$prefix/lib/pkgconfig";
- my $response = prompt("Pkg-config directory", $default);
+ my $response = $default;
if (-d($response)) {
$pkgconfigDir = $response;