Added a fix for bug #75604.

Package-Manager: portage-2.0.51.16

6 files changed, 196 insertions, 7 deletions

diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index fcd58413b3eb..a51a15a02f4a 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-terms/aterm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.58 2005/02/06 00:52:55 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.59 2005/02/06 21:34:10 spock Exp $
+
+*aterm-0.4.2-r12 (06 Feb 2005)
+
+  06 Feb 2005; Michał Januszewski <spock@gentoo.org>
+  +files/aterm-0.4.2-scroll-double-free.patch, +aterm-0.4.2-r12.ebuild,
+  aterm-1.00_beta2.ebuild:
+  Added a fix for bug #75604. aterm-0.4.2-r12 is the first 0.4.2 ebuild that
+  uses the xgetdefault USE flag. If you have some problems with how your
+  ~/.Xdefaults is handled, try enabling/disabling this flag.
 
 *aterm-1.00_beta2 (06 Feb 2005)
 
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index c29b215a950f..a11018932e76 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bb4c569c7c6b2d8d1d59bab8b5b7ce7e aterm-1.00_beta2.ebuild 1555
+MD5 d960cc3ac5eba8e6dbf6635ebbde673e aterm-1.00_beta2.ebuild 1652
 MD5 cfdac67e637f4ef919ea59a599de13df aterm-0.4.2-r11.ebuild 2879
 MD5 59ea7920f8bed448ead90626580d91ef aterm-0.4.2-r7.ebuild 2049
-MD5 12478f784ccec5f7eec0b03def1f01a5 ChangeLog 10458
+MD5 29bd18da6fea2dddad1e67ad06dee456 aterm-0.4.2-r12.ebuild 2955
+MD5 1802c3b912181d2530ce146ccb3953a8 ChangeLog 10855
 MD5 41328649bf184e80ecc1043bc7b44ec0 aterm-0.4.2-r9.ebuild 2369
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 MD5 f35d671ae7390589e50cb67736e90fc3 files/digest-aterm-1.00_beta2 69
@@ -12,6 +13,7 @@ MD5 c2aedeeb3e7cc1dcc9361a021a570973 files/aterm-0.4.2-paste.patch 2160
 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r7 128
 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r9 128
 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r11 128
+MD5 2b5573768ab860ead256fa2af0a1882a files/digest-aterm-0.4.2-r12 64
 MD5 1ddbe9b625c32cb9e67d8ee23af57110 files/aterm-0.4.2-patch-pack000.patch 4124
 MD5 df2652026f1f4f3e4444db9cddc145b6 files/aterm-0.4.2-qtpaste.patch 2510
 MD5 18e59b417ce4b6394317ac17da46c122 files/aterm-0.4.2-internal-border.patch 3246
@@ -20,12 +22,13 @@ MD5 80558db5a2d61eaaf6998877b616bbd0 files/aterm-0.4.2-copynpaste-r3.patch 6358
 MD5 e91e244a20f4bff5ed4238e4cdb4d87a files/aterm-0.4.2-paste_mouse_outside.patch 6267
 MD5 1c869d8199dea55badd3758c5967e182 files/aterm-0.4.2-copynpaste.patch 3668
 MD5 001fefd640df8a6318e8597f86c6e08c files/aterm-0.4.2-ja-savelines.patch 4459
+MD5 64a8e39eb81e3b76ec3a28e0c36b2c30 files/aterm-0.4.2-scroll-double-free.patch 1826
 MD5 56383dccdb085d09e33858081b774724 files/aterm-0.4.2-borderless.patch 4692
 MD5 8faf173b6f8032958f1bc48d7877353c files/aterm-0.4.2-savelines.patch 4081
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCBWp2chej4aZK9/cRAn4/AJ9UfHctm3y5ofmbjXB2ugoBhRfbOgCdGXkf
-rtrHTceOmFg7SkjHS9Meq4Y=
-=8sb4
+iD8DBQFCBo2lchej4aZK9/cRAqwdAJ9V9djkquPcXiUSoLeHVZUbGHNdNACfQXbl
+FEzXs7pSDnQ8wr1vSHpWIyg=
+=VBYU
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/aterm/aterm-0.4.2-r12.ebuild b/x11-terms/aterm/aterm-0.4.2-r12.ebuild
new file mode 100644
index 000000000000..c456b0b373ee
--- /dev/null
+++ b/x11-terms/aterm/aterm-0.4.2-r12.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r12.ebuild,v 1.1 2005/02/06 21:34:10 spock Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
+HOMEPAGE="http://aterm.sourceforge.net"
+SRC_URI="mirror://sourceforge/aterm/${P}.tar.bz2
+	cjk? (http://dev.gentoo.org/~spock/portage/distfiles/aterm-0.4.2-ja.patch)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
+IUSE="cjk xgetdefault"
+
+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
+
+	sed -i "s:    KeySym          keysym;:    KeySym          keysym = 0;:" command.c
+
+	cd ${S}
+	epatch ${FILESDIR}/aterm-0.4.2-borderless.patch
+	epatch ${FILESDIR}/aterm-0.4.2-paste.patch
+	epatch ${FILESDIR}/aterm-0.4.2-paste_mouse_outside.patch
+
+	if use cjk ; then
+		epatch ${DISTDIR}/aterm-0.4.2-ja.patch
+	else
+		epatch ${FILESDIR}/aterm-0.4.2-copynpaste-r3.patch
+	fi
+
+	epatch ${FILESDIR}/aterm-0.4.2-patch-pack000.patch
+
+	if use cjk ; then
+		epatch ${FILESDIR}/aterm-0.4.2-ja-savelines.patch
+	else
+		epatch ${FILESDIR}/aterm-0.4.2-savelines.patch
+	fi
+
+	epatch ${FILESDIR}/aterm-0.4.2-internal-border.patch
+	epatch ${FILESDIR}/aterm-0.4.2-scroll-double-free.patch
+}
+
+src_compile() {
+	local myconf
+
+	# macos doesn't support -z flag
+	if ! ( use macos || use ppc-macos ) ; then
+		append-ldflags -Wl,-z,now
+	fi
+
+	# 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 \
+		$(use_enable xgetdefault) \
+		--with-terminfo=/usr/share/terminfo \
+		--enable-transparency \
+		--enable-fading \
+		--enable-background-image \
+		--enable-menubar \
+		--enable-graphics \
+		--enable-utmp \
+		--with-x \
+		${myconf} || die
+
+	sed -i -re 's#^XLIB = (.*)#XLIB = \1 -lXmu#' src/Makefile
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	fowners root:utmp /usr/bin/aterm
+	fperms g+s /usr/bin/aterm
+
+	doman doc/aterm.1
+	dodoc ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.*
+	docinto menu
+	dodoc doc/menu/*
+	dohtml -r .
+}
+
+pkg_postinst () {
+	echo ""
+	einfo "Hint: you can copy text from aterm to the clipboard by holding the ALT key"
+	einfo "while highlighting the text."
+	echo ""
+	ewarn "The transparent background will only work if you have the 'real' root wallpaper"
+	ewarn "set. Use Esetroot (x11-terms/eterm) or fbsetbg (x11-wm/fluxbox) if you are"
+	ewarn "experiencing problems with transparency in aterm."
+	echo ""
+}
diff --git a/x11-terms/aterm/aterm-1.00_beta2.ebuild b/x11-terms/aterm/aterm-1.00_beta2.ebuild
index 9acf567cade1..f09bf2d32749 100644
--- a/x11-terms/aterm/aterm-1.00_beta2.ebuild
+++ b/x11-terms/aterm/aterm-1.00_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.00_beta2.ebuild,v 1.1 2005/02/06 00:52:55 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.00_beta2.ebuild,v 1.2 2005/02/06 21:34:10 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -21,6 +21,12 @@ DEPEND="media-libs/jpeg
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/aterm-0.4.2-scroll-double-free.patch
+}
+
 src_compile() {
 	local myconf
 
diff --git a/x11-terms/aterm/files/aterm-0.4.2-scroll-double-free.patch b/x11-terms/aterm/files/aterm-0.4.2-scroll-double-free.patch
new file mode 100644
index 000000000000..997de5962424
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-0.4.2-scroll-double-free.patch
@@ -0,0 +1,61 @@
+diff -Naur aterm-0.4.2-orig/src/screen.c aterm-0.4.2/src/screen.c
+--- aterm-0.4.2-orig/src/screen.c	2005-02-06 22:15:49.000000000 +0100
++++ aterm-0.4.2/src/screen.c	2005-02-06 22:16:58.000000000 +0100
+@@ -448,6 +448,8 @@
+     for (i = 0; i < total_rows; i++) {
+ 	if (screen.text[i]) {	/* then so is screen.rend[i] */
+ 	    FREE(screen.text[i]);
++	}
++	if (screen.rend[i]) {
+ 	    FREE(screen.rend[i]);
+ 	}
+     }
+@@ -784,6 +786,8 @@
+     if (count > 0) {
+ /* A: scroll up */
+ 
++	void *t;
++
+ 	MIN_IT(count, row2 - row1 + 1);
+ /* A1: Copy lines that will get clobbered by the rotation */
+ 	for (i = 0, j = row1; i < count; i++, j++) {
+@@ -793,9 +797,13 @@
+ 	}
+ /* A2: Rotate lines */
+ 	for (j = row1; (j + count) <= row2; j++) {
+-	    screen.text[j] = screen.text[j + count];
++	    t = screen.text[j + count];
++	    screen.text[j + count] = NULL;
++	    screen.text[j] = t;
+ 	    screen.tlen[j] = screen.tlen[j + count];
+-	    screen.rend[j] = screen.rend[j + count];
++	    t = screen.rend[j + count];
++	    screen.rend[j + count] = NULL;
++	    screen.rend[j] = t;
+ 	}
+ /* A3: Resurrect lines */
+ 	for (i = 0; i < count; i++, j++) {
+@@ -805,6 +813,7 @@
+ 	}
+     } else if (count < 0) {
+ /* B: scroll down */
++	void *t;
+ 
+ 	count = min(-count, row2 - row1 + 1);
+ /* B1: Copy lines that will get clobbered by the rotation */
+@@ -815,9 +824,13 @@
+ 	}
+ /* B2: Rotate lines */
+ 	for (j = row2; (j - count) >= row1; j--) {
+-	    screen.text[j] = screen.text[j - count];
++	    t = screen.text[j - count];
++	    screen.text[j - count] = NULL;
++	    screen.text[j] = t;
+ 	    screen.tlen[j] = screen.tlen[j - count];
+-	    screen.rend[j] = screen.rend[j - count];
++	    t = screen.rend[j - count];
++	    screen.rend[j - count] = NULL;
++	    screen.rend[j] = t;
+ 	}
+ /* B3: Resurrect lines */
+ 	for (i = 0, j = row1; i < count; i++, j++) {
diff --git a/x11-terms/aterm/files/digest-aterm-0.4.2-r12 b/x11-terms/aterm/files/digest-aterm-0.4.2-r12
new file mode 100644
index 000000000000..5cf11a8573c5
--- /dev/null
+++ b/x11-terms/aterm/files/digest-aterm-0.4.2-r12
@@ -0,0 +1 @@
+MD5 5c29d0cde4225bdbd63ccb6a4dd94c56 aterm-0.4.2.tar.bz2 243419