diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2008-07-22 17:03:14 +0000 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2008-07-22 17:03:14 +0000 |
| commit | 2ca34fd8e6e692ea82c36372f30768cb7b2ccf60 (patch) | |
| tree | 69beef39c789f42042ff2219aedcf5cea32babd7 /x11-wm/dwm | |
| parent | ppc stable, bug #227351 (diff) | |
| download | gentoo-2-2ca34fd8e6e692ea82c36372f30768cb7b2ccf60.tar.gz gentoo-2-2ca34fd8e6e692ea82c36372f30768cb7b2ccf60.tar.bz2 gentoo-2-2ca34fd8e6e692ea82c36372f30768cb7b2ccf60.zip | |
Fix xinerama dependencies and CFLAGS for bug #232477
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-wm/dwm')
| -rw-r--r-- | x11-wm/dwm/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-wm/dwm/dwm-5.0.1.ebuild | 18 |
2 files changed, 17 insertions, 6 deletions
diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog index bb953daa053d..a4db92639bdb 100644 --- a/x11-wm/dwm/ChangeLog +++ b/x11-wm/dwm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-wm/dwm # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/ChangeLog,v 1.40 2008/07/21 17:19:11 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/ChangeLog,v 1.41 2008/07/22 17:03:14 cedk Exp $ + + 22 Jul 2008; Cédric Krier <cedk@gentoo.org> dwm-5.0.1.ebuild: + Fix xinerama dependencies and CFLAGS for bug #232477 21 Jul 2008; nixnut <nixnut@gentoo.org> dwm-5.0.1.ebuild: Stable on ppc wrt bug 232477 diff --git a/x11-wm/dwm/dwm-5.0.1.ebuild b/x11-wm/dwm/dwm-5.0.1.ebuild index d01bea4f2e7e..4ef6f33eece6 100644 --- a/x11-wm/dwm/dwm-5.0.1.ebuild +++ b/x11-wm/dwm/dwm-5.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/dwm-5.0.1.ebuild,v 1.5 2008/07/21 17:19:11 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/dwm-5.0.1.ebuild,v 1.6 2008/07/22 17:03:14 cedk Exp $ inherit toolchain-funcs savedconfig @@ -11,9 +11,10 @@ SRC_URI="http://code.suckless.org/dl/dwm/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="" +IUSE="xinerama" -DEPEND="x11-libs/libX11" +DEPEND="x11-libs/libX11 + xinerama? ( x11-libs/libXinerama )" RDEPEND=${DEPEND} src_unpack() { @@ -21,8 +22,10 @@ src_unpack() { cd "${S}" sed -i \ - -e "s/CFLAGS = -Os/CFLAGS += -g/" \ + -e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall -g/" \ -e "s/LDFLAGS = -s/LDFLAGS += -g/" \ + -e "s/XINERAMALIBS =/XINERAMALIBS ?=/" \ + -e "s/XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \ config.mk || die "sed failed" if use savedconfig; then @@ -33,7 +36,12 @@ src_unpack() { src_compile() { local msg use savedconfig && msg=", please check the configfile" - emake CC=$(tc-getCC) || die "emake failed${msg}" + if use xinerama; then + emake CC=$(tc-getCC) || die "emake failed${msg}" + else + emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" \ + || die "emake failed${msg}" + fi } src_install() { |