[Lunar-commits] <moonbase> gtk+-2: compatibility with jpeg 7

[Paul Bredbury]

commit 581c7226d9240e4e1e2a1e7401b7a23c7b9c0a1a
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Sun Aug 30 14:24:25 2009 +0700

    gtk+-2: compatibility with jpeg 7
    
    For those brave souls who have upgraded to jpeg 7 already.
---
 graphics/gtk+-2/BUILD   |   12 +++++++++++-
 graphics/gtk+-2/DETAILS |    5 ++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/graphics/gtk+-2/BUILD b/graphics/gtk+-2/BUILD
index 3c7451c..1058b15 100644
--- a/graphics/gtk+-2/BUILD
+++ b/graphics/gtk+-2/BUILD
@@ -1,8 +1,18 @@
 (
 
+  if egrep -q '^#define JPEG_LIB_VERSION.*7[0-9]+' /usr/include/jpeglib.h; then
+    # Is 7.0 API, rather than old version 6b
+    # Old patch: http://repos.archlinux.org/viewvc.cgi/gtk2/repos/extra-i686/
+    # Fixes blurry jpegs: http://bugzilla.gnome.org/show_bug.cgi?id=588740
+    # http://bugs.gentoo.org/show_bug.cgi?id=282744
+    # Info: http://bbs.archlinux.org/viewtopic.php?id=75529
+    # Original fix:  sedit "s:cinfo->scale_denom <= 8:cinfo->scale_denom <= 16:" gdk-pixbuf/io-jpeg.c
+    patch_it $SOURCE2 0
+  fi &&
+
   if [ "$USE_XINPUT" == "y" ]; then
     # XInput support is needed for Wacom tablets to work in GIMP
-     OPTS="$OPTS --with-xinput=yes --enable-debug=no"
+    OPTS+=" --with-xinput=yes --enable-debug=no"
   fi &&
 
   default_build
diff --git a/graphics/gtk+-2/DETAILS b/graphics/gtk+-2/DETAILS
index a4e9d31..73ad038 100644
--- a/graphics/gtk+-2/DETAILS
+++ b/graphics/gtk+-2/DETAILS
@@ -2,11 +2,14 @@
          VERSION=16.6
            MAJOR=2.16
           SOURCE=$MODULE.$VERSION.tar.bz2
+         SOURCE2=gtk\+-2-2.16.5-jpeg7.patch.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE.$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/gtk+/$MAJOR
    SOURCE_URL[1]=ftp://ftp.gtk.org/pub/gtk/v$MAJOR
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:f69cb48311d60664bac7cf68351c175c7a214ae6
-        WEB_SITE=http://www.gtk.org
+     SOURCE2_VFY=sha1:6981a977ea91d6dce32f444ad3b097e2ad43302b
+        WEB_SITE=http://www.gtk.org/
          ENTERED=20020313
          UPDATED=20090829
            SHORT="A multi-platform toolkit for creating GUIs"