Add qt pasting patch from bug 29232

5 files changed, 155 insertions, 5 deletions

diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index 8f3c6108bf73..fba51b8d13e7 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/aterm
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.15 2003/12/03 12:02:53 zul Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.16 2004/01/15 15:41:59 agriffis Exp $
+
+*aterm-0.4.2-r6 (15 Jan 2004)
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> aterm-0.4.2-r6.ebuild,
+  files/aterm-0.4.2-qtpaste.patch:
+  Add qt pasting patch from bug 29232
 
   03 Dec 2003; Chuck Short <zul@gentoo.org> aterm-0.4.2-r5.ebuild:
   Added ~amd64 keyword, closes #34900.
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index c808e5050f9b..e2ff5254b3c9 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,6 +1,9 @@
-MD5 56bfa415a6e1bbdf0d3736e67d6630a3 aterm-0.4.2-r5.ebuild 1684
 MD5 41671f312c9f9e5a9a64bca53df5a741 ChangeLog 2671
+MD5 56bfa415a6e1bbdf0d3736e67d6630a3 aterm-0.4.2-r5.ebuild 1684
+MD5 10ea644fb7e6aa6ab75e43115c5f1906 aterm-0.4.2-r6.ebuild 1730
 MD5 2d93bf72ffa2ddabf05b54d5717cbd93 aterm-0.4.2-r4.ebuild 1626
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r4 128
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r5 128
 MD5 1109dcca55994f56324dc3b15ca2d04b files/aterm-0.4.2-borderless.patch 4692
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r5 128
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r4 128
+MD5 df2652026f1f4f3e4444db9cddc145b6 files/aterm-0.4.2-qtpaste.patch 2510
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r6 128
diff --git a/x11-terms/aterm/aterm-0.4.2-r6.ebuild b/x11-terms/aterm/aterm-0.4.2-r6.ebuild
new file mode 100644
index 000000000000..cde55422790a
--- /dev/null
+++ b/x11-terms/aterm/aterm-0.4.2-r6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r6.ebuild,v 1.1 2004/01/15 15:41:59 agriffis Exp $
+
+IUSE="cjk"
+S=${WORKDIR}/${P}
+DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
+SRC_URI="mirror://sourceforge/aterm/${P}.tar.bz2
+	cjk? (http://wakaba.com/~tsann/aterm/aterm-0.4.2-ja.patch)"
+HOMEPAGE="http://aterm.sourceforge.net"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+DEPEND="media-libs/jpeg
+	media-libs/libpng
+	virtual/x11"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd ${S}/src
+	cp feature.h feature.h.orig
+	sed "s:\(#define LINUX_KEYS\):/\*\1\*/:" \
+		feature.h.orig > feature.h
+
+	cd ${S}
+	epatch ${FILESDIR}/aterm-0.4.2-borderless.patch
+	epatch ${FILESDIR}/aterm-0.4.2-qtpaste.patch
+	use cjk && epatch ${DISTDIR}/aterm-0.4.2-ja.patch
+}
+
+src_compile() {
+	local myconf
+
+	# You can't --enable-big5 with aterm-0.4.2-ja.patch
+	# I think it's very bad thing but as nobody complains it
+	# and we don't have per-language flag atm, I stick to
+	# use --enable-kanji/--enable-thai (and leave --enable-big5)
+	use cjk && myconf="$myconf
+		--enable-kanji
+		--enable-thai
+		--enable-xim
+		--enable-linespace"
+
+	econf \
+		--enable-transparency \
+		--enable-fading \
+		--enable-background-image \
+		--enable-menubar \
+		--enable-graphics \
+		--enable-utmp \
+		--with-x \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	fperms g+s /usr/bin/aterm
+	fowners root:utmp /usr/bin/aterm
+
+	doman doc/aterm.1
+	dodoc ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.*
+	docinto menu
+	dodoc doc/menu/*
+	dohtml -r .
+}
diff --git a/x11-terms/aterm/files/aterm-0.4.2-qtpaste.patch b/x11-terms/aterm/files/aterm-0.4.2-qtpaste.patch
new file mode 100644
index 000000000000..dff3b995ccdf
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-0.4.2-qtpaste.patch
@@ -0,0 +1,70 @@
+--- aterm-0.4.2-orig/src/screen.c	2001-09-06 12:38:07.000000000 -0400
++++ aterm-0.4.2/src/screen.c	2003-09-11 02:45:54.000000000 -0400
+@@ -2788,8 +2788,10 @@
+ {
+     Atom            prop;
+ 
++#if 0 /* make shift-insert with the mouse outside the window work (#77338) */
+     if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
+ 	return;			/* outside window */
++#endif
+ 
+     if (selection.text != NULL) {
+ 	PasteIt(selection.text, selection.len);		/* internal selection */
+@@ -3328,10 +3330,21 @@
+ void
+ selection_send(XSelectionRequestEvent * rq)
+ {
++    /* Changes are from rxvt. This fixes #205040. */
+     XEvent          ev;
+-    Atom32          target_list[2];
++    Atom32          target_list[4];
++    Atom            target;
+     static Atom     xa_targets = None;
+-
++    static Atom     xa_compound_text = None;
++    static Atom     xa_text = None;
++    XTextProperty   ct;
++    XICCEncodingStyle style;
++    char           *cl[4];
++
++    if (xa_text == None)
++	xa_text = XInternAtom(Xdisplay, "TEXT", False);
++    if (xa_compound_text == None)
++	xa_compound_text = XInternAtom(Xdisplay, "COMPOUND_TEXT", False);
+     if (xa_targets == None)
+ 	xa_targets = XInternAtom(Xdisplay, "TARGETS", False);
+ 
+@@ -3346,14 +3359,29 @@
+     if (rq->target == xa_targets) {
+ 	target_list[0] = (Atom32) xa_targets;
+ 	target_list[1] = (Atom32) XA_STRING;
++	target_list[2] = (Atom32) xa_text;
++	target_list[3] = (Atom32) xa_compound_text;
+ 	XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target,
+ 			(8 * sizeof(target_list[0])), PropModeReplace,
+ 			(unsigned char *)target_list,
+ 			(sizeof(target_list) / sizeof(target_list[0])));
+ 	ev.xselection.property = rq->property;
+-    } else if (rq->target == XA_STRING) {
+-	XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target,
+-			8, PropModeReplace, selection.text, selection.len);
++    } else if (rq->target == XA_STRING
++	       || rq->target == xa_compound_text
++	       || rq->target == xa_text) {
++	if (rq->target == XA_STRING) {
++	    style = XStringStyle;
++	    target = XA_STRING;
++	} else {
++	    target = xa_compound_text;
++	    style = (rq->target == xa_compound_text) ? XCompoundTextStyle
++		: XStdICCTextStyle;
++	}
++	cl[0] = selection.text;
++	XmbTextListToTextProperty(Xdisplay, cl, 1, style, &ct);
++	XChangeProperty(Xdisplay, rq->requestor, rq->property,
++			target, 8, PropModeReplace,
++			ct.value, ct.nitems);
+ 	ev.xselection.property = rq->property;
+     }
+     XSendEvent(Xdisplay, rq->requestor, False, 0, &ev);
diff --git a/x11-terms/aterm/files/digest-aterm-0.4.2-r6 b/x11-terms/aterm/files/digest-aterm-0.4.2-r6
new file mode 100644
index 000000000000..a1aafd5e085e
--- /dev/null
+++ b/x11-terms/aterm/files/digest-aterm-0.4.2-r6
@@ -0,0 +1,2 @@
+MD5 5c29d0cde4225bdbd63ccb6a4dd94c56 aterm-0.4.2.tar.bz2 243419
+MD5 2bd8629ea2a1926bca13841b0aca6604 aterm-0.4.2-ja.patch 84282