summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2005-01-18 13:51:58 +0000
committerMichael Januszewski <spock@gentoo.org>2005-01-18 13:51:58 +0000
commitaa0ce1438c4d06100b5204ebec087ff8f6d0fa8e (patch)
tree6a577147b2354e9a25da153f04ec50abf18dc230 /x11-terms/aterm
parentVersion bumped. (Manifest recommit) (diff)
downloadgentoo-2-aa0ce1438c4d06100b5204ebec087ff8f6d0fa8e.tar.gz
gentoo-2-aa0ce1438c4d06100b5204ebec087ff8f6d0fa8e.tar.bz2
gentoo-2-aa0ce1438c4d06100b5204ebec087ff8f6d0fa8e.zip
Added a simple fix for the internal-border related bug #72970.
(Portage version: 2.0.51-r13)
Diffstat (limited to 'x11-terms/aterm')
-rw-r--r--x11-terms/aterm/ChangeLog6
-rw-r--r--x11-terms/aterm/files/aterm-0.4.2-internal-border.patch27
2 files changed, 23 insertions, 10 deletions
diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index 349cea0fcd23..41fb1e64941e 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,10 @@
# 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.55 2005/01/12 18:49:42 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.56 2005/01/18 13:51:57 spock Exp $
+
+ 18 Jan 2005; Michał Januszewski <spock@gentoo.org>
+ files/aterm-0.4.2-internal-border.patch:
+ Added a simple fix for the internal-border related bug #72970.
12 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> aterm-0.4.2-r11.ebuild:
Stable on sparc
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
index 43a2c0b87adb..d39f6cb7c149 100644
--- a/x11-terms/aterm/files/aterm-0.4.2-internal-border.patch
+++ b/x11-terms/aterm/files/aterm-0.4.2-internal-border.patch
@@ -1,6 +1,15 @@
-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
+diff -Naur aterm-0.4.2/src/main.c aterm-0.4.2-spock/src/main.c
+--- aterm-0.4.2/src/main.c 2005-01-18 14:40:55.000000000 +0100
++++ aterm-0.4.2-spock/src/main.c 2005-01-18 14:42:35.000000000 +0100
+@@ -838,7 +838,7 @@
+ Resize_menuBar(x, 0, width, y);
+ }
+ }
+- XMoveResizeWindow(Xdisplay, TermWin.vt, x, y, width, height + 1);
++ XMoveResizeWindow(Xdisplay, TermWin.vt, x, y, width, (height < 0xffff) ? height + 1 : height);
+
+ if (old_width)
+ Gr_Resize(old_width, old_height);
@@ -1634,6 +1634,7 @@
rs_minBufferWidth = NULL;
rs_saveLines = NULL; /* scrollback buffer [lines] */
@@ -22,9 +31,9 @@ diff -Naur aterm-0.4.2/src/main.c aterm-0.4.2-orig/src/main.c
/* 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
+diff -Naur aterm-0.4.2/src/rxvt.h aterm-0.4.2-spock/src/rxvt.h
+--- aterm-0.4.2/src/rxvt.h 2005-01-18 14:40:55.000000000 +0100
++++ aterm-0.4.2-spock/src/rxvt.h 2005-01-18 14:41:50.000000000 +0100
@@ -603,10 +603,6 @@
#define scrollBar_esc 30
#define menuBar_margin 2 /* margin below text */
@@ -57,9 +66,9 @@ diff -Naur aterm-0.4.2/src/rxvt.h aterm-0.4.2-orig/src/rxvt.h
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
+diff -Naur aterm-0.4.2/src/xdefaults.c aterm-0.4.2-spock/src/xdefaults.c
+--- aterm-0.4.2/src/xdefaults.c 2005-01-18 14:40:28.000000000 +0100
++++ aterm-0.4.2-spock/src/xdefaults.c 2005-01-18 14:41:50.000000000 +0100
@@ -302,6 +302,8 @@
"pointer color"),
STRG(rs_borderWidth, "borderWidth", "bw", "number",