summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch')
-rw-r--r--x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch32
1 files changed, 11 insertions, 21 deletions
diff --git a/x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch b/x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch
index 412baa0c2399..b2a430883be7 100644
--- a/x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch
+++ b/x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch
@@ -1,26 +1,11 @@
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
-@@ -53,6 +53,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
-@@ -62,6 +63,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
-
-@@ -408,12 +410,13 @@
+diff --git a/configure.in b/configure.in
+index 33cd3e8..2a71c95 100644
+--- a/configure.in
++++ b/configure.in
+@@ -412,12 +412,19 @@ esac
# We have a direct dependency on X11 on gdk-x11, see bug #613525
AC_MSG_CHECKING([for GDK target])
@@ -29,7 +14,12 @@ no longer works. So, sort of hack around it for now?
-case "$GDK_TARGET" in
- x11) PLATFORM_PKGS="x11 cairo-xlib" ;;
- *) PLATFORM_PKGS="" ;;
--esac
++case "$with_gtk" in
++ 2.0) GDK_TARGETS=$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)
++ ;;
++ 3.0) GDK_TARGETS=$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)
++ ;;
+ esac
+AC_MSG_RESULT([$GDK_TARGETS])
+PLATFORM_PKGS=
+for i in $GDK_TARGETS; do