[arch-commits] Commit in gimp-devel/trunk (ChangeLog PKGBUILD libpng-1.4.patch)

Eric Bélanger eric at archlinux.org
Tue Jan 19 10:53:55 UTC 2010


    Date: Tuesday, January 19, 2010 @ 05:53:55
  Author: eric
Revision: 64029

upgpkg: gimp-devel 2.7.0-2
    Rebuilt against libpng 1.4/libjpeg 8

Added:
  gimp-devel/trunk/libpng-1.4.patch
Modified:
  gimp-devel/trunk/ChangeLog
  gimp-devel/trunk/PKGBUILD

------------------+
 ChangeLog        |    5 +++++
 PKGBUILD         |   11 +++++++----
 libpng-1.4.patch |   26 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-01-19 10:32:02 UTC (rev 64028)
+++ ChangeLog	2010-01-19 10:53:55 UTC (rev 64029)
@@ -1,3 +1,8 @@
+2010-01-18  Eric Belanger  <eric at archlinux.org>
+
+	* gimp-devel 2.7.0-2
+	* Rebuilt for libpng 1.4 and libjpeg 8
+
 2009-11-29  Eric Belanger  <eric at archlinux.org>
 
 	* gimp-devel 2.7.0-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-19 10:32:02 UTC (rev 64028)
+++ PKGBUILD	2010-01-19 10:53:55 UTC (rev 64029)
@@ -4,7 +4,7 @@
 
 pkgname=gimp-devel
 pkgver=2.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
@@ -24,12 +24,15 @@
 conflicts=('gimp')
 provides=("gimp=${pkgver}")
 install=gimp-devel.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('bd9fb22079a547f1f302c219b1a29fcc' 'bb27bc214261d36484093e857f015f38')
-sha1sums=('15f3797e025ee23463149225b92af1bd67ed6fd3' '110ce9798173b19a662d086ed7b882b4729f06cf')
+source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl libpng-1.4.patch)
+md5sums=('bd9fb22079a547f1f302c219b1a29fcc' 'bb27bc214261d36484093e857f015f38'\
+         '211eccab51593526e852816e647f7da4')
+sha1sums=('15f3797e025ee23463149225b92af1bd67ed6fd3' '110ce9798173b19a662d086ed7b882b4729f06cf'\
+         '21c0fe284c39cc133ec977a48ec38220033020c5')
 
 build() {
   cd "${srcdir}/gimp-${pkgver}"
+  patch -p1 < ../libpng-1.4.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-mp --enable-gimp-console --enable-gimp-remote \
     --enable-python --with-gif-compression=lzw \

Added: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch	                        (rev 0)
+++ libpng-1.4.patch	2010-01-19 10:53:55 UTC (rev 64029)
@@ -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);




More information about the arch-commits mailing list