[Lunar-commits] <moonbase> gtk+-2: version bumped to 2.20.0.

[Florin Braescu]

commit 6c5e8d58ac60a6e07fe554f8a2cbedda8b987f26
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Thu Apr 1 20:09:09 2010 +0300

    gtk+-2: version bumped to 2.20.0.
---
 graphics/gtk+-2/BUILD     |   17 ++---------------
 graphics/gtk+-2/CONFIGURE |    2 +-
 graphics/gtk+-2/DEPENDS   |    2 +-
 graphics/gtk+-2/DETAILS   |   16 +++++-----------
 4 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/graphics/gtk+-2/BUILD b/graphics/gtk+-2/BUILD
index 58564f9..c56688c 100644
--- a/graphics/gtk+-2/BUILD
+++ b/graphics/gtk+-2/BUILD
@@ -1,22 +1,9 @@
 (
 
-  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 &&
-
-  # Quieten the "XID collision, trouble ahead" useless, spammy warning
-  patch_it $SOURCE3 1 &&
-
-  if [ "$USE_XINPUT" == "y" ]; then
+  if ! [ "$USE_XINPUT" == "n" ]; then
     # XInput support is needed for Wacom tablets to work in GIMP
     OPTS+=" --with-xinput=yes"
-  fi &&
+  fi  &&
 
   default_build
 
diff --git a/graphics/gtk+-2/CONFIGURE b/graphics/gtk+-2/CONFIGURE
index 96c931d..fb0279c 100644
--- a/graphics/gtk+-2/CONFIGURE
+++ b/graphics/gtk+-2/CONFIGURE
@@ -1 +1 @@
-mquery USE_XINPUT "Install XINPUT support? This is needed for wacom tablets in gimp!" y
+mquery USE_XINPUT "Install XINPUT support (needed for wacom tablets in gimp)?" n
diff --git a/graphics/gtk+-2/DEPENDS b/graphics/gtk+-2/DEPENDS
index 06dfb86..68afb3e 100644
--- a/graphics/gtk+-2/DEPENDS
+++ b/graphics/gtk+-2/DEPENDS
@@ -2,7 +2,7 @@ depends  atk
 depends  pango
 depends  tiff
 depends  jpeg
-depends  %X
+depends  libX11
 
 optional_depends  "cups"    ""                 ""                     "for the CUPS based printing backed"
 optional_depends  "jasper"  "--with-libjasper"  "--without-libjasper"  "jpeg2000 support"
diff --git a/graphics/gtk+-2/DETAILS b/graphics/gtk+-2/DETAILS
index 1b2dc99..eac931a 100644
--- a/graphics/gtk+-2/DETAILS
+++ b/graphics/gtk+-2/DETAILS
@@ -1,20 +1,14 @@
           MODULE=gtk\+-2
-         VERSION=16.6
-           MAJOR=2.16
+         VERSION=20.0
+           MAJOR=2.20
           SOURCE=$MODULE.$VERSION.tar.bz2
-         SOURCE2=gtk\+-2-2.16.5-jpeg7.patch.bz2
-         SOURCE3=gtk\+-2.16.6-quiet-xid-collision-warning.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
-     SOURCE3_URL=$PATCH_URL
-      SOURCE_VFY=sha1:f69cb48311d60664bac7cf68351c175c7a214ae6
-     SOURCE2_VFY=sha1:6981a977ea91d6dce32f444ad3b097e2ad43302b
-     SOURCE3_VFY=sha1:00d7688f8dbca9543ac54a53b217242aa926c1ed
-        WEB_SITE=http://www.gtk.org/
+      SOURCE_VFY=sha1:db8a8f1040a813fc1a7872d38b675b4805fa0446
+        WEB_SITE=http://www.gtk.org
          ENTERED=20020313
-         UPDATED=20090924
+         UPDATED=20100401
            SHORT="A multi-platform toolkit for creating GUIs"
 
 cat << EOF