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

[Eric Bélanger]

    Date: Tuesday, June 29, 2010 @ 20:37:33
  Author: eric
Revision: 84459

upgpkg: gimp-devel 2.7.1-1
Upstream update, Removed old libpng patch

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

------------------+
 ChangeLog        |    5 +++++
 PKGBUILD         |   13 +++++--------
 libpng-1.4.patch |   26 --------------------------
 3 files changed, 10 insertions(+), 34 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog   2010-06-29 22:11:47 UTC (rev 84458)
+++ ChangeLog   2010-06-30 00:37:33 UTC (rev 84459)
@@ -1,3 +1,8 @@
+2010-06-29  Eric Belanger  <e...@archlinux.org>
+
+       * gimp-devel 2.7.1-1
+       * Upstream update
+
 2010-06-28  Eric Belanger  <e...@archlinux.org>
 
        * gimp-devel 2.7.0-4

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-06-29 22:11:47 UTC (rev 84458)
+++ PKGBUILD    2010-06-30 00:37:33 UTC (rev 84459)
@@ -3,8 +3,8 @@
 # Contributor: Woody Gilk <wo...@archlinux.org>
 
 pkgname=gimp-devel
-pkgver=2.7.0
-pkgrel=4
+pkgver=2.7.1
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/";
@@ -23,15 +23,12 @@
 provides=("gimp=${pkgver}")
 install=gimp-devel.install
 changelog=ChangeLog
-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')
+source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 
linux.gpl)
+md5sums=('4932a0a1645ecd5b23ea6155ddda013d' 'bb27bc214261d36484093e857f015f38')
+sha1sums=('3dcfc08ddccbdf541449e4ea6be252b449f6d872' 
'110ce9798173b19a662d086ed7b882b4729f06cf')
 
 build() {
   cd "${srcdir}/gimp-${pkgver}"
-  patch -p1 < ../libpng-1.4.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-mp --enable-gimp-console --enable-gimp-remote \
     --enable-python --with-gif-compression=lzw \

Deleted: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch    2010-06-29 22:11:47 UTC (rev 84458)
+++ libpng-1.4.patch    2010-06-30 00:37:33 UTC (rev 84459)
@@ -1,26 +0,0 @@
-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);