(non-maintainer commit) add deadkeys patch submitted by Yarda in bug #211576

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 126 insertions, 2 deletions

diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index 9482f964122f..80685a71c37a 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/aterm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.111 2008/09/10 15:06:07 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.112 2008/10/02 02:37:46 darkside Exp $
+
+*aterm-1.0.1-r2 (02 Oct 2008)
+
+  02 Oct 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/aterm-1.0.1-deadkeys.patch, +aterm-1.0.1-r2.ebuild:
+  (non-maintainer commit) add deadkeys patch submitted by Yarda in bug #211576
 
   10 Sep 2008; Jeremy Olexa <darkside@gentoo.org> -aterm-1.0.1.ebuild,
   aterm-1.0.1-r1.ebuild:
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 741996087efc..92cb481e50bc 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,5 +1,7 @@
+AUX aterm-1.0.1-deadkeys.patch 1358 RMD160 cf30459951d2b7c4c9d37074669619722478807f SHA1 e9ce3ac47e7f8076928bdc60bb13d03c473c8493 SHA256 5611f694ee0368c46e45389e87cfc8f66a8d4e7ad3b6141098ce7f325cf89640
 AUX aterm-1.0.1-display-security-issue.patch 797 RMD160 fa20d35058d625e487feb75c8053782c4645f60d SHA1 11f7a0e6c2bc6fa7400d4c3f360d0da331a5b816 SHA256 2fa7012ff386d4bc4b7f1b42ce0ddf75243bc6c9bb48b4c7ed009d6651b63ff4
 DIST aterm-1.0.1.tar.bz2 276810 RMD160 74c46af824c19d0c24c26178f0cb38c2d4e66e21 SHA1 a975753b415306a0734efc3773de8a86129bb54b SHA256 a161c3b2d9c7149130a41963899993af21eae92e8e362f4b5b3c7c4cb16760ce
 EBUILD aterm-1.0.1-r1.ebuild 1863 RMD160 c66744585cda70c42cbe6164a052f3dc1efaa11b SHA1 bdf4b58ccbc92a309230ad409114673bb7186421 SHA256 bbd3d153609f3bfcd01bb5d76ae9065a251c44fe3659bb70c40f46a3cfdc49d8
-MISC ChangeLog 18190 RMD160 cdaf31cbf08c4e296471f9a69502b274434bb738 SHA1 45e862937ae4cf93a57df1fc90a0dc3ba737473b SHA256 a4be955772e0fb2c770fd99729609d5c909c462a4e7b6589b0b6d7b76a440e84
+EBUILD aterm-1.0.1-r2.ebuild 1912 RMD160 5dfa082eef997801c4a453f923b289dfbdd3f4e4 SHA1 a74bf824b00c33918bee780e36f380bd3e6a9fa4 SHA256 138cd96a34c739ed610aa3d670dab6e66855ebb5606d4be72de1ba5ab86a8d1f
+MISC ChangeLog 18412 RMD160 90dfd4b46ad8d982999eb3dfdbf5f59cb44be60d SHA1 eb0dbe945f049d99b3718007ee350ce6a3359262 SHA256 9f0c453ea85fe83d0e716b191a5a82ee4cfdd04243b0394655e763036618bbfe
 MISC metadata.xml 450 RMD160 24f8a5cb2a00373b59ed5c12cc41010a069c8bfe SHA1 a70590ecba34c465bf70b89a76245915ff3232f9 SHA256 c310a050aab86e09333dcfc239ec10a78397796441274ab0cd93b725cb4e9a0e
diff --git a/x11-terms/aterm/aterm-1.0.1-r2.ebuild b/x11-terms/aterm/aterm-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..0edf30dcb727
--- /dev/null
+++ b/x11-terms/aterm/aterm-1.0.1-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.0.1-r2.ebuild,v 1.1 2008/10/02 02:37:46 darkside Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
+HOMEPAGE="http://aterm.sourceforge.net"
+SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="background cjk xgetdefault"
+
+RDEPEND="media-libs/jpeg
+	media-libs/libpng
+	background? ( x11-wm/afterstep )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libICE"
+
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Security bug #219746
+	epatch "${FILESDIR}/${P}-display-security-issue.patch"
+	epatch "${FILESDIR}"/${P}-deadkeys.patch
+}
+
+src_compile() {
+	local myconf
+
+	use cjk && myconf="$myconf
+		--enable-kanji
+		--enable-thai
+		--enable-big5"
+
+	econf \
+		$(use_enable xgetdefault) \
+		$(use_enable background background-image) \
+		--with-terminfo=/usr/share/terminfo \
+		--enable-transparency \
+		--enable-fading \
+		--enable-background-image \
+		--enable-menubar \
+		--enable-graphics \
+		--enable-utmp \
+		--enable-wtmp \
+		--with-x \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	fowners root:utmp /usr/bin/aterm
+	fperms g+s /usr/bin/aterm
+
+	doman doc/aterm.1
+	dodoc ChangeLog doc/FAQ doc/README.*
+	docinto menu
+	dodoc doc/menu/*
+	dohtml -r .
+}
+
+pkg_postinst() {
+	echo
+	ewarn "The transparent background will only work if you have the 'real'"
+	ewarn "root wallpaper set. Some tools that might help include: Esetroot"
+	ewarn "(x11-terms/eterm), wmsetbg (x11-wm/windowmaker), and/or"
+	ewarn "media-gfx/feh."
+	echo
+}
diff --git a/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch b/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch
new file mode 100644
index 000000000000..958f40900bcd
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch
@@ -0,0 +1,35 @@
+--- aterm-1.0.1~/src/command.c	2006-06-26 20:01:20.000000000 +0200
++++ aterm-1.0.1/src/command.c	2007-09-26 15:03:19.000000000 +0200
+@@ -1486,19 +1486,21 @@
+  	numlock_state = (ev->xkey.state & ModNumLockMask);	/* numlock toggle */
+ 	PrivMode((!numlock_state), PrivMode_aplKP);
+     }
+-#ifdef USE_XIM
++#if defined(USE_XIM) || !defined(NO_XLOCALE)
+     len = 0;
+-    if (Input_Context != NULL) {
+-      Status          status_return;
++    if (!XFilterEvent(ev, *(&ev->xkey.window))) {
++        if (Input_Context != NULL) {
++            Status          status_return;
+ 
+-      kbuf[0] = '\0';
+-      len = XmbLookupString(Input_Context, &ev->xkey, kbuf,
+-                          sizeof(kbuf), &keysym,
+-                          &status_return);
+-    } else {
+-      len = XLookupString(&ev->xkey, kbuf,
+-                        sizeof(kbuf), &keysym,
+-                        &compose);
++            kbuf[0] = '\0';
++            len = XmbLookupString(Input_Context, &ev->xkey, kbuf,
++                    sizeof(kbuf), &keysym,
++                    &status_return);
++        } else {
++            len = XLookupString(&ev->xkey, kbuf,
++                    sizeof(kbuf), &keysym,
++                    &compose);
++        }
+     }
+ #else                         /* USE_XIM */
+     len = XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, &compose);