diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-08-30 09:56:44 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-08-30 09:56:44 +0000 |
| commit | adba60f12af7c6a4b97a5859bbaabea554074038 (patch) | |
| tree | 4d42c8bfaa2f6fbdc3dcb57faab87133bfc65d36 /x11-wm | |
| parent | Also apply llvm r600 patches, should fix bug #427206 (diff) | |
| download | gentoo-2-adba60f12af7c6a4b97a5859bbaabea554074038.tar.gz gentoo-2-adba60f12af7c6a4b97a5859bbaabea554074038.tar.bz2 gentoo-2-adba60f12af7c6a4b97a5859bbaabea554074038.zip | |
Use fribidi.pc pkg-config file to read Cflags: to get correct path(s) for GLib 2.x headers wrt #417311 by Stefan Kuhn
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fluxbox/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/fluxbox/fluxbox-1.3.2.ebuild | 11 | ||||
| -rw-r--r-- | x11-wm/fluxbox/fluxbox-9999.ebuild | 14 |
3 files changed, 21 insertions, 11 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog index e58ec6f361e3..a95807105b7d 100644 --- a/x11-wm/fluxbox/ChangeLog +++ b/x11-wm/fluxbox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/fluxbox # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.304 2012/05/28 15:48:00 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.305 2012/08/30 09:56:44 ssuominen Exp $ + + 30 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> fluxbox-1.3.2.ebuild, + fluxbox-9999.ebuild: + Use fribidi.pc pkg-config file to read Cflags: to get correct path(s) for + GLib 2.x headers wrt #417311 by Stefan Kuhn 28 May 2012; Raúl Porcel <armin76@gentoo.org> fluxbox-1.3.2.ebuild: alpha/ia64/sparc stable wrt #409339 diff --git a/x11-wm/fluxbox/fluxbox-1.3.2.ebuild b/x11-wm/fluxbox/fluxbox-1.3.2.ebuild index 5efed043ab40..93dca6c0c895 100644 --- a/x11-wm/fluxbox/fluxbox-1.3.2.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.3.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild,v 1.8 2012/05/28 15:48:00 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild,v 1.9 2012/08/30 09:56:44 ssuominen Exp $ EAPI=4 -inherit eutils prefix +inherit eutils flag-o-matic toolchain-funcs prefix IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax" @@ -20,13 +20,14 @@ RDEPEND="x11-libs/libXpm || ( x11-misc/gkmessage x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) truetype? ( media-libs/freetype ) - bidi? ( dev-libs/fribidi ) + bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) vim-syntax? ( app-vim/fluxbox-syntax ) !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 !!<=x11-misc/fluxconf-0.9.9 !!<=x11-misc/fbdesk-1.2.1" -DEPEND="nls? ( sys-devel/gettext ) +DEPEND="bidi? ( virtual/pkgconfig ) + nls? ( sys-devel/gettext ) x11-proto/xextproto ${RDEPEND}" @@ -55,6 +56,8 @@ src_prepare() { } src_configure() { + use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" + econf \ $(use_enable nls) \ $(use_enable xinerama) \ diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild index 7ca6a6012a4e..666dd1a0baf4 100644 --- a/x11-wm/fluxbox/fluxbox-9999.ebuild +++ b/x11-wm/fluxbox/fluxbox-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.10 2011/11/29 14:08:31 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.11 2012/08/30 09:56:44 ssuominen Exp $ EAPI=4 -inherit eutils git-2 prefix +inherit eutils flag-o-matic toolchain-funcs git-2 prefix IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax" @@ -21,13 +21,14 @@ RDEPEND="x11-libs/libXpm || ( x11-misc/gkmessage x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) truetype? ( media-libs/freetype ) - bidi? ( dev-libs/fribidi ) + bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) vim-syntax? ( app-vim/fluxbox-syntax ) !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 !!<=x11-misc/fluxconf-0.9.9 !!<=x11-misc/fbdesk-1.2.1" -DEPEND="nls? ( sys-devel/gettext ) +DEPEND="bidi? ( virtual/pkgconfig ) + nls? ( sys-devel/gettext ) x11-proto/xextproto ${RDEPEND}" @@ -56,8 +57,9 @@ src_prepare() { } src_configure() { + use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" + econf \ - --disable-dependency-tracking \ $(use_enable nls) \ $(use_enable xinerama) \ $(use_enable truetype xft) \ |