1 |
ssuominen 12/08/30 09:56:44 |
2 |
|
3 |
Modified: ChangeLog fluxbox-9999.ebuild fluxbox-1.3.2.ebuild |
4 |
Log: |
5 |
Use fribidi.pc pkg-config file to read Cflags: to get correct path(s) for GLib 2.x headers wrt #417311 by Stefan Kuhn |
6 |
|
7 |
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.305 x11-wm/fluxbox/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.305&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.305&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?r1=1.304&r2=1.305 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v |
19 |
retrieving revision 1.304 |
20 |
retrieving revision 1.305 |
21 |
diff -u -r1.304 -r1.305 |
22 |
--- ChangeLog 28 May 2012 15:48:00 -0000 1.304 |
23 |
+++ ChangeLog 30 Aug 2012 09:56:44 -0000 1.305 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for x11-wm/fluxbox |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.304 2012/05/28 15:48:00 armin76 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.305 2012/08/30 09:56:44 ssuominen Exp $ |
29 |
+ |
30 |
+ 30 Aug 2012; Samuli Suominen <ssuominen@g.o> fluxbox-1.3.2.ebuild, |
31 |
+ fluxbox-9999.ebuild: |
32 |
+ Use fribidi.pc pkg-config file to read Cflags: to get correct path(s) for |
33 |
+ GLib 2.x headers wrt #417311 by Stefan Kuhn |
34 |
|
35 |
28 May 2012; Raúl Porcel <armin76@g.o> fluxbox-1.3.2.ebuild: |
36 |
alpha/ia64/sparc stable wrt #409339 |
37 |
|
38 |
|
39 |
|
40 |
1.11 x11-wm/fluxbox/fluxbox-9999.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild?rev=1.11&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild?rev=1.11&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild?r1=1.10&r2=1.11 |
45 |
|
46 |
Index: fluxbox-9999.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v |
49 |
retrieving revision 1.10 |
50 |
retrieving revision 1.11 |
51 |
diff -u -r1.10 -r1.11 |
52 |
--- fluxbox-9999.ebuild 29 Nov 2011 14:08:31 -0000 1.10 |
53 |
+++ fluxbox-9999.ebuild 30 Aug 2012 09:56:44 -0000 1.11 |
54 |
@@ -1,9 +1,9 @@ |
55 |
-# Copyright 1999-2011 Gentoo Foundation |
56 |
+# Copyright 1999-2012 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.10 2011/11/29 14:08:31 lack Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.11 2012/08/30 09:56:44 ssuominen Exp $ |
60 |
|
61 |
EAPI=4 |
62 |
-inherit eutils git-2 prefix |
63 |
+inherit eutils flag-o-matic toolchain-funcs git-2 prefix |
64 |
|
65 |
IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax" |
66 |
|
67 |
@@ -21,13 +21,14 @@ |
68 |
|| ( x11-misc/gkmessage x11-apps/xmessage ) |
69 |
xinerama? ( x11-libs/libXinerama ) |
70 |
truetype? ( media-libs/freetype ) |
71 |
- bidi? ( dev-libs/fribidi ) |
72 |
+ bidi? ( >=dev-libs/fribidi-0.19.2 ) |
73 |
imlib? ( >=media-libs/imlib2-1.2.0[X] ) |
74 |
vim-syntax? ( app-vim/fluxbox-syntax ) |
75 |
!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
76 |
!!<=x11-misc/fluxconf-0.9.9 |
77 |
!!<=x11-misc/fbdesk-1.2.1" |
78 |
-DEPEND="nls? ( sys-devel/gettext ) |
79 |
+DEPEND="bidi? ( virtual/pkgconfig ) |
80 |
+ nls? ( sys-devel/gettext ) |
81 |
x11-proto/xextproto |
82 |
${RDEPEND}" |
83 |
|
84 |
@@ -56,8 +57,9 @@ |
85 |
} |
86 |
|
87 |
src_configure() { |
88 |
+ use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" |
89 |
+ |
90 |
econf \ |
91 |
- --disable-dependency-tracking \ |
92 |
$(use_enable nls) \ |
93 |
$(use_enable xinerama) \ |
94 |
$(use_enable truetype xft) \ |
95 |
|
96 |
|
97 |
|
98 |
1.9 x11-wm/fluxbox/fluxbox-1.3.2.ebuild |
99 |
|
100 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild?rev=1.9&view=markup |
101 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild?rev=1.9&content-type=text/plain |
102 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild?r1=1.8&r2=1.9 |
103 |
|
104 |
Index: fluxbox-1.3.2.ebuild |
105 |
=================================================================== |
106 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild,v |
107 |
retrieving revision 1.8 |
108 |
retrieving revision 1.9 |
109 |
diff -u -r1.8 -r1.9 |
110 |
--- fluxbox-1.3.2.ebuild 28 May 2012 15:48:00 -0000 1.8 |
111 |
+++ fluxbox-1.3.2.ebuild 30 Aug 2012 09:56:44 -0000 1.9 |
112 |
@@ -1,9 +1,9 @@ |
113 |
# Copyright 1999-2012 Gentoo Foundation |
114 |
# Distributed under the terms of the GNU General Public License v2 |
115 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild,v 1.8 2012/05/28 15:48:00 armin76 Exp $ |
116 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild,v 1.9 2012/08/30 09:56:44 ssuominen Exp $ |
117 |
|
118 |
EAPI=4 |
119 |
-inherit eutils prefix |
120 |
+inherit eutils flag-o-matic toolchain-funcs prefix |
121 |
|
122 |
IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax" |
123 |
|
124 |
@@ -20,13 +20,14 @@ |
125 |
|| ( x11-misc/gkmessage x11-apps/xmessage ) |
126 |
xinerama? ( x11-libs/libXinerama ) |
127 |
truetype? ( media-libs/freetype ) |
128 |
- bidi? ( dev-libs/fribidi ) |
129 |
+ bidi? ( >=dev-libs/fribidi-0.19.2 ) |
130 |
imlib? ( >=media-libs/imlib2-1.2.0[X] ) |
131 |
vim-syntax? ( app-vim/fluxbox-syntax ) |
132 |
!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
133 |
!!<=x11-misc/fluxconf-0.9.9 |
134 |
!!<=x11-misc/fbdesk-1.2.1" |
135 |
-DEPEND="nls? ( sys-devel/gettext ) |
136 |
+DEPEND="bidi? ( virtual/pkgconfig ) |
137 |
+ nls? ( sys-devel/gettext ) |
138 |
x11-proto/xextproto |
139 |
${RDEPEND}" |
140 |
|
141 |
@@ -55,6 +56,8 @@ |
142 |
} |
143 |
|
144 |
src_configure() { |
145 |
+ use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" |
146 |
+ |
147 |
econf \ |
148 |
$(use_enable nls) \ |
149 |
$(use_enable xinerama) \ |