Fri, 09 Jan 2009 01:41:46 +0100
Port to standard ISO C by linking to external libs after local objects.
netpbm/netpbm.patch | file | annotate | diff | comparison | revisions | |
netpbm/netpbm.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/netpbm/netpbm.patch Fri Jan 09 01:40:36 2009 +0100 1.2 +++ b/netpbm/netpbm.patch Fri Jan 09 01:41:46 2009 +0100 1.3 @@ -62,3 +62,64 @@ 1.4 pm_ungamma709(float const brightness) { 1.5 1.6 /* These are the same parameters as in pm_gamma, above */ 1.7 +Index: converter/other/Makefile 1.8 +--- converter/other/Makefile.orig 2005-02-05 18:48:28.000000000 +0100 1.9 ++++ converter/other/Makefile 2009-01-09 00:54:13.704466003 +0100 1.10 +@@ -111,29 +111,29 @@ 1.11 + endif 1.12 + 1.13 + tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIB) $(LIBOPT) 1.14 +- $(LD) $(LDFLAGS) -o $@ $@.o \ 1.15 ++ $(LD) -o $@ $@.o \ 1.16 + `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(TIFFLIB) $(TIFFLIB_EXTRALIBS)` \ 1.17 +- $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 1.18 ++ $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 1.19 + 1.20 + pngtopnm: %: %.o $(NETPBMLIB) $(LIBOPT) 1.21 +- $(LD) $(LDFLAGS) -o $@ $@.o \ 1.22 ++ $(LD) -o $@ $@.o \ 1.23 + `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \ 1.24 +- $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 1.25 ++ $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 1.26 + 1.27 + pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT) 1.28 +- $(LD) $(LDFLAGS) -o $@ $@.o pngtxt.o \ 1.29 ++ $(LD) -o $@ $@.o pngtxt.o \ 1.30 + `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \ 1.31 +- $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 1.32 ++ $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 1.33 + 1.34 + jpegtopnm: %: %.o jpegdatasource.o exif.o $(NETPBMLIB) $(LIBOPT) 1.35 +- $(LD) $(LDFLAGS) -o $@ $< jpegdatasource.o exif.o \ 1.36 ++ $(LD) -o $@ $< jpegdatasource.o exif.o \ 1.37 + `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \ 1.38 +- $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 1.39 ++ $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 1.40 + 1.41 + pnmtojpeg: %: %.o $(NETPBMLIB) $(LIBOPT) 1.42 +- $(LD) $(LDFLAGS) -o $@ $@.o \ 1.43 ++ $(LD) -o $@ $@.o \ 1.44 + `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \ 1.45 +- $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 1.46 ++ $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 1.47 + 1.48 + # If URTLIB is BUNDLED_URTLIB, then we're responsible for building it, which 1.49 + # means it needs to be a dependency: 1.50 +@@ -142,13 +142,13 @@ 1.51 + endif 1.52 + 1.53 + rletopnm pnmtorle: %: %.o $(NETPBMLIB) $(URTLIBDEP) $(LIBOPT) 1.54 +- $(LD) $(LDFLAGS) -o $@ $@.o \ 1.55 +- `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(MATHLIB) $(LDLIBS) \ 1.56 ++ $(LD) -o $@ $@.o \ 1.57 ++ `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \ 1.58 + $(RPATH) $(LADD) 1.59 + 1.60 + pnmtorast rasttopnm: %: %.o rast.o $(NETPBMLIB) $(LIBOPT) 1.61 +- $(LD) $(LDFLAGS) -o $@ $@.o rast.o \ 1.62 +- `$(LIBOPT) $(NETPBMLIB)` $(MATHLIB) $(LDLIBS) \ 1.63 ++ $(LD) -o $@ $@.o rast.o \ 1.64 ++ `$(LIBOPT) $(NETPBMLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \ 1.65 + $(RPATH) $(LADD) 1.66 + 1.67 + install.bin: install.bin.local
2.1 --- a/netpbm/netpbm.spec Fri Jan 09 01:40:36 2009 +0100 2.2 +++ b/netpbm/netpbm.spec Fri Jan 09 01:41:46 2009 +0100 2.3 @@ -32,7 +32,7 @@ 2.4 Group: Graphics 2.5 License: MIT-style 2.6 Version: 10.26.56 2.7 -Release: 20080814 2.8 +Release: 20090106 2.9 2.10 # list of sources 2.11 Source0: http://switch.dl.sourceforge.net/sourceforge/netpbm/netpbm-%{version}.tgz