OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Apr-2005 20:26:14
Branch: HEAD Handle: 2005040519261300
Added files:
openpkg-src/netpbm netpbm.patch
Modified files:
openpkg-src/netpbm netpbm.spec
Log:
include bugfix patch from FreeBSD port and merge out subst into it,
too
Summary:
Revision Changes Path
1.3 +43 -0 openpkg-src/netpbm/netpbm.patch
1.57 +2 -4 openpkg-src/netpbm/netpbm.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/netpbm/netpbm.patch
============================================================================
$ cvs diff -u -r0 -r1.3 netpbm.patch
--- /dev/null 2005-04-05 20:22:00 +0200
+++ netpbm.patch 2005-04-05 20:26:14 +0200
@@ -0,0 +1,43 @@
+Index: converter/other/jpeg2000/jpeg2ktopam.c
+--- converter/other/jpeg2000/jpeg2ktopam.c.orig 2005-03-06 21:27:28
+0100
++++ converter/other/jpeg2000/jpeg2ktopam.c 2005-04-05 20:22:33 +0200
+@@ -9,7 +9,6 @@
+
*****************************************************************************/
+
+ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */
+-#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */
+ #include <string.h>
+
+ #include "pam.h"
+Index: converter/other/jpeg2000/pamtojpeg2k.c
+--- converter/other/jpeg2000/pamtojpeg2k.c.orig 2005-02-21 04:56:41
+0100
++++ converter/other/jpeg2000/pamtojpeg2k.c 2005-04-05 20:22:37 +0200
+@@ -9,7 +9,6 @@
+
*****************************************************************************/
+
+ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */
+-#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */
+ #include <string.h>
+
+ #include "pam.h"
+Index: lib/libpm.c
+--- lib/libpm.c.orig 2004-11-20 17:55:27 +0100
++++ lib/libpm.c 2005-04-05 20:22:46 +0200
+@@ -617,7 +617,7 @@
+ pm_openr(const char * const name) {
+ FILE* f;
+
+- if (strcmp(name, "-") == 0)
++ if (name == NULL || strcmp(name, "-") == 0)
+ f = stdin;
+ else {
+ #ifndef VMS
+@@ -639,7 +639,7 @@
+ pm_openw(const char * const name) {
+ FILE* f;
+
+- if (strcmp(name, "-") == 0)
++ if (name == NULL || strcmp(name, "-") == 0)
+ f = stdout;
+ else {
+ #ifndef VMS
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/netpbm/netpbm.spec
============================================================================
$ cvs diff -u -r1.56 -r1.57 netpbm.spec
--- openpkg-src/netpbm/netpbm.spec 5 Apr 2005 15:17:40 -0000 1.56
+++ openpkg-src/netpbm/netpbm.spec 5 Apr 2005 18:26:13 -0000 1.57
@@ -37,6 +37,7 @@
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/netpbm/netpbm-%{version}.tgz
+Patch0: netpbm.patch
# build information
Prefix: %{l_prefix}
@@ -63,10 +64,7 @@
%prep
%setup -q
- %{l_shtool} subst \
- -e 's;#define _XOPEN_SOURCE;#define _PATCHED_XOPEN_SOURCE;' \
- converter/other/jpeg2000/jpeg2ktopam.c \
- converter/other/jpeg2000/pamtojpeg2k.c
+ %patch -p0
%build
( cat Makefile.config.in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
