[Lunar-commits] <moonbase> gtk+-2: configuration update

[Duncan Gibson]

commit 40b18c664deacf9ff86d53af19fe539970ce57a9
Author: Christian Krause <kizkizzbangbang at googlemail.com>
Date:   Thu Feb 3 02:35:56 2011 +0100

    gtk+-2: configuration update
    
    ... makes choosing DirectFB as gdktarget possible
---
 graphics/gtk+-2/BUILD     |   16 +++++++---------
 graphics/gtk+-2/CONFIGURE |   14 +++++++++++++-
 graphics/gtk+-2/DEPENDS   |   18 +++++++++++++-----
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/graphics/gtk+-2/BUILD b/graphics/gtk+-2/BUILD
index 904b178..4ecd992 100644
--- a/graphics/gtk+-2/BUILD
+++ b/graphics/gtk+-2/BUILD
@@ -1,7 +1,7 @@
 (
 
-  bad_flags -mssse3 &&
-  bad_flags -mfpmath=sse &&
+  bad_flags -mssse3       &&
+  bad_flags -mfpmath=sse  &&
 
   # Fixes mysterious drag and drop crash in gtk+-2
   # gtk+-2 when compiled with -O2 or -O3 will compile well
@@ -10,14 +10,12 @@
   # The scary thing is -O2, -O3 and -Os all enable -fcaller-saves
   # but only -Os does it in a way gtk+-2 does not crash on DnD.
   case "$CFLAGS" in
-  *-O[23]*) CFLAGS+=' -fno-caller-saves';;
-  esac &&
+    *-O[23]*) 
+      CFLAGS+=' -fno-caller-saves'
+      ;;
+  esac                    &&
 
-  patch_it $SOURCE2 1 &&
-  if [ "$USE_XINPUT" == "y" ]; then
-    # XInput support is needed for Wacom tablets to work in GIMP
-    OPTS+=" --with-xinput=yes"
-  fi  &&
+  patch_it $SOURCE2 1     &&
 
   default_build
 
diff --git a/graphics/gtk+-2/CONFIGURE b/graphics/gtk+-2/CONFIGURE
index 6fa7858..09e5e1d 100644
--- a/graphics/gtk+-2/CONFIGURE
+++ b/graphics/gtk+-2/CONFIGURE
@@ -1 +1,13 @@
-mquery USE_XINPUT "Install XINPUT support (needed for wacom tablets in gimp)?" n "--with-xinput" "--without-xinput"
+mquery GDK_TARGET "Use DirectFB as gdk-target instead of X11?"               \
+                  n                                                          \
+                  "--with-gdktarget=directfb"                                \
+                  "--with-gdktarget=x11"
+
+if [ "`get_module_config GDK_TARGET`" = "n" ]; then
+
+  mquery XINPUT "Install XINPUT support (needed for wacom tablets in gimp)?" \
+                n                                                            \
+                "--with-xinput=yes"                                          \
+                "--with-xinput=no"
+
+fi
diff --git a/graphics/gtk+-2/DEPENDS b/graphics/gtk+-2/DEPENDS
index 1e85aba..0f727f8 100644
--- a/graphics/gtk+-2/DEPENDS
+++ b/graphics/gtk+-2/DEPENDS
@@ -1,8 +1,16 @@
-depends  gdk-pixbuf
 depends  atk
+depends  gdk-pixbuf
 depends  pango
-depends  tiff
-depends  %JPEG
-depends  libX11
 
-optional_depends  "cups"  "--enable-cups" "--disable-cups" "for the CUPS based printing backed"
+optional_depends "libX11"   "" "" "for X11 as gdk-target"
+optional_depends "DirectFB" "" "" "for DirectFB as gdk-target"
+
+optional_depends "cups"                                   \
+                 "--enable-cups"                          \
+                 "--disable-cups"                         \
+                 "for Common Unix Printing System backed"
+
+optional_depends "gobject-introspection"                  \
+                 "--enable-introspection"                 \
+                 "--disable-introspection"                \
+                 "for gobject introspection"