summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2006-11-02 20:15:44 +0000
committerMamoru Komachi <usata@gentoo.org>2006-11-02 20:15:44 +0000
commite7a9e6f46d0d37761c3556371b64365d264b00d7 (patch)
tree9a2cefb5c97b3568d03fc8e449b1292b66560cf4 /x11-terms
parentGrr. Commit broke half-way. Fix up manifest. (diff)
downloadgentoo-2-e7a9e6f46d0d37761c3556371b64365d264b00d7.tar.gz
gentoo-2-e7a9e6f46d0d37761c3556371b64365d264b00d7.tar.bz2
gentoo-2-e7a9e6f46d0d37761c3556371b64365d264b00d7.zip
Applied --as-needed patch. Thanks to Jory A. Pratt <geekypenguin@gmail.com>. This closes bug #131670. Removed -r2.
(Portage version: 2.1.1-r1)
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/rxvt/ChangeLog8
-rw-r--r--x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch13
-rw-r--r--x11-terms/rxvt/rxvt-2.7.10-r3.ebuild3
3 files changed, 22 insertions, 2 deletions
diff --git a/x11-terms/rxvt/ChangeLog b/x11-terms/rxvt/ChangeLog
index de32497740ee..7a2ff61a91fb 100644
--- a/x11-terms/rxvt/ChangeLog
+++ b/x11-terms/rxvt/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-terms/rxvt
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.52 2006/08/07 00:40:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.53 2006/11/02 20:15:44 usata Exp $
+
+ 02 Nov 2006; Mamoru KOMACHI <usata@gentoo.org>
+ +files/rxvt-2.7.10-asneeded.patch, -rxvt-2.7.10-r2.ebuild,
+ rxvt-2.7.10-r3.ebuild:
+ Applied --as-needed patch. Thanks to Jory A. Pratt <geekypenguin@gmail.com>.
+ This closes bug #131670. Removed -r2.
07 Aug 2006; Jeroen Roovers <jer@gentoo.org> rxvt-2.7.10-r3.ebuild:
Stable for HPPA.
diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch b/x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch
new file mode 100644
index 000000000000..e1a48cde8af8
--- /dev/null
+++ b/x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch
@@ -0,0 +1,13 @@
+Index: rxvt-2.7.10/src/Makefile.in
+===================================================================
+--- rxvt-2.7.10.orig/src/Makefile.in
++++ rxvt-2.7.10/src/Makefile.in
+@@ -103,7 +103,7 @@ rxvt: version.h rxvt.o librxvt.la
+ date >.protos
+
+ librxvt.la: $(LIBOBJS)
+- $(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
++ $(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) $(XLIB) -o $@
+ #-------------------------------------------------------------------------
+ tags: $(SRCS) $(HDRS) $(EXTRAHDRS)
+ ctags $(SRCS) $(HDRS) $(EXTRAHDRS)
diff --git a/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild b/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild
index ff41fb440517..9cd0bd961b32 100644
--- a/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild
+++ b/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild,v 1.13 2006/08/07 00:40:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild,v 1.14 2006/11/02 20:15:44 usata Exp $
inherit eutils flag-o-matic libtool
@@ -36,6 +36,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-line-scroll.patch
+ epatch ${FILESDIR}/${P}-asneeded.patch
use motif && epatch ${FILESDIR}/${P}-azz4.diff
if use cjk ; then
epatch ${DISTDIR}/${P}-xim-fix.patch.gz