Hello community, here is the log from the commit of package xstereograph for openSUSE:Factory checked in at 2012-09-14 12:43:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xstereograph (Old) and /work/SRC/openSUSE:Factory/.xstereograph.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xstereograph", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xstereograph/xstereograph.changes 2011-09-23 12:52:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xstereograph.new/xstereograph.changes 2012-09-14 12:43:14.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 4 15:29:45 UTC 2012 - [email protected] + +- builds also with libpng15 + * libpng15.patch + +------------------------------------------------------------------- New: ---- xstereograph-2.1-libpng15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xstereograph.spec ++++++ --- /var/tmp/diff_new_pack.7MXUFr/_old 2012-09-14 12:43:15.000000000 +0200 +++ /var/tmp/diff_new_pack.7MXUFr/_new 2012-09-14 12:43:15.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xstereograph (Version 2.1) +# spec file for package xstereograph # -# Copyright (c) 2009 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 @@ -15,18 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: xstereograph -BuildRequires: libpng-devel xaw3d-devel xorg-x11 xorg-x11-devel +BuildRequires: libpng-devel +BuildRequires: xaw3d-devel +BuildRequires: xorg-x11 +BuildRequires: xorg-x11-devel %define version_libsx 2.03 Summary: Stereogram generator -Group: Amusements/Games/Other License: GPL-2.0+ ; LGPL-2.1+ -Requires: xless ImageMagick emacs-x11 +Group: Amusements/Games/Other +Requires: ImageMagick +Requires: emacs-x11 +Requires: xless Version: 2.1 -Release: 788 +Release: 0 Url: http://freshmeat.net/projects/xstereograph/ Source0: %{name}-%{version}.tar.bz2 Source1: libsx-%{version_libsx}.tar.bz2 @@ -36,6 +39,8 @@ Patch3: %{name}-%{version}-dialogs.patch Patch4: %{name}-%{version}-gcc4.patch Patch5: %{name}-%{version}-uninitialized.patch +# libpng15.patch not sent to upstream (is project alive?) +Patch6: %{name}-%{version}-libpng15.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +66,7 @@ %patch3 %patch4 %patch5 +%patch6 %build # This package failed when testing with -Wl,-as-needed being default. ++++++ xstereograph-2.1-libpng15.patch ++++++ Index: stereograph-0.28a/gfxio.c =================================================================== --- stereograph-0.28a/gfxio.c +++ stereograph-0.28a/gfxio.c @@ -315,7 +315,7 @@ int Read_PNG (FILE *ifile, unsigned char } /* libpng error handling */ - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); if(verbose) printf("FAILED;\n"); else fprintf(stderr, "reading gfx data...FAILED\n"); fprintf(stderr, "libpng reported an error!\n"); @@ -415,7 +415,7 @@ int Write_PNG (FILE *ofile, struct GFX_D } /* libpng error handling */ - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_write_struct(&png_ptr, &info_ptr); if(verbose) printf("FAILED;\n"); else fprintf(stderr, "writing gfx data...FAILED\n"); fprintf(stderr, "libpng reported an error!\n"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
