[crossfire-client] libpng15

Jon Ciesla limb at fedoraproject.org
Thu Jan 12 15:41:26 UTC 2012


commit df14318be39f21bccd6c42220fd660924352375f
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jan 12 09:40:27 2012 -0600

    libpng15

 crossfire-client-1.60.0-libpng15.patch |   11 +++++++++++
 crossfire-client.spec                  |    2 ++
 2 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/crossfire-client-1.60.0-libpng15.patch b/crossfire-client-1.60.0-libpng15.patch
new file mode 100644
index 0000000..8274c1c
--- /dev/null
+++ b/crossfire-client-1.60.0-libpng15.patch
@@ -0,0 +1,11 @@
+--- gtk-v2/src/png.c~	2011-01-28 00:17:57.000000000 -0600
++++ gtk-v2/src/png.c	2012-01-12 09:33:20.726502381 -0600
+@@ -571,7 +571,7 @@
+         png_destroy_read_struct (&png_ptr, NULL, NULL);
+         return PNGX_OUTOFMEM;
+     }
+-    if (setjmp (png_ptr->jmpbuf)) {
++    if (setjmp (png_jmpbuf(png_ptr))) {
+         png_destroy_read_struct (&png_ptr, &info_ptr,NULL);
+         return PNGX_DATA;
+     }
diff --git a/crossfire-client.spec b/crossfire-client.spec
index ad612c6..ca8f7a6 100644
--- a/crossfire-client.spec
+++ b/crossfire-client.spec
@@ -7,6 +7,7 @@ License: GPLv2+
 URL: http://crossfire.real-time.com
 Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz
 Patch0: crossfire-client-1.11.0-curl.patch
+Patch1: crossfire-client-1.60.0-libpng15.patch
 BuildRequires: SDL-devel SDL_image-devel
 BuildRequires: gtk+-devel gtk2-devel libpng-devel curl-devel
 BuildRequires: desktop-file-utils ImageMagick
@@ -29,6 +30,7 @@ package.
 %setup -q
 
 %patch0 -p0
+%patch1 -p0
 
 for size in 48x48 32x32 16x16 ; do 
     convert -transparent white pixmaps/${size}.png temp.png


More information about the scm-commits mailing list