1 |
ayoy 10/02/20 09:55:07 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: qt-core-4.6.1-r1.ebuild qt-core-4.6.2-r1.ebuild |
5 |
Removed: qt-core-4.6.1.ebuild qt-core-4.6.2.ebuild |
6 |
Log: |
7 |
Remove X11R6 from include dirs and libdirs in mkspecs (bug #305001) |
8 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.92 x11-libs/qt-core/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.92&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.92&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.91&r2=1.92 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v |
20 |
retrieving revision 1.91 |
21 |
retrieving revision 1.92 |
22 |
diff -u -r1.91 -r1.92 |
23 |
--- ChangeLog 18 Feb 2010 00:07:18 -0000 1.91 |
24 |
+++ ChangeLog 20 Feb 2010 09:55:06 -0000 1.92 |
25 |
@@ -1,6 +1,14 @@ |
26 |
# ChangeLog for x11-libs/qt-core |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.91 2010/02/18 00:07:18 wired Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.92 2010/02/20 09:55:06 ayoy Exp $ |
30 |
+ |
31 |
+*qt-core-4.6.2-r1 (20 Feb 2010) |
32 |
+*qt-core-4.6.1-r1 (20 Feb 2010) |
33 |
+ |
34 |
+ 20 Feb 2010; Dominik Kapusta <ayoy@g.o> |
35 |
+ +files/qt-4.6-nox11r6.patch, -qt-core-4.6.1.ebuild, |
36 |
+ +qt-core-4.6.1-r1.ebuild, -qt-core-4.6.2.ebuild, +qt-core-4.6.2-r1.ebuild: |
37 |
+ Remove X11R6 from include dirs and libdirs in mkspecs (bug #305001) |
38 |
|
39 |
18 Feb 2010; Alex Alexander <wired@g.o> metadata.xml: |
40 |
added exceptions USE flag description |
41 |
|
42 |
|
43 |
|
44 |
1.1 x11-libs/qt-core/qt-core-4.6.1-r1.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1-r1.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1-r1.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: qt-core-4.6.1-r1.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2010 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1-r1.ebuild,v 1.1 2010/02/20 09:55:06 ayoy Exp $ |
54 |
|
55 |
EAPI="2" |
56 |
inherit qt4-build |
57 |
|
58 |
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" |
59 |
SLOT="4" |
60 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
61 |
IUSE="doc +glib iconv optimized-qmake qt3support ssl" |
62 |
|
63 |
RDEPEND="sys-libs/zlib |
64 |
glib? ( dev-libs/glib ) |
65 |
ssl? ( dev-libs/openssl ) |
66 |
!<x11-libs/qt-4.4.0:4" |
67 |
DEPEND="${RDEPEND} |
68 |
dev-util/pkgconfig" |
69 |
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )" |
70 |
|
71 |
PATCHES=( |
72 |
"${FILESDIR}/qt-4.6-nolibx11.patch" |
73 |
"${FILESDIR}/qt-4.6-nox11r6.patch" |
74 |
) |
75 |
|
76 |
pkg_setup() { |
77 |
QT4_TARGET_DIRECTORIES=" |
78 |
src/tools/bootstrap |
79 |
src/tools/moc |
80 |
src/tools/rcc |
81 |
src/tools/uic |
82 |
src/corelib |
83 |
src/xml |
84 |
src/network |
85 |
src/plugins/codecs |
86 |
tools/linguist/lconvert |
87 |
tools/linguist/lrelease |
88 |
tools/linguist/lupdate" |
89 |
|
90 |
QT4_EXTRACT_DIRECTORIES=" |
91 |
include/Qt |
92 |
include/QtCore |
93 |
include/QtNetwork |
94 |
include/QtScript |
95 |
include/QtXml |
96 |
src/plugins/plugins.pro |
97 |
src/plugins/qpluginbase.pri |
98 |
src/src.pro |
99 |
src/3rdparty/des |
100 |
src/3rdparty/harfbuzz |
101 |
src/3rdparty/md4 |
102 |
src/3rdparty/md5 |
103 |
src/3rdparty/sha1 |
104 |
src/3rdparty/easing |
105 |
src/script |
106 |
tools/linguist/shared |
107 |
translations" |
108 |
|
109 |
if use doc; then |
110 |
QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES} |
111 |
doc/" |
112 |
QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
113 |
tools/qdoc3" |
114 |
fi |
115 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
116 |
${QT4_EXTRACT_DIRECTORIES}" |
117 |
|
118 |
qt4-build_pkg_setup |
119 |
} |
120 |
|
121 |
src_prepare() { |
122 |
# Don't pre-strip, bug 235026 |
123 |
for i in kr jp cn tw ; do |
124 |
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro |
125 |
done |
126 |
|
127 |
qt4-build_src_prepare |
128 |
|
129 |
# bug 172219 |
130 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ |
131 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" |
132 |
sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
133 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" |
134 |
} |
135 |
|
136 |
src_configure() { |
137 |
unset QMAKESPEC |
138 |
|
139 |
myconf="${myconf} |
140 |
$(qt_use glib) |
141 |
$(qt_use iconv) |
142 |
$(qt_use optimized-qmake) |
143 |
$(qt_use ssl openssl) |
144 |
$(qt_use qt3support)" |
145 |
|
146 |
myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr |
147 |
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl |
148 |
-no-nas-sound -no-dbus -no-cups -no-gif -no-libpng |
149 |
-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns |
150 |
-no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl |
151 |
-no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools |
152 |
-no-cups -no-xsync -no-xinput -no-multimedia" |
153 |
|
154 |
if ! use doc; then |
155 |
myconf="${myconf} -nomake docs" |
156 |
fi |
157 |
|
158 |
qt4-build_src_configure |
159 |
} |
160 |
|
161 |
src_compile() { |
162 |
# bug 259736 |
163 |
unset QMAKESPEC |
164 |
qt4-build_src_compile |
165 |
} |
166 |
|
167 |
src_install() { |
168 |
dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed" |
169 |
|
170 |
install_directories src/{corelib,xml,network,plugins/codecs} |
171 |
|
172 |
emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" |
173 |
|
174 |
if use doc; then |
175 |
emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed" |
176 |
fi |
177 |
|
178 |
# use freshly built libraries |
179 |
local DYLD_FPATH= |
180 |
[[ -d "${S}"/lib/QtCore.framework ]] \ |
181 |
&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done) |
182 |
DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ |
183 |
LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \ |
184 |
|| die "generating translations faied" |
185 |
insinto ${QTTRANSDIR#${EPREFIX}} |
186 |
doins translations/*.qm || die "doins translations failed" |
187 |
|
188 |
setqtenv |
189 |
fix_library_files |
190 |
|
191 |
# List all the multilib libdirs |
192 |
local libdirs= |
193 |
for libdir in $(get_all_libdirs); do |
194 |
libdirs+=:${EPREFIX}/usr/${libdir}/qt4 |
195 |
done |
196 |
|
197 |
cat <<-EOF > "${T}/44qt4" |
198 |
LDPATH="${libdirs:1}" |
199 |
EOF |
200 |
doenvd "${T}/44qt4" |
201 |
|
202 |
dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo |
203 |
mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ |
204 |
|| die "Failed to move qconfig.pri" |
205 |
|
206 |
# Framework hacking |
207 |
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then |
208 |
#TODO do this better |
209 |
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ |
210 |
"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ |
211 |
|| die "sed for qconfig.h failed." |
212 |
dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo |
213 |
else |
214 |
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ |
215 |
"${D}${QTHEADERDIR}"/QtCore/qconfig.h \ |
216 |
"${D}${QTHEADERDIR}"/Qt/qconfig.h \ |
217 |
|| die "sed for qconfig.h failed" |
218 |
fi |
219 |
|
220 |
if use glib; then |
221 |
QCONFIG_DEFINE="$(use glib && echo QT_GLIB) |
222 |
$(use ssl && echo QT_OPENSSL)" |
223 |
install_qconfigs |
224 |
fi |
225 |
|
226 |
# remove some unnecessary headers |
227 |
rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\ |
228 |
qatomic_windows.h,\ |
229 |
qatomic_windowsce.h,\ |
230 |
qt_windows.h} |
231 |
|
232 |
keepdir "${QTSYSCONFDIR#${EPREFIX}}" |
233 |
|
234 |
# Framework magic |
235 |
fix_includes |
236 |
} |
237 |
|
238 |
|
239 |
|
240 |
1.1 x11-libs/qt-core/qt-core-4.6.2-r1.ebuild |
241 |
|
242 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild?rev=1.1&view=markup |
243 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild?rev=1.1&content-type=text/plain |
244 |
|
245 |
Index: qt-core-4.6.2-r1.ebuild |
246 |
=================================================================== |
247 |
# Copyright 1999-2010 Gentoo Foundation |
248 |
# Distributed under the terms of the GNU General Public License v2 |
249 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild,v 1.1 2010/02/20 09:55:06 ayoy Exp $ |
250 |
|
251 |
EAPI="2" |
252 |
inherit qt4-build |
253 |
|
254 |
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" |
255 |
SLOT="4" |
256 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
257 |
IUSE="doc +glib iconv optimized-qmake qt3support ssl" |
258 |
|
259 |
RDEPEND="sys-libs/zlib |
260 |
glib? ( dev-libs/glib ) |
261 |
ssl? ( dev-libs/openssl ) |
262 |
!<x11-libs/qt-4.4.0:4" |
263 |
DEPEND="${RDEPEND} |
264 |
dev-util/pkgconfig" |
265 |
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )" |
266 |
|
267 |
PATCHES=( |
268 |
"${FILESDIR}/qt-4.6-nolibx11.patch" |
269 |
"${FILESDIR}/qt-4.6-nox11r6.patch" |
270 |
) |
271 |
|
272 |
pkg_setup() { |
273 |
QT4_TARGET_DIRECTORIES=" |
274 |
src/tools/bootstrap |
275 |
src/tools/moc |
276 |
src/tools/rcc |
277 |
src/tools/uic |
278 |
src/corelib |
279 |
src/xml |
280 |
src/network |
281 |
src/plugins/codecs |
282 |
tools/linguist/lconvert |
283 |
tools/linguist/lrelease |
284 |
tools/linguist/lupdate" |
285 |
|
286 |
QT4_EXTRACT_DIRECTORIES=" |
287 |
include/Qt |
288 |
include/QtCore |
289 |
include/QtNetwork |
290 |
include/QtScript |
291 |
include/QtXml |
292 |
src/plugins/plugins.pro |
293 |
src/plugins/qpluginbase.pri |
294 |
src/src.pro |
295 |
src/3rdparty/des |
296 |
src/3rdparty/harfbuzz |
297 |
src/3rdparty/md4 |
298 |
src/3rdparty/md5 |
299 |
src/3rdparty/sha1 |
300 |
src/3rdparty/easing |
301 |
src/script |
302 |
tools/linguist/shared |
303 |
translations" |
304 |
|
305 |
if use doc; then |
306 |
QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES} |
307 |
doc/" |
308 |
QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
309 |
tools/qdoc3" |
310 |
fi |
311 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
312 |
${QT4_EXTRACT_DIRECTORIES}" |
313 |
|
314 |
qt4-build_pkg_setup |
315 |
} |
316 |
|
317 |
src_prepare() { |
318 |
# Don't pre-strip, bug 235026 |
319 |
for i in kr jp cn tw ; do |
320 |
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro |
321 |
done |
322 |
|
323 |
qt4-build_src_prepare |
324 |
|
325 |
# bug 172219 |
326 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ |
327 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" |
328 |
sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
329 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" |
330 |
} |
331 |
|
332 |
src_configure() { |
333 |
unset QMAKESPEC |
334 |
|
335 |
myconf="${myconf} |
336 |
$(qt_use glib) |
337 |
$(qt_use iconv) |
338 |
$(qt_use optimized-qmake) |
339 |
$(qt_use ssl openssl) |
340 |
$(qt_use qt3support)" |
341 |
|
342 |
myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr |
343 |
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl |
344 |
-no-nas-sound -no-dbus -no-cups -no-gif -no-libpng |
345 |
-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns |
346 |
-no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl |
347 |
-no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools |
348 |
-no-cups -no-xsync -no-xinput -no-multimedia" |
349 |
|
350 |
if ! use doc; then |
351 |
myconf="${myconf} -nomake docs" |
352 |
fi |
353 |
|
354 |
qt4-build_src_configure |
355 |
} |
356 |
|
357 |
src_compile() { |
358 |
# bug 259736 |
359 |
unset QMAKESPEC |
360 |
qt4-build_src_compile |
361 |
} |
362 |
|
363 |
src_install() { |
364 |
dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed" |
365 |
|
366 |
install_directories src/{corelib,xml,network,plugins/codecs} |
367 |
|
368 |
emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" |
369 |
|
370 |
if use doc; then |
371 |
emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed" |
372 |
fi |
373 |
|
374 |
# use freshly built libraries |
375 |
local DYLD_FPATH= |
376 |
[[ -d "${S}"/lib/QtCore.framework ]] \ |
377 |
&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done) |
378 |
DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ |
379 |
LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \ |
380 |
|| die "generating translations faied" |
381 |
insinto ${QTTRANSDIR#${EPREFIX}} |
382 |
doins translations/*.qm || die "doins translations failed" |
383 |
|
384 |
setqtenv |
385 |
fix_library_files |
386 |
|
387 |
# List all the multilib libdirs |
388 |
local libdirs= |
389 |
for libdir in $(get_all_libdirs); do |
390 |
libdirs+=:${EPREFIX}/usr/${libdir}/qt4 |
391 |
done |
392 |
|
393 |
cat <<-EOF > "${T}/44qt4" |
394 |
LDPATH="${libdirs:1}" |
395 |
EOF |
396 |
doenvd "${T}/44qt4" |
397 |
|
398 |
dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo |
399 |
mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ |
400 |
|| die "Failed to move qconfig.pri" |
401 |
|
402 |
# Framework hacking |
403 |
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then |
404 |
#TODO do this better |
405 |
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ |
406 |
"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ |
407 |
|| die "sed for qconfig.h failed." |
408 |
dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo |
409 |
else |
410 |
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ |
411 |
"${D}${QTHEADERDIR}"/QtCore/qconfig.h \ |
412 |
"${D}${QTHEADERDIR}"/Qt/qconfig.h \ |
413 |
|| die "sed for qconfig.h failed" |
414 |
fi |
415 |
|
416 |
if use glib; then |
417 |
QCONFIG_DEFINE="$(use glib && echo QT_GLIB) |
418 |
$(use ssl && echo QT_OPENSSL)" |
419 |
install_qconfigs |
420 |
fi |
421 |
|
422 |
# remove some unnecessary headers |
423 |
rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\ |
424 |
qatomic_windows.h,\ |
425 |
qatomic_windowsce.h,\ |
426 |
qt_windows.h} |
427 |
|
428 |
keepdir "${QTSYSCONFDIR#${EPREFIX}}" |
429 |
|
430 |
# Framework magic |
431 |
fix_includes |
432 |
} |