summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-04-27 16:05:36 +0200
committertnut <thierryn1 at hispeed dot ch>2010-04-27 16:05:36 +0200
commitc0a9061eae6604278c3e0dab7da8d92f3c482e72 (patch)
tree7919d37ac285a92803aa1524c5505035d3bd56bd
parenta059b98e8434f20966d450728dac61e3bec5c770 (diff)
downloadnutyx-pakxe-c0a9061eae6604278c3e0dab7da8d92f3c482e72.tar.gz
nutyx-pakxe-c0a9061eae6604278c3e0dab7da8d92f3c482e72.tar.bz2
nutyx-pakxe-c0a9061eae6604278c3e0dab7da8d92f3c482e72.tar.xz
nutyx-pakxe-c0a9061eae6604278c3e0dab7da8d92f3c482e72.zip
gimp, patch libpng
-rw-r--r--extra/gimp/.md5sum1
-rw-r--r--extra/gimp/Pkgfile3
-rw-r--r--extra/gimp/libpng-1.4.patch26
3 files changed, 29 insertions, 1 deletions
diff --git a/extra/gimp/.md5sum b/extra/gimp/.md5sum
index 1bd0deeb6..55f1429cb 100644
--- a/extra/gimp/.md5sum
+++ b/extra/gimp/.md5sum
@@ -1,3 +1,4 @@
a4d9462c9420954824a80c9b1963f9d9 gimp-2.6.8.tar.bz2
d7927c7f1057d2deabf0456e94d2e8c3 gimp-splash-2009-2.png
ca3f9d966013b38b9a219a4b8044ba49 gimp.desktop
+211eccab51593526e852816e647f7da4 libpng-1.4.patch
diff --git a/extra/gimp/Pkgfile b/extra/gimp/Pkgfile
index 3cb64ba0f..233bc3313 100644
--- a/extra/gimp/Pkgfile
+++ b/extra/gimp/Pkgfile
@@ -8,11 +8,12 @@ name=gimp
version=2.6.8
release=3
source=(ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-$version.tar.bz2 \
- gimp-splash-2009-2.png gimp.desktop)
+ gimp-splash-2009-2.png gimp.desktop libpng-1.4.patch)
build() {
cd $name-$version
+ patch -Np1 -i ../libpng-1.4.patch
./configure --prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
diff --git a/extra/gimp/libpng-1.4.patch b/extra/gimp/libpng-1.4.patch
new file mode 100644
index 000000000..8f7963d23
--- /dev/null
+++ b/extra/gimp/libpng-1.4.patch
@@ -0,0 +1,26 @@
+diff -Naur gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c gimp-2.7.0/plug-ins/file-ico/ico-load.c
+--- gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c 2010-01-18 19:01:46.000000000 -0500
++++ gimp-2.7.0/plug-ins/file-ico/ico-load.c 2010-01-18 19:14:43.000000000 -0500
+@@ -286,14 +286,22 @@
+ switch (color_type)
+ {
+ case PNG_COLOR_TYPE_GRAY:
++#if PNG_LIBPNG_VER < 10400
+ png_set_gray_1_2_4_to_8 (png_ptr);
++#else
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
++#endif
+ if ( bit_depth == 16 )
+ png_set_strip_16 (png_ptr);
+ png_set_gray_to_rgb (png_ptr);
+ png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
+ break;
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
++#if PNG_LIBPNG_VER < 10400
+ png_set_gray_1_2_4_to_8 (png_ptr);
++#else
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
++#endif
+ if ( bit_depth == 16 )
+ png_set_strip_16 (png_ptr);
+ png_set_gray_to_rgb (png_ptr);