From e5e058e2aadafa0d61c11709f7481375c6db504b Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sat, 23 Oct 2010 22:46:06 +0200
Subject: gimp, port nettoyé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/gimp/.md5sum                |   2 --
 extra/gimp/Pkgfile                |   4 ++--
 extra/gimp/gimp-splash-2009-2.png | Bin 303998 -> 0 bytes
 extra/gimp/gimp.desktop           |  11 -----------
 extra/gimp/libpng-1.4.patch       |  26 --------------------------
 5 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 extra/gimp/gimp-splash-2009-2.png
 delete mode 100644 extra/gimp/gimp.desktop
 delete mode 100644 extra/gimp/libpng-1.4.patch

(limited to 'extra')

diff --git a/extra/gimp/.md5sum b/extra/gimp/.md5sum
index cf602c4b2..22e7c4420 100644
--- a/extra/gimp/.md5sum
+++ b/extra/gimp/.md5sum
@@ -1,4 +1,2 @@
 bb2939fe13e54fc7255cef5d097bb5dd  gimp-2.6.11.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 94e8235c1..f9f742986 100644
--- a/extra/gimp/Pkgfile
+++ b/extra/gimp/Pkgfile
@@ -8,7 +8,7 @@ name=gimp
 version=2.6.11
 release=1
 source=(ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-$version.tar.bz2 \
-	gimp-splash-2009-2.png gimp.desktop libpng-1.4.patch)
+	gimp-splash-2009-2.png)
 
 
 build() {
@@ -22,7 +22,7 @@ build() {
 	make
 	make DESTDIR=$PKG install
 	rm -f $PKG/usr/share/gimp/2.0/images/gimp-splash.png
-	cp ../gimp-splash-2009-2.png $PKG/usr/share/gimp/2.0/images/gimp-splash.png
+	install -m664 ../gimp-splash-2009-2.png $PKG/usr/share/gimp/2.0/images/gimp-splash.png
 }
 
   
diff --git a/extra/gimp/gimp-splash-2009-2.png b/extra/gimp/gimp-splash-2009-2.png
deleted file mode 100644
index 7c8df5a38..000000000
Binary files a/extra/gimp/gimp-splash-2009-2.png and /dev/null differ
diff --git a/extra/gimp/gimp.desktop b/extra/gimp/gimp.desktop
deleted file mode 100644
index 9c439302f..000000000
--- a/extra/gimp/gimp.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-  Name=The GIMP
-  Name[fr]=Le GIMP
-  Comment=GNU Image Manipulation Program
-  Comment[fr]=Le Programme de Manipulation d'Images GNU
-  TryExec=gimp
-  Exec=gimp
-  Icon=gimp2.png
-  Terminal=0
-  Type=Application
-
diff --git a/extra/gimp/libpng-1.4.patch b/extra/gimp/libpng-1.4.patch
deleted file mode 100644
index 8f7963d23..000000000
--- a/extra/gimp/libpng-1.4.patch
+++ /dev/null
@@ -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);
-- 
cgit v1.2.3-70-g09d2