Added a simple fix for the internal-border related bug #72970.

Package-Manager: portage-2.0.51-r13

3 files changed, 37 insertions, 24 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/Manifest b/x11-terms/aterm/Manifest
index 4ea5bc78fe26..b0f8e561bc29 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ab7772e9758dbba4ce8544c425632b7f ChangeLog 9505
 MD5 ced8dc80f42f22c728d85d95b2193eb6 aterm-0.4.2-r11.ebuild 2882
 MD5 59ea7920f8bed448ead90626580d91ef aterm-0.4.2-r7.ebuild 2049
+MD5 9acf1e869044112c3594beebac6da05d ChangeLog 9665
 MD5 41328649bf184e80ecc1043bc7b44ec0 aterm-0.4.2-r9.ebuild 2369
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
-MD5 56383dccdb085d09e33858081b774724 files/aterm-0.4.2-borderless.patch 4692
+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 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
 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
 MD5 1c869d8199dea55badd3758c5967e182 files/aterm-0.4.2-copynpaste.patch 3668
-MD5 5ebafb301735c88060c9329ef658f963 files/aterm-0.4.2-internal-border.patch 2942
 MD5 001fefd640df8a6318e8597f86c6e08c files/aterm-0.4.2-ja-savelines.patch 4459
-MD5 c2aedeeb3e7cc1dcc9361a021a570973 files/aterm-0.4.2-paste.patch 2160
-MD5 e91e244a20f4bff5ed4238e4cdb4d87a files/aterm-0.4.2-paste_mouse_outside.patch 6267
-MD5 1ddbe9b625c32cb9e67d8ee23af57110 files/aterm-0.4.2-patch-pack000.patch 4124
-MD5 df2652026f1f4f3e4444db9cddc145b6 files/aterm-0.4.2-qtpaste.patch 2510
+MD5 56383dccdb085d09e33858081b774724 files/aterm-0.4.2-borderless.patch 4692
 MD5 8faf173b6f8032958f1bc48d7877353c files/aterm-0.4.2-savelines.patch 4081
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r11 128
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r7 128
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r9 128
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5XFOKRy60XGEcJIRAoXAAJ40VDpz4Y1B0hAzGMIMU3skO79Z7QCfbST8
-BLcqpPc1xGTmzaDnIttX6Fo=
-=F/xX
+iD8DBQFB7RScchej4aZK9/cRAgrrAJ43zkVF9asDmzvoGNlX1WCY98HIwACeM2z2
+oua3M9OdwMxoKMA9IAgafUc=
+=Idrm
 -----END PGP SIGNATURE-----
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",