[Frugalware-git] imgrebuild: libclaw-1.5.4-2-i686 * extend png patch

[James Buren]

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

commit 065cb1695297b9a4fa7490faff471d94c39b9749
Author: James Buren <ryuo at frugalware.org>
Date:   Sat May 15 01:11:13 2010 -0500

libclaw-1.5.4-2-i686
* extend png patch

diff --git a/source/xlib-extra/libclaw/FrugalBuild b/source/xlib-extra/libclaw/FrugalBuild
index c669e11..21c769a 100644
--- a/source/xlib-extra/libclaw/FrugalBuild
+++ b/source/xlib-extra/libclaw/FrugalBuild
@@ -12,6 +12,6 @@ source=(${source[@]} $pkgname-$pkgver-gcc-4.5.patch $pkgname-$pkgver-png-1.4.pat
archs=('i686' 'x86_64')
sha1sums=('79fcd958f143232ae4ddd0fd8deeeb4c6d13ebbf' \
'7ce188e8800ba275a82d9255122ddf52b4f30eb9' \
-          '71dcb8f5188d6e4c841d34917449af2abbe182e8')
+          'cb95cb57773c7deb742c3d0380940ae4dcee3681')

# 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
index 8dc9be9..e2a5c16 100644
--- 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
@@ -39,3 +39,15 @@ diff -aur libclaw-1.5.4/claw/code/png_reader.cpp libclaw-1.5.4-2/claw/code/png_r
}

if (!png_ptr || !info_ptr)
+diff -aur libclaw-1.5.4/claw/code/png_writer.cpp libclaw-1.5.4-2/claw/code/png_writer.cpp
+--- libclaw-1.5.4/claw/code/png_writer.cpp	2008-01-07 10:38:58.000000000 -0600
++++ libclaw-1.5.4-2/claw/code/png_writer.cpp	2010-05-15 01:10:25.000000000 -0500
+@@ -296,7 +296,7 @@
+       info_ptr = png_create_info_struct(png_ptr);
+
+       if (!info_ptr)
+-        png_destroy_write_struct(&png_ptr, png_infopp_NULL);
++        png_destroy_write_struct(&png_ptr, NULL);
+     }
+
+   if (!png_ptr || !info_ptr)