[Frugalware-git] imgrebuild: libclaw-1.5.4-2-i686 * add patch for libpng 1.4.x

[James Buren]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=ab6c5402d7cd117170b346f7c5c267aecf7b8977

commit ab6c5402d7cd117170b346f7c5c267aecf7b8977
Author: James Buren <ryuo at frugalware.org>
Date:   Sat May 15 01:07:19 2010 -0500

libclaw-1.5.4-2-i686
* add patch for libpng 1.4.x

diff --git a/source/xlib-extra/libclaw/FrugalBuild b/source/xlib-extra/libclaw/FrugalBuild
index 9f49fb1..c669e11 100644
--- a/source/xlib-extra/libclaw/FrugalBuild
+++ b/source/xlib-extra/libclaw/FrugalBuild
@@ -8,9 +8,10 @@ pkgdesc="C++ Library Absolutely Wonderful"
depends=('libstdc++' 'libjpeg>=8a' 'libpng>=1.4.1')
groups=('xlib-extra')
Finclude sourceforge cmake
-source=(${source[@]} $pkgname-$pkgver-gcc-4.5.patch)
+source=(${source[@]} $pkgname-$pkgver-gcc-4.5.patch $pkgname-$pkgver-png-1.4.patch)
archs=('i686' 'x86_64')
sha1sums=('79fcd958f143232ae4ddd0fd8deeeb4c6d13ebbf' \
-          '7ce188e8800ba275a82d9255122ddf52b4f30eb9')
+          '7ce188e8800ba275a82d9255122ddf52b4f30eb9' \
+          '71dcb8f5188d6e4c841d34917449af2abbe182e8')

# optimization OK
diff --git a/source/xlib-extra/libclaw/libclaw-1.5.4-png-1.4.patch b/source/xlib-extra/libclaw/libclaw-1.5.4-png-1.4.patch
new file mode 100644
index 0000000..8dc9be9
--- /dev/null
+++ b/source/xlib-extra/libclaw/libclaw-1.5.4-png-1.4.patch
@@ -0,0 +1,41 @@
+Only in libclaw-1.5.4-2: build
+diff -aur libclaw-1.5.4/claw/code/png_reader.cpp libclaw-1.5.4-2/claw/code/png_reader.cpp
+--- libclaw-1.5.4/claw/code/png_reader.cpp	2008-09-12 08:17:23.000000000 -0500
++++ libclaw-1.5.4-2/claw/code/png_reader.cpp	2010-05-15 01:05:14.000000000 -0500
+@@ -146,7 +146,7 @@
+     {
+       /* If we get here, we had a problem reading the file */
+       /* Free all of the memory associated with the png_ptr and info_ptr */
+-      png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++      png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       throw CLAW_EXCEPTION("Invalid PNG file.");
+     }
+
+@@ -156,7 +156,8 @@
+                    claw__graphic__png__source_manager__read );
+
+   png_set_strip_16(png_ptr);
+-  png_set_gray_1_2_4_to_8(png_ptr);
++  png_set_expand_gray_1_2_4_to_8(png_ptr);
++  png_set_tRNS_to_alpha(png_ptr);
+   png_set_packing(png_ptr);
+
+   // transform palette index into RGB value
+@@ -170,7 +171,7 @@
+   png_read_info(png_ptr, info_ptr);
+   read_image( png_ptr, info_ptr );
+
+-  png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++  png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ } // png::reader::read_from_file()
+
+ /*----------------------------------------------------------------------------*/
+@@ -340,7 +341,7 @@
+       info_ptr = png_create_info_struct(png_ptr);
+
+       if (!info_ptr)
+-        png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++        png_destroy_read_struct(&png_ptr, NULL, NULL);
+     }
+
+   if (!png_ptr || !info_ptr)