Hello community, here is the log from the commit of package xmgrace for openSUSE:Factory:NonFree checked in at 2012-09-05 19:59:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/xmgrace (Old) and /work/SRC/openSUSE:Factory:NonFree/.xmgrace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmgrace", Maintainer is "frei...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/xmgrace/xmgrace.changes 2012-06-13 13:33:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.xmgrace.new/xmgrace.changes 2012-09-05 19:59:26.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 4 15:49:43 UTC 2012 - pgaj...@suse.com + +- builds also with libpng15 + * libpng15.patch + +------------------------------------------------------------------- New: ---- xmgrace-libpng15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmgrace.spec ++++++ --- /var/tmp/diff_new_pack.3on2of/_old 2012-09-05 19:59:29.000000000 +0200 +++ /var/tmp/diff_new_pack.3on2of/_new 2012-09-05 19:59:29.000000000 +0200 @@ -32,6 +32,8 @@ Patch0: xmgrace-null.patch Patch1: xmgrace-strip.patch Patch2: xmgrace-help.patch +# libpng15.patch: project seems not to be alive, not sent upstream +Patch3: xmgrace-libpng15.patch Url: http://plasma-gate.weizmann.ac.il/Grace/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +70,7 @@ %patch0 -p0 %patch1 %patch2 +%patch3 %build CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=/usr/%{_lib} --enable-grace-home=/usr/%{_lib}/xmgrace --bindir=/usr/bin --with-helpviewer="/usr/bin/desktop-launch %s" --mandir=%{_mandir} ++++++ xmgrace-libpng15.patch ++++++ --- src/rstdrv.c 2004-07-03 22:47:46.000000000 +0200 +++ src/rstdrv.c.new 2012-09-04 17:46:08.325843443 +0200 @@ -54,6 +54,7 @@ #ifdef HAVE_LIBPNG # include <png.h> +# include <zlib.h> #endif #ifndef NONE_GUI @@ -885,7 +886,7 @@ static void rstImagePng(gdImagePtr ihand return; } - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_write_struct(&png_ptr, &info_ptr); return; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
