From 2e7a831805de7161b254dae85c6484bd57e3236d Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 28 Jun 2015 19:16:26 -0400
Subject: [PATCH] Update netpbm from r2523 to r2592

---
 packages/netpbm/.build.sh.swo             | Bin 0 -> 12288 bytes
 packages/netpbm/build.sh                  |   2 +-
 packages/netpbm/buildtools-Makefile.patch |  17 +++++------------
 3 files changed, 6 insertions(+), 13 deletions(-)
 create mode 100644 packages/netpbm/.build.sh.swo

diff --git a/packages/netpbm/.build.sh.swo b/packages/netpbm/.build.sh.swo
new file mode 100644
index 0000000000000000000000000000000000000000..05b6e0c5eeee6608c0b79d52f405ac58b3735a30
GIT binary patch
literal 12288
zcmeI2&u<$=6vwArz?1?4&hVOAD3Rjb#w`LO9Lcda&Z>@W?K)B6vh0tsJ<a~o&a9iL
zEpPzN9FdTa_yf3r5O+Wo2=NCXIC0{@fg1-@i8uDTv0FC+sRux_(pTQydHd$g=e;*l
zl<_Ven0xTDcA4PyG$A`TKiL0cyF-3mC1j9f@pU&0<<M!Dmk&-GzB~5T%%L9mdg}Uz
z?vQdlrXuws-OE`RXnb_nTHPoDioio7kc&a(m2>1$b>pJ+d12)|Jp0W4LvybjDFTXs
zBA^H;0*Zhlpa>`eion00fJo1fw=v8|ict09_sl)N#iROB1QY>9KoL*`6ahs*5l{pa
z0YyL&Py`f#{~!T3Ampb<3Hkgn3?BdgKl}Utho=bHM*aRIAs?bDs2|S}avSvt>L%(<
z)Gn%pdJ*;g6NG$+`WE#m%0pd1{dty<FH!HK-b1~MdJc8xaYBAUeS`WK^$zL{R26j=
z^>c}kuTfv2K0*o971Vju3#jK&1oa!nejD`#O0MHGl)4lFML-cy1QY>9;D1Hn7Aa{u
zi@Cs~iPOV_q!hV_6e`zX1B!EnkRA>Lmeq6-rNt3LQpzHzSOb`UCukPsM-CS>b)*xg
za15(!aDxz>i~6GkR@%*-cD-dgJ6+4!-Z$G#sKE+sZGoS}12)v6!<l8{?;5t73*LPH
z0sb1No8i1iX_5)B`<B`3S>0BxJh`0(WOn-f*L#NT>|)HXu~>-XlyYsfwR}FiU+<fZ
zwz=)}yIuSuUT#(ZL4$H}yWDPyLz+$R9$?j&STvT8TJ;XbBQ2(P%dP5`w5VJ6j{50I
zk~9{dJdlzfK)G*Nd;3?N-j$YPTaBh^k<taQDTOjV>Otb`W(S$H+u(XhE?`=6FgdRZ
z{1_`I(qJdaz|BPxxq|uAF%C>XM*Sp;XdH03mUDq~r^hTFp2UCwVROz>*sJ$<Yx5D|
zvU{DD)97|~%$9?}ZI-1CMxLHTZW%k~Ro!E;9x^YDhm~nfo*3ZL?sKGL(;Q-lKxNL;
zGDA|DBXpmeg=qVGJq&R%3Q4nv*u;o}8wXj!0$2=_`x#3GU}mIE>WUGpdKAwJ)5(ib
zg4~jru5FU}W}U7vN29x)%EvOfP|2X|*ascQG7e1J>~>%zM7pW#IIj6gKs7$lFpK(Z
zW6<SG-3`WW?9-(cF+VXq5}E4@XSUHyr!N@o)vp*1_F%)XZNsi@kU4gfZNo7;vdn77
zl+TYfjh@kI+O?G_nstfjC<?19^F{}TC6`mn$~P9)cZ)1M)~YYPS|wP+3FMq&362?O
zNz7r8CDA`*fmxXCs9Zyz-8ei3J5Ol_ws5_W0^<-cE;8oj0^zwFTo7&s9`4TT*a?_e
z4%jz=I~k4x2olO6PGmDgDMJ_68KykK9At4(8geQu7H~1W0UNVGdX5rooYjprXwoqa
zlN8%Ztix(`4eCYe@afXpEHL@~>ScVKi&pyWW04g-oY9cF9HW`cLuDa)awajOG_})s
zl4riG$RV8+PVt>K5>Ysxpr&Cra1ZXwB(3z5Bs|0|Kq8FXn5B7$n?n*qGJs*`rX$=a
zSR{|YuVd}|VICA4!<c3=U(#+m4jvWPDUFfr*v%Lf$8s!Sg8|Kuft&&N9llU2yWKsb
OS8o}$qV^xK67m=JqLYdM

literal 0
HcmV?d00001

diff --git a/packages/netpbm/build.sh b/packages/netpbm/build.sh
index 9cc5ca4a..5a6c3fe9 100644
--- a/packages/netpbm/build.sh
+++ b/packages/netpbm/build.sh
@@ -4,7 +4,7 @@ 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.
-_SVN_REVISION=2523
+_SVN_REVISION=2592
 TERMUX_PKG_VERSION=r${_SVN_REVISION}
 TERMUX_PKG_DEPENDS="libpng, libxml2"
 TERMUX_PKG_BUILD_IN_SRC=yes
diff --git a/packages/netpbm/buildtools-Makefile.patch b/packages/netpbm/buildtools-Makefile.patch
index 73e854d9..f5b93388 100644
--- a/packages/netpbm/buildtools-Makefile.patch
+++ b/packages/netpbm/buildtools-Makefile.patch
@@ -1,19 +1,12 @@
-diff -u -r ../advanced/buildtools/Makefile ./buildtools/Makefile
---- ../advanced/buildtools/Makefile	2014-12-29 02:10:39.856106335 -0500
-+++ ./buildtools/Makefile	2014-12-29 02:22:26.036106824 -0500
-@@ -27,13 +27,13 @@
+diff -u -r ../src-orig/buildtools/Makefile ./buildtools/Makefile
+--- ../src-orig/buildtools/Makefile	2015-06-28 19:14:14.522452203 -0400
++++ ./buildtools/Makefile	2015-06-28 19:14:28.146229128 -0400
+@@ -27,7 +27,7 @@
  	$(CC_FOR_BUILD) -c -o $@ $(CFLAGS_FOR_BUILD) \
  	  -DSHLIBPREFIXLIST="\"$(SHLIBPREFIXLIST)\"" \
  	  $(STRIP_DLL_VERSION) $(EXPLICIT) \
 -	  $(CFLAGS_PERSONAL) $(CFLAGS) $(CADD) \
-+	  $(CFLAGS_PERSONAL) $(CFLAGS_FOR_BUILD) $(CADD) \
++	  $(CFLAGS_PERSONAL) $(CADD) \
  	  $<
  
  typegen.o endiangen.o:%.o:%.c
- 	$(CC_FOR_BUILD) -c -o $@ $(CFLAGS_FOR_BUILD) $<
- 
--$(BUILDPROGS):%:%.o
-+$(PROGS):%:%.o
- 	$(LD_FOR_BUILD) -o $@ $(LDFLAGS_FOR_BUILD) $<
- 
- distclean clean: cleanlocal
-- 
2.11.0