Hello community, here is the log from the commit of package pngtoico for openSUSE:Factory checked in at 2012-01-09 11:17:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pngtoico (Old) and /work/SRC/openSUSE:Factory/.pngtoico.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pngtoico", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/pngtoico/pngtoico.changes 2011-12-25 17:40:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pngtoico.new/pngtoico.changes 2012-01-09 11:17:08.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 5 13:33:24 UTC 2012 - [email protected] + +- build also with libpng15 + * libpng15.patch + +------------------------------------------------------------------- New: ---- pngtoico-libpng15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pngtoico.spec ++++++ --- /var/tmp/diff_new_pack.Qf9uz7/_old 2012-01-09 11:17:08.000000000 +0100 +++ /var/tmp/diff_new_pack.Qf9uz7/_new 2012-01-09 11:17:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pngtoico # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,9 @@ Source0: %{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE pngtoico-makefile.patch -- adjusts path and linkage Patch0: %{name}-makefile.patch +# PATCH-FIX-UPSTREAM pngtoico-libpng15.patch -- [email protected]; build with libpng15; sent today to [email protected] +# build against libpng14 should not be affected, otherwise please let me know +Patch1: %{name}-libpng15.patch BuildRequires: libpng-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,6 +38,7 @@ %prep %setup -q %patch0 +%patch1 -p1 %build make CFLAGS="%{optflags}" ++++++ pngtoico-libpng15.patch ++++++ Index: pngtoico-1.0.1/pngtoico.c =================================================================== --- pngtoico-1.0.1.orig/pngtoico.c +++ pngtoico-1.0.1/pngtoico.c @@ -188,7 +188,7 @@ read_png(const char *file) goto perrexit; } - if ( setjmp(png_ptr->jmpbuf) ) { + if ( setjmp(png_jmpbuf(png_ptr)) ) { fprintf(stderr, "%s: PNG format error\n", file); goto errexit; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
