Add patch from upstream to fix behaviour when mrxvt window is completely obscured, bug #229469.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-tuxonice-r5 x86_64

4 files changed, 151 insertions, 5 deletions

diff --git a/x11-terms/mrxvt/ChangeLog b/x11-terms/mrxvt/ChangeLog
index c542bdcffdd8..e0742bd05937 100644
--- a/x11-terms/mrxvt/ChangeLog
+++ b/x11-terms/mrxvt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/mrxvt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.66 2008/06/10 22:05:42 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.67 2008/06/26 09:13:01 nelchael Exp $
+
+*mrxvt-0.5.3-r3 (26 Jun 2008)
+
+  26 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/mrxvt-0.5.3-stop-polling-when-obscured.patch,
+  +mrxvt-0.5.3-r3.ebuild:
+  Add patch from upstream to fix behaviour when mrxvt window is completely
+  obscured, bug #229469.
 
   10 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   -files/mrxvt-0.5.2-no_debug_x.patch, -mrxvt-0.5.1.ebuild,
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index 37ee3b76ec08..b6617b136851 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 AUX mrxvt-0.5.3-display-security.patch 1955 RMD160 00a026429da646cc0c594a96d261f29a276fbf3b SHA1 af49d324e36b9a719fd6065a5bbf9279aa8fa272 SHA256 4d12ee8672170ee55fdc5fb1ccb624c976d3fcd3a0601e61dae4a38431a54559
 AUX mrxvt-0.5.3-no-scroll-with-buffer.patch 2182 RMD160 0b05e382fe8736617961d8790786ba0341945caf SHA1 303de6d33aa76892f24c6fac7b93ac21a945fda5 SHA256 5c7b6e0e4f07b35d8ed14ef2c87e8c57bfc4806dcd01f6ee14ef0b233c5b6932
+AUX mrxvt-0.5.3-stop-polling-when-obscured.patch 338 RMD160 02b0dcfe85850fb0f48146c7236d7a8d4d46f4ec SHA1 ee7025382b6ef5e9f70788a1f0e52cf205f9bac8 SHA256 51770f3b37406b80bcfa72eec757bbcea633bda6663c3332c7c6cb7defa812ce
 DIST mrxvt-0.5.3.tar.gz 592897 RMD160 76fbbd5ba20215dd7785eafa07dae909029194ec SHA1 442006f1d797ea5464c5c49d26d0cdecf79160f4 SHA256 e2327b7fdf1db3f2152d7cbda564f638ec11a4bed17f69e6de985c888ab5d411
 EBUILD mrxvt-0.5.3-r2.ebuild 3325 RMD160 6aa0dd4f1c3d5bfd3881a7276830ca16ff09e7d1 SHA1 5a13eb94b913eedd2d7ab2e3ca4afb1a58ab8e24 SHA256 6b0f50275f68f16ee09112baab68bda68194f9e5dbfae886c88780e71ea2be1c
-MISC ChangeLog 9443 RMD160 210c5ea30ec9610c6a3756e4ad63192a3faf1372 SHA1 3443255ba67c8942410c351d40bfca22b76eb99b SHA256 6a3e8275ec5c89de9ed68aeb61e2dd491007aeab124eb0f8bc1776e1b79ee4d5
+EBUILD mrxvt-0.5.3-r3.ebuild 3387 RMD160 4a8ca8d2182a049669021bf150fa13eb99e7d5f6 SHA1 4d9dd746e215b5a3130cb03cded79413dca36ee4 SHA256 6bf73be0e9f03840b28c97331755ce2f28bc66d0b77c78fb25b7e85a0fda5d96
+MISC ChangeLog 9709 RMD160 8c4bf8d0ff737b0aa135c7d19474d7c56bce9207 SHA1 fe77487ffef5395ecd5c317d27c04acd32f3ed3c SHA256 24693fdf94924aeef20c0d2f0aeb8fea63a2875432e756ff72e80da71cdcd39b
 MISC metadata.xml 227 RMD160 4603991d222df002795ac3709a24e98165edd8d1 SHA1 ac9b347ba7ed1d5f92472126580ef32d63fb9bfa SHA256 ef0905299b05e713fbb019ae7ca5e3e6ebfbf32d47fdd4d803e96a3bda500f71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhO+rsACgkQgo/w9rxVVVH0PQCaAtQ847BIUWiOYypLstXS0c9X
-AUQAn3ECzk6luZOcjcvp/FVq4kLOK0Fz
-=b/8y
+iEYEARECAAYFAkhjXaIACgkQgo/w9rxVVVHgOwCfdMinFwF6cnABrPd8f7JN/Yqy
+4VcAn2lYDF3ZDYwho0Jis2SRJL+bsqow
+=bRMX
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.3-stop-polling-when-obscured.patch b/x11-terms/mrxvt/files/mrxvt-0.5.3-stop-polling-when-obscured.patch
new file mode 100644
index 000000000000..191f07f5b9c9
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.3-stop-polling-when-obscured.patch
@@ -0,0 +1,13 @@
+Index: src/command.c
+===================================================================
+--- src/command.c	(revision 292)
++++ src/command.c	(revision 293)
+@@ -1966,7 +1966,7 @@
+     value->tv_sec = 0;
+ 
+ 
+-    if (!r->TermWin.mapped)
++    if( !r->TermWin.mapped || r->h->refresh_type == NO_REFRESH )
+ 	quick_timeout = 0;
+     else
+     {
diff --git a/x11-terms/mrxvt/mrxvt-0.5.3-r3.ebuild b/x11-terms/mrxvt/mrxvt-0.5.3-r3.ebuild
new file mode 100644
index 000000000000..54d16f6cd549
--- /dev/null
+++ b/x11-terms/mrxvt/mrxvt-0.5.3-r3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/06/26 09:13:01 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
+HOMEPAGE="http://materm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/materm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~x86"
+
+LINGUAS_IUSE="linguas_el linguas_ja linguas_ko linguas_th linguas_zh_CN linguas_zh_TW"
+IUSE="debug png jpeg session truetype menubar utempter xpm ${LINGUAS_IUSE}"
+
+RDEPEND="png? ( media-libs/libpng )
+	utempter? ( sys-libs/libutempter )
+	jpeg? ( media-libs/jpeg )
+	truetype? ( virtual/xft
+		media-libs/fontconfig
+		media-libs/freetype )
+	x11-libs/libX11
+	x11-libs/libXt
+	xpm? ( x11-libs/libXpm )
+	x11-libs/libXrender"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-no-scroll-with-buffer.patch"
+	epatch "${FILESDIR}/${P}-display-security.patch"
+	epatch "${FILESDIR}/${P}-stop-polling-when-obscured.patch"
+
+}
+
+src_compile() {
+
+	local myconf
+
+	# if you want to pass any other flags, use EXTRA_ECONF.
+	if use linguas_el ; then
+		myconf="${myconf} --enable-greek"
+	fi
+	if use linguas_ja ; then
+		# --with-encoding=sjis
+		myconf="${myconf} --enable-kanji --with-encoding=eucj"
+	fi
+	if use linguas_ko ; then
+		myconf="${myconf} --enable-kr --with-encoding=kr"
+	fi
+	if use linguas_th ; then
+		myconf="${myconf} --enable-thai"
+	fi
+	if use linguas_zh_CN ; then
+		# --with-encoding=gbk
+		myconf="${myconf} --enable-gb --with-encoding=gb"
+	fi
+	if use linguas_zh_TW ; then
+		myconf="${myconf} --enable-big5 --with-encoding=big5"
+	fi
+
+	# 2006-03-13 gi1242: mrxvt works best with TERM=rxvt AND correctly set
+	# termcap / terminfo entries. If the rxvt termcap / terminfo entries are
+	# messed up then then it's better to set TERM=xterm.
+	#
+	# Provide support for this by setting the or RXVT_TERM environment variables
+	# before emerging, as done in the rxvt ebuild.
+
+	if [[ -n ${RXVT_TERM} ]]; then
+		myconf="${myconf} --with-term=${RXVT_TERM}"
+	fi
+
+	econf \
+		--enable-everything \
+		--with-atab-extra=25 \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable xpm) \
+		$(use_enable session sessionmgr) \
+		$(use_enable truetype xft) \
+		$(use_enable utempter) \
+		$(use_enable menubar) \
+		${myconf} || die
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR="${D}" docdir=/usr/share/doc/${PF} install || die
+	# Give mrxvt perms to update utmp
+	fowners root:utmp /usr/bin/mrxvt
+	fperms g+s /usr/bin/mrxvt
+	dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO
+
+}
+
+pkg_postinst() {
+
+	if [[ -z $RXVT_TERM ]]; then
+		einfo
+		einfo "If you experience problems with curses programs, then this is"
+		einfo "most likely because of incorrectly set termcap / terminfo"
+		einfo "entries. To fix this you can dry and run (as user)"
+		einfo "	tic /usr/share/doc/${P}/etc/mrxvt.terminfo"
+		einfo "Alternately, run the offending programs with TERM=xterm."
+		einfo
+		einfo "To emerge mrxvt with TERM=xterm by default, set the RXVT_TERM"
+		einfo "environment variable to 'xterm', or your desired default"
+		einfo "terminal name. Alternately you can put 'Mrxvt.termName: xterm'"
+		einfo "in your ~/.mrxvtrc, or /etc/mrxvt/mrxvtrc."
+		einfo
+	fi
+
+}