diff options
| author |   Emanuele Giaquinta <exg@gentoo.org> | 2006-03-21 21:24:06 +0000 |
|---|---|---|
| committer | Emanuele Giaquinta <exg@gentoo.org> | 2006-03-21 21:24:06 +0000 |
| commit | dfa190baa39291587488f6ce9cb861fdf572701f (patch) | |
| tree | 8301c9cf30f232a947798d411cf3280954764d17 /x11-terms | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-dfa190baa39291587488f6ce9cb861fdf572701f.tar.gz gentoo-2-dfa190baa39291587488f6ce9cb861fdf572701f.tar.bz2 gentoo-2-dfa190baa39291587488f6ce9cb861fdf572701f.zip | |
Correct last fix.
(Portage version: 2.1_pre6-r5)
Diffstat (limited to 'x11-terms')
| -rw-r--r-- | x11-terms/xterm/ChangeLog | 4 | ||||
| -rw-r--r-- | x11-terms/xterm/xterm-211.ebuild | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog index f699027ee22b..da7390c120a3 100644 --- a/x11-terms/xterm/ChangeLog +++ b/x11-terms/xterm/ChangeLog @@ -1,9 +1,9 @@ # ChangeLog for x11-terms/xterm # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.129 2006/03/21 15:29:04 exg Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.130 2006/03/21 21:24:06 exg Exp $ 21 Mar 2006; Emanuele Giaquinta <exg@gentoo.org> xterm-211.ebuild: - Enable NARROW proto to fix scrollbar breakage on modular X, bug #115037. + Use narrow prototypes on monolithic X; fix scrollbar breakage, bug #115037. 21 Mar 2006; Emanuele Giaquinta <exg@gentoo.org> xterm-211.ebuild: Fixed sed for modular X, bug #126110. diff --git a/x11-terms/xterm/xterm-211.ebuild b/x11-terms/xterm/xterm-211.ebuild index b2a87674924b..5de268a6110d 100644 --- a/x11-terms/xterm/xterm-211.ebuild +++ b/x11-terms/xterm/xterm-211.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/xterm/xterm-211.ebuild,v 1.3 2006/03/21 15:29:04 exg Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-211.ebuild,v 1.4 2006/03/21 21:24:06 exg Exp $ inherit eutils flag-o-matic @@ -45,6 +45,12 @@ src_compile() { filter-flags "-fstack-protector" + local myconf="" + + if has_version ">=x11-base/xorg-x11-7.0.0_rc1"; then + myconf="--disable-narrowproto" + fi + econf \ --libdir=/etc \ --with-x \ @@ -52,7 +58,6 @@ src_compile() { --disable-setuid \ --disable-full-tgetent \ --disable-imake \ - --enable-narrowproto \ --enable-ansi-color \ --enable-88-color \ --enable-256-color \ @@ -71,6 +76,7 @@ src_compile() { `use_enable truetype freetype` \ `use_enable unicode luit` `use_enable unicode mini-luit` \ `use_with Xaw3d` \ + ${myconf} \ || die emake || die "failed to compile xterm" |