Hello community, here is the log from the commit of package netpbm for openSUSE:Factory checked in at Fri Sep 3 13:15:13 CEST 2010. -------- --- netpbm/netpbm.changes 2010-04-06 11:25:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/netpbm/netpbm.changes 2010-09-01 11:16:42.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Sep 1 11:13:33 CEST 2010 - pgajdos@suse.cz + +- updated to 10.35.76: + * Pnmtopng: -libversion doesn't report level of linked libz. + * don't fail due to SIGRTMIN, SIGRTMAX being undefined. + * palmtopnm: fix for pixel size 16. Thanks Paul Bolle + <pebolle@tiscali.nl>. + * fix -reduce. Introduced in 10.27. +- build against libpng14 + * libpng14.patch + +------------------------------------------------------------------- +Tue Aug 31 03:55:28 UTC 2010 - cristian.rodriguez@opensuse.org + +- Do not include build date in binaries + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 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-security2.patch netpbm-10.35.74-security.patch netpbm-10.35.74.tar.bz2 netpbm-10.35.74-tmpfile.patch New: ---- netpbm-10.35.76-documentation.tar.bz2 netpbm-10.35.76-fixes.patch netpbm-10.35.76-libpng14.patch netpbm-10.35.76-make.patch netpbm-10.35.76-manpages.patch netpbm-10.35.76-missing-file-close.patch netpbm-10.35.76-pamscale.patch netpbm-10.35.76-pnmtopng-CAN-2978.patch netpbm-10.35.76-security2.patch netpbm-10.35.76-security.patch netpbm-10.35.76.tar.bz2 netpbm-10.35.76-tmpfile.patch netpbm-no-build-date.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netpbm.spec ++++++ --- /var/tmp/diff_new_pack.4R3Kgn/_old 2010-09-03 13:13:53.000000000 +0200 +++ /var/tmp/diff_new_pack.4R3Kgn/_new 2010-09-03 13:13:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package netpbm (Version 10.35.74) +# spec file for package netpbm (Version 10.35.76) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: netpbm # regarding to libpng: netpbm is compatible with libpng14 from version 10.48 -BuildRequires: flex libjasper-devel libpng12-compat-devel libtiff-devel python +BuildRequires: flex libjasper-devel libpng-devel libtiff-devel python License: LGPLv2.1+ Group: Productivity/Graphics/Convertors Provides: pbmplus @@ -30,8 +30,8 @@ Obsoletes: netpbm-64bit %endif # -Version: 10.35.74 -Release: 2 +Version: 10.35.76 +Release: 1 Summary: A Powerful Graphics Conversion Package Source: netpbm-%{version}.tar.bz2 Source1: netpbm-%{version}-documentation.tar.bz2 @@ -55,6 +55,10 @@ Patch7: %{name}-%{version}-pamscale.patch # upstreamed in development version Patch8: %{name}-%{version}-missing-file-close.patch +# no build date +Patch9: netpbm-no-build-date.patch +# new versions build against libpng14 +Patch10: %{name}-%{version}-libpng14.patch Url: http://netpbm.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -118,6 +122,8 @@ %patch6 %patch7 %patch8 +%patch9 +%patch10 -p1 rm -rf converter/other/jpeg2000/libjasper/include #make sure the internal libjasper is not used mkdir -p pnmtopalm cd pnmtopalm ++++++ netpbm-10.35.74-documentation.tar.bz2 -> netpbm-10.35.76-documentation.tar.bz2 ++++++ ++++ no output (probably identical) ++++++ netpbm-10.35.74-fixes.patch -> netpbm-10.35.76-fixes.patch ++++++ ++++++ netpbm-10.35.76-libpng14.patch ++++++ Index: netpbm-10.35.76/converter/other/pnmtopng.c =================================================================== --- netpbm-10.35.76.orig/converter/other/pnmtopng.c +++ netpbm-10.35.76/converter/other/pnmtopng.c @@ -69,12 +69,6 @@ #include "nstring.h" #include "version.h" -#if PNG_LIBPNG_VER >= 10400 -#error Your PNG library (<png.h>) is incompatible with this Netpbm source code. -#error You need either an older PNG library (older than 1.4) -#error newer Netpbm source code (at least 10.48) -#endif - struct zlibCompression { /* These are parameters that describe a form of zlib compression. @@ -2612,7 +2606,7 @@ convertpnm(struct cmdlineInfo const cmdl info_ptr->num_palette = palette_size; if (trans_size > 0) { info_ptr->valid |= PNG_INFO_tRNS; - info_ptr->trans = trans; + info_ptr->trans_alpha = trans; info_ptr->num_trans = trans_size; /* omit opaque values */ } /* creating hIST chunk */ @@ -2649,7 +2643,7 @@ convertpnm(struct cmdlineInfo const cmdl info_ptr->color_type == PNG_COLOR_TYPE_RGB) { if (transparent > 0) { info_ptr->valid |= PNG_INFO_tRNS; - info_ptr->trans_values = + info_ptr->trans_color = xelToPngColor_16(transcolor, maxval, png_maxval); } } else { @@ -2661,10 +2655,10 @@ convertpnm(struct cmdlineInfo const cmdl if (info_ptr->valid && PNG_INFO_tRNS) pm_message("Transparent color {gray, red, green, blue} = " "{%d, %d, %d, %d}", - info_ptr->trans_values.gray, - info_ptr->trans_values.red, - info_ptr->trans_values.green, - info_ptr->trans_values.blue); + info_ptr->trans_color.gray, + info_ptr->trans_color.red, + info_ptr->trans_color.green, + info_ptr->trans_color.blue); else pm_message("No transparent color"); } Index: netpbm-10.35.76/converter/other/pngtopnm.c =================================================================== --- netpbm-10.35.76.orig/converter/other/pngtopnm.c +++ netpbm-10.35.76/converter/other/pngtopnm.c @@ -44,12 +44,6 @@ #include "nstring.h" #include "shhopt.h" -#if PNG_LIBPNG_VER >= 10400 -#error Your PNG library (<png.h>) is incompatible with this Netpbm source code. -#error You need either an older PNG library (older than 1.4) -#error newer Netpbm source code (at least 10.48) -#endif - typedef struct _jmpbuf_wrapper { jmp_buf jmpbuf; } jmpbuf_wrapper; @@ -482,7 +476,7 @@ isTransparentColor(pngcolor const colo bool retval; if (info_ptr->valid & PNG_INFO_tRNS) { - const png_color_16 * const transColorP = &info_ptr->trans_values; + const png_color_16 * const transColorP = &info_ptr->trans_color; /* There seems to be a problem here: you can't compare real @@ -575,8 +569,8 @@ paletteHasPartialTransparency(png_info * for (i = 0, foundGray = FALSE; i < info_ptr->num_trans && !foundGray; ++i) { - if (info_ptr->trans[i] != 0 && - info_ptr->trans[i] != maxval) { + if (info_ptr->trans_alpha[i] != 0 && + info_ptr->trans_alpha[i] != maxval) { foundGray = TRUE; } } @@ -647,7 +641,7 @@ setupSignificantBits(png_struct * unsigned int i; trans_mix = TRUE; for (i = 0; i < info_ptr->num_trans; ++i) - if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) { + if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) { trans_mix = FALSE; break; } @@ -885,7 +879,7 @@ writePnm(FILE * const ofP, setXel(&xelrow[col], fgColor, bgColor, alpha_handling, ((info_ptr->valid & PNG_INFO_tRNS) && (fgColor.r == - gamma_correct(info_ptr->trans_values.gray, + gamma_correct(info_ptr->trans_color.gray, totalgamma))) ? 0 : maxval); } @@ -914,7 +908,7 @@ writePnm(FILE * const ofP, setXel(&xelrow[col], fgColor, bgColor, alpha_handling, (info_ptr->valid & PNG_INFO_tRNS) && index < info_ptr->num_trans ? - info_ptr->trans[index] : maxval); + info_ptr->trans_alpha[index] : maxval); } break; ++++++ netpbm-10.35.74-make.patch -> netpbm-10.35.76-make.patch ++++++ ++++++ netpbm-10.35.74-manpages.patch -> netpbm-10.35.76-manpages.patch ++++++ ++++++ netpbm-10.35.74-missing-file-close.patch -> netpbm-10.35.76-missing-file-close.patch ++++++ ++++++ netpbm-10.35.74-pamscale.patch -> netpbm-10.35.76-pamscale.patch ++++++ ++++++ netpbm-10.35.74-pnmtopng-CAN-2978.patch -> netpbm-10.35.76-pnmtopng-CAN-2978.patch ++++++ ++++++ netpbm-10.35.74-security2.patch -> netpbm-10.35.76-security2.patch ++++++ ++++++ netpbm-10.35.74-security2.patch -> netpbm-10.35.76-security.patch ++++++ ++++ 2247 lines (skipped) ++++ between netpbm/netpbm-10.35.74-security2.patch ++++ and /mounts/work_src_done/STABLE/netpbm/netpbm-10.35.76-security.patch ++++++ netpbm-10.35.74-documentation.tar.bz2 -> netpbm-10.35.76.tar.bz2 ++++++ ++++ 373363 lines of diff (skipped) ++++++ netpbm-10.35.74-tmpfile.patch -> netpbm-10.35.76-tmpfile.patch ++++++ ++++++ netpbm-no-build-date.patch ++++++ Index: buildtools/stamp-date =================================================================== --- buildtools/stamp-date.orig 2006-08-18 23:12:28.000000000 -0400 +++ buildtools/stamp-date 2010-08-30 23:51:36.999688787 -0400 @@ -19,5 +19,3 @@ fi echo "/* This file tells the package when it was compiled */" echo "/* DO NOT EDIT - THIS FILE IS MAINTAINED AUTOMATICALLY */" echo "/* Created by the program 'stamp-date' */" -echo "#define COMPILE_TIME \"$DATE\"" -echo "#define COMPILED_BY \"$USER\"" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org