netpbm: Update from r2901 to r2935

Also add -fPIC to CFLAGs for shared library builds (needed for
at least the arm build to work).

diff --git a/packages/netpbm/build.sh b/packages/netpbm/build.sh
index 941ee51..c7e7c44 100644 (file)
--- a/packages/netpbm/build.sh
+++ b/packages/netpbm/build.sh
@@ -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.
 # 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=2901
+TERMUX_PKG_VERSION=2935
 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/netpbm-advanced-r${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=0fded2dd3dd311ed08ab73fa50ed0bd61adf80783f9033e9b5f4f7395d3266b1
+TERMUX_PKG_SHA256=8a09acbc8438dc44ffb3f7a6482dd390f8c17fc55ba61cb7531ca16f9bc54530
 TERMUX_PKG_DEPENDS="libpng, libxml2"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
@@ -24,6 +24,7 @@ termux_step_configure () {
        echo "RANLIB = $RANLIB" >> config.mk
        echo "CC = $CC" >> config.mk
        echo "CFLAGS = $CFLAGS" >> config.mk
+       echo "CFLAGS_SHLIB = -fPIC" >> config.mk
        echo "LDFLAGS = $LDFLAGS" >> config.mk
        echo "STATICLIB_TOO = n" >> config.mk
        echo "INTTYPES_H = <inttypes.h>" >> config.mk

diff --git a/packages/netpbm/installnetpbm.pl.patch b/packages/netpbm/buildtools-installnetpbm.pl.patch
similarity index 73%
rename from packages/netpbm/installnetpbm.pl.patch
rename to packages/netpbm/buildtools-installnetpbm.pl.patch
index d331f5d..3464b2e 100644 (file)
--- a/packages/netpbm/installnetpbm.pl.patch
+++ b/packages/netpbm/buildtools-installnetpbm.pl.patch
@@ -1,6 +1,6 @@
-diff -u -r ../advanced/buildtools/installnetpbm.pl ./buildtools/installnetpbm.pl
---- ../advanced/buildtools/installnetpbm.pl    2014-12-29 05:18:32.416114132 -0500
-+++ ./buildtools/installnetpbm.pl      2014-12-29 05:18:12.900114119 -0500
+diff -u -r ../netpbm-advanced-r2935/buildtools/installnetpbm.pl ./buildtools/installnetpbm.pl
+--- ../netpbm-advanced-r2935/buildtools/installnetpbm.pl       2017-03-30 23:03:27.000000000 +0200
++++ ./buildtools/installnetpbm.pl      2017-03-30 23:07:53.748201627 +0200
 @@ -59,7 +59,7 @@
                "'make package'?\n");
          my $default = "/tmp/netpbm";
@@ -73,28 +73,7 @@ diff -u -r ../advanced/buildtools/installnetpbm.pl ./buildtools/installnetpbm.pl
          
          if (-d($response)) {
              $hdrDir = $response;
-@@ -766,9 +766,9 @@
-     my $manDir;
- 
-     while (!$manDir) {
--        my $default = "$prefix/man";
-+        my $default = "$prefix/share/man";
- 
--        my $response = prompt("man page directory", $default);
-+        my $response = $default;
- 
-         if (-d($response)) {
-             $manDir = $response;
-@@ -820,7 +820,7 @@
-     my $done;
-     
-     while (!$done) {
--        my $response = prompt("create /etc/manweb.conf", "Y");
-+        my $response = "N";
-         
-         if (uc($response) eq "Y") {
-             my $successful = open(MANWEB_CONF, ">/etc/manweb.conf");
-@@ -1102,7 +1102,7 @@
+@@ -877,7 +877,7 @@
      while (!$pkgconfigDir) {
          my $default = "$prefix/lib/pkgconfig";