Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

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