- updated to 10.47.73 (last super_stable from 10.47.x line)

- updated build patch

diff --git a/netpbm-build.patch b/netpbm-build.patch
index 191cbd1c8a29497d6f024e9ae659ebfb0d65c466..3f5865f8f9101110d15b6169a295e57cd581f28e 100644 (file)
--- a/netpbm-build.patch
+++ b/netpbm-build.patch
@@ -1,5 +1,5 @@
---- netpbm-10.47.63/converter/other/pnmtopng.c.orig    2016-09-26 18:44:20.000000000 +0200
-+++ netpbm-10.47.63/converter/other/pnmtopng.c 2016-10-26 20:21:09.553805369 +0200
+--- netpbm-10.47.73/converter/other/pnmtopng.c.orig    2019-06-28 23:02:17.000000000 +0200
++++ netpbm-10.47.73/converter/other/pnmtopng.c 2019-07-27 10:44:23.878530313 +0200
 @@ -59,7 +59,8 @@
  #include <assert.h>
  #include <string.h> /* strcat() */
@@ -31,7 +31,7 @@
  
  struct zlibCompression {
      /* These are parameters that describe a form of zlib compression.
-@@ -2123,6 +2110,7 @@ makePngLine(png_byte *           const l
+@@ -2131,6 +2118,7 @@ makePngLine(png_byte *           const l
              gray *               const alpha_mask,
              colorhash_table      const cht,
              coloralphahash_table const caht,
@@ -39,7 +39,7 @@
              png_info *           const info_ptr,
              xelval               const png_maxval,
              unsigned int         const depth) {
-@@ -2134,21 +2122,22 @@ makePngLine(png_byte *           const l
+@@ -2142,21 +2130,22 @@ makePngLine(png_byte *           const l
      for (col = 0; col < cols; ++col) {
          xel p_png;
          xel const p = xelrow[col];
@@ -67,7 +67,7 @@
              if (depth == 16)
                  *pp++ = PPM_GETR(p_png) >> 8;
              *pp++ = PPM_GETR(p_png) & 0xff;
-@@ -2161,7 +2150,7 @@ makePngLine(png_byte *           const l
+@@ -2169,7 +2158,7 @@ makePngLine(png_byte *           const l
          } else
              pm_error("INTERNAL ERROR: undefined color_type");
                  
@@ -76,7 +76,7 @@
              int const png_alphaval = (int)
                  alpha_mask[col] * (float) png_maxval / maxval + 0.5;
              if (depth == 16)
-@@ -2218,7 +2207,7 @@ writeRaster(png_struct *         const p
+@@ -2226,7 +2215,7 @@ writeRaster(png_struct *         const p
              
              makePngLine(line, xelrow, cols, maxval,
                          alpha, alpha ? alpha_mask[row] : NULL,
@@ -85,7 +85,7 @@
  
              png_write_row(png_ptr, line);
          }
-@@ -2230,12 +2219,12 @@ writeRaster(png_struct *         const p
+@@ -2238,12 +2227,12 @@ writeRaster(png_struct *         const p
  
  static void
  doGamaChunk(struct cmdlineInfo const cmdline,
@@ -100,7 +100,7 @@
      }
  }
  
-@@ -2243,20 +2232,16 @@ doGamaChunk(struct cmdlineInfo const cmd
+@@ -2251,20 +2240,16 @@ doGamaChunk(struct cmdlineInfo const cmd
  
  static void
  doChrmChunk(struct cmdlineInfo const cmdline,
@@ -127,7 +127,7 @@
      }
  }
  
-@@ -2264,15 +2249,13 @@ doChrmChunk(struct cmdlineInfo const cmd
+@@ -2272,15 +2257,13 @@ doChrmChunk(struct cmdlineInfo const cmd
  
  static void
  doPhysChunk(struct cmdlineInfo const cmdline,
@@ -146,7 +146,7 @@
      }
  }
  
-@@ -2281,26 +2264,29 @@ doPhysChunk(struct cmdlineInfo const cmd
+@@ -2289,26 +2272,29 @@ doPhysChunk(struct cmdlineInfo const cmd
  
  static void
  doTimeChunk(struct cmdlineInfo const cmdline,
@@ -181,7 +181,7 @@
          (pngMaxval > maxval || (alpha && pngMaxval > alphaMaxval))) {
  
          /* We're writing in a bit depth that doesn't match the maxval
-@@ -2319,27 +2305,27 @@ doSbitChunk(png_info * const pngInfoP,
+@@ -2327,27 +2313,27 @@ doSbitChunk(png_info * const pngInfoP,
             sBIT chunk.
          */
  
@@ -219,7 +219,7 @@
      }
  }
  
-@@ -2620,43 +2606,40 @@ convertpnm(struct cmdlineInfo const cmdl
+@@ -2628,43 +2614,40 @@ convertpnm(struct cmdlineInfo const cmdl
      pm_error ("setjmp returns error condition (2)");
    }
  
@@ -281,7 +281,7 @@
      }
      /* creating hIST chunk */
      if (cmdline.hist) {
-@@ -2682,18 +2665,17 @@ convertpnm(struct cmdlineInfo const cmdl
+@@ -2690,18 +2673,17 @@ convertpnm(struct cmdlineInfo const cmdl
  
          ppm_freecolorhash(cht);
  
@@ -306,7 +306,7 @@
          }
      } else {
          /* This is PNG_COLOR_MASK_ALPHA.  Transparency will be handled
-@@ -2701,13 +2683,17 @@ convertpnm(struct cmdlineInfo const cmdl
+@@ -2709,13 +2691,17 @@ convertpnm(struct cmdlineInfo const cmdl
          */
      }
      if (verbose) {
@@ -329,7 +329,7 @@
          else
              pm_message("No transparent color");
      }
-@@ -2715,46 +2701,40 @@ convertpnm(struct cmdlineInfo const cmdl
+@@ -2723,29 +2709,29 @@ convertpnm(struct cmdlineInfo const cmdl
  
    /* bKGD chunk */
    if (cmdline.background) {
@@ -369,8 +369,9 @@
 -  doTimeChunk(cmdline, info_ptr);
 +  doTimeChunk(cmdline, png_ptr, info_ptr);
  
-   if (cmdline.filterSet != 0)
+   if (cmdline.filterSetSpec)
        png_set_filter(png_ptr, 0, cmdline.filterSet);
+@@ -2755,17 +2741,11 @@ convertpnm(struct cmdlineInfo const cmdl
  
    setZlibCompression(png_ptr, cmdline.zlibCompression);
  

diff --git a/netpbm.spec b/netpbm.spec
index a5ed7c1d04fb0f0a8b7ef62aaedf474ad4262610..17ae924f49875d36e5b877432d90e5a7b87ad43d 100644 (file)
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -10,14 +10,14 @@ Summary(pt_BR.UTF-8):       Ferramentas para manipular arquivos graficos nos formatos
 Summary(ru.UTF-8):     Набор библиотек для работы с различными графическими файлами
 Summary(uk.UTF-8):     Набір бібліотек для роботи з різними графічними файлами
 Name:          netpbm
-Version:       10.47.71
+Version:       10.47.73
 Release:       1
 License:       Freeware
 Group:         Libraries
 #  svn export https://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm-%{version} (where version from doc/HISTORY)
 #  svn export https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{version}/userguide
 Source0:       http://downloads.sourceforge.net/netpbm/%{name}-%{version}.tgz
-# Source0-md5: 8b314bc792b7a2f2c3ddd6e97da15307
+# Source0-md5: f9cba5b3d2b74e9608c6a2c3ce71c17e
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 8fb174f8da02ea01bf72a9dc61be10f1
 Source2:       %{name}-docs-20030520.tar.bz2