Revision bump fixing two bugs

(Portage version: 2.1.4.5)

4 files changed, 159 insertions, 1 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index f01dba5d0c56..0e8411853bd8 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.125 2008/10/05 08:46:19 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.126 2008/11/01 09:35:13 killerfox Exp $
+
+*rxvt-unicode-9.05-r3 (01 Nov 2008)
+
+  01 Nov 2008; René Nussbaumer <killerfox@gentoo.org>
+  +files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch,
+  +files/rxvt-unicode_no-urgency-if-focused.diff,
+  +rxvt-unicode-9.05-r3.ebuild:
+  * Fix https://bugs.gentoo.org/show_bug.cgi?id=240165
+  * Fix https://bugs.gentoo.org/show_bug.cgi?id=237271
 
   05 Oct 2008; René Nussbaumer <killerfox@gentoo.org>
   rxvt-unicode-9.05-r2.ebuild:
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch
new file mode 100644
index 000000000000..972adbe06836
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch
@@ -0,0 +1,38 @@
+While setting MWM_HINTS_DECORATIONS to disable window decorations
+seems to work with most window managers, using _MOTIF_WM_INFO seems
+not to, and in some cases can lead to severe problems with focus
+management. Therefore this patch here disables the _MOTIF_WM_INFO
+check and always attempts to have the window manager honour the
+decorations hint.
+
+If your window manager does not honour MWM_HINTS_DECORATIONS, and you
+are determined that you want to have borderless windows nevertheless,
+you are still free to enable override-redirect manually, using the
+corresponding command line option or X resource.
+
+See also: http://bugs.gentoo.org/show_bug.cgi?id=237271
+2008-09-10 Martin von Gagern
+
+Index: src/init.C
+===================================================================
+RCS file: /schmorpforge/rxvt-unicode/src/init.C,v
+retrieving revision 1.253
+diff -u -r1.253 init.C
+--- src/init.C	15 Jul 2008 16:41:22 -0000	1.253
++++ src/init.C	10 Sep 2008 08:07:09 -0000
+@@ -1078,15 +1078,7 @@
+ #if ENABLE_FRILLS
+   if (option (Opt_borderLess))
+     {
+-      if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
+-        {
+-          // rxvt_warn("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");
+-          attributes.override_redirect = true;
+-        }
+-      else
+-        {
+           mwmhints.flags = MWM_HINTS_DECORATIONS;
+-        }
+     }
+ #endif
+ 
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode_no-urgency-if-focused.diff b/x11-terms/rxvt-unicode/files/rxvt-unicode_no-urgency-if-focused.diff
new file mode 100644
index 000000000000..7949bd17fc41
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode_no-urgency-if-focused.diff
@@ -0,0 +1,11 @@
+--- src/screen.C.orig	2008-08-01 11:56:18.380063687 +0200
++++ src/screen.C	2008-08-01 11:56:30.046093124 +0200
+@@ -1898,7 +1898,7 @@
+ # endif
+ 
+ # if ENABLE_FRILLS
+-  if (option (Opt_urgentOnBell))
++  if (option (Opt_urgentOnBell) && !focus)
+     {
+       if (XWMHints *h = XGetWMHints(dpy, parent[0]))
+         {
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r3.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r3.ebuild
new file mode 100644
index 000000000000..3f359db723b5
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r3.ebuild,v 1.1 2008/11/01 09:35:13 killerfox Exp $
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/"
+SRC_URI="http://dist.schmorp.de/rxvt-unicode/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="truetype perl iso14755 afterimage xterm-color wcwidth vanilla"
+
+# see bug #115992 for modular x deps
+RDEPEND="x11-libs/libX11
+	x11-libs/libXft
+	afterimage? ( media-libs/libafterimage )
+	x11-libs/libXrender
+	perl? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if (use xterm-color || use wcwidth); then
+		ewarn "You enabled xterm-color or wcwidth or both."
+		ewarn "Please note that neither of them are supported by upstream."
+		ewarn "You are at your own if you run into problems."
+		ebeep 5
+	fi
+
+	local tdir=/usr/share/terminfo
+	if use xterm-color; then
+		epatch doc/urxvt-8.2-256color.patch
+		sed -e \
+			's/^\(rxvt-unicode\)/\1256/;s/colors#88/colors#256/;s/pairs#256/pairs#32767/' \
+			doc/etc/rxvt-unicode.terminfo > doc/etc/rxvt-unicode256.terminfo
+		sed -i -e \
+			"s~^\(\s\+@TIC@.*\)~\1\n\t@TIC@ -o ${D}/${tdir} \$(srcdir)/etc/rxvt-unicode256.terminfo~" \
+			doc/Makefile.in
+	fi
+
+	use wcwidth && epatch doc/wcwidth.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=240165
+	epatch ${FILESDIR}/${PN}_no-urgency-if-focused.diff
+
+	if ! use vanilla; then
+		ewarn "You are going to include third-party bug fixes/features."
+		ewarn "They came without any warranty and are not supported by the"
+		ewarn "Gentoo community."
+		ebeep 5
+		# https://bugs.gentoo.org/show_bug.cgi?id=237271
+		epatch ${FILESDIR}/${P}_no-MOTIF-WM-INFO.patch
+	fi
+
+	sed -i -e \
+		"s~@TIC@ \(\$(srcdir)/etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \
+		doc/Makefile.in
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf=''
+
+	use iso14755 || myconf='--disable-iso14755'
+	use xterm-color && myconf="$myconf --enable-xterm-colors=256"
+
+	econf --enable-everything \
+		$(use_enable truetype xft) \
+		$(use_enable afterimage) \
+		$(use_enable perl) \
+		--disable-text-blink \
+		${myconf}
+
+	emake || die
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc README.FAQ Changes
+	cd "${S}"/doc
+	dodoc README* changes.txt etc/* rxvt-tabbed
+}
+
+pkg_postinst() {
+	einfo "urxvt now always uses TERM=rxvt-unicode so that the"
+	einfo "upstream-supplied terminfo files can be used."
+}