diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2011-10-04 20:36:48 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2011-10-04 20:36:48 +0000 |
| commit | 75d9ae0a050c93db6c8e5d72d8ae975832e1f6fc (patch) | |
| tree | bacda2d10a47253599c3f2516d58f87eb967e939 /x11-libs | |
| parent | lsof shows files like /.sock{dshmem,slock}XXXXXXX being created by sockd, and... (diff) | |
| download | gentoo-2-75d9ae0a050c93db6c8e5d72d8ae975832e1f6fc.tar.gz gentoo-2-75d9ae0a050c93db6c8e5d72d8ae975832e1f6fc.tar.bz2 gentoo-2-75d9ae0a050c93db6c8e5d72d8ae975832e1f6fc.zip | |
Fix gdk-targets patch to prevent underlinking problems, bug #369387 and patch by Naohiro Aota.
(Portage version: 2.1.10.20/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/vte/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch | 32 |
2 files changed, 17 insertions, 22 deletions
diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog index 5c57702a2406..3d11bfc2fb45 100644 --- a/x11-libs/vte/ChangeLog +++ b/x11-libs/vte/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/vte # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.286 2011/09/10 08:54:54 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.287 2011/10/04 20:36:48 pacho Exp $ + + 04 Oct 2011; Pacho Ramos <pacho@gentoo.org> + files/vte-0.28.0-fix-gdk-targets.patch: + Fix gdk-targets patch to prevent underlinking problems, bug #369387 and patch + by Naohiro Aota. *vte-0.28.2-r300 (10 Sep 2011) *vte-0.28.2-r200 (10 Sep 2011) 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 |