Fixing home page bug 290472 , Fixing urgency hint, patch thanks to Jan Hruban <hrubi13@gmail.com> bug 274129

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 132 insertions, 1 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 4c09a343dfdb..d4d779d2ccc7 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.129 2009/09/12 03:25:59 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.130 2009/10/25 18:09:06 vostorga Exp $
+
+*rxvt-unicode-9.06-r1 (25 Oct 2009)
+
+  25 Oct 2009; Víctor Ostorga <vostorga@gentoo.org>
+  +rxvt-unicode-9.06-r1.ebuild,
+  +files/rxvt-unicode-9.06-no-urgency-if-focused.diff:
+  Fixing home page bug 290472 , Fixing urgency hint, patch thanks to Jan
+  Hruban <hrubi13@gmail.com> bug #274129 
 
   12 Sep 2009; Víctor Ostorga <vostorga@gentoo.org>
   -files/scrolling-one-line.patch:
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff
new file mode 100644
index 000000000000..81a3646d4859
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff
@@ -0,0 +1,16 @@
+diff -NrU5 rxvt-unicode-9.06.original/src/screen.C rxvt-unicode-9.06/src/screen.C
+--- rxvt-unicode-9.06.original/src/screen.C	2009-10-25 18:16:16.000000000 -0600
++++ rxvt-unicode-9.06/src/screen.C	2009-10-25 18:17:53.000000000 -0600
+@@ -1927,11 +1927,11 @@
+ #  endif
+     XMapWindow (dpy, parent[0]);
+ # endif
+ 
+ # if ENABLE_FRILLS
+-  if (option (Opt_urgentOnBell))
++  if (option (Opt_urgentOnBell) && !focus)
+     set_urgency (1);
+ # endif
+ 
+   if (option (Opt_visualBell))
+     {
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r1.ebuild
new file mode 100644
index 000000000000..3aaf3f90ed0f
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2009 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.06-r1.ebuild,v 1.1 2009/10/25 18:09:06 vostorga Exp $
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+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}"
+
+	#Bug 270694
+	epatch "${FILESDIR}/${PN}-9.06-glibc-2.10.patch"
+
+	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
+
+	# bug #240165
+	epatch "${FILESDIR}"/${P}-no-urgency-if-focused.diff
+
+
+	# ncurses will provide rxvt-unicode terminfo, so we don't install them again
+	# see bug #192083
+	#
+	# According to my tests this is not (yet?) true, so keep it prepared and
+	# disabled  until it's needed again.
+	#if has_version '<sys-libs/ncurses-5.7'; then
+		sed -i -e \
+			"s~@TIC@ \(\$(srcdir)/etc/rxvt\)~@TIC@ -o "${D}"/${tdir} \1~" \
+			doc/Makefile.in
+	#else
+	#	# Remove everything except if we have rxvt-unicode256
+	#	sed -i -e \
+	#	    '/rxvt-unicode256/p;/@TIC@/d' \
+	#		doc/Makefile.in
+	#fi
+
+	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."
+}