diff options
| -rw-r--r-- | x11-terms/aterm/ChangeLog | 11 | ||||
| -rw-r--r-- | x11-terms/aterm/aterm-0.4.2-r12.ebuild | 109 | ||||
| -rw-r--r-- | x11-terms/aterm/aterm-1.00_beta2.ebuild | 8 | ||||
| -rw-r--r-- | x11-terms/aterm/files/aterm-0.4.2-scroll-double-free.patch | 61 | ||||
| -rw-r--r-- | x11-terms/aterm/files/digest-aterm-0.4.2-r12 | 1 |
5 files changed, 188 insertions, 2 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/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 |