packages: corona/corona.spec, corona/corona-libpng15.patch (NEW)=?UTF-8?Q?=20?=- release ...

[adamg]

Author: adamg                        Date: Thu Feb  9 17:29:55 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- release 6 (rebuild against libpng-1.5)

---- Files affected:
packages/corona:
   corona.spec (1.7 -> 1.8) , corona-libpng15.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/corona/corona.spec
diff -u packages/corona/corona.spec:1.7 packages/corona/corona.spec:1.8
--- packages/corona/corona.spec:1.7	Tue Feb  7 22:58:46 2012
+++ packages/corona/corona.spec	Thu Feb  9 18:29:50 2012
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Biblioteka wejścia/wyjścia dla obrazów
 Name:		corona
 Version:	1.0.2
-Release:	5
+Release:	6
 License:	zlib
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/corona/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Patch0:		%{name}-system-gif.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-gcc43.patch
+Patch3:		%{name}-libpng15.patch
 URL:		http://corona.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -72,6 +73,7 @@
 %patch1 -p1
 dos2unix src/OpenTGA.cpp
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -117,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2012/02/09 17:29:50  adamg
+- release 6 (rebuild against libpng-1.5)
+
 Revision 1.7  2012/02/07 21:58:46  arekm
 - release 5
 

================================================================
Index: packages/corona/corona-libpng15.patch
diff -u /dev/null packages/corona/corona-libpng15.patch:1.1
--- /dev/null	Thu Feb  9 18:29:55 2012
+++ packages/corona/corona-libpng15.patch	Thu Feb  9 18:29:50 2012
@@ -0,0 +1,21 @@
+--- corona-1.0.2/src/OpenPNG.cpp~	2002-12-26 02:52:21.000000000 +0100
++++ corona-1.0.2/src/OpenPNG.cpp	2012-02-09 18:24:26.329842098 +0100
+@@ -39,7 +39,7 @@
+   void PNG_error_function(png_structp png_ptr, png_const_charp warning) {
+     // copied from libpng's pngerror.cpp, but without the fprintf
+     jmp_buf jmpbuf;
+-    memcpy(jmpbuf, png_ptr->jmpbuf, sizeof(jmp_buf));
++    memcpy(jmpbuf, png_jmpbuf(png_ptr), sizeof(jmp_buf));
+     longjmp(jmpbuf, 1);
+   }
+ 
+--- corona-1.0.2/src/SavePNG.cpp~	2003-07-17 01:09:48.000000000 +0200
++++ corona-1.0.2/src/SavePNG.cpp	2012-02-09 18:28:20.597717016 +0100
+@@ -145,7 +145,6 @@
+       pixels += width * color_format_bpp;      
+     }
+     png_set_rows(png_ptr, info_ptr, (png_bytepp)rows);
+-    info_ptr->valid |= PNG_INFO_IDAT;
+ 
+     // actually write the image
+     png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/corona/corona.spec?r1=1.7&r2=1.8&f=u