diff options
Diffstat (limited to 'source/xap/gimp')
| -rwxr-xr-x | source/xap/gimp/gimp.SlackBuild | 14 | ||||
| -rw-r--r-- | source/xap/gimp/gimp.png14.diff | 19 |
2 files changed, 8 insertions, 25 deletions
diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild index 377f519ca..330ca4f13 100755 --- a/source/xap/gimp/gimp.SlackBuild +++ b/source/xap/gimp/gimp.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.6.8 -BUILD=${BUILD:-2} +PKGNAM=gimp +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -51,6 +52,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi cd $TMP @@ -58,8 +62,6 @@ rm -rf gimp-$VERSION tar xvf $CWD/gimp-$VERSION.tar.?z* || exit 1 cd gimp-$VERSION || exit 1 -zcat $CWD/gimp.png14.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -96,7 +98,7 @@ make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/gimp-$VERSION cp -a \ - AUTHORS COPYING HACKING INSTALL LICENSE NEWS README* docs/Wilber* \ + AUTHORS COPYING* HACKING INSTALL LICENSE NEWS README* docs/Wilber* \ $PKG/usr/doc/gimp-$VERSION ( cd $PKG/usr/doc/gimp-$VERSION for i in \ diff --git a/source/xap/gimp/gimp.png14.diff b/source/xap/gimp/gimp.png14.diff deleted file mode 100644 index 5af06d6e3..000000000 --- a/source/xap/gimp/gimp.png14.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ./plug-ins/file-ico/ico-load.c.orig 2009-07-20 15:20:51.000000000 -0500 -+++ ./plug-ins/file-ico/ico-load.c 2010-02-15 22:54:44.000000000 -0600 -@@ -287,14 +287,14 @@ - switch (color_type) - { - case PNG_COLOR_TYPE_GRAY: -- png_set_gray_1_2_4_to_8 (png_ptr); -+ png_set_expand_gray_1_2_4_to_8 (png_ptr); - 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: -- png_set_gray_1_2_4_to_8 (png_ptr); -+ png_set_expand_gray_1_2_4_to_8 (png_ptr); - if ( bit_depth == 16 ) - png_set_strip_16 (png_ptr); - png_set_gray_to_rgb (png_ptr); |