- release 6 (rebuild against libpng-1.5)

Changed files:
    corona-libpng15.patch -> 1.1
    corona.spec -> 1.8

diff --git a/corona-libpng15.patch b/corona-libpng15.patch
new file mode 100644 (file)
index 0000000..99d79d3
--- /dev/null
+++ b/corona-libpng15.patch
@@ -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);

diff --git a/corona.spec b/corona.spec
index ede86b111162dd84d4fe3c3fe6e56492358de7c5..1257bbdfc3291a56e4beda16a2c5aa0102e3d8c9 100644 (file)
--- a/corona.spec
+++ b/corona.spec
@@ -2,7 +2,7 @@ Summary:        Image input/output library
 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
@@ -10,6 +10,7 @@ Source0:      http://dl.sourceforge.net/corona/%{name}-%{version}.tar.gz
 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
@@ -71,6 +72,7 @@ Statyczna biblioteka corona.
 %patch1 -p1
 dos2unix src/OpenTGA.cpp
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}