build gimp against libpng12 oi_148
authorGuido Berhoerster <guido@berhoerster.name>
Sat, 27 Nov 2010 11:07:25 +0100
branchoi_148
changeset 12 f23e4a69f338
parent 11 cb598b846ce5
child 13 d21034aa1c78
build gimp against libpng12
fix-SUNWgnome-img-editor-fix-libpng-version.patch
series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fix-SUNWgnome-img-editor-fix-libpng-version.patch	Sat Nov 27 11:07:25 2010 +0100
@@ -0,0 +1,39 @@
+diff --git a/base-specs/gimp.spec b/base-specs/gimp.spec
+--- a/base-specs/gimp.spec
++++ b/base-specs/gimp.spec
+@@ -41,7 +41,8 @@
+ # date:2010-02-23 owner:chrisk type:bug
+ Patch6:       gimp-06-fixxref-modules.diff
+ # date:2010-08-04 owner:davelam type:bug
+-Patch7:       gimp-07-libpng14.diff
++#Patch7:       gimp-07-libpng14.diff
++Patch1000:    gimp-05-libpng12.diff
+ 
+ URL:          http://www.gimp.org
+ BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+@@ -119,7 +120,8 @@
+ %patch4 -p1
+ %patch5 -p1
+ %patch6 -p1
+-%patch7 -p1
++#%%patch7 -p1
++%patch1000 -p1
+ %build
+ %ifos linux
+ if [ -x /usr/bin/getconf ]; then
+diff --git a/patches/gimp-1000-libpng12.diff b/patches/gimp-1000-libpng12.diff
+new file mode 100644
+--- /dev/null
++++ b/patches/gimp-1000-libpng12.diff
+@@ -0,0 +1,11 @@
++--- gimp-2.6.10/configure.in.orig	2010-08-27 16:23:21.600378577 +0800
+++++ gimp-2.6.10/configure.in	2010-08-27 16:21:00.511876535 +0800
++@@ -1115,7 +1115,7 @@
++ have_libpng=no
++ if test "x$with_libpng" != xno; then
++   have_libpng=yes
++-  PKG_CHECK_MODULES(PNG, libpng,
+++  PKG_CHECK_MODULES(PNG, libpng12,
++     FILE_PNG='file-png$(EXEEXT)',
++     [have_libpng="no (libpng not found)"
++      AC_MSG_ERROR([
--- a/series	Sat Nov 27 11:01:16 2010 +0100
+++ b/series	Sat Nov 27 11:07:25 2010 +0100
@@ -29,3 +29,4 @@
 fix-SUNWsongbird-fix-type.patch
 fix-SUNWxscreensaver-linker-workaround.patch
 fix-SUNWdbus-fix-console-user-identification.patch
+fix-SUNWgnome-img-editor-fix-libpng-version.patch