commit netpbm for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package netpbm for openSUSE:Factory checked in at Fri Apr 2 00:05:29 CEST 2010. -------- --- netpbm/netpbm.changes 2010-02-13 23:58:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/netpbm/netpbm.changes 2010-04-01 19:05:40.000000000 +0200 @@ -1,0 +2,15 @@ +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 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- netpbm-10.22-security2.patch netpbm-10.23-security.patch netpbm-10.35.69-colornames-init.diff netpbm-10.35.69-documentation.tar.bz2 netpbm-10.35.69-endian.patch netpbm-10.35.69-fixes.patch netpbm-10.35.69-gcc45.patch netpbm-10.35.69-manpages.patch netpbm-10.35.69-missing-file-close.patch netpbm-10.35.69-pamscale.patch netpbm-10.35.69-pamtouil.patch netpbm-10.35.69-pnmtopng-CAN-2005-2978.patch netpbm-10.35.69-pnmtopng-transparent.patch netpbm-10.35.69-rgb.patch netpbm-10.35.69-tmpfile.patch netpbm-10.35.69-ximtoppm-fixes.patch netpbm-10.35.69.dif netpbm-10.35.69.tar.bz2 New: ---- netpbm-10.35.74-documentation.tar.bz2 netpbm-10.35.74-fixes.patch netpbm-10.35.74-make.patch netpbm-10.35.74-manpages.patch netpbm-10.35.74-missing-file-close.patch netpbm-10.35.74-pamscale.patch netpbm-10.35.74-pnmtopng-CAN-2978.patch netpbm-10.35.74-security.patch netpbm-10.35.74-security2.patch netpbm-10.35.74-tmpfile.patch netpbm-10.35.74.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netpbm.spec ++++++ --- /var/tmp/diff_new_pack.aIs0s8/_old 2010-04-02 00:02:21.000000000 +0200 +++ /var/tmp/diff_new_pack.aIs0s8/_new 2010-04-02 00:02:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package netpbm (Version 10.35.69) +# spec file for package netpbm (Version 10.35.74) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,29 +29,31 @@ Obsoletes: netpbm-64bit %endif # -Version: 10.35.69 -Release: 3 +Version: 10.35.74 +Release: 1 Summary: A Powerful Graphics Conversion Package Source: netpbm-%{version}.tar.bz2 Source1: netpbm-%{version}-documentation.tar.bz2 Source2: baselibs.conf Source3: prepare-src-tarball -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 +# 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 Url: http://netpbm.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -106,22 +108,15 @@ %setup %setup -D -q -a 1 rm -rf libtiff -%patch -%patch2 +%patch0 +%patch1 +%patch2 -p1 %patch3 -p1 -%patch4 -p1 +%patch4 +%patch5 %patch6 -%patch7 -p1 +%patch7 %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 ++++++ netpbm-10.35.69-documentation.tar.bz2 -> netpbm-10.35.74-documentation.tar.bz2 ++++++ ++++ no output (probably identical) ++++++ netpbm-10.35.69-fixes.patch -> netpbm-10.35.74-fixes.patch ++++++ --- netpbm/netpbm-10.35.69-fixes.patch 2009-11-24 18:56:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/netpbm/netpbm-10.35.74-fixes.patch 2010-04-01 19:05:33.000000000 +0200 @@ -1,6 +1,8 @@ ---- buildtools/Makefile +Index: buildtools/Makefile +=================================================================== +--- buildtools/Makefile.orig +++ buildtools/Makefile -@@ -34,10 +34,10 @@ +@@ -34,10 +34,10 @@ libopt.o: libopt.c -o $@ $< typegen.o endiangen.o:%.o:%.c @@ -13,19 +15,21 @@ distclean clean: cleanlocal .PHONY: cleanlocal ---- converter/other/fiasco/codec/dfiasco.c +Index: converter/other/fiasco/codec/dfiasco.c +=================================================================== +--- converter/other/fiasco/codec/dfiasco.c.orig +++ converter/other/fiasco/codec/dfiasco.c -@@ -16,6 +16,9 @@ +@@ -15,6 +15,7 @@ + */ #include <string.h> - -+#include <string.h> +#include <stdlib.h> -+ + #include "config.h" - #include "types.h" ---- converter/other/fiasco/input/basis.c +Index: converter/other/fiasco/input/basis.c +=================================================================== +--- converter/other/fiasco/input/basis.c.orig +++ converter/other/fiasco/input/basis.c @@ -14,6 +14,7 @@ * $State: Exp $ @@ -35,9 +39,11 @@ #include "config.h" #include "types.h" ---- converter/other/fitstopnm.c +Index: converter/other/fitstopnm.c +=================================================================== +--- converter/other/fitstopnm.c.orig +++ converter/other/fitstopnm.c -@@ -444,7 +444,7 @@ +@@ -444,7 +444,7 @@ read_val (fp, bitpix, vp) c[i] = ich; } swapbytes(c, 4); @@ -46,7 +52,7 @@ break; case -64: -@@ -455,7 +455,7 @@ +@@ -455,7 +455,7 @@ read_val (fp, bitpix, vp) c[i] = ich; } swapbytes(c, 8); @@ -55,9 +61,11 @@ break; default: ---- converter/other/jpegtopnm.c +Index: converter/other/jpegtopnm.c +=================================================================== +--- converter/other/jpegtopnm.c.orig +++ converter/other/jpegtopnm.c -@@ -511,6 +511,7 @@ +@@ -511,6 +511,7 @@ set_color_spaces(const J_COLOR_SPACE jpe pm_error("Input JPEG image has 'unknown' color space " "(JCS_UNKNOWN).\n" "We cannot interpret this image."); @@ -65,7 +73,7 @@ break; case JCS_GRAYSCALE: *output_type_p = PGM_TYPE; -@@ -538,6 +539,7 @@ +@@ -538,6 +539,7 @@ set_color_spaces(const J_COLOR_SPACE jpe default: pm_error("Internal error: unknown color space code %d passed " "to set_color_spaces().", jpeg_color_space); @@ -73,9 +81,11 @@ } pm_message("WRITING %s FILE", *output_type_p == PPM_TYPE ? "PPM" : "PGM"); ---- converter/other/pamtopfm.c +Index: converter/other/pamtopfm.c +=================================================================== +--- converter/other/pamtopfm.c.orig +++ converter/other/pamtopfm.c -@@ -149,12 +149,12 @@ +@@ -149,12 +149,12 @@ floatToPfmSample(float const input Type converter -----------------------------------------------------------------------------*/ if (machineEndianness == pfmEndianness) { @@ -90,7 +100,7 @@ for (i = 0, j = sizeof(pfmSample)-1; i < sizeof(pfmSample); -@@ -239,6 +239,7 @@ +@@ -239,6 +239,7 @@ makePfmHeader(const struct pam * const p enum endian const endian) { struct pfmHeader pfmHeader; @@ -98,9 +108,11 @@ pfmHeader.width = pamP->width; pfmHeader.height = pamP->height; ---- converter/other/pamtosvg/curve.c +Index: converter/other/pamtosvg/curve.c +=================================================================== +--- converter/other/pamtosvg/curve.c.orig +++ converter/other/pamtosvg/curve.c -@@ -222,9 +222,7 @@ +@@ -222,9 +222,7 @@ curve_list_type new_curve_list (void) { curve_list_type curve_list; @@ -111,9 +123,11 @@ return curve_list; } ---- converter/other/pamtosvg/pxl-outline.c +Index: converter/other/pamtosvg/pxl-outline.c +=================================================================== +--- converter/other/pamtosvg/pxl-outline.c.orig +++ converter/other/pamtosvg/pxl-outline.c -@@ -262,6 +262,9 @@ +@@ -262,6 +262,9 @@ find_one_centerline(bitmap_type const outline.open = false; outline.color = getBitmapColor(bitmap, original_row, original_col); @@ -123,7 +137,7 @@ /* 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 @@ +@@ -272,9 +275,6 @@ find_one_centerline(bitmap_type const LOG2(" (%d,%d)", pos.col, pos.row); append_outline_pixel(&outline, pos); } @@ -133,7 +147,7 @@ for ( ; ; ) { unsigned int const prev_row = row; -@@ -527,6 +527,7 @@ +@@ -527,6 +527,7 @@ new_pixel_outline (void) { pixel_outline_type pixel_outline; @@ -141,9 +155,11 @@ O_LENGTH (pixel_outline) = 0; pixel_outline.data = NULL; pixel_outline.open = false; ---- converter/other/pamtosvg/spline.c +Index: converter/other/pamtosvg/spline.c +=================================================================== +--- converter/other/pamtosvg/spline.c.orig +++ converter/other/pamtosvg/spline.c -@@ -80,6 +80,7 @@ +@@ -80,6 +80,7 @@ spline_list_type empty_spline_list (void) { spline_list_type answer; @@ -151,7 +167,7 @@ SPLINE_LIST_DATA (answer) = NULL; SPLINE_LIST_LENGTH (answer) = 0; return answer; -@@ -153,6 +154,7 @@ +@@ -153,6 +154,7 @@ spline_list_array_type new_spline_list_array (void) { spline_list_array_type answer; @@ -159,19 +175,11 @@ SPLINE_LIST_ARRAY_DATA (answer) = NULL; SPLINE_LIST_ARRAY_LENGTH (answer) = 0; ---- 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 +Index: converter/other/pamtouil.c +=================================================================== +--- converter/other/pamtouil.c.orig +++ converter/other/pamtouil.c -@@ -376,11 +376,15 @@ +@@ -376,11 +376,15 @@ freeCmap(cixel_map cmap[], unsigned int int i; for (i = 0; i < ncolors; ++i) { @@ -190,9 +198,11 @@ } } ---- converter/other/pgmtopbm.c +Index: converter/other/pgmtopbm.c +=================================================================== +--- converter/other/pgmtopbm.c.orig +++ converter/other/pgmtopbm.c -@@ -549,6 +549,8 @@ +@@ -549,6 +549,8 @@ createDither8Converter(unsigned int cons converter.cols = cols; converter.convertRow = &dither8ConvertRow; converter.destroy = NULL; @@ -201,7 +211,7 @@ /* Scale dither matrix. */ for (row = 0; row < 16; ++row) { -@@ -622,6 +624,7 @@ +@@ -622,6 +624,7 @@ createClusterConverter(unsigned int cons converter.cols = cols; converter.convertRow = &clusterConvertRow; converter.destroy = &clusterDestroy; @@ -209,9 +219,11 @@ MALLOCVAR_NOFAIL(stateP); ---- converter/other/pnmtopng.c +Index: converter/other/pnmtopng.c +=================================================================== +--- converter/other/pnmtopng.c.orig +++ converter/other/pnmtopng.c -@@ -506,6 +506,7 @@ +@@ -513,6 +513,7 @@ xelToPngColor_16(xel const input, retval.green = PPM_GETG(scaled); retval.blue = PPM_GETB(scaled); retval.gray = PNM_GET1(scaled); @@ -219,9 +231,11 @@ return retval; } ---- converter/other/rletopnm.c +Index: converter/other/rletopnm.c +=================================================================== +--- converter/other/rletopnm.c.orig +++ converter/other/rletopnm.c -@@ -101,7 +101,7 @@ +@@ -101,7 +101,7 @@ parseCommandLine(int argc, char ** argv, optStruct3 opt; unsigned int option_def_index; @@ -230,9 +244,11 @@ MALLOCARRAY(option_def, 100); ---- converter/ppm/ximtoppm.c +Index: converter/ppm/ximtoppm.c +=================================================================== +--- converter/ppm/ximtoppm.c.orig +++ converter/ppm/ximtoppm.c -@@ -44,7 +44,7 @@ +@@ -44,7 +44,7 @@ parseCommandLine(int argc, char ** argv, unsigned int option_def_index; @@ -241,7 +257,9 @@ option_def_index = 0; /* incremented by OPTENT3 */ OPTENT3(0, "alphaout", OPT_STRING, ---- lib/pm.h +Index: lib/pm.h +=================================================================== +--- lib/pm.h.orig +++ lib/pm.h @@ -21,6 +21,7 @@ #include <errno.h> @@ -251,11 +269,26 @@ #ifdef VMS #include <perror.h> ---- lib/util/wordaccess_64_le.h +Index: lib/util/wordaccess_64_le.h +=================================================================== +--- lib/util/wordaccess_64_le.h.orig +++ lib/util/wordaccess_64_le.h -@@ -49,4 +49,5 @@ +@@ -49,4 +49,5 @@ wordintClz(wordint const x){ 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.74-make.patch ++++++ --- Makefile.config.in +++ Makefile.config.in @@ -108,7 +108,7 @@ #OSF1: #INSTALL = $(SRCDIR)/buildtools/installosf #Red Hat Linux: -#INSTALL = install +INSTALL = install # STRIPFLAG is the option you pass to the above install program to make it # strip unnecessary information out of binaries. @@ -283,7 +283,7 @@ CFLAGS_SHLIB = # Gcc: #CFLAGS_SHLIB = -fpic -#CFLAGS_SHLIB = -fPIC +CFLAGS_SHLIB = -fPIC # Sun compiler: #CFLAGS_SHLIB = -Kpic #CFLAGS_SHLIB = -KPIC @@ -350,7 +350,7 @@ # The TIFF library. See above. If you want to build the tiff # converters, you must have the tiff library already installed. -TIFFLIB = NONE +TIFFLIB = libtiff.so TIFFHDR_DIR = #TIFFLIB = libtiff.so @@ -382,7 +382,7 @@ # JPEG stuff statically linked in, in which case you won't need # JPEGLIB in order to build the Tiff converters. -JPEGLIB = NONE +JPEGLIB = libjpeg.so JPEGHDR_DIR = #JPEGLIB = libjpeg.so #JPEGHDR_DIR = /usr/include/jpeg @@ -432,7 +432,7 @@ # # If you have 'libpng-config' (see above), these are irrelevant. -ZLIB = NONE +ZLIB = libz.so ZHDR_DIR = #ZLIB = libz.so ++++++ netpbm-10.35.69-manpages.patch -> netpbm-10.35.74-manpages.patch ++++++ ++++++ netpbm-10.35.69-missing-file-close.patch -> netpbm-10.35.74-missing-file-close.patch ++++++ ++++++ netpbm-10.35.69-pamscale.patch -> netpbm-10.35.74-pamscale.patch ++++++ ++++++ netpbm-10.35.69-pnmtopng-CAN-2005-2978.patch -> netpbm-10.35.74-pnmtopng-CAN-2978.patch ++++++ ++++++ netpbm-10.22-security2.patch -> netpbm-10.35.74-security.patch ++++++ ++++ 2247 lines (skipped) ++++ between netpbm/netpbm-10.22-security2.patch ++++ and /mounts/work_src_done/STABLE/netpbm/netpbm-10.35.74-security.patch ++++++ netpbm-10.22-security2.patch -> netpbm-10.35.74-security2.patch ++++++ ++++++ netpbm-10.35.69-tmpfile.patch -> netpbm-10.35.74-tmpfile.patch ++++++ ++++++ netpbm-10.35.69-documentation.tar.bz2 -> netpbm-10.35.74.tar.bz2 ++++++ ++++ 373290 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de