Fix gdk-targets patch to prevent underlinking problems, bug #369387 and patch by...

Package-Manager: portage-2.1.10.20/cvs/Linux x86_64

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index 5c57702a2406d1f454e5f0ac7a6aeeb63d8d8bf1..3d11bfc2fb459685d3189b1a7173cb3fdcbdd0a7 100644 (file)
--- 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/Manifest b/x11-libs/vte/Manifest
index b1acc9beb0a39a94a3d827a7aa39c4047a9f8af3..aa541963e3530a7fbfc357177b7e01f95cac05dd 100644 (file)
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX vte-0.28.0-fix-gdk-targets.patch 1302 RMD160 953e83b5f39d02278d69b95601a6d35f3b733544 SHA1 2b5fd8289ce58d9795c3627b7b289bd7f6442b62 SHA256 f3886e0e8a580010a71e0cce47c124b97ef78988ee031c1212c4707b0cd50828
+AUX vte-0.28.0-fix-gdk-targets.patch 1118 RMD160 b0c49ea17fdb498facf335931d66c9e55a52d0e4 SHA1 9b49f9b12d3031fab3b14320bccb8305eac8051f SHA256 660edc007fd8f5daafdcf2b91b1da5b1d70c1295cdf61e6da28964a06bca126f
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 DIST vte-0.28.1.tar.xz 963496 RMD160 48b6423cc688a07d7864738dd864261b33313aae SHA1 528191c07aaf7f315fba7585bd427616a56dedd1 SHA256 ad1b868356e0231c42ac2493d3e2a7726014c9dc4110ec89fbb01aee8c2ed7ad
 DIST vte-0.28.2.tar.xz 962340 RMD160 8f3396d4e98023b74898e938331917b181964158 SHA1 b0af0701ef9d6c7ede9c578366b12a70ac47ab66 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae
@@ -9,12 +9,12 @@ EBUILD vte-0.28.1-r200.ebuild 1457 RMD160 2d65682be75db9599ae56deff82523e48e29b3
 EBUILD vte-0.28.1-r300.ebuild 1458 RMD160 94d6ccea4d9be8dbdf71521e605ade040616fb65 SHA1 e9a2ae9c3527e6cb275e95ede2a7a9578c26b8d3 SHA256 0ef5199b303c8a03fcf577af4dbeb25aa3fa41bc9082b3bdb11bc53d3ee1837f
 EBUILD vte-0.28.2-r200.ebuild 1464 RMD160 01409873aa81b8601f1434c7a39770646b21f961 SHA1 38997ef19d0fd1f204afa48248ac595b074fa6ae SHA256 e000c3b5e080791654c2e6e954c6e7d9d6c2acd22de154f1bb4398d8673b6f1f
 EBUILD vte-0.28.2-r300.ebuild 1575 RMD160 a7ab4efc2203ae97b43bcd6dc70eb11377ffcc7c SHA1 4f214d6e2566af607ba89d76dbba429d89001541 SHA256 260d840d6f1da3a1895da1414512c051bddea6763c36ba6f596b58e30c4742ce
-MISC ChangeLog 37716 RMD160 c626ed385baf194cb5edb9c99d54129d286a2b5b SHA1 23fd687cc262ff0c497025c65108033e3651273e SHA256 ed85acdce51c0c1781dfdc4a214b1173d9d12c35b29267e52d863cadac9be727
+MISC ChangeLog 37904 RMD160 dc237c13b745ab3bb3ae6d199cbf76e6afbfb306 SHA1 23b015a6d1fea3568436ba2f2caef8d2de57f121 SHA256 6ae018fef0df7c9432676bab9736a32ff32e9d29371ddd9d92229e3c47891f1b
 MISC metadata.xml 350 RMD160 c81d1e1776ed27ef7418cdc46a686e2b6a9dbdeb SHA1 8063a6278411458adbfa260f11d53687a6881f3b SHA256 16e77360aaa3f204d03bfad2997aabf51d51c3360f59f6c4d5f24076e9bae0d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5rJeUACgkQCaWpQKGI+9SrhwCfQDHQE094aO/dYh90dEMShfpa
-UDMAnRIPxHp9v3ekQrt2vlIvaaFGkylm
-=LdJd
+iEYEARECAAYFAk6LbmUACgkQCaWpQKGI+9S4+QCfYN6Hrb3/N8S/0Fq2Vm3vGaNK
+0XoAnRRNgKSCqX0Wu6bESMn14oZ0qGIT
+=zWRc
 -----END PGP SIGNATURE-----

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 412baa0c23994f0265fff08918b51c16289a472d..b2a430883be7050b341650c6c55c040223d4e9f4 100644 (file)
--- 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