Added a patch to let user specify the value of internalBorder.

5 files changed, 184 insertions, 2 deletions

diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index ddff80a06eb5..5149c0dbfe06 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/aterm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.41 2004/08/07 10:14:11 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.42 2004/08/23 12:19:38 spock Exp $
+
+*aterm-0.4.2-r11 (23 Aug 2004)
+
+  23 Aug 2004; Michal Januszewski <spock@gentoo.org>
+  +files/aterm-0.4.2-internal-border.patch, +aterm-0.4.2-r11.ebuild:
+  Added a patch to let the user specify the value of internalBorder. Closes bug
+  #60813.
 
   07 Aug 2004; Tom Martin <slarti@gentoo.org> aterm-0.4.2-r9.ebuild:
   Stable on amd64.
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 40cf047806b9..46eca7d0d85e 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,7 +1,8 @@
+MD5 acac44eea1bcf20b2a0411af82e71b03 aterm-0.4.2-r11.ebuild 2598
 MD5 0583ec5b616f4e07029334e2eee1a31e aterm-0.4.2-r8.ebuild 2074
 MD5 8dc53ebe8c19e888a046fd01774151ac aterm-0.4.2-r10.ebuild 2543
 MD5 8322a090943f0f51c2a26442b10a21e8 aterm-0.4.2-r7.ebuild 1867
-MD5 8eafa87d5e81f8c909b9f6e2189ce58c ChangeLog 7161
+MD5 d8726a368725958aada283dc84643f13 ChangeLog 7405
 MD5 3b08f91f0073f06d9ff53749a795ac10 aterm-0.4.2-r9.ebuild 2171
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 MD5 b8757044e762f66c12e52131c40355a1 aterm-0.4.2-r4.ebuild 1632
@@ -11,8 +12,10 @@ MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r7 128
 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r8 128
 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r9 128
 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r10 128
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r11 128
 MD5 1ddbe9b625c32cb9e67d8ee23af57110 files/aterm-0.4.2-patch-pack000.patch 4124
 MD5 df2652026f1f4f3e4444db9cddc145b6 files/aterm-0.4.2-qtpaste.patch 2510
+MD5 5ebafb301735c88060c9329ef658f963 files/aterm-0.4.2-internal-border.patch 2942
 MD5 cc3291cba64add4b46d22268878043f7 files/aterm-0.4.2-copynpaste-r2.patch 5308
 MD5 80558db5a2d61eaaf6998877b616bbd0 files/aterm-0.4.2-copynpaste-r3.patch 6358
 MD5 e91e244a20f4bff5ed4238e4cdb4d87a files/aterm-0.4.2-paste_mouse_outside.patch 6267
diff --git a/x11-terms/aterm/aterm-0.4.2-r11.ebuild b/x11-terms/aterm/aterm-0.4.2-r11.ebuild
new file mode 100644
index 000000000000..ab027e42bfec
--- /dev/null
+++ b/x11-terms/aterm/aterm-0.4.2-r11.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 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-r11.ebuild,v 1.1 2004/08/23 12:19:38 spock Exp $
+
+inherit eutils
+
+IUSE="cjk"
+DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
+SRC_URI="mirror://sourceforge/aterm/${P}.tar.bz2
+	cjk? (http://dev.gentoo.org/~spock/portage/distfiles/aterm-0.4.2-ja.patch)"
+HOMEPAGE="http://aterm.sourceforge.net"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~mips"
+
+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
+}
+
+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
+
+	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/files/aterm-0.4.2-internal-border.patch b/x11-terms/aterm/files/aterm-0.4.2-internal-border.patch
new file mode 100644
index 000000000000..43a2c0b87adb
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-0.4.2-internal-border.patch
@@ -0,0 +1,71 @@
+diff -Naur aterm-0.4.2/src/main.c aterm-0.4.2-orig/src/main.c
+--- aterm-0.4.2/src/main.c	2004-08-23 14:08:25.000000000 +0200
++++ aterm-0.4.2-orig/src/main.c	2004-08-23 14:11:12.071851096 +0200
+@@ -1634,6 +1634,7 @@
+     rs_minBufferWidth = NULL;
+     rs_saveLines = NULL;	/* scrollback buffer [lines] */
+     rs_borderWidth = NULL;
++    rs_internal_border = NULL;
+     rs_modifier = NULL;	/* modifier */
+ #if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
+ /* recognized when combined with HOTKEY */
+@@ -1771,6 +1772,12 @@
+     else
+         TermWin.borderWidth = t;
+ 
++    if (!rs_internal_border|| (t = atoi(rs_internal_border)) < 0)
++        TermWin_internalBorder = 2;
++    else
++        TermWin_internalBorder = t;
++    TermWin_internalBorders = 2 * TermWin_internalBorder;
++    
+ /* no point having a scrollbar without having any scrollback! */
+     if (!TermWin.saveLines)
+ 	Options &= ~Opt_scrollBar;
+diff -Naur aterm-0.4.2/src/rxvt.h aterm-0.4.2-orig/src/rxvt.h
+--- aterm-0.4.2/src/rxvt.h	2004-08-23 14:08:25.000000000 +0200
++++ aterm-0.4.2-orig/src/rxvt.h	2004-08-23 14:09:58.099096664 +0200
+@@ -603,10 +603,6 @@
+ #define scrollBar_esc		30
+ #define menuBar_margin		2	/* margin below text */
+ 
+-/* gap between text and window edges (could be configurable) */
+-#define TermWin_internalBorder	2
+-#define TermWin_internalBorders	4 /* must be two times of value above */
+-
+ /* width of scrollBar, menuBar shadow, must be 1 or 2 */
+ #ifdef HALFSHADOW
+ # define SHADOW 1
+@@ -944,6 +940,12 @@
+ extern Window		ParentWin[PARENTS_NUM];
+ extern int		ParentWinNum;
+ 
++/* gap between text and window edges (could be configurable) */
++EXTERN int TermWin_internalBorder;
++/* must be two times of value above */
++EXTERN int TermWin_internalBorders;
++
++
+ EXTERN scrollBar_t	scrollBar;
+ EXTERN menuBar_t	menuBar;
+ EXTERN Display	       *Xdisplay;
+@@ -968,6 +970,7 @@
+ EXTERN const char      *rs_minBufferWidth; /* minimum buffer width - so we can scroll horizontally */
+ EXTERN const char      *rs_saveLines;	/* scrollback buffer [lines] */
+ EXTERN const char      *rs_borderWidth; /* border width [pixels] */
++EXTERN const char      *rs_internal_border; /* internal border width [pixels] */
+ EXTERN const char      *rs_cutchars;	/* chars for selection boundaries */
+ #ifdef META8_OPTION
+ EXTERN const char      *rs_modifier;
+diff -Naur aterm-0.4.2/src/xdefaults.c aterm-0.4.2-orig/src/xdefaults.c
+--- aterm-0.4.2/src/xdefaults.c	2004-08-23 14:08:24.000000000 +0200
++++ aterm-0.4.2-orig/src/xdefaults.c	2004-08-23 14:09:23.273390976 +0200
+@@ -302,6 +302,8 @@
+          "pointer color"),
+     STRG(rs_borderWidth, "borderWidth", "bw", "number",
+          "width of border"),
++    STRG(rs_internal_border, "internalBorder", "ib", "number",
++         "width of the internal border"),
+     STRG(rs_color[Color_border], "borderColor", "bd", "color",
+          "border color"),
+     BOOL(rs_borderLess, "borderLess", "bl", Opt_borderLess, "no decoration"),
diff --git a/x11-terms/aterm/files/digest-aterm-0.4.2-r11 b/x11-terms/aterm/files/digest-aterm-0.4.2-r11
new file mode 100644
index 000000000000..a1aafd5e085e
--- /dev/null
+++ b/x11-terms/aterm/files/digest-aterm-0.4.2-r11
@@ -0,0 +1,2 @@
+MD5 5c29d0cde4225bdbd63ccb6a4dd94c56 aterm-0.4.2.tar.bz2 243419
+MD5 2bd8629ea2a1926bca13841b0aca6604 aterm-0.4.2-ja.patch 84282