Fix scrolling bug.

Package-Manager: portage-2.1.3.7

5 files changed, 95 insertions, 16 deletions

diff --git a/x11-terms/mrxvt/ChangeLog b/x11-terms/mrxvt/ChangeLog
index 69fe25ddd98e..b16e2532d874 100644
--- a/x11-terms/mrxvt/ChangeLog
+++ b/x11-terms/mrxvt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/mrxvt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.51 2007/08/22 20:21:30 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.52 2007/08/27 19:00:58 nelchael Exp $
+
+*mrxvt-0.5.3-r1 (27 Aug 2007)
+
+  27 Aug 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/mrxvt-0.5.3-no-scroll-with-buffer.patch, -mrxvt-0.5.3.ebuild,
+  +mrxvt-0.5.3-r1.ebuild:
+  Fix scrolling bug.
 
 *mrxvt-0.5.3 (22 Aug 2007)
 
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index d67e9b27d1fd..67d923ee8966 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -5,6 +5,10 @@ AUX mrxvt-0.5.2-no_debug_x.patch 275 RMD160 869479674beda85d8511549a369d3fc8f56a
 MD5 021613030ae67c5c9868ec2a0c031172 files/mrxvt-0.5.2-no_debug_x.patch 275
 RMD160 869479674beda85d8511549a369d3fc8f56ac9d2 files/mrxvt-0.5.2-no_debug_x.patch 275
 SHA256 a41c3eb4cf94fe7b059468983a2f533e0669d0204088fa5ece365b1663b560c7 files/mrxvt-0.5.2-no_debug_x.patch 275
+AUX mrxvt-0.5.3-no-scroll-with-buffer.patch 2182 RMD160 0b05e382fe8736617961d8790786ba0341945caf SHA1 303de6d33aa76892f24c6fac7b93ac21a945fda5 SHA256 5c7b6e0e4f07b35d8ed14ef2c87e8c57bfc4806dcd01f6ee14ef0b233c5b6932
+MD5 9032af5f981b91462ed916d27ae286b9 files/mrxvt-0.5.3-no-scroll-with-buffer.patch 2182
+RMD160 0b05e382fe8736617961d8790786ba0341945caf files/mrxvt-0.5.3-no-scroll-with-buffer.patch 2182
+SHA256 5c7b6e0e4f07b35d8ed14ef2c87e8c57bfc4806dcd01f6ee14ef0b233c5b6932 files/mrxvt-0.5.3-no-scroll-with-buffer.patch 2182
 DIST mrxvt-0.5.1.tar.gz 711657 RMD160 fc133e9ae6835c5e0881909e77c6298128a9779c SHA1 f6d442341e1071c5eae42c08ecd50b97234a5392 SHA256 f33bbef378a59d4a209650d57822fdc4b4147a51200f0b30484509749c119d71
 DIST mrxvt-0.5.2.tar.gz 559242 RMD160 85ccf709be85dc91374b1c6c893059155ab5c26f SHA1 a8fba2500b1edfabdd794e899b74666b2d909692 SHA256 558491d1f112362780abaf7429d14216e658b7768dd30f82f102ce646d3065cf
 DIST mrxvt-0.5.3.tar.gz 592897 RMD160 76fbbd5ba20215dd7785eafa07dae909029194ec SHA1 442006f1d797ea5464c5c49d26d0cdecf79160f4 SHA256 e2327b7fdf1db3f2152d7cbda564f638ec11a4bed17f69e6de985c888ab5d411
@@ -16,14 +20,14 @@ EBUILD mrxvt-0.5.2-r1.ebuild 3189 RMD160 ee01b494dd78eb0e4fc8b262a2d0d6de9cbb2f9
 MD5 17cf2f953c4d209ddec44765ac1ffa32 mrxvt-0.5.2-r1.ebuild 3189
 RMD160 ee01b494dd78eb0e4fc8b262a2d0d6de9cbb2f9b mrxvt-0.5.2-r1.ebuild 3189
 SHA256 adbc83ea5688beb481b5a4afd03baf91486a25d256a1c903c1b15c2f76a3ba8a mrxvt-0.5.2-r1.ebuild 3189
-EBUILD mrxvt-0.5.3.ebuild 3203 RMD160 3588859fa5cd47fe76ed11ebffc6abf9b7829e89 SHA1 30e94f9acd851df164f36411472d1a03e7e716aa SHA256 fb2697ca1e36123aec31be68bfdb28250e3603b072439c901928afb708d542c5
-MD5 f30ed7d5dc8086ec609b354888fb23c7 mrxvt-0.5.3.ebuild 3203
-RMD160 3588859fa5cd47fe76ed11ebffc6abf9b7829e89 mrxvt-0.5.3.ebuild 3203
-SHA256 fb2697ca1e36123aec31be68bfdb28250e3603b072439c901928afb708d542c5 mrxvt-0.5.3.ebuild 3203
-MISC ChangeLog 7390 RMD160 81475bf4a16743a31740457a21d562c9b876312a SHA1 ee8965f6c0b57281b095b883f5a5520d15511da1 SHA256 501b359e5143a437cffee225fc103de24c3f92382294c089533f098e16adec06
-MD5 2324a90e4053955fb8137c3b176cd82d ChangeLog 7390
-RMD160 81475bf4a16743a31740457a21d562c9b876312a ChangeLog 7390
-SHA256 501b359e5143a437cffee225fc103de24c3f92382294c089533f098e16adec06 ChangeLog 7390
+EBUILD mrxvt-0.5.3-r1.ebuild 3305 RMD160 14537aa3fb6104d222c4ad00eb1b066c1caeb8b1 SHA1 d56457bcaf4643f0cd37c421cf2be7061cfbdafe SHA256 1dfb3095fd958c1f1ddb60e1e688374b355c360b1781b76bddef8eb43841cf85
+MD5 379015d230b98540be32f72b2d0d15b3 mrxvt-0.5.3-r1.ebuild 3305
+RMD160 14537aa3fb6104d222c4ad00eb1b066c1caeb8b1 mrxvt-0.5.3-r1.ebuild 3305
+SHA256 1dfb3095fd958c1f1ddb60e1e688374b355c360b1781b76bddef8eb43841cf85 mrxvt-0.5.3-r1.ebuild 3305
+MISC ChangeLog 7593 RMD160 db197e365b78a46c05f0de719faeea749fa05b9b SHA1 01aab91f177364e5929aaf1f8ad4fe82164f80a0 SHA256 730bc7ac678c3b1132051284ca59fe9ad944bfd773bb345d7306831f507afe9d
+MD5 9ae776ef312aaf35fa3405f732d33ec4 ChangeLog 7593
+RMD160 db197e365b78a46c05f0de719faeea749fa05b9b ChangeLog 7593
+SHA256 730bc7ac678c3b1132051284ca59fe9ad944bfd773bb345d7306831f507afe9d ChangeLog 7593
 MISC metadata.xml 285 RMD160 7a393ddbd1e4bc0b8c8105de7db5fb64469ab0eb SHA1 e33da3adbda26c1cc1f8ea6c2773b114d22fcfd1 SHA256 849e6d884378550f853c172d2a2f5095b9a167259155c0ec629c893c3ac13b83
 MD5 3d61af9a82832d3ee3595f41c1bcff41 metadata.xml 285
 RMD160 7a393ddbd1e4bc0b8c8105de7db5fb64469ab0eb metadata.xml 285
@@ -34,13 +38,13 @@ SHA256 78149106af20984e8ebc740292bb2b82eb63ccdd15b9f1b76694dcfd3b38eb8f files/di
 MD5 462d323d4cd1e6e08f3a1cc0b3c4074f files/digest-mrxvt-0.5.2-r1 235
 RMD160 da573d82ba0fa508412446305c4104110125cc2d files/digest-mrxvt-0.5.2-r1 235
 SHA256 bb43bbebc2d9c21da4339557a8d6e2872aca88abbe656d8e18994947f62db19f files/digest-mrxvt-0.5.2-r1 235
-MD5 d26895b53b3610014c906b52f815b6f1 files/digest-mrxvt-0.5.3 235
-RMD160 5fa9ce8745e4bfcce307b68fb5cbdaa2c15cac1f files/digest-mrxvt-0.5.3 235
-SHA256 ecf174262e3a30de3ee61d4927418caaee4166de9f9ac53b08b3ab753d80f399 files/digest-mrxvt-0.5.3 235
+MD5 d26895b53b3610014c906b52f815b6f1 files/digest-mrxvt-0.5.3-r1 235
+RMD160 5fa9ce8745e4bfcce307b68fb5cbdaa2c15cac1f files/digest-mrxvt-0.5.3-r1 235
+SHA256 ecf174262e3a30de3ee61d4927418caaee4166de9f9ac53b08b3ab753d80f399 files/digest-mrxvt-0.5.3-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGzJntgo/w9rxVVVERAvKPAJ96ykBCDIr2krFRoqXy92bmIt5b0gCdE0+k
-mcteaHqsQLAynWzCwk6ZUk4=
-=otEz
+iD8DBQFG0x5lgo/w9rxVVVERAiBmAJ9rYmxJgKamNIUulZVuGwyQhmNs/wCfWbhU
+q0Ake81iCHOoXpVd7qN9Udo=
+=Ng94
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.5.3 b/x11-terms/mrxvt/files/digest-mrxvt-0.5.3-r1
index c4d1d0365bfd..c4d1d0365bfd 100644
--- a/x11-terms/mrxvt/files/digest-mrxvt-0.5.3
+++ b/x11-terms/mrxvt/files/digest-mrxvt-0.5.3-r1
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.3-no-scroll-with-buffer.patch b/x11-terms/mrxvt/files/mrxvt-0.5.3-no-scroll-with-buffer.patch
new file mode 100644
index 000000000000..08b926a2a904
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.3-no-scroll-with-buffer.patch
@@ -0,0 +1,60 @@
+Index: src/rxvtlib.h
+===================================================================
+--- src/rxvtlib.h	(revision 244)
++++ src/rxvtlib.h	(working copy)
+@@ -280,7 +280,7 @@
+ #define Opt_forceTransparent	    ((1LU<<16) | IS_OPTION1)
+ #define Opt_mc_hack		    ((1LU<<17) | IS_OPTION1)
+ #define Opt_tripleclickwords	    ((1LU<<18) | IS_OPTION1)
+-#define Opt_scrollWithBuffer	    ((1LU<<19) | IS_OPTION1)
++/* #define Opt_scrollWithBuffer	    ((1LU<<19) | IS_OPTION1) */
+ #define Opt_mouseWheelScrollPage    ((1LU<<21) | IS_OPTION1)
+ #define Opt_pointerBlank	    ((1LU<<22) | IS_OPTION1)
+ #define Opt_cursorBlink		    ((1LU<<23) | IS_OPTION1)
+Index: src/xdefaults.c
+===================================================================
+--- src/xdefaults.c	(revision 244)
++++ src/xdefaults.c	(working copy)
+@@ -203,8 +203,6 @@
+ 	    "scroll-on-tty-output inhibit" ),
+     BOOL( "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress,
+ 	    "scroll-on-keypress" ),
+-    BOOL( "scrollWithBuffer", "sw", Opt_scrollWithBuffer,
+-	    "scroll-with-buffer" ),
+ 
+     STRG(Rs_opacity, "opacity", "o", "%",
+ 	"transluscent window (true transparent) opaque degree", 0),
+Index: src/screen.c
+===================================================================
+--- src/screen.c	(revision 244)
++++ src/screen.c	(working copy)
+@@ -938,10 +938,6 @@
+ 	    PVTS(r, page)->nscrolled = SVLINES;
+ 	else
+ 	    PVTS(r, page)->nscrolled = (uint16_t)nscrolled;
+-	if (ISSET_OPTION(r, Opt_scrollWithBuffer) &&
+-	    VSTART != 0 &&
+-	    VSTART != SVLINES)
+-	    rxvt_scr_page(r, page, UP, count);
+     }
+     else if (!spec)
+ 	row1 += SVLINES;
+Index: doc/mrxvt.1
+===================================================================
+--- doc/mrxvt.1	(revision 244)
++++ doc/mrxvt.1	(working copy)
+@@ -329,14 +329,6 @@
+ Draw floating scrollbar (i.e. without a trough).
+ .Op Cm scrollbarFloating
+ .
+-.BO sw
+-Scroll synchronusly with buffer. Normally
+-.Nm
+-does not keep the screen completely up to date while scrolling. This allows
+-.Nm
+-to run faster when network latencies are very high and is typically useful when running across a very large internet or many gateways.
+-.Op Cm scrollWithBuffer
+-.
+ .El
+ .Ed
+ .\" {{{2 color
diff --git a/x11-terms/mrxvt/mrxvt-0.5.3.ebuild b/x11-terms/mrxvt/mrxvt-0.5.3-r1.ebuild
index e4b8b80b3bac..2663eca1a31d 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.3.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.3.ebuild,v 1.1 2007/08/22 20:21:30 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.5.3-r1.ebuild,v 1.1 2007/08/27 19:00:58 nelchael Exp $
 
 inherit eutils
 
@@ -30,6 +30,14 @@ RDEPEND="!ppc-macos? (
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-no-scroll-with-buffer.patch"
+
+}
+
 src_compile() {
 
 	local myconf