[patch] updated patch for vte-9999

vte-9999-fix-gdk-targets.patch (text/plain), 1.27 KB, created by Alexandre Rostovtsev (RETIRED) on 2011-02-27 18:45:58 UTC

Gdk-3.0/Gtk-3.0 supports multiple targets now, and the "target" variable
no longer works. So, sort of hack around it for now?

---
--- configure.in
+++ configure.in
@@ -58,6 +58,7 @@
        GTK_API_VERSION=2.0
        GTK_REQUIRED=2.20.0
        GLADE_API_VERSION=1.0
+       GDK_TARGETS=$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)
        ;;
   3.0) VTE_API_VERSION=2.90
        VTE_API_MAJOR_VERSION=2
@@ -68,6 +69,7 @@
        GTK_API_VERSION=3.0
        GTK_REQUIRED=3.0.0
        GLADE_API_VERSION=2.0
+       GDK_TARGETS=$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)
        ;;
 esac
 
@@ -412,12 +414,13 @@
 
 # We have a direct dependency on X11 on gdk-x11, see bug #613525
 AC_MSG_CHECKING([for GDK target])
-GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)"
-AC_MSG_RESULT([$GDK_TARGET])
-case "$GDK_TARGET" in
-  x11) PLATFORM_PKGS="x11 cairo-xlib" ;;
-  *) PLATFORM_PKGS="" ;;
-esac
+AC_MSG_RESULT([$GDK_TARGETS])
+PLATFORM_PKGS=
+for i in $GDK_TARGETS; do
+  if test "$i" = "x11"; then
+    PLATFORM_PKGS="$PLATFORM_PKGS x11 cairo-xlib"
+  fi
+done
 
 VTE_PKGS="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 pango >= $PANGO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gobject-2.0 gio-2.0 gio-unix-2.0 $PLATFORM_PKGS"
 PKG_CHECK_MODULES([VTE],[$VTE_PKGS])