Hello community, here is the log from the commit of package khunphan for openSUSE:Factory checked in at 2012-09-06 08:52:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khunphan (Old) and /work/SRC/openSUSE:Factory/.khunphan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "khunphan", Maintainer is "p...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/khunphan/khunphan.changes 2012-01-24 12:19:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.khunphan.new/khunphan.changes 2012-09-06 08:52:52.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 30 14:09:33 UTC 2012 - pgaj...@suse.com + +- build also with libpng15 + * libpng15.patch + +------------------------------------------------------------------- New: ---- khunphan-libpng15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khunphan.spec ++++++ --- /var/tmp/diff_new_pack.PHMbWy/_old 2012-09-06 08:52:53.000000000 +0200 +++ /var/tmp/diff_new_pack.PHMbWy/_new 2012-09-06 08:52:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package khunphan # -# 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 @@ -16,7 +16,6 @@ # - Name: khunphan BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel @@ -29,6 +28,8 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11-Mesa-devel Summary: Traditional Thai Puzzle Board Game in 3D with Wooden Blocks +License: GPL-2.0+ +Group: Amusements/Games/3D/Other Version: 0.55 Release: 0 Source0: http://www.ibiblio.org/pub/Linux/games/strategy/khunphan-0.55.tar.bz2 @@ -38,9 +39,9 @@ Patch1: khunphan-freeglut.diff Patch2: khunphan-DESTDIR.diff Patch3: khunphan-0.55-png_uint_32.diff -Group: Amusements/Games/3D/Other -License: GPL-2.0+ -URL: http://geocities.com/khunphangame/ +# PATCH-FIX-UPSTREAM khunphan-libpng15.patch pgaj...@suse.com -- Support building with libpng15 (not sent upstream, no activity) +Patch4: khunphan-libpng15.patch +Url: http://geocities.com/khunphangame/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _bindir /usr/games/ %define _datadir /usr/share/games/ @@ -65,6 +66,7 @@ %patch1 %patch2 %patch3 +%patch4 -p1 chmod -x khunphan/{*.cpp,*.h} rm -f aclocal.m4 acinclude.m4 configure.files configure.in* cp %{S:2} . ++++++ khunphan-libpng15.patch ++++++ Index: khunphan-0.55/khunphan/btexture.cpp =================================================================== --- khunphan-0.55.orig/khunphan/btexture.cpp +++ khunphan-0.55/khunphan/btexture.cpp @@ -24,6 +24,7 @@ #include <windows.h> #endif #include <png.h> +#include <zlib.h> #include "misc1.h" #include "btexture.h" @@ -447,7 +448,7 @@ bool BTexture::WriteTextureToPngFile (FI return false; } - if (setjmp(png_ptr->jmpbuf)) { + if (png_jmpbuf(png_ptr)) { png_destroy_write_struct(&png_ptr, &info_ptr); return false; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
