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

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo x86_64)

3 files changed, 123 insertions, 1 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/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);