From d8bf515101dff0520deda6adade2ced7226932c2 Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Sun, 9 Jul 2006 18:07:10 +0000
Subject: [PATCH] Stefan Fiedler: 	libpng: fix a symlink so cups 1.1.23
 doesn't break 	gimp: add a patch for building against latest libpng 	NOTE:
 gimp patch not tested yet 	BUGFIX

[2006070220372928330] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7713 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/libpng/libpng.conf               |  7 +++++
 .../gimp/gimp-2.2.11-libpng_fix-1.patch       | 31 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 package/base/libpng/libpng.conf
 create mode 100644 package/gnome2/gimp/gimp-2.2.11-libpng_fix-1.patch

diff --git a/package/base/libpng/libpng.conf b/package/base/libpng/libpng.conf
new file mode 100644
index 000000000..fea7eba81
--- /dev/null
+++ b/package/base/libpng/libpng.conf
@@ -0,0 +1,7 @@
+libpng_postmake ()
+{
+	# this fixes building cups against latest libpng
+	ln -svf libpng.so.3.12.0 $root/usr/lib/libpng.so
+}
+
+hook_add postmake 5 libpng_postmake
diff --git a/package/gnome2/gimp/gimp-2.2.11-libpng_fix-1.patch b/package/gnome2/gimp/gimp-2.2.11-libpng_fix-1.patch
new file mode 100644
index 000000000..b2d4137ce
--- /dev/null
+++ b/package/gnome2/gimp/gimp-2.2.11-libpng_fix-1.patch
@@ -0,0 +1,31 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2006-05-27
+Initial Package Version: 2.2.11
+Upstream Status:         In upstream CVS
+Origin:                  Upstream CVS
+Description:             Fixes an issue with Gimp using a deprecated libpng
+                         function no longer available in >= libpng-1.2.9
+
+$Id: gimp-2.2.11-libpng_fix-1.patch 1546 2006-05-27 23:44:49Z randy $
+
+
+--- gimp-2.2.11-orig/plug-ins/common/png.c	2004-11-23 14:28:43.000000000 +0000
++++ gimp-2.2.11/plug-ins/common/png.c	2006-05-27 23:08:02.000000000 +0000
+@@ -1012,7 +1012,7 @@
+    * Done with the file...
+    */
+ 
+-  png_read_destroy (pp, info, NULL);
++  png_destroy_read_struct (&pp, &info, NULL);
+ 
+   g_free (pixel);
+   g_free (pixels);
+@@ -1441,7 +1441,7 @@
+     };
+ 
+   png_write_end (pp, info);
+-  png_write_destroy (pp);
++  png_destroy_write_struct (&pp, &info);
+ 
+   g_free (pixel);
+   g_free (pixels);