| 1 |
nirbheek 11/05/01 15:13:33 |
| 2 |
|
| 3 |
Added: vte-0.28.0-fix-gdk-targets.patch |
| 4 |
Removed: vte-0.24.1-background-color2.patch |
| 5 |
vte-0.24.2-invisible-cursor.patch |
| 6 |
vte-0.24.2-invisible-cursor2.patch |
| 7 |
vte-0.24.1-cleanup-background.patch |
| 8 |
vte-0.24.1-background-color.patch |
| 9 |
Log: |
| 10 |
Remove unused patches, fix bug 365555 |
| 11 |
|
| 12 |
(Portage version: 2.1.9.46/cvs/Linux x86_64) |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.1 x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch?rev=1.1&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch?rev=1.1&content-type=text/plain |
| 19 |
|
| 20 |
Index: vte-0.28.0-fix-gdk-targets.patch |
| 21 |
=================================================================== |
| 22 |
Gdk-3.0/Gtk-3.0 supports multiple targets now, and the "target" variable |
| 23 |
no longer works. So, sort of hack around it for now? |
| 24 |
|
| 25 |
--- |
| 26 |
--- configure.in |
| 27 |
+++ configure.in |
| 28 |
@@ -53,6 +53,7 @@ |
| 29 |
GTK_API_VERSION=2.0 |
| 30 |
GTK_REQUIRED=2.20.0 |
| 31 |
GLADE_API_VERSION=1.0 |
| 32 |
+ GDK_TARGETS=$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION) |
| 33 |
;; |
| 34 |
3.0) VTE_API_VERSION=2.90 |
| 35 |
VTE_API_MAJOR_VERSION=2 |
| 36 |
@@ -62,6 +63,7 @@ |
| 37 |
GTK_API_VERSION=3.0 |
| 38 |
GTK_REQUIRED=3.0.0 |
| 39 |
GLADE_API_VERSION=2.0 |
| 40 |
+ GDK_TARGETS=$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION) |
| 41 |
;; |
| 42 |
esac |
| 43 |
|
| 44 |
@@ -408,12 +410,13 @@ |
| 45 |
|
| 46 |
# We have a direct dependency on X11 on gdk-x11, see bug #613525 |
| 47 |
AC_MSG_CHECKING([for GDK target]) |
| 48 |
-GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)" |
| 49 |
-AC_MSG_RESULT([$GDK_TARGET]) |
| 50 |
-case "$GDK_TARGET" in |
| 51 |
- x11) PLATFORM_PKGS="x11 cairo-xlib" ;; |
| 52 |
- *) PLATFORM_PKGS="" ;; |
| 53 |
-esac |
| 54 |
+AC_MSG_RESULT([$GDK_TARGETS]) |
| 55 |
+PLATFORM_PKGS= |
| 56 |
+for i in $GDK_TARGETS; do |
| 57 |
+ if test "$i" = "x11"; then |
| 58 |
+ PLATFORM_PKGS="$PLATFORM_PKGS x11 cairo-xlib" |
| 59 |
+ fi |
| 60 |
+done |
| 61 |
|
| 62 |
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" |
| 63 |
PKG_CHECK_MODULES([VTE],[$VTE_PKGS]) |
Archives