rpms/netpbm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream release 10.71.02 (#1252352)

Browse Source 
Signed-off-by: Petr Hracek <phracek@redhat.com>
This commit is contained in:
Petr Hracek 2015-08-11 10:11:35 +02:00
parent 8a165220d2
commit d776db3079
21 changed files with 824 additions and 1093 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/netpbm-10.61.02.tar.xz /netpbm-10.61.02.tar.xz
/netpbm-10.66.02.tar.xz /netpbm-10.66.02.tar.xz
/netpbm-10.71.02.tar.xz

9
netpbm-CAN-2005-2471.patch
View File

@ -1,7 +1,8 @@
diff -up netpbm-10.56.03/converter/other/pstopnm.c.CAN-2005-2471 netpbm-10.56.03/converter/other/pstopnm.c diff --git a/converter/other/pstopnm.c b/converter/other/pstopnm.c
--- netpbm-10.56.03/converter/other/pstopnm.c.CAN-2005-2471 2011-11-09 09:18:00.000000000 +0100 index b253442..dca141f 100644
+++ netpbm-10.56.03/converter/other/pstopnm.c 2011-11-11 11:43:51.827409226 +0100 --- a/converter/other/pstopnm.c
@@ -747,11 +747,11 @@ execGhostscript(int const input +++ b/converter/other/pstopnm.c
@@ -811,11 +811,11 @@ execGhostscript(int const inputPipeFd,
ghostscriptProg, arg0, ghostscriptProg, arg0,
deviceopt, outfileopt, gopt, ropt, textalphabitsopt, deviceopt, outfileopt, gopt, ropt, textalphabitsopt,
"-q", "-dNOPAUSE", "-q", "-dNOPAUSE",

8
netpbm-bmptopnm.patch
View File

@ -1,6 +1,8 @@
--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm 2007-01-29 13:08:46.000000000 +0100 diff --git a/converter/other/bmptopnm.c b/converter/other/bmptopnm.c
+++ netpbm-10.35/converter/other/bmptopnm.c 2007-01-29 13:32:21.000000000 +0100 index a069092..20a0331 100644
@@ -1262,7 +1262,7 @@ readBmp(FILE * const ifP, --- a/converter/other/bmptopnm.c
+++ b/converter/other/bmptopnm.c
@@ -1328,7 +1328,7 @@ readBmp(FILE * const ifP,
xel ** const colormapP, xel ** const colormapP,
bool const verbose) { bool const verbose) {

9
netpbm-cmuwtopbm.patch
View File

@ -1,6 +1,7 @@
diff -up netpbm-10.61.01/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix netpbm-10.61.01/converter/pbm/cmuwmtopbm.c diff --git a/converter/pbm/cmuwmtopbm.c b/converter/pbm/cmuwmtopbm.c
--- netpbm-10.61.01/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix 2013-01-02 18:39:57.000000000 +0100 index ccf8cfc..1f9bc6c 100644
+++ netpbm-10.61.01/converter/pbm/cmuwmtopbm.c 2013-01-03 05:41:36.024984241 +0100 --- a/converter/pbm/cmuwmtopbm.c
+++ b/converter/pbm/cmuwmtopbm.c
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
This program does not check the pad bits at the end of each row. This program does not check the pad bits at the end of each row.
*/ */
@ -10,7 +11,7 @@ diff -up netpbm-10.61.01/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix netpbm-10.61.01
#include "pbm.h" #include "pbm.h"
/*-------------------------- /*--------------------------
@@ -42,7 +42,7 @@ readCmuwmHeader(FILE * const ifP @@ -42,7 +42,7 @@ readCmuwmHeader(FILE * const ifP,
"CMU window manager header EOF / read error"; "CMU window manager header EOF / read error";
uint32_t const cmuwmMagic = 0xf10040bb; uint32_t const cmuwmMagic = 0xf10040bb;

20
netpbm-config.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/config.mk.in b/config.mk.in
index 5910146..bd1c70b 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -476,12 +476,12 @@ JBIGLIB = $(INTERNAL_JBIGLIB)
JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR)
# The Jasper JPEG-2000 image compression library (aka JasPer):
-JASPERLIB = $(INTERNAL_JASPERLIB)
-JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
+JASPERLIB = ""
+JASPERHDR_DIR = "/usr/include/jasper"
# JASPERDEPLIBS is the libraries (-l options or file names) on which
# The Jasper library depends -- i.e. what you have to link into any
# executable that links in the Jasper library.
-JASPERDEPLIBS =
+JASPERDEPLIBS = -ljasper
#JASPERDEPLIBS = -ljpeg
# And the Utah Raster Toolkit (aka URT aka RLE) library:

4
netpbm-disable-pbmtog3.patch
View File

@ -1,8 +1,8 @@
diff --git a/test/Test-Order b/test/Test-Order diff --git a/test/Test-Order b/test/Test-Order
index ff4b985..7ef1d97 100644 index d21b9e8..133a48d 100644
--- a/test/Test-Order --- a/test/Test-Order
+++ b/test/Test-Order +++ b/test/Test-Order
@@ -74,7 +74,7 @@ symmetry.test @@ -79,7 +79,7 @@ symmetry.test
# Format converter tests # Format converter tests

67
netpbm-docfix.patch
View File

@ -1,19 +1,21 @@
diff -up netpbm-10.35.58/converter/pbm/pbmtoepson.c.docfix netpbm-10.35.58/converter/pbm/pbmtoepson.c diff --git a/converter/pbm/pbmtoepson.c b/converter/pbm/pbmtoepson.c
--- netpbm-10.35.58/converter/pbm/pbmtoepson.c.docfix 2009-01-19 09:24:03.000000000 +0100 index bb36791..79d9ece 100644
+++ netpbm-10.35.58/converter/pbm/pbmtoepson.c 2009-04-15 09:10:52.000000000 +0200 --- a/converter/pbm/pbmtoepson.c
@@ -74,7 +74,7 @@ parseCommandLine(int arg +++ b/converter/pbm/pbmtoepson.c
&dpiSpec, 0); @@ -74,7 +74,7 @@ parseCommandLine(int argc,
OPTENT3(0, "adjacent", OPT_FLAG, NULL, &dpiSpec, 0);
OPTENT3(0, "adjacent", OPT_FLAG, NULL,
&adjacentSpec, 0); &adjacentSpec, 0);
- OPTENT3(0, "nonadjacent", OPT_FLAG, NULL, - OPTENT3(0, "nonadjacent", OPT_FLAG, NULL,
+ OPTENT3(0, "noadjacent", OPT_FLAG, NULL, + OPTENT3(0, "noadjacent", OPT_FLAG, NULL,
&nonadjacentSpec, 0); &nonadjacentSpec, 0);
opt.opt_table = option_def; opt.opt_table = option_def;
diff -up netpbm-10.35.58/userguide/cameratopam.html.docfix netpbm-10.35.58/userguide/cameratopam.html diff --git a/userguide/cameratopam.html b/userguide/cameratopam.html
--- netpbm-10.35.58/userguide/cameratopam.html.docfix 2009-01-19 09:24:18.000000000 +0100 index 4a34817..f26338f 100644
+++ netpbm-10.35.58/userguide/cameratopam.html 2009-04-15 09:16:16.000000000 +0200 --- a/userguide/cameratopam.html
@@ -25,10 +25,10 @@ cameratopam - convert raw camera image t +++ b/userguide/cameratopam.html
@@ -25,10 +25,10 @@ cameratopam - convert raw camera image to PAM
[<b>-balance_camera</b>] [<b>-balance_camera</b>]
[<b>-red_scale=</b><i>float</i>] [<b>-red_scale=</b><i>float</i>]
[<b>-blue_scale=</b><i>float</i>] [<b>-blue_scale=</b><i>float</i>]
@ -35,7 +37,7 @@ diff -up netpbm-10.35.58/userguide/cameratopam.html.docfix netpbm-10.35.58/userg
<dd>Change the output brightness. Default is 1.0. <dd>Change the output brightness. Default is 1.0.
@@ -114,14 +114,14 @@ channels by these values. Both default @@ -114,14 +114,14 @@ channels by these values. Both default to 1.0.
<dd>By default, <b>cameratoapm</b> clips all colors to prevent pink <dd>By default, <b>cameratoapm</b> clips all colors to prevent pink
hues in the highlights. Combine this option with hues in the highlights. Combine this option with
@ -52,10 +54,11 @@ diff -up netpbm-10.35.58/userguide/cameratopam.html.docfix netpbm-10.35.58/userg
<dd>For cameras based on the Fuji Super CCD SR, this option causes <dd>For cameras based on the Fuji Super CCD SR, this option causes
<b>cameratopam</b> to use the secondary sensors, in effect <b>cameratopam</b> to use the secondary sensors, in effect
diff -up netpbm-10.35.58/userguide/fiascotopnm.html.docfix netpbm-10.35.58/userguide/fiascotopnm.html diff --git a/userguide/fiascotopnm.html b/userguide/fiascotopnm.html
--- netpbm-10.35.58/userguide/fiascotopnm.html.docfix 2009-01-19 09:24:18.000000000 +0100 index d8e2551..1747ad3 100644
+++ netpbm-10.35.58/userguide/fiascotopnm.html 2009-04-15 09:10:52.000000000 +0200 --- a/userguide/fiascotopnm.html
@@ -51,7 +51,7 @@ the output file(s) are written to the fi +++ b/userguide/fiascotopnm.html
@@ -51,7 +51,7 @@ the output file(s) are written to the first (writable) directory of
this list. Otherwise, the current directory is used to store the this list. Otherwise, the current directory is used to store the
output file(s). output file(s).
@ -64,7 +67,7 @@ diff -up netpbm-10.35.58/userguide/fiascotopnm.html.docfix netpbm-10.35.58/userg
<DD> <DD>
Decompress images in the 4:2:0 format; i.e., each chroma channel is Decompress images in the 4:2:0 format; i.e., each chroma channel is
decompressed to an image of halved width and height. Use this option decompressed to an image of halved width and height. Use this option
@@ -83,7 +83,7 @@ given amount <I>N</I>. <I>N</I> is 1 (mi @@ -83,7 +83,7 @@ given amount <I>N</I>. <I>N</I> is 1 (minimum) to 100 (maximum); default
is 70. When <I>N</I>=0, then the smoothing amount specified in the is 70. When <I>N</I>=0, then the smoothing amount specified in the
FIASCO file is used (defined by the FIASCO coder). FIASCO file is used (defined by the FIASCO coder).
@ -73,7 +76,7 @@ diff -up netpbm-10.35.58/userguide/fiascotopnm.html.docfix netpbm-10.35.58/userg
<DD> <DD>
Set number of frames per second to <I>N</I>. When using this option, Set number of frames per second to <I>N</I>. When using this option,
the frame rate specified in the FIASCO file is overridden. the frame rate specified in the FIASCO file is overridden.
@@ -109,13 +109,9 @@ following methods (in the specified orde @@ -113,13 +113,9 @@ following methods (in the specified order):
<LI>--config=<I>name</I> <LI>--config=<I>name</I>
</OL> </OL>
@ -89,10 +92,11 @@ diff -up netpbm-10.35.58/userguide/fiascotopnm.html.docfix netpbm-10.35.58/userg
</DL> </DL>
diff -up netpbm-10.47.12/userguide/pamperspective.html.docfix netpbm-10.47.12/userguide/pamperspective.html diff --git a/userguide/pamperspective.html b/userguide/pamperspective.html
--- netpbm-10.47.12/userguide/pamperspective.html.docfix 2010-04-27 15:48:09.000000000 +0200 index 9f5e9f0..bb6cb58 100644
+++ netpbm-10.47.12/userguide/pamperspective.html 2010-05-03 14:16:26.064266675 +0200 --- a/userguide/pamperspective.html
@@ -220,7 +220,7 @@ default rectangle as the &quot;frame.&qu +++ b/userguide/pamperspective.html
@@ -220,7 +220,7 @@ default rectangle as the "frame." The visible part is always
a rectangle the axes of which are parallel to those of the frame. a rectangle the axes of which are parallel to those of the frame.
<p>The frame options are additive. All the parts of the image <p>The frame options are additive. All the parts of the image
@ -101,10 +105,11 @@ diff -up netpbm-10.47.12/userguide/pamperspective.html.docfix netpbm-10.47.12/us
<b>--include</b> (or their defaults) are in the visible part. The <b>--include</b> (or their defaults) are in the visible part. The
visible part is the smallest possible rectangle that contains the visible part is the smallest possible rectangle that contains the
parts specified those three ways. parts specified those three ways.
diff -up netpbm-10.47.12/userguide/pbmtoepson.html.docfix netpbm-10.47.12/userguide/pbmtoepson.html diff --git a/userguide/pbmtoepson.html b/userguide/pbmtoepson.html
--- netpbm-10.47.12/userguide/pbmtoepson.html.docfix 2010-04-27 15:48:09.000000000 +0200 index 6895d33..c0df7c4 100644
+++ netpbm-10.47.12/userguide/pbmtoepson.html 2010-05-03 14:34:03.571141020 +0200 --- a/userguide/pbmtoepson.html
@@ -18,7 +18,7 @@ pbmtoepson - convert a PBM image into Ep +++ b/userguide/pbmtoepson.html
@@ -18,7 +18,7 @@ pbmtoepson - convert a PBM image into Epson printer graphics
[<b>-dpi=</b><i>n</i>] [<b>-dpi=</b><i>n</i>]
[<b>-protocol=</b>{<b>escp9</b>|<B>escp</B>}] [<b>-protocol=</b>{<b>escp9</b>|<B>escp</B>}]
[<b>-adjacent</b>] [<b>-adjacent</b>]
@ -113,12 +118,12 @@ diff -up netpbm-10.47.12/userguide/pbmtoepson.html.docfix netpbm-10.47.12/usergu
[<I>pbmfile</I>] [<I>pbmfile</I>]
@@ -74,7 +74,7 @@ print density for you consistent with yo @@ -74,7 +74,7 @@ print density for you consistent with your other options.
<p>This option was new in Netpbm 10.23 (July 2004). <p>This option was new in Netpbm 10.23 (July 2004).
<dt><b>-adjacent</b> <dt><b>-adjacent</b>
-<dt><b>-nonadjacent</b> -<dt><b>-nonadjacent</b>
+<dt><b>-noadjacent</b> +<dt><b>-noadjacent</b>
<dd>These options determine whether the output uses &quot;adjacent dot <dd>These options determine whether the output uses "adjacent dot
printing&quot; or not, whatever that is. printing" or not, whatever that is.

16
netpbm-gcc4.patch
View File

@ -1,6 +1,7 @@
diff -up netpbm-10.58.01/lib/pm.h.gcc4 netpbm-10.58.01/lib/pm.h diff --git a/lib/pm.h b/lib/pm.h
--- netpbm-10.58.01/lib/pm.h.gcc4 2012-04-09 19:08:08.885137097 +0200 index 47cbfe8..e9f1405 100644
+++ netpbm-10.58.01/lib/pm.h 2012-04-09 19:08:08.894136984 +0200 --- a/lib/pm.h
+++ b/lib/pm.h
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <ctype.h> #include <ctype.h>
@ -9,10 +10,11 @@ diff -up netpbm-10.58.01/lib/pm.h.gcc4 netpbm-10.58.01/lib/pm.h
#include <errno.h> #include <errno.h>
#include <setjmp.h> #include <setjmp.h>
#include <sys/stat.h> #include <sys/stat.h>
diff -up netpbm-10.58.01/urt/rle.h.gcc4 netpbm-10.58.01/urt/rle.h diff --git a/urt/rle.h b/urt/rle.h
--- netpbm-10.58.01/urt/rle.h.gcc4 2012-04-09 19:08:08.000000000 +0200 index 0766d22..8d72cb9 100644
+++ netpbm-10.58.01/urt/rle.h 2012-04-09 19:08:39.137758887 +0200 --- a/urt/rle.h
@@ -34,6 +34,7 @@ +++ b/urt/rle.h
@@ -31,6 +31,7 @@
#define RLE_H #define RLE_H
#include <stdio.h> /* Declare FILE. */ #include <stdio.h> /* Declare FILE. */

167
netpbm-manfix.patch
View File

@ -1,10 +1,10 @@
diff -up netpbm-10.59.03/userguide/avstopam.html.manfix netpbm-10.59.03/userguide/avstopam.html diff --git a/userguide/avstopam.html b/userguide/avstopam.html
--- netpbm-10.59.03/userguide/avstopam.html.manfix 2012-09-22 03:46:15.000000000 +0200 index 9ec5e41..f69fdaa 100644
+++ netpbm-10.59.03/userguide/avstopam.html 2012-09-25 10:47:22.756174816 +0200 --- a/userguide/avstopam.html
+++ b/userguide/avstopam.html
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html> +<html>
<head> <head>
<title>Avstopam User Manual</title> <title>Avstopam User Manual</title>
@ -12,25 +12,22 @@ diff -up netpbm-10.59.03/userguide/avstopam.html.manfix netpbm-10.59.03/userguid
</head> </head>
<body> <body>
diff -up netpbm-10.59.03/userguide/escp2topbm.html.manfix netpbm-10.59.03/userguide/escp2topbm.html diff --git a/userguide/escp2topbm.html b/userguide/escp2topbm.html
--- netpbm-10.59.03/userguide/escp2topbm.html.manfix 2012-09-22 03:46:15.000000000 +0200 index 186e032..af35b06 100644
+++ netpbm-10.59.03/userguide/escp2topbm.html 2012-09-25 10:47:22.756174816 +0200 --- a/userguide/escp2topbm.html
@@ -2,10 +2,11 @@ +++ b/userguide/escp2topbm.html
<HTML><HEAD><TITLE>Escp2topbm User Manual</TITLE></HEAD> @@ -6,6 +6,7 @@ Updated: 14 July 2015
<BODY>
<H1>escp2topbm</H1>
-Created: 1 August 2003
+Updated: 1 August 2003
<BR> <BR>
<A HREF="#index">Table Of Contents</A> <A HREF="#index">Table Of Contents</A>
+<H2>NAME</H2> +<h2>NAME</h2>
escp2topbm - convert an ESC/P2 printer file to a PBM image escp2topbm - convert an ESC/P2 printer file to a PBM image
<H2 id="synopsis">SYNOPSIS</H2> <H2 id="synopsis">SYNOPSIS</H2>
diff -up netpbm-10.59.03/userguide/faxformat.html.manfix netpbm-10.59.03/userguide/faxformat.html diff --git a/userguide/faxformat.html b/userguide/faxformat.html
--- netpbm-10.59.03/userguide/faxformat.html.manfix 2012-09-22 03:46:15.000000000 +0200 index cb5d710..cadd217 100644
+++ netpbm-10.59.03/userguide/faxformat.html 2012-09-25 10:47:22.756174816 +0200 --- a/userguide/faxformat.html
+++ b/userguide/faxformat.html
@@ -5,10 +5,12 @@ @@ -5,10 +5,12 @@
Updated: 03 December 2008 Updated: 03 December 2008
<BR> <BR>
@ -44,9 +41,10 @@ diff -up netpbm-10.59.03/userguide/faxformat.html.manfix netpbm-10.59.03/usergui
<p>The ITU (formerly CCITT) publishes standards for operation of fax machines <p>The ITU (formerly CCITT) publishes standards for operation of fax machines
(the idea is to provide a way to be sure that a fax machine is able to receive (the idea is to provide a way to be sure that a fax machine is able to receive
a fax sent by another). These standards incidentally specify graphics file a fax sent by another). These standards incidentally specify graphics file
diff -up netpbm-10.59.03/userguide/pampaintspill.html.manfix netpbm-10.59.03/userguide/pampaintspill.html diff --git a/userguide/pampaintspill.html b/userguide/pampaintspill.html
--- netpbm-10.59.03/userguide/pampaintspill.html.manfix 2012-09-22 03:46:15.000000000 +0200 index c71db55..f62011f 100644
+++ netpbm-10.59.03/userguide/pampaintspill.html 2012-09-25 10:47:22.757174803 +0200 --- a/userguide/pampaintspill.html
+++ b/userguide/pampaintspill.html
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html xmlns="http://www.w3.org/1999/xhtml"> -<html xmlns="http://www.w3.org/1999/xhtml">
@ -65,33 +63,12 @@ diff -up netpbm-10.59.03/userguide/pampaintspill.html.manfix netpbm-10.59.03/use
<p>pampaintspill - smoothly spill colors into the background</p> <p>pampaintspill - smoothly spill colors into the background</p>
<h2><a name="synopsis">SYNOPSIS</a></h2> <h2><a name="synopsis">SYNOPSIS</a></h2>
diff -up netpbm-10.59.03/userguide/pamrecolor.html.manfix netpbm-10.59.03/userguide/pamrecolor.html diff --git a/userguide/pamsistoaglyph.html b/userguide/pamsistoaglyph.html
--- netpbm-10.59.03/userguide/pamrecolor.html.manfix 2012-09-22 03:46:15.000000000 +0200 index 8487717..d17368b 100644
+++ netpbm-10.59.03/userguide/pamrecolor.html 2012-09-25 10:47:22.757174803 +0200 --- a/userguide/pamsistoaglyph.html
@@ -1,8 +1,7 @@ +++ b/userguide/pamsistoaglyph.html
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> @@ -1,8 +1,6 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
<head>
<title>Pamrecolor User Manual</title>
-<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
</head>
<body>
@@ -11,7 +10,7 @@
<p>Updated: 31 July 2010</p>
-<p><a href="#contents">Table Of Contents</a></p>
+<p><a href="#index">Table Of Contents</a></p>
<h2 id="name">NAME</h2>
diff -up netpbm-10.59.03/userguide/pamsistoaglyph.html.manfix netpbm-10.59.03/userguide/pamsistoaglyph.html
--- netpbm-10.59.03/userguide/pamsistoaglyph.html.manfix 2012-09-22 03:46:15.000000000 +0200
+++ netpbm-10.59.03/userguide/pamsistoaglyph.html 2012-09-25 10:47:22.758174790 +0200
@@ -1,8 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html xmlns="http://www.w3.org/1999/xhtml"> -<html xmlns="http://www.w3.org/1999/xhtml">
+<html> +<html>
<head> <head>
@ -100,13 +77,34 @@ diff -up netpbm-10.59.03/userguide/pamsistoaglyph.html.manfix netpbm-10.59.03/us
</head> </head>
<body> <body>
diff -up netpbm-10.59.03/userguide/pamtoavs.html.manfix netpbm-10.59.03/userguide/pamtoavs.html diff --git a/userguide/pamstereogram.html b/userguide/pamstereogram.html
--- netpbm-10.59.03/userguide/pamtoavs.html.manfix 2012-09-22 03:46:15.000000000 +0200 index d5c3f83..a43fd5f 100644
+++ netpbm-10.59.03/userguide/pamtoavs.html 2012-09-25 10:47:22.759174777 +0200 --- a/userguide/pamstereogram.html
@@ -1,8 +1,7 @@ +++ b/userguide/pamstereogram.html
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> @@ -1,5 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> -<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
<head>
<title>Pamstereogram User Manual</title>
</head>
@@ -10,7 +10,7 @@
<p>Updated: 19 June 2015</p>
-<p><a href="#contents">Table Of Contents</a></p>
+<p><a href="#index">Table Of Contents</a></p>
<h2 id="name">NAME</h2>
diff --git a/userguide/pamtoavs.html b/userguide/pamtoavs.html
index 4f1b63e..0619e1b 100644
--- a/userguide/pamtoavs.html
+++ b/userguide/pamtoavs.html
@@ -1,8 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html> +<html>
<head> <head>
<title>Pamtoavs User Manual</title> <title>Pamtoavs User Manual</title>
@ -114,13 +112,13 @@ diff -up netpbm-10.59.03/userguide/pamtoavs.html.manfix netpbm-10.59.03/userguid
</head> </head>
<body> <body>
diff -up netpbm-10.59.03/userguide/pamtooctaveimg.html.manfix netpbm-10.59.03/userguide/pamtooctaveimg.html diff --git a/userguide/pamtooctaveimg.html b/userguide/pamtooctaveimg.html
--- netpbm-10.59.03/userguide/pamtooctaveimg.html.manfix 2012-09-22 03:46:15.000000000 +0200 index 9cadc13..69b09cb 100644
+++ netpbm-10.59.03/userguide/pamtooctaveimg.html 2012-09-25 10:47:22.759174777 +0200 --- a/userguide/pamtooctaveimg.html
+++ b/userguide/pamtooctaveimg.html
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html> +<html>
<head> <head>
<title>Pamtooctaveimg User Manual</title> <title>Pamtooctaveimg User Manual</title>
@ -128,9 +126,10 @@ diff -up netpbm-10.59.03/userguide/pamtooctaveimg.html.manfix netpbm-10.59.03/us
</head> </head>
<body> <body>
diff -up netpbm-10.59.03/userguide/pnmflip.html.manfix netpbm-10.59.03/userguide/pnmflip.html diff --git a/userguide/pnmflip.html b/userguide/pnmflip.html
--- netpbm-10.59.03/userguide/pnmflip.html.manfix 2012-09-22 03:46:15.000000000 +0200 index 53c365c..eb0b896 100644
+++ netpbm-10.59.03/userguide/pnmflip.html 2012-09-25 10:47:22.760174765 +0200 --- a/userguide/pnmflip.html
+++ b/userguide/pnmflip.html
@@ -4,9 +4,11 @@ @@ -4,9 +4,11 @@
<BODY> <BODY>
<H1>pnmflip</H1> <H1>pnmflip</H1>
@ -143,9 +142,10 @@ diff -up netpbm-10.59.03/userguide/pnmflip.html.manfix netpbm-10.59.03/userguide
<P><B>pamflip</b> is mostly backward compatible with <b>pnmflip</b>, <P><B>pamflip</b> is mostly backward compatible with <b>pnmflip</b>,
but works on PAM images too. but works on PAM images too.
diff -up netpbm-10.59.03/userguide/pnmmercator.html.manfix netpbm-10.59.03/userguide/pnmmercator.html diff --git a/userguide/pnmmercator.html b/userguide/pnmmercator.html
--- netpbm-10.59.03/userguide/pnmmercator.html.manfix 2012-09-22 03:46:15.000000000 +0200 index e9e7165..9ac6c5b 100644
+++ netpbm-10.59.03/userguide/pnmmercator.html 2012-09-25 10:47:22.760174765 +0200 --- a/userguide/pnmmercator.html
+++ b/userguide/pnmmercator.html
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
@ -155,18 +155,10 @@ diff -up netpbm-10.59.03/userguide/pnmmercator.html.manfix netpbm-10.59.03/userg
<title>PnmMercator User Manual</title> <title>PnmMercator User Manual</title>
</head> </head>
<body> <body>
diff -up netpbm-10.59.03/userguide/pnmtotiff.html.manfix netpbm-10.59.03/userguide/pnmtotiff.html diff --git a/userguide/ppmtogif.html b/userguide/ppmtogif.html
--- netpbm-10.59.03/userguide/pnmtotiff.html.manfix 2012-09-22 03:46:15.000000000 +0200 index 84b5163..1d33072 100644
+++ netpbm-10.59.03/userguide/pnmtotiff.html 2012-09-25 10:47:22.760174765 +0200 --- a/userguide/ppmtogif.html
@@ -1,5 +1,4 @@ +++ b/userguide/ppmtogif.html
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<!>
<html><head>
<title>pnmtotiff</title>
</head><body>
diff -up netpbm-10.59.03/userguide/ppmtogif.html.manfix netpbm-10.59.03/userguide/ppmtogif.html
--- netpbm-10.59.03/userguide/ppmtogif.html.manfix 2012-09-22 03:46:15.000000000 +0200
+++ netpbm-10.59.03/userguide/ppmtogif.html 2012-09-25 10:47:22.761174753 +0200
@@ -4,11 +4,14 @@ @@ -4,11 +4,14 @@
<BODY> <BODY>
<H1>ppmtogif</H1> <H1>ppmtogif</H1>
@ -182,24 +174,3 @@ diff -up netpbm-10.59.03/userguide/ppmtogif.html.manfix netpbm-10.59.03/userguid
<P>One way <b>pamtogif</b> is not backward compatible with <b>ppmtogif</b> <P>One way <b>pamtogif</b> is not backward compatible with <b>ppmtogif</b>
is that to specify a transparency (alpha) mask with <b>ppmtogif</b>, you is that to specify a transparency (alpha) mask with <b>ppmtogif</b>, you
supply the transparency as a separate pseudo-PGM image and use the supply the transparency as a separate pseudo-PGM image and use the
diff -up netpbm-10.61.02/userguide/pamstereogram.html.manfix netpbm-10.61.02/userguide/pamstereogram.html
--- netpbm-10.61.02/userguide/pamstereogram.html.manfix 2013-02-20 07:32:26.000000000 +0100
+++ netpbm-10.61.02/userguide/pamstereogram.html 2013-02-20 07:40:35.071099535 +0100
@@ -1,5 +1,5 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
<head>
<title>Pamstereogram User Manual</title>
</head>
@@ -10,8 +10,7 @@
<p>Updated:30 December 2012</p>
-<p><a href="#contents">Table Of Contents</a></p>
-
+<p><a href="#index">Table Of Contents</a></p>
<h2 id="name">NAME</h2>

9
netpbm-message.patch
View File

@ -1,7 +1,8 @@
diff -up netpbm-10.59.01/converter/other/giftopnm.c.message netpbm-10.59.01/converter/other/giftopnm.c diff --git a/converter/other/giftopnm.c b/converter/other/giftopnm.c
--- netpbm-10.59.01/converter/other/giftopnm.c.message 2012-07-11 05:54:52.000000000 +0200 index 2e6ae1d..be4655f 100644
+++ netpbm-10.59.01/converter/other/giftopnm.c 2012-07-11 05:57:57.745246980 +0200 --- a/converter/other/giftopnm.c
@@ -2038,7 +2038,7 @@ convertImages(FILE * const ifP, +++ b/converter/other/giftopnm.c
@@ -2086,7 +2086,7 @@ convertImages(FILE * const ifP,
imageSeq, imageSeq > 1 ? "s" : ""); imageSeq, imageSeq > 1 ? "s" : "");
} else { } else {
if (verbose) if (verbose)

10
netpbm-nodoc.patch
View File

@ -1,13 +1,13 @@
diff --git a/GNUmakefile b/GNUmakefile diff --git a/GNUmakefile b/GNUmakefile
index b0b7f00..a46329d 100644 index caf8e37..4418076 100644
--- a/GNUmakefile --- a/GNUmakefile
+++ b/GNUmakefile +++ b/GNUmakefile
@@ -369,7 +369,7 @@ install.lib: @@ -394,7 +394,7 @@ install.lib:
endif endif
.PHONY: install.manwebmain .PHONY: install.manwebmain
-install.manwebmain: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url -install.manwebmain: $(PKGDIR)/$(PKGMANDIR)/web/netpbm.url $(PKGDIR)/bin/doc.url
+install.manwebmain: $(PKGDIR)/man/web/netpbm.url +install.manwebmain: $(PKGDIR)/$(PKGMANDIR)/web/netpbm.url
$(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web $(PKGDIR)/$(PKGMANDIR)/web/netpbm.url: $(PKGDIR)/$(PKGMANDIR)/web
echo "$(NETPBM_DOCURL)" > $@ echo "$(NETPBM_DOCURL)" > $@

14
netpbm-noppmtompeg.patch
View File

@ -1,6 +1,7 @@
diff -up netpbm-10.47.12/buildtools/manpage.mk.noppmtompeg netpbm-10.47.12/buildtools/manpage.mk diff --git a/buildtools/manpage.mk b/buildtools/manpage.mk
--- netpbm-10.47.12/buildtools/manpage.mk.noppmtompeg 2010-04-27 09:54:52.121522491 -0400 index 47d890c..62e613f 100644
+++ netpbm-10.47.12/buildtools/manpage.mk 2010-04-27 09:55:10.337642487 -0400 --- a/buildtools/manpage.mk
+++ b/buildtools/manpage.mk
@@ -251,7 +251,6 @@ MAN1 = \ @@ -251,7 +251,6 @@ MAN1 = \
ppmtolj.1 \ ppmtolj.1 \
ppmtomap.1 \ ppmtomap.1 \
@ -9,9 +10,10 @@ diff -up netpbm-10.47.12/buildtools/manpage.mk.noppmtompeg netpbm-10.47.12/build
ppmtoneo.1 \ ppmtoneo.1 \
ppmtopcx.1 \ ppmtopcx.1 \
ppmtopgm.1 \ ppmtopgm.1 \
diff -up netpbm-10.47.12/converter/ppm/Makefile.noppmtompeg netpbm-10.47.12/converter/ppm/Makefile diff --git a/converter/ppm/Makefile b/converter/ppm/Makefile
--- netpbm-10.47.12/converter/ppm/Makefile.noppmtompeg 2010-04-27 09:55:20.293517254 -0400 index 003ef8d..09f05cd 100644
+++ netpbm-10.47.12/converter/ppm/Makefile 2010-04-27 09:55:41.534642567 -0400 --- a/converter/ppm/Makefile
+++ b/converter/ppm/Makefile
@@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) @@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
include $(BUILDDIR)/config.mk include $(BUILDDIR)/config.mk

6
netpbm-pnmtops.patch
View File

@ -1,5 +1,5 @@
diff --git a/converter/other/Makefile b/converter/other/Makefile diff --git a/converter/other/Makefile b/converter/other/Makefile
index 7aefda1..0d998f6 100644 index f51a780..9df16bc 100644
--- a/converter/other/Makefile --- a/converter/other/Makefile
+++ b/converter/other/Makefile +++ b/converter/other/Makefile
@@ -121,7 +121,7 @@ PORTBINARIES = avstopam bmptopnm fitstopnm \ @@ -121,7 +121,7 @@ PORTBINARIES = avstopam bmptopnm fitstopnm \
@ -7,7 +7,7 @@ index 7aefda1..0d998f6 100644
pbmtopgm pdbimgtopam pfmtopam \ pbmtopgm pdbimgtopam pfmtopam \
pgmtopbm pgmtoppm ppmtopgm pnmtoddif \ pgmtopbm pgmtoppm ppmtopgm pnmtoddif \
- pnmtopclxl pnmtorast \ - pnmtopclxl pnmtorast \
+ pnmtopclxl pnmtops pnmtorast \ + pnmtopclxl pnmtops pnmtorast \
pnmtosgi pnmtosir pamtotga pnmtoxwd \ pnmtosgi pnmtosir pamtotga pnmtoxwd \
rasttopnm rlatopam sgitopnm sirtopnm srftopam sunicontopnm \ rasttopnm rlatopam sgitopnm sirtopnm srftopam sunicontopnm \
winicontopam xwdtopnm zeisstopnm winicontopam xwdtopnm yuy2topam zeisstopnm

23
netpbm-ppmfadeusage.patch
View File

@ -1,7 +1,8 @@
diff -up netpbm-10.47.09/editor/ppmfade.ppmfadeusage netpbm-10.47.09/editor/ppmfade diff --git a/editor/ppmfade b/editor/ppmfade
--- netpbm-10.47.09/editor/ppmfade.ppmfadeusage 2010-02-17 11:22:02.000000000 +0100 index 8eb094f..adcdb6d 100755
+++ netpbm-10.47.09/editor/ppmfade 2010-02-17 11:27:29.000000000 +0100 --- a/editor/ppmfade
@@ -34,7 +34,6 @@ my $base_name = "fade"; # default base +++ b/editor/ppmfade
@@ -60,7 +60,6 @@ my $base_name = "fade"; # default base name of output files
my $image = "ppm"; # default output storage format my $image = "ppm"; # default output storage format
my $mode = $SPREAD; # default fading mode my $mode = $SPREAD; # default fading mode
@ -9,7 +10,7 @@ diff -up netpbm-10.47.09/editor/ppmfade.ppmfadeusage netpbm-10.47.09/editor/ppmf
my $n; # argument number my $n; # argument number
for ($n = 0; $n < @ARGV; $n++) { for ($n = 0; $n < @ARGV; $n++) {
@@ -44,7 +43,7 @@ for ($n = 0; $n < @ARGV; $n++) { @@ -70,7 +69,7 @@ for ($n = 0; $n < @ARGV; $n++) {
if (-e $first_file) { if (-e $first_file) {
} else { } else {
print "I can't find first file '$first_file'\n"; print "I can't find first file '$first_file'\n";
@ -18,7 +19,7 @@ diff -up netpbm-10.47.09/editor/ppmfade.ppmfadeusage netpbm-10.47.09/editor/ppmf
} }
} elsif ($ARGV[$n] eq "-l") { } elsif ($ARGV[$n] eq "-l") {
$n++; $n++;
@@ -52,7 +51,7 @@ for ($n = 0; $n < @ARGV; $n++) { @@ -78,7 +77,7 @@ for ($n = 0; $n < @ARGV; $n++) {
if (-e $last_file) { if (-e $last_file) {
} else { } else {
print "I can't find last file '$last_file'\n"; print "I can't find last file '$last_file'\n";
@ -27,7 +28,7 @@ diff -up netpbm-10.47.09/editor/ppmfade.ppmfadeusage netpbm-10.47.09/editor/ppmf
} }
} elsif ($ARGV[$n] eq "-base") { } elsif ($ARGV[$n] eq "-base") {
$n++; $n++;
@@ -73,11 +72,12 @@ for ($n = 0; $n < @ARGV; $n++) { @@ -99,11 +98,12 @@ for ($n = 0; $n < @ARGV; $n++) {
$mode = $BLOCK; $mode = $BLOCK;
} elsif ("$ARGV[$n]" eq "-mix") { } elsif ("$ARGV[$n]" eq "-mix") {
$mode = $MIX; $mode = $MIX;
@ -43,12 +44,12 @@ diff -up netpbm-10.47.09/editor/ppmfade.ppmfadeusage netpbm-10.47.09/editor/ppmf
} }
} }
# #
@@ -96,18 +96,18 @@ if ($first_file ne "undefined") { @@ -122,18 +122,18 @@ if ($first_file ne "undefined") {
$width = $1; $height = $2; $width = $1; $height = $2;
} else { } else {
print("Unrecognized results from pnmfile on $first_file.\n"); print("Unrecognized results from pnmfile on $first_file.\n");
- exit(50); - exit(50);
+ exit 1; + exit(1);
} }
} elsif ($last_file ne "undefined") { } elsif ($last_file ne "undefined") {
if ((`pnmfile $last_file` =~ m{\b(\d+)\sby\s(\d+)} )) { if ((`pnmfile $last_file` =~ m{\b(\d+)\sby\s(\d+)} )) {
@ -56,12 +57,12 @@ diff -up netpbm-10.47.09/editor/ppmfade.ppmfadeusage netpbm-10.47.09/editor/ppmf
} else { } else {
print("Unrecognized results from pnmfile on $first_file.\n"); print("Unrecognized results from pnmfile on $first_file.\n");
- exit(50); - exit(50);
+ exit 1; + exit(1);
} }
} else { } else {
print("ppmfade: You must specify -f or -l (or both)\n"); print("ppmfade: You must specify -f or -l (or both)\n");
- exit(90); - exit(90);
+ exit 1; + exit(1);
} }
print("Frames are " . $width . "W x " . $height . "H\n"); print("Frames are " . $width . "W x " . $height . "H\n");

13
netpbm-ppmtopict.patch
View File

@ -1,10 +1,11 @@
diff -up netpbm-10.58.01/converter/ppm/ppmtopict.c.ppmtopict netpbm-10.58.01/converter/ppm/ppmtopict.c diff --git a/converter/ppm/ppmtopict.c b/converter/ppm/ppmtopict.c
--- netpbm-10.58.01/converter/ppm/ppmtopict.c.ppmtopict 2012-06-13 09:52:42.000000000 +0200 index 36464b6..034e705 100644
+++ netpbm-10.58.01/converter/ppm/ppmtopict.c 2012-06-13 11:33:11.134747363 +0200 --- a/converter/ppm/ppmtopict.c
@@ -200,7 +200,7 @@ putRow(FILE * const ifP, +++ b/converter/ppm/ppmtopict.c
pixel * const rowpixels, @@ -208,7 +208,7 @@ putRow(FILE * const ofP,
char * const packed) {
Use buffer 'outBuf'.
-----------------------------------------------------------------------------*/
- unsigned int i; - unsigned int i;
+ int i; + int i;
unsigned int count; unsigned int count;

1418
netpbm-security-code.patch
View File

File diff suppressed because it is too large Load Diff

85
netpbm-werror.patch
View File

@ -1,62 +1,3 @@
diff --git a/converter/pbm/cmuwmtopbm.c b/converter/pbm/cmuwmtopbm.c
index 5c138c1..1f9bc6c 100644
--- a/converter/pbm/cmuwmtopbm.c
+++ b/converter/pbm/cmuwmtopbm.c
@@ -48,20 +48,20 @@ readCmuwmHeader(FILE * const ifP,
rc = pm_readbiglong(ifP, &l);
if (rc == -1 )
- pm_error(initReadError);
+ pm_error("%s", initReadError);
if ((uint32_t)l != cmuwmMagic)
pm_error("bad magic number in CMU window manager file");
rc = pm_readbiglong(ifP, &l);
if (rc == -1)
- pm_error(initReadError);
+ pm_error("%s", initReadError);
*colsP = l;
rc = pm_readbiglong(ifP, &l);
if (rc == -1 )
- pm_error(initReadError);
+ pm_error("%s", initReadError);
*rowsP = l;
rc = pm_readbigshort(ifP, &s);
if (rc == -1)
- pm_error(initReadError);
+ pm_error("%s", initReadError);
*depthP = s;
}
diff --git a/converter/other/tifftopnm.c b/converter/other/tifftopnm.c
index 3aa2e43..b8ebf39 100644
--- a/converter/other/tifftopnm.c
+++ b/converter/other/tifftopnm.c
@@ -1459,7 +1459,7 @@ convertRasterInMemory(pnmOut * const pnmOutP,
int ok;
ok = TIFFRGBAImageOK(tif, emsg);
if (!ok) {
- pm_message(emsg);
+ pm_message("%s", emsg);
*statusP = CONV_UNABLE;
} else {
uint32 * raster;
@@ -1479,14 +1479,14 @@ convertRasterInMemory(pnmOut * const pnmOutP,
ok = TIFFRGBAImageBegin(&img, tif, stopOnErrorFalse, emsg);
if (!ok) {
- pm_message(emsg);
+ pm_message("%s", emsg);
*statusP = CONV_FAILED;
} else {
int ok;
ok = TIFFRGBAImageGet(&img, raster, cols, rows);
TIFFRGBAImageEnd(&img) ;
if (!ok) {
- pm_message(emsg);
+ pm_message("%s", emsg);
*statusP = CONV_FAILED;
} else {
*statusP = CONV_DONE;
diff --git a/lib/util/pm_c_util.h b/lib/util/pm_c_util.h diff --git a/lib/util/pm_c_util.h b/lib/util/pm_c_util.h
index 01a0765..8f5aa01 100644 index 01a0765..8f5aa01 100644
--- a/lib/util/pm_c_util.h --- a/lib/util/pm_c_util.h
@ -74,29 +15,3 @@ index 01a0765..8f5aa01 100644
#endif #endif
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
diff --git a/converter/other/fiasco/pnmtofiasco.c b/converter/other/fiasco/pnmtofiasco.c
index d78ff6b..761dac5 100644
--- a/converter/other/fiasco/pnmtofiasco.c
+++ b/converter/other/fiasco/pnmtofiasco.c
@@ -170,7 +170,7 @@ main (int argc, char **argv)
return 0;
else
{
- fprintf (stderr, fiasco_get_error_message ());
+ fprintf (stderr, "%s", fiasco_get_error_message ());
fprintf (stderr, "\n");
return 1;
}
diff --git a/converter/other/fiasco/params.c b/converter/other/fiasco/params.c
index a4d843a..9659e9f 100644
--- a/converter/other/fiasco/params.c
+++ b/converter/other/fiasco/params.c
@@ -656,7 +656,7 @@ usage (const param_t *params, const char *progname, const char *synopsis,
fprintf (stderr, "Usage: %s [OPTION]...%s\n", progname,
non_opt_string ? non_opt_string : " ");
if (synopsis != NULL)
- fprintf (stderr, synopsis);
+ fprintf (stderr, "%s\n", synopsis);
fprintf (stderr, "\n\n");
fprintf (stderr, "Mandatory or optional arguments to long options "
"are mandatory or optional\nfor short options too. "

8
netpbm-xwdfix.patch
View File

@ -1,6 +1,8 @@
--- netpbm-10.35/converter/other/xwdtopnm.c.xwdfix 2006-09-18 13:24:50.000000000 +0200 diff --git a/converter/other/xwdtopnm.c b/converter/other/xwdtopnm.c
+++ netpbm-10.35/converter/other/xwdtopnm.c 2006-09-18 13:27:26.000000000 +0200 index d49a2b0..45d66b4 100644
@@ -945,7 +945,7 @@ getpix(pixelReader * const rdrP) { --- a/converter/other/xwdtopnm.c
+++ b/converter/other/xwdtopnm.c
@@ -1025,7 +1025,7 @@ pixelReader_getbits(pixelReader * const rdrP,
unsigned long const bitsToTakeMask = lsbmask[nBitsToTake]; unsigned long const bitsToTakeMask = lsbmask[nBitsToTake];
/* E.g. if nbitsToTake is 4, this is 0x0000000F */ /* E.g. if nbitsToTake is 4, this is 0x0000000F */

16
netpbm.spec
View File

@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats Summary: A library for handling different graphics file formats
Name: netpbm Name: netpbm
Version: 10.66.02 Version: 10.71.02
Release: 7%{?dist} Release: 1%{?dist}
# See copyright_summary for details # See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain License: BSD and GPLv2 and IJG and MIT and Public Domain
Group: System Environment/Libraries Group: System Environment/Libraries
@ -32,10 +32,10 @@ Patch21: netpbm-cmuwtopbm.patch
Patch22: netpbm-pamtojpeg2k.patch Patch22: netpbm-pamtojpeg2k.patch
Patch23: netpbm-manfix.patch Patch23: netpbm-manfix.patch
Patch24: netpbm-ppmtopict.patch Patch24: netpbm-ppmtopict.patch
Patch25: netpbm-pnmtopclxl.patch
Patch26: netpbm-werror.patch Patch26: netpbm-werror.patch
Patch27: netpbm-disable-pbmtog3.patch Patch27: netpbm-disable-pbmtog3.patch
Patch28: netpbm-pnmtops.patch Patch28: netpbm-pnmtops.patch
Patch29: netpbm-config.patch
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel, libxml2-devel BuildRequires: libX11-devel, python, jasper-devel, libxml2-devel
BuildRequires: ghostscript-core BuildRequires: ghostscript-core
@ -109,10 +109,10 @@ netpbm-doc. You'll also need to install the netpbm-progs package.
%patch22 -p1 -b .pamtojpeg2kfix %patch22 -p1 -b .pamtojpeg2kfix
%patch23 -p1 -b .manfix %patch23 -p1 -b .manfix
%patch24 -p1 -b .ppmtopict %patch24 -p1 -b .ppmtopict
%patch25 -p1 -b .pnmtopclxl
%patch26 -p1 -b .werror %patch26 -p1 -b .werror
%patch27 -p1 -b .disable-pbmtog3 %patch27 -p1 -b .disable-pbmtog3
%patch28 -p1 -b .pnmtops %patch28 -p1 -b .pnmtops
%patch29 -p1 -b .config
sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
rm -rf converter/other/jpeg2000/libjasper/ rm -rf converter/other/jpeg2000/libjasper/
@ -156,10 +156,7 @@ make \
TIFFLIB_DIR=%{_libdir} \ TIFFLIB_DIR=%{_libdir} \
LINUXSVGALIB="NONE" \ LINUXSVGALIB="NONE" \
X11LIB=%{_libdir}/libX11.so \ X11LIB=%{_libdir}/libX11.so \
XML2LIBS="NONE" \ XML2LIBS="NONE"
JASPERLIB="" \
JASPERDEPLIBS="-ljasper" \
JASPERHDR_DIR="/usr/include/jasper"
# prepare man files # prepare man files
cd userguide cd userguide
@ -265,6 +262,9 @@ rm -rf $RPM_BUILD_ROOT
%doc userguide/* %doc userguide/*
%changelog %changelog
* Mon Aug 10 2015 Petr Hracek <phracek@redhat.com> - 10.71.02-1
- Update to the latest upstream release (#1252352)
* Thu Aug 06 2015 Petr Hracek <phracek@redhat.com> - 10.66.02-7 * Thu Aug 06 2015 Petr Hracek <phracek@redhat.com> - 10.66.02-7
- remove doc/copyright_summary (#1219743) - remove doc/copyright_summary (#1219743)

4
netpbm2tar.sh
View File

@ -14,7 +14,7 @@ if [[ -z $VERSION ]]; then
fi fi
NETPBM_NAME="netpbm-$VERSION" NETPBM_NAME="netpbm-$VERSION"
TEMP_DIR="/var/tmp/netpbm" TEMP_DIR="/var/tmp/netpbm"
TARBALL="$TEMP_DIR/$NETPBM_NAME.tar.gz" TARBALL="$TEMP_DIR/$NETPBM_NAME.tar.xz"
mkdir -p $TEMP_DIR mkdir -p $TEMP_DIR
pushd $TEMP_DIR pushd $TEMP_DIR
svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced $NETPBM_NAME svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced $NETPBM_NAME
@ -22,7 +22,7 @@ svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide $NETPBM
svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/trunk/test $NETPBM_NAME/test svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/trunk/test $NETPBM_NAME/test
find -name '\.svn' -type d -print0 | xargs -0 rm -rf find -name '\.svn' -type d -print0 | xargs -0 rm -rf
rm -rf $NETPBM_NAME/converter/ppm/ppmtompeg/ rm -rf $NETPBM_NAME/converter/ppm/ppmtompeg/
tar -czvf $NETPBM_NAME.tar.gz $NETPBM_NAME tar -cJvf $NETPBM_NAME.tar.xz $NETPBM_NAME
rm -rf $NETPBM_NAME/ rm -rf $NETPBM_NAME/
popd popd
if [[ -f "$TARBALL" ]]; then if [[ -f "$TARBALL" ]]; then

2
sources
View File

@ -1 +1 @@
dcb7de91384d630eb399e48c71158f3d netpbm-10.66.02.tar.xz 24df6a5baf36fa8943f046568726fd57 netpbm-10.71.02.tar.xz