OpenPKG Specs: netpbm/netpbm.patch@6b18bb69901e

Correct the paths of patched scripts, refine password generation,
mitigate fdatasync(2) detection problems, correct dependencies, remove
outdated autoconf components, correct conf file paths and attributes,
complete and correct log file rotation handing, and note warnings
useful for diagnosing builds.

     1 Index: converter/other/jpeg2000/jpeg2ktopam.c

     2 --- converter/other/jpeg2000/jpeg2ktopam.c.orig	2005-05-19 17:29:47 +0200

     3 +++ converter/other/jpeg2000/jpeg2ktopam.c	2006-10-24 08:07:49 +0200

     4 @@ -9,7 +9,6 @@

     5  *****************************************************************************/

     7  #define _BSD_SOURCE 1      /* Make sure strdup() is in string.h */

     8 -#define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */

     9  #include <string.h>

    11  #include "pam.h"

    12 Index: converter/other/jpeg2000/pamtojpeg2k.c

    13 --- converter/other/jpeg2000/pamtojpeg2k.c.orig	2005-02-21 04:56:41 +0100

    14 +++ converter/other/jpeg2000/pamtojpeg2k.c	2006-10-24 08:07:49 +0200

    15 @@ -9,7 +9,6 @@

    16  *****************************************************************************/

    18  #define _BSD_SOURCE 1    /* Make sure strdup() is in string.h */

    19 -#define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */

    20  #include <string.h>

    22  #include "pam.h"

    23 Index: lib/libpm.c

    24 --- lib/libpm.c.orig	2004-11-20 17:55:27 +0100

    25 +++ lib/libpm.c	2006-10-24 08:07:49 +0200

    26 @@ -617,7 +617,7 @@

    27  pm_openr(const char * const name) {

    28      FILE* f;

    30 -    if (strcmp(name, "-") == 0)

    31 +    if (name == NULL || strcmp(name, "-") == 0)

    32          f = stdin;

    33      else {

    34  #ifndef VMS

    35 @@ -639,7 +639,7 @@

    36  pm_openw(const char * const name) {

    37      FILE* f;

    39 -    if (strcmp(name, "-") == 0)

    40 +    if (name == NULL || strcmp(name, "-") == 0)

    41          f = stdout;

    42      else {

    43  #ifndef VMS

    44 Index: lib/pm_gamma.h

    45 --- lib/pm_gamma.h.orig	2004-06-13 00:53:25 +0200

    46 +++ lib/pm_gamma.h	2006-10-24 08:18:26 +0200

    47 @@ -5,7 +5,7 @@

    49  #include <math.h>

    51 -static __inline__ float

    52 +static float

    53  pm_gamma709(float const intensity) {

    55      /* Here are parameters of the gamma transfer function

    56 @@ -34,7 +34,7 @@

    60 -static __inline__ float

    61 +static float

    62  pm_ungamma709(float const brightness) {

    64      /* These are the same parameters as in pm_gamma, above */

    65 Index: converter/other/Makefile

    66 --- converter/other/Makefile.orig	2005-02-05 18:48:28.000000000 +0100

    67 +++ converter/other/Makefile	2009-01-09 00:54:13.704466003 +0100

    68 @@ -111,29 +111,29 @@

    69  endif

    71  tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIB) $(LIBOPT)

    72 -	$(LD) $(LDFLAGS) -o $@ $@.o \

    73 +	$(LD) -o $@ $@.o \

    74  	  `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(TIFFLIB) $(TIFFLIB_EXTRALIBS)` \

    75 -	   $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)

    76 +	   $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)

    78  pngtopnm: %: %.o $(NETPBMLIB) $(LIBOPT)

    79 -	$(LD) $(LDFLAGS) -o $@ $@.o \

    80 +	$(LD) -o $@ $@.o \

    81  	  `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \

    82 -	  $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)

    83 +	  $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)

    85  pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT)

    86 -	$(LD) $(LDFLAGS) -o $@ $@.o pngtxt.o \

    87 +	$(LD) -o $@ $@.o pngtxt.o \

    88  	  `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \

    89 -	  $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)

    90 +	  $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)

    92  jpegtopnm: %: %.o jpegdatasource.o exif.o $(NETPBMLIB) $(LIBOPT)

    93 -	$(LD) $(LDFLAGS) -o $@ $< jpegdatasource.o exif.o \

    94 +	$(LD) -o $@ $< jpegdatasource.o exif.o \

    95  	  `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \

    96 -	  $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)

    97 +	  $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)

    99  pnmtojpeg: %: %.o $(NETPBMLIB) $(LIBOPT)

   100 -	$(LD) $(LDFLAGS) -o $@ $@.o \

   101 +	$(LD) -o $@ $@.o \

   102  	  `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \

   103 -	  $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)

   104 +	  $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)

   106  # If URTLIB is BUNDLED_URTLIB, then we're responsible for building it, which

   107  # means it needs to be a dependency:

   108 @@ -142,13 +142,13 @@

   109  endif

   111  rletopnm pnmtorle: %: %.o $(NETPBMLIB) $(URTLIBDEP) $(LIBOPT)

   112 -	$(LD) $(LDFLAGS) -o $@ $@.o \

   113 -	  `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(MATHLIB) $(LDLIBS) \

   114 +	$(LD) -o $@ $@.o \

   115 +	  `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \

   116  	   $(RPATH) $(LADD)

   118  pnmtorast rasttopnm: %: %.o rast.o $(NETPBMLIB) $(LIBOPT)

   119 -	$(LD) $(LDFLAGS) -o $@ $@.o rast.o \

   120 -	  `$(LIBOPT) $(NETPBMLIB)` $(MATHLIB) $(LDLIBS) \

   121 +	$(LD) -o $@ $@.o rast.o \

   122 +	  `$(LIBOPT) $(NETPBMLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \

   123  	   $(RPATH) $(LADD)

   125  install.bin: install.bin.local

OpenPKG Specs / file revision

netpbm/netpbm.patch@6b18bb69901e

netpbm/netpbm.patch