Added a fix for disabling gdk warnings, see bug #101401, and the upstream link.

Package-Manager: portage-2.0.53_rc7

5 files changed, 99 insertions, 17 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index fc52c5cf14cd..922c292cd9df 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/vte
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.91 2005/11/02 12:48:52 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.92 2005/11/06 15:21:07 obz Exp $
+
+*vte-0.11.15-r1 (06 Nov 2005)
+
+  06 Nov 2005; Mike Gardiner <obz@gentoo.org>
+  +files/vte-0.11.15-gdk-warnings.patch, +vte-0.11.15-r1.ebuild:
+  Added a fix for disabling gdk warnings, see bug #101401, and the upstream link.
 
   02 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> vte-0.11.15.ebuild:
   Stable on sparc
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index b6118ca909f5..122017c610c7 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 91bbba7d68b5a5c202912b63bae30148 vte-0.11.15.ebuild 1301
-MD5 e8e97b01a803c6bca0fc83255bf0bc04 ChangeLog 10575
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 aa4d3fbbdfc954475759cebe1f450a58 vte-0.11.13-r2.ebuild 1401
-MD5 3805528034f3d01fa27e24f600618c0d files/vte-line-scroll.patch 2234
+MD5 dc74aed45b8601d9ef27072251b945f7 ChangeLog 10795
 MD5 41b41aaa36ba84805514d34f2d9b491f files/digest-vte-0.11.13-r2 64
+MD5 d1ed443a14f417affb1932a7765c120c files/digest-vte-0.11.15 64
+MD5 d1ed443a14f417affb1932a7765c120c files/digest-vte-0.11.15-r1 64
 MD5 f8d6220ac03de9b337c4b0ec5243f55f files/vte-0.11.13-memory_fix.patch 7661
+MD5 5c662cb9664c2ba65b3623c2a14395bf files/vte-0.11.15-gdk-warnings.patch 632
+MD5 3805528034f3d01fa27e24f600618c0d files/vte-line-scroll.patch 2234
 MD5 31acc289fb190f9bdd0285147233eee0 files/vte-no_lazy_bindings.patch 419
-MD5 d1ed443a14f417affb1932a7765c120c files/digest-vte-0.11.15 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDaLXKKRy60XGEcJIRAjWeAJ9JNHZTxkipM7oM7/SxrkeSLyIpUwCfacJG
-YH3PIEGl/tmvQAJTT8weuBk=
-=LXFm
------END PGP SIGNATURE-----
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 aa4d3fbbdfc954475759cebe1f450a58 vte-0.11.13-r2.ebuild 1401
+MD5 7908ea079b9824d12b50b370a37876cf vte-0.11.15-r1.ebuild 1395
+MD5 91bbba7d68b5a5c202912b63bae30148 vte-0.11.15.ebuild 1301
diff --git a/x11-libs/vte/files/digest-vte-0.11.15-r1 b/x11-libs/vte/files/digest-vte-0.11.15-r1
new file mode 100644
index 000000000000..17efa6ba80fb
--- /dev/null
+++ b/x11-libs/vte/files/digest-vte-0.11.15-r1
@@ -0,0 +1 @@
+MD5 a9dc7b330d52ce384e3e5715d396c72f vte-0.11.15.tar.bz2 959449
diff --git a/x11-libs/vte/files/vte-0.11.15-gdk-warnings.patch b/x11-libs/vte/files/vte-0.11.15-gdk-warnings.patch
new file mode 100644
index 000000000000..eb8bb8899300
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.11.15-gdk-warnings.patch
@@ -0,0 +1,24 @@
+--- vte-0.11.13/src/vtebg.c	20 Apr 2004 06:35:43 -0000	1.9
++++ vte-0.11.13/src/vtebg.c	25 Jun 2005 21:38:09 -0000
+@@ -112,7 +112,7 @@
+ 			  XID **pixmaps)
+ {
+ 	return gdk_property_get(window, atom, GDK_TARGET_PIXMAP,
+-				0, INT_MAX,
++				0, INT_MAX - 3,
+ 				FALSE,
+ 				type, NULL, size,
+ 				(guchar**) pixmaps);
+
+--- vte-0.11.13/src/vterdb.c	20 Apr 2004 05:16:56 -0000	1.8
++++ vte-0.11.13/src/vterdb.c	25 Jun 2005 21:38:09 -0000
+@@ -40,7 +40,7 @@
+ 			 char **retval)
+ {
+ 	return gdk_property_get(window, atom, GDK_TARGET_STRING,
+-				0, INT_MAX,
++				0, INT_MAX - 3,
+ 				FALSE,
+ 				type, NULL, size,
+ 				(guchar**) retval);
+
diff --git a/x11-libs/vte/vte-0.11.15-r1.ebuild b/x11-libs/vte/vte-0.11.15-r1.ebuild
new file mode 100644
index 000000000000..36964f1ce73f
--- /dev/null
+++ b/x11-libs/vte/vte-0.11.15-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.11.15-r1.ebuild,v 1.1 2005/11/06 15:21:07 obz Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Xft powered terminal widget"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc python static"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2.2
+	>=x11-libs/pango-1.1
+	>=media-libs/freetype-2.0.2
+	media-libs/fontconfig
+	sys-libs/ncurses
+	python? (
+		>=dev-python/pygtk-2.4
+		>=dev-lang/python-2.2 )
+	virtual/x11"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-0.6 )
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+
+pkg_setup() {
+	G2CONF="$(use_enable debug debugging) $(use_enable python) \
+		$(use_enable static)"
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}/src"
+
+	# Apply the, shift-<up,down> scroll one
+	# line at a time patch.
+	epatch ${FILESDIR}/${PN}-line-scroll.patch
+
+	cd "${S}"
+	# Resolve all symbols at execution time for gnome-pty-helper. See bug
+	# #91617.
+	epatch ${FILESDIR}/${PN}-no_lazy_bindings.patch
+
+	# Remove harmless gdk warnings, see bug #101401
+	epatch ${FILESDIR}/${P}-gdk-warnings.patch
+
+	cd gnome-pty-helper
+	WANT_AUTOMAKE=1.9
+	aclocal  || die "aclocal failed"
+	automake || die "automake failed"
+}