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 | 4c514ea70bbdbe7ade150ceeb3c42b16f28906a0 (patch) | |
| tree | 4f35620ad91a77b6b18a6985d01d61632be5ddd3 /x11-wm/dwm | |
| parent | ppc stable, bug #227351 (diff) | |
| download | historical-4c514ea70bbdbe7ade150ceeb3c42b16f28906a0.tar.gz historical-4c514ea70bbdbe7ade150ceeb3c42b16f28906a0.tar.bz2 historical-4c514ea70bbdbe7ade150ceeb3c42b16f28906a0.zip | |
Fix xinerama dependencies and CFLAGS for bug #232477
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'x11-wm/dwm')
| -rw-r--r-- | x11-wm/dwm/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-wm/dwm/Manifest | 4 | ||||
| -rw-r--r-- | x11-wm/dwm/dwm-5.0.1.ebuild | 18 |
3 files changed, 19 insertions, 8 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/Manifest b/x11-wm/dwm/Manifest index 7ebe5810c4a6..1cf1a1ae58f5 100644 --- a/x11-wm/dwm/Manifest +++ b/x11-wm/dwm/Manifest @@ -3,6 +3,6 @@ AUX dwm.desktop 130 RMD160 b641ffda3dbd37915f7f24ca66cbd87f08dc9497 SHA1 a852b1b DIST dwm-4.2.tar.gz 19337 RMD160 24257387ac85b573a1fa44ffcd756962f76ef746 SHA1 023630e503fe5ac9534380b895395906326e04f0 SHA256 b2f9684f267d8c417296211d91b780a9d36edf557d02741d3785cdb277ca1023 DIST dwm-5.0.1.tar.gz 17954 RMD160 66847b275517c07530e785188f8d950e08de0d1b SHA1 724846584f20c854481923c77cfcc3f3514b3caf SHA256 f39e2b62d75b79489c535dc3cfcd6ea2b9c412857448519f29a4eed7af2f33a3 EBUILD dwm-4.2.ebuild 1658 RMD160 f7b99656c245c5df33177488f98a984b83838362 SHA1 9868324209064fd2fdbc5ba2c157692ed2e34281 SHA256 d910656435bd285919dcdf6b77fabfe205c98ffa7c3bcc4d4d24d5878ce43e36 -EBUILD dwm-5.0.1.ebuild 1674 RMD160 29ef5f2f87dfa078dce151f89305044dfa861102 SHA1 fb8fa52f93a195d57f67494456d3b6e9d81b67df SHA256 1b3ab7c5e7bccfba7287e2839a54c302bbff3d7fdab575088c204d51d0dd2115 -MISC ChangeLog 4561 RMD160 c2c3412fefce62d76cd156851070f1cd1cdfe69d SHA1 af06e1993220db68934c4184b7284969866b6017 SHA256 69fc4ef481e34f0fce478e46feee4a984d68e4b69e1bca67090ca1deea6c10b0 +EBUILD dwm-5.0.1.ebuild 1977 RMD160 bc363b45f28346a04afffeb4ec66384cdfe758b3 SHA1 effedebfbd95906dca530c1a96162ae54c6d0d4c SHA256 7967986202ebdc948a3fdc1898851093dc0eae7605595cba180d9f0196436cc4 +MISC ChangeLog 4680 RMD160 8d3e53d5109bd39ee67b4ac8003fe61334fcdf99 SHA1 b626b6500b076eb915a42e96eee38d6d0602cab6 SHA256 21cd29d76ee8c3a943d0510433d8d7caa1f561f535700d1299f83e69bdba45ff MISC metadata.xml 464 RMD160 6a015eb09888ce94ac15fa060db3245003086bd3 SHA1 ce1903fc125b85fb2d17a1586dad6e2a634908d2 SHA256 2fc98596b93f4b722956c930fc9bc1dc52cd51c316e6c4ff21fd8e5086d2f0d4 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() { |