Accepting request 36703 from graphics

checked in (request 36703)

OBS-URL: https://build.opensuse.org/request/show/36703
OBS-URL: https://build.opensuse.org/package/show/graphics/netpbm?expand=0&rev=19

netpbm-10.35.69-colornames-init.diff

@@ -0,0 +1,19 @@
+--- netpbm-10.35.64/lib/libppmcolor.c
++++ netpbm-10.35.64/lib/libppmcolor.c
+@@ -536,6 +536,16 @@
+ 
+         fclose(colorFile);
+     }
++    else {
++         /*
++          * 31.8.2004, jw:
++        * ppm_freecolornames() may be unhappy when
++        * free'ing uninitialized data.
++          */
++         int i = MAXCOLORNAMES;
++         while (i) colornames[--i] = NULL;
++    }
++
+ }
+ 
+ 

netpbm-10.35.69-endian.patch

@@ -0,0 +1,19 @@
+--- converter/other/fiasco/config.h
++++ converter/other/fiasco/config.h
+@@ -23,7 +23,15 @@
+ 
+ /* Define if your processor stores words with the most significant
+    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+-/* #undef WORDS_BIGENDIAN */
++
++
++/* since we don't have autoconf... */
++#include <endian.h>
++#if __BYTE_ORDER == __BIG_ENDIAN
++#define WORDS_BIGENDIAN 1
++#endif
++
++
+ 
+ /* Define if the X Window System is missing or not being used.  */
+ #define X_DISPLAY_MISSING 1

netpbm-10.35.69-fixes.patch

@@ -1,8 +1,6 @@
-Index: buildtools/Makefile
-===================================================================
---- buildtools/Makefile.orig
+--- buildtools/Makefile
 +++ buildtools/Makefile
-@@ -34,10 +34,10 @@ libopt.o: libopt.c
+@@ -34,10 +34,10 @@
  	  -o $@ $<
  
  typegen.o endiangen.o:%.o:%.c
@@ -15,21 +13,19 @@ Index: buildtools/Makefile
  
  distclean clean: cleanlocal
  .PHONY: cleanlocal
-Index: converter/other/fiasco/codec/dfiasco.c
-===================================================================
---- converter/other/fiasco/codec/dfiasco.c.orig
+--- converter/other/fiasco/codec/dfiasco.c
 +++ converter/other/fiasco/codec/dfiasco.c
-@@ -15,6 +15,7 @@
-  */
+@@ -16,6 +16,9 @@
  
  #include <string.h>
-+#include <stdlib.h>
  
++#include <string.h>
++#include <stdlib.h>
++
  #include "config.h"
  
-Index: converter/other/fiasco/input/basis.c
-===================================================================
---- converter/other/fiasco/input/basis.c.orig
+ #include "types.h"
+--- converter/other/fiasco/input/basis.c
 +++ converter/other/fiasco/input/basis.c
 @@ -14,6 +14,7 @@
   *  $State: Exp $
@@ -39,11 +35,9 @@ Index: converter/other/fiasco/input/basis.c
  #include "config.h"
  
  #include "types.h"
-Index: converter/other/fitstopnm.c
-===================================================================
---- converter/other/fitstopnm.c.orig
+--- converter/other/fitstopnm.c
 +++ converter/other/fitstopnm.c
-@@ -444,7 +444,7 @@ read_val (fp, bitpix, vp)
+@@ -444,7 +444,7 @@
              c[i] = ich;
          }
          swapbytes(c, 4);
@@ -52,7 +46,7 @@ Index: converter/other/fitstopnm.c
          break;
        
      case -64:
-@@ -455,7 +455,7 @@ read_val (fp, bitpix, vp)
+@@ -455,7 +455,7 @@
              c[i] = ich;
          }
          swapbytes(c, 8);
@@ -61,11 +55,9 @@ Index: converter/other/fitstopnm.c
          break;
        
      default:
-Index: converter/other/jpegtopnm.c
-===================================================================
---- converter/other/jpegtopnm.c.orig
+--- converter/other/jpegtopnm.c
 +++ converter/other/jpegtopnm.c
-@@ -511,6 +511,7 @@ set_color_spaces(const J_COLOR_SPACE jpe
+@@ -511,6 +511,7 @@
          pm_error("Input JPEG image has 'unknown' color space "
                   "(JCS_UNKNOWN).\n"
                   "We cannot interpret this image.");
@@ -73,7 +65,7 @@ Index: converter/other/jpegtopnm.c
          break;
      case JCS_GRAYSCALE:
          *output_type_p = PGM_TYPE;
-@@ -538,6 +539,7 @@ set_color_spaces(const J_COLOR_SPACE jpe
+@@ -538,6 +539,7 @@
      default:
          pm_error("Internal error: unknown color space code %d passed "
                   "to set_color_spaces().", jpeg_color_space);
@@ -81,11 +73,9 @@ Index: converter/other/jpegtopnm.c
      }
      pm_message("WRITING %s FILE", 
                 *output_type_p == PPM_TYPE ? "PPM" : "PGM");
-Index: converter/other/pamtopfm.c
-===================================================================
---- converter/other/pamtopfm.c.orig
+--- converter/other/pamtopfm.c
 +++ converter/other/pamtopfm.c
-@@ -149,12 +149,12 @@ floatToPfmSample(float       const input
+@@ -149,12 +149,12 @@
     Type converter
  -----------------------------------------------------------------------------*/
      if (machineEndianness == pfmEndianness) {
@@ -100,7 +90,7 @@ Index: converter/other/pamtopfm.c
          
          for (i = 0, j = sizeof(pfmSample)-1; 
               i < sizeof(pfmSample); 
-@@ -239,6 +239,7 @@ makePfmHeader(const struct pam * const p
+@@ -239,6 +239,7 @@
                enum endian        const endian) {
      
      struct pfmHeader pfmHeader;
@@ -108,11 +98,9 @@ Index: converter/other/pamtopfm.c
      
      pfmHeader.width  = pamP->width;
      pfmHeader.height = pamP->height;
-Index: converter/other/pamtosvg/curve.c
-===================================================================
---- converter/other/pamtosvg/curve.c.orig
+--- converter/other/pamtosvg/curve.c
 +++ converter/other/pamtosvg/curve.c
-@@ -222,9 +222,7 @@ curve_list_type
+@@ -222,9 +222,7 @@
  new_curve_list (void)
  {
    curve_list_type curve_list;
@@ -123,11 +111,9 @@ Index: converter/other/pamtosvg/curve.c
  
    return curve_list;
  }
-Index: converter/other/pamtosvg/pxl-outline.c
-===================================================================
---- converter/other/pamtosvg/pxl-outline.c.orig
+--- converter/other/pamtosvg/pxl-outline.c
 +++ converter/other/pamtosvg/pxl-outline.c
-@@ -262,6 +262,9 @@ find_one_centerline(bitmap_type    const
+@@ -262,6 +262,9 @@
      outline.open  = false;
      outline.color = getBitmapColor(bitmap, original_row, original_col);
  
@@ -137,7 +123,7 @@ Index: converter/other/pamtosvg/pxl-outline.c
      /* Add the starting pixel to the output list, changing from bitmap
         to Cartesian coordinates and specifying the left edge so that
         the coordinates won't be adjusted.
-@@ -272,9 +275,6 @@ find_one_centerline(bitmap_type    const
+@@ -272,9 +275,6 @@
          LOG2(" (%d,%d)", pos.col, pos.row);
          append_outline_pixel(&outline, pos);
      }
@@ -147,7 +133,7 @@ Index: converter/other/pamtosvg/pxl-outline.c
  
      for ( ; ; ) {
          unsigned int const prev_row = row;
-@@ -527,6 +527,7 @@ new_pixel_outline (void)
+@@ -527,6 +527,7 @@
  {
    pixel_outline_type pixel_outline;
  
@@ -155,11 +141,9 @@ Index: converter/other/pamtosvg/pxl-outline.c
    O_LENGTH (pixel_outline) = 0;
    pixel_outline.data = NULL;
    pixel_outline.open = false;
-Index: converter/other/pamtosvg/spline.c
-===================================================================
---- converter/other/pamtosvg/spline.c.orig
+--- converter/other/pamtosvg/spline.c
 +++ converter/other/pamtosvg/spline.c
-@@ -80,6 +80,7 @@ spline_list_type
+@@ -80,6 +80,7 @@
  empty_spline_list (void)
  {
    spline_list_type answer;
@@ -167,7 +151,7 @@ Index: converter/other/pamtosvg/spline.c
    SPLINE_LIST_DATA (answer) = NULL;
    SPLINE_LIST_LENGTH (answer) = 0;
    return answer;
-@@ -153,6 +154,7 @@ spline_list_array_type
+@@ -153,6 +154,7 @@
  new_spline_list_array (void)
  {
    spline_list_array_type answer;
@@ -175,11 +159,19 @@ Index: converter/other/pamtosvg/spline.c
  
    SPLINE_LIST_ARRAY_DATA (answer) = NULL;
    SPLINE_LIST_ARRAY_LENGTH (answer) = 0;
-Index: converter/other/pamtouil.c
-===================================================================
---- converter/other/pamtouil.c.orig
+--- converter/other/pamtosvg/vector.c
++++ converter/other/pamtosvg/vector.c
+@@ -38,6 +38,7 @@
+ 
+   coord.x = v.dx;
+   coord.y = v.dy;
++  coord.z = v.dz;
+ 
+   return coord;
+ }
+--- converter/other/pamtouil.c
 +++ converter/other/pamtouil.c
-@@ -376,11 +376,15 @@ freeCmap(cixel_map cmap[], unsigned int
+@@ -376,11 +376,15 @@
      int i;
  
      for (i = 0; i < ncolors; ++i) {
@@ -198,11 +190,9 @@ Index: converter/other/pamtouil.c
      }
  }
  
-Index: converter/other/pgmtopbm.c
-===================================================================
---- converter/other/pgmtopbm.c.orig
+--- converter/other/pgmtopbm.c
 +++ converter/other/pgmtopbm.c
-@@ -549,6 +549,8 @@ createDither8Converter(unsigned int cons
+@@ -549,6 +549,8 @@
      converter.cols = cols;
      converter.convertRow = &dither8ConvertRow;
      converter.destroy = NULL;
@@ -211,7 +201,7 @@ Index: converter/other/pgmtopbm.c
  
      /* Scale dither matrix. */
      for (row = 0; row < 16; ++row) {
-@@ -622,6 +624,7 @@ createClusterConverter(unsigned int cons
+@@ -622,6 +624,7 @@
      converter.cols = cols;
      converter.convertRow = &clusterConvertRow;
      converter.destroy = &clusterDestroy;
@@ -219,11 +209,9 @@ Index: converter/other/pgmtopbm.c
  
      MALLOCVAR_NOFAIL(stateP);
  
-Index: converter/other/pnmtopng.c
-===================================================================
---- converter/other/pnmtopng.c.orig
+--- converter/other/pnmtopng.c
 +++ converter/other/pnmtopng.c
-@@ -513,6 +513,7 @@ xelToPngColor_16(xel const input,
+@@ -506,6 +506,7 @@
      retval.green = PPM_GETG(scaled);
      retval.blue  = PPM_GETB(scaled);
      retval.gray  = PNM_GET1(scaled);
@@ -231,11 +219,9 @@ Index: converter/other/pnmtopng.c
  
      return retval;
  }
-Index: converter/other/rletopnm.c
-===================================================================
---- converter/other/rletopnm.c.orig
+--- converter/other/rletopnm.c
 +++ converter/other/rletopnm.c
-@@ -101,7 +101,7 @@ parseCommandLine(int argc, char ** argv,
+@@ -101,7 +101,7 @@
      optStruct3 opt;
      unsigned int option_def_index;
  
@@ -244,11 +230,9 @@ Index: converter/other/rletopnm.c
  
      MALLOCARRAY(option_def, 100);
  
-Index: converter/ppm/ximtoppm.c
-===================================================================
---- converter/ppm/ximtoppm.c.orig
+--- converter/ppm/ximtoppm.c
 +++ converter/ppm/ximtoppm.c
-@@ -44,7 +44,7 @@ parseCommandLine(int argc, char ** argv,
+@@ -44,7 +44,7 @@
  
      unsigned int option_def_index;
  
@@ -257,9 +241,7 @@ Index: converter/ppm/ximtoppm.c
  
      option_def_index = 0;   /* incremented by OPTENT3 */
      OPTENT3(0,   "alphaout",   OPT_STRING, 
-Index: lib/pm.h
-===================================================================
---- lib/pm.h.orig
+--- lib/pm.h
 +++ lib/pm.h
 @@ -21,6 +21,7 @@
  #include <errno.h>
@@ -269,26 +251,11 @@ Index: lib/pm.h
  
  #ifdef VMS
  #include <perror.h>
-Index: lib/util/wordaccess_64_le.h
-===================================================================
---- lib/util/wordaccess_64_le.h.orig
+--- lib/util/wordaccess_64_le.h
 +++ lib/util/wordaccess_64_le.h
-@@ -49,4 +49,5 @@ wordintClz(wordint const x){
+@@ -49,4 +49,5 @@
          return (__builtin_clzll((long long int)x << (s - 8) * 8));
      else
          pm_error("Long long int is less than 64 bits on this machine"); 
 +    return 0; /* unreached */
  }
-Index: converter/other/fiasco/lib/image.c
-===================================================================
---- converter/other/fiasco/lib/image.c.orig
-+++ converter/other/fiasco/lib/image.c
-@@ -239,7 +239,7 @@ alloc_image (unsigned width, unsigned he
-    image->format      = format;
-    image->reference_count = 1;
-    
--   strcpy (image->id, "IFIASCO");
-+   strncpy (image->id, "IFIASCO", 7);
- 
-    for (band = first_band (color); band <= last_band (color); band++)
-       if (format == FORMAT_4_2_0 && band != Y)

netpbm-10.35.69-gcc45.patch

@@ -0,0 +1,13 @@
+Index: converter/other/fiasco/lib/image.c
+===================================================================
+--- converter/other/fiasco/lib/image.c.orig	2006-08-19 05:12:28.000000000 +0200
++++ converter/other/fiasco/lib/image.c	2010-02-13 23:50:44.000000000 +0100
+@@ -200,7 +200,7 @@ alloc_image (unsigned width, unsigned he
+    image->format 	  = format;
+    image->reference_count = 1;
+    
+-   strcpy (image->id, "IFIASCO");
++   strncpy (image->id, "IFIASCO", 7);
+ 
+    for (band = first_band (color); band <= last_band (color); band++)
+       if (format == FORMAT_4_2_0 && band != Y)

netpbm-10.35.69-pamtouil.patch

@@ -0,0 +1,11 @@
+--- converter/other/pamtouil.c
++++ converter/other/pamtouil.c
+@@ -95,7 +95,7 @@
+ 
+         /* Remove trailing "_icon" */
+         barPos = strrchr(cmdlineP->outname, '_');
+-        if (STREQ(barPos, "_icon")) 
++        if (barPos && STREQ(barPos, "_icon")) 
+             *barPos = '\0';
+     } else {
+         if (STREQ(cmdlineP->inputFilespec, "-"))

netpbm-10.35.69-pnmtopng-transparent.patch

@@ -0,0 +1,20 @@
+--- converter/other/pnmtopng.c
++++ converter/other/pnmtopng.c
+@@ -1842,7 +1842,7 @@
+         computePixelWidth(PNM_FORMAT_TYPE(format), pnm_meaningful_bits, alpha,
+                           NULL, &bitsPerPixel);
+ 
+-        if (!pfP && bitsPerPixel == 1)
++        if (0/*!pfP && bitsPerPixel == 1*/)
+             /* No palette can beat 1 bit per pixel -- no need to waste time
+                counting the colors.
+             */
+@@ -1865,7 +1865,7 @@
+                           "colormapped PNG", MAXCOLORS);
+             } else {
+                 /* There are few enough colors that a palette is possible */
+-                if (bitsPerPixel <= paletteIndexBits(colors) && !pfP)
++                if (0/*bitsPerPixel <= paletteIndexBits(colors) && !pfP*/)
+                     asprintfN(noColormapReasonP, 
+                               "palette index for %u colors would be "
+                               "no smaller than the indexed value (%u bits)", 

netpbm-10.35.69-rgb.patch

@@ -0,0 +1,11 @@
+--- pm_config.in.h
++++ pm_config.in.h
+@@ -67,7 +67,7 @@
+ #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
+ #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
+ #else
+-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
++#define RGB_DB1 "/usr/share/X11/rgb.txt"
+ #define RGB_DB2 "/usr/share/X11/rgb.txt"
+ #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
+ #endif

netpbm-10.35.69-ximtoppm-fixes.patch

@@ -0,0 +1,13 @@
+--- converter/ppm/ximtoppm.c
++++ converter/ppm/ximtoppm.c
+@@ -54,6 +54,10 @@
+     opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
+     opt.allowNegNum = FALSE;  /* We have no parms that are negative numbers */
+ 
++    opt.opt_table = option_def;
++    opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
++    opt.allowNegNum = FALSE;  /* We may have parms that are negative numbers */
++
+     optParseOptions3(&argc, argv, opt, sizeof(opt), 0);
+         /* Uses and sets argc, argv, and all of *cmdlineP. */
+ 

netpbm-10.35.69.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:529fcabf99cc964d7f68c8e584c3af3bb383e2342028a4b07390e048fb122e3b
+size 2082641

netpbm-10.35.74.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21ec64baccfb5a39b7ef886f61b69411c73d70c0e387133854259abf9d536812
-size 2083692

netpbm.changes

@@ -1,18 +1,3 @@
--------------------------------------------------------------------
-Tue Mar 30 12:33:31 CEST 2010 - pgajdos@suse.cz
-
-- updated to 10.35.74 (see doc/HISTORY)
-  * upstreamed or outdated
-    - colornames-init.diff (present in the code)
-    - endian.patch (tested against bnc#105431)
-    - pamtouil.patch (present in the code)
-    - ximtoppm-fixes.patch (present in the code)
-    - [partially, refreshed] fixes.patch
-    - pngtomng-transparent.patch (tested against bnc#225258)
-    - rgb.patch (/usr/share/X11/rgb.txt is in RGB_DB2 yet)
-  * .dif renamed to make.patch
-  * gcc45.patch merged into fixes.patch
-  
 -------------------------------------------------------------------
 Sat Feb 13 23:57:33 CET 2010 - rguenther@suse.de
 

netpbm.spec

@@ -29,31 +29,29 @@ AutoReqProv:    on
 Obsoletes:      netpbm-64bit
 %endif
 #
-Version:        10.35.74
+Version:        10.35.69
 Release:        3
 Summary:        A Powerful Graphics Conversion Package
 Source:         netpbm-%{version}.tar.bz2
 Source1:        netpbm-%{version}-documentation.tar.bz2
 Source2:        baselibs.conf
 Source3:        prepare-src-tarball
-# SUSE specific
-Patch0:         %{name}-%{version}-make.patch 
-# partially upstreamed in development version
-Patch1:         %{name}-%{version}-manpages.patch 
-# refused by upstream
-Patch2:         %{name}-%{version}-security.patch 
-# refused by upstream
-Patch3:         %{name}-%{version}-security2.patch 
-# refused by upstream
-Patch4:         %{name}-%{version}-pnmtopng-CAN-2978.patch 
-# don't know what it does so far
-Patch5:         %{name}-%{version}-tmpfile.patch 
-# asked upstream on 2010-04-01
-Patch6:         %{name}-%{version}-fixes.patch 
-# asked upstream on 2010-04-01
-Patch7:         %{name}-%{version}-pamscale.patch 
-# upstreamed in development version
-Patch8:         %{name}-%{version}-missing-file-close.patch 
+Patch:          netpbm-%{version}.dif
+Patch2:         netpbm-%{version}-manpages.patch
+Patch3:         netpbm-10.23-security.patch
+Patch4:         netpbm-10.22-security2.patch 
+Patch6:         netpbm-%{version}-tmpfile.patch
+Patch7:         netpbm-%{version}-colornames-init.diff
+Patch8:         netpbm-%{version}-fixes.patch
+Patch10:        netpbm-%{version}-endian.patch
+Patch11:        netpbm-%{version}-pnmtopng-CAN-2005-2978.patch
+Patch13:        netpbm-%{version}-ximtoppm-fixes.patch
+Patch15:        netpbm-%{version}-rgb.patch
+Patch16:        netpbm-%{version}-pamtouil.patch
+Patch17:        netpbm-%{version}-pnmtopng-transparent.patch
+Patch19:        netpbm-%{version}-pamscale.patch
+Patch20:        netpbm-%{version}-missing-file-close.patch
+Patch21:        netpbm-%{version}-gcc45.patch
 Url:            http://netpbm.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -108,15 +106,22 @@ source package.
 %setup
 %setup -D -q -a 1
 rm -rf libtiff
-%patch0
-%patch1
-%patch2 -p1
+%patch
+%patch2
 %patch3 -p1
-%patch4
-%patch5
+%patch4 -p1
 %patch6
-%patch7
+%patch7 -p1
 %patch8
+%patch10
+%patch11
+%patch13
+%patch15
+%patch16
+%patch17
+%patch19
+%patch20
+%patch21
 rm -rf converter/other/jpeg2000/libjasper/include #make sure the internal libjasper is not used
 mkdir -p pnmtopalm
 cd pnmtopalm