[Lunar-commits] <moonbase> gtk+-2: removes support for DirectFB gdk-target

[Christian Krause]

commit f2e289f787610f865f4d13b262ff562397ca03a7
Author: Christian Krause <wookietreiber at lunar-linux.org>
Date:   Thu Aug 11 09:42:52 2011 +0200

    gtk+-2: removes support for DirectFB gdk-target
    
    DirectFB gdk-target was buggy anyway - never got it to work ...
    this immensly simplifies DEPENDS
---
 graphics/gtk+-2/BUILD     |    2 ++
 graphics/gtk+-2/CONFIGURE |   17 ++++-------------
 graphics/gtk+-2/DEPENDS   |   16 ++++++++++------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/graphics/gtk+-2/BUILD b/graphics/gtk+-2/BUILD
index 9e72887..3f94369 100644
--- a/graphics/gtk+-2/BUILD
+++ b/graphics/gtk+-2/BUILD
@@ -21,6 +21,8 @@
     sedit "s/docs m4macros build/m4macros build/g" Makefile.in
   fi  &&
 
+  OPTS+=" --with-gdktarget=x11"
+
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/graphics/gtk+-2/CONFIGURE b/graphics/gtk+-2/CONFIGURE
index 6b60b12..747e78c 100644
--- a/graphics/gtk+-2/CONFIGURE
+++ b/graphics/gtk+-2/CONFIGURE
@@ -1,15 +1,6 @@
-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
+mquery XINPUT "Install XINPUT support (needed for wacom tablets in gimp)?" \
+              n                                                            \
+              "--with-xinput=yes"                                          \
+              "--with-xinput=no"
 
 mquery DOCS "Build docs?" n
diff --git a/graphics/gtk+-2/DEPENDS b/graphics/gtk+-2/DEPENDS
index 259031d..239b417 100644
--- a/graphics/gtk+-2/DEPENDS
+++ b/graphics/gtk+-2/DEPENDS
@@ -1,10 +1,14 @@
-depends  gdk-pixbuf
-depends  atk
-depends  pango
-depends  cairo
+depends gdk-pixbuf
+depends atk
+depends pango
+depends cairo
 
-optional_depends "libXcomposite" "" "" "for X as gdk-target"
-optional_depends "DirectFB"      "" "" "for DirectFB as gdk-target"
+# needed by X gdk target
+depends libXcomposite
+depends libXcursor
+depends libXrandr
+
+optional_depends "libXinerama" "--enable-xinerama" "--disable-xinerama" "for xinerama support"
 
 optional_depends "cups"                                   \
                  "--enable-cups"                          \