1 |
wired 12/01/29 17:00:02 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: qt-core-4.8.0-r1.ebuild |
5 |
Log: |
6 |
version bump |
7 |
|
8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.7 x11-libs/qt-core/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/metadata.xml?rev=1.7&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/metadata.xml?rev=1.7&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/metadata.xml?r1=1.6&r2=1.7 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/metadata.xml,v |
20 |
retrieving revision 1.6 |
21 |
retrieving revision 1.7 |
22 |
diff -u -r1.6 -r1.7 |
23 |
--- metadata.xml 19 Nov 2010 01:27:29 -0000 1.6 |
24 |
+++ metadata.xml 29 Jan 2012 17:00:02 -0000 1.7 |
25 |
@@ -12,5 +12,7 @@ |
26 |
<flag name="private-headers">Install Qt declarative private headers |
27 |
required by Qt-creator QmlDesigner and QmlInspector plugins"</flag> |
28 |
<flag name="jit">Enables JIT for Javascript usage inside Qt</flag> |
29 |
+ <flag name='c++0x'>Build Qt using the C++11 standard</flag> |
30 |
+ <flag name='qpa'>Build a window system agnostic implementation of Qt</flag> |
31 |
</use> |
32 |
</pkgmetadata> |
33 |
|
34 |
|
35 |
|
36 |
1.150 x11-libs/qt-core/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.150&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.150&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.149&r2=1.150 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v |
45 |
retrieving revision 1.149 |
46 |
retrieving revision 1.150 |
47 |
diff -u -r1.149 -r1.150 |
48 |
--- ChangeLog 27 Dec 2011 21:25:59 -0000 1.149 |
49 |
+++ ChangeLog 29 Jan 2012 17:00:02 -0000 1.150 |
50 |
@@ -1,6 +1,12 @@ |
51 |
# ChangeLog for x11-libs/qt-core |
52 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.149 2011/12/27 21:25:59 maekke Exp $ |
54 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
55 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.150 2012/01/29 17:00:02 wired Exp $ |
56 |
+ |
57 |
+*qt-core-4.8.0-r1 (29 Jan 2012) |
58 |
+ |
59 |
+ 29 Jan 2012; Alex Alexander <wired@g.o> +qt-core-4.8.0-r1.ebuild, |
60 |
+ +files/qt-core-4.8.0-qurl-regression-fix.patch, metadata.xml: |
61 |
+ version bump |
62 |
|
63 |
27 Dec 2011; Markus Meier <maekke@g.o> qt-core-4.7.4-r1.ebuild: |
64 |
x86 stable, bug #390963 |
65 |
|
66 |
|
67 |
|
68 |
1.1 x11-libs/qt-core/qt-core-4.8.0-r1.ebuild |
69 |
|
70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.8.0-r1.ebuild?rev=1.1&view=markup |
71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.8.0-r1.ebuild?rev=1.1&content-type=text/plain |
72 |
|
73 |
Index: qt-core-4.8.0-r1.ebuild |
74 |
=================================================================== |
75 |
# Copyright 1999-2012 Gentoo Foundation |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.0-r1.ebuild,v 1.1 2012/01/29 17:00:02 wired Exp $ |
78 |
|
79 |
EAPI="3" |
80 |
if [[ ${PV} == 4*9999 ]]; then |
81 |
ECLASS="-edge" |
82 |
fi |
83 |
inherit qt4-build${ECLASS} |
84 |
|
85 |
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" |
86 |
SLOT="4" |
87 |
if [[ ${PV} != 4*9999 ]]; then |
88 |
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" |
89 |
else |
90 |
KEYWORDS="" |
91 |
fi |
92 |
IUSE="+glib iconv optimized-qmake qt3support ssl" |
93 |
|
94 |
DEPEND="sys-libs/zlib |
95 |
glib? ( dev-libs/glib ) |
96 |
ssl? ( dev-libs/openssl ) |
97 |
!<x11-libs/qt-4.4.0:4 |
98 |
!<x11-libs/cairo-1.10.2-r2" |
99 |
RDEPEND="${DEPEND}" |
100 |
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )" |
101 |
|
102 |
PATCHES=( |
103 |
"${FILESDIR}/${P}-qurl-regression-fix.patch" |
104 |
) |
105 |
|
106 |
pkg_setup() { |
107 |
QT4_TARGET_DIRECTORIES=" |
108 |
src/tools/bootstrap |
109 |
src/tools/moc |
110 |
src/tools/rcc |
111 |
src/tools/uic |
112 |
src/corelib |
113 |
src/xml |
114 |
src/network |
115 |
src/plugins/codecs |
116 |
tools/linguist/lconvert |
117 |
tools/linguist/lrelease |
118 |
tools/linguist/lupdate" |
119 |
|
120 |
# This is not needed in live ebuilds since the git repo contains everything |
121 |
if [[ ${PV} != 4*9999 ]]; then |
122 |
QT4_EXTRACT_DIRECTORIES=" ${QT4_TARGET_DIRECTORIES} |
123 |
include/Qt |
124 |
include/QtCore |
125 |
include/QtDeclarative |
126 |
include/QtGui |
127 |
include/QtNetwork |
128 |
include/QtScript |
129 |
include/QtXml |
130 |
src/plugins/plugins.pro |
131 |
src/plugins/qpluginbase.pri |
132 |
src/src.pro |
133 |
src/3rdparty/des |
134 |
src/3rdparty/harfbuzz |
135 |
src/3rdparty/md4 |
136 |
src/3rdparty/md5 |
137 |
src/3rdparty/sha1 |
138 |
src/3rdparty/easing |
139 |
src/3rdparty/zlib_dependency.pri |
140 |
src/declarative |
141 |
src/gui |
142 |
src/script |
143 |
tools/shared |
144 |
tools/linguist/shared |
145 |
translations" |
146 |
fi |
147 |
qt4-build${ECLASS}_pkg_setup |
148 |
} |
149 |
|
150 |
src_prepare() { |
151 |
# Don't pre-strip, bug 235026 |
152 |
for i in kr jp cn tw ; do |
153 |
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro |
154 |
done |
155 |
|
156 |
qt4-build${ECLASS}_src_prepare |
157 |
|
158 |
# bug 172219 |
159 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ |
160 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" |
161 |
sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
162 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" |
163 |
} |
164 |
|
165 |
src_configure() { |
166 |
myconf+=" |
167 |
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon |
168 |
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative |
169 |
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg |
170 |
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl |
171 |
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
172 |
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb |
173 |
$(qt_use glib) |
174 |
$(qt_use iconv) |
175 |
$(qt_use optimized-qmake) |
176 |
$(qt_use ssl openssl) |
177 |
$(qt_use qt3support)" |
178 |
|
179 |
qt4-build${ECLASS}_src_configure |
180 |
} |
181 |
|
182 |
src_install() { |
183 |
dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed" |
184 |
|
185 |
install_directories src/{corelib,xml,network,plugins/codecs} |
186 |
|
187 |
emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" |
188 |
|
189 |
#install private headers |
190 |
insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private |
191 |
find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \; |
192 |
|
193 |
# use freshly built libraries |
194 |
local DYLD_FPATH= |
195 |
[[ -d "${S}"/lib/QtCore.framework ]] \ |
196 |
&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done) |
197 |
DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ |
198 |
LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \ |
199 |
|| die "generating translations failed" |
200 |
insinto "${QTTRANSDIR#${EPREFIX}}" |
201 |
doins translations/*.qm || die "doins translations failed" |
202 |
|
203 |
setqtenv |
204 |
fix_library_files |
205 |
|
206 |
# List all the multilib libdirs |
207 |
local libdirs= |
208 |
for libdir in $(get_all_libdirs); do |
209 |
libdirs+=":${EPREFIX}/usr/${libdir}/qt4" |
210 |
done |
211 |
|
212 |
cat <<-EOF > "${T}/44qt4" |
213 |
LDPATH="${libdirs:1}" |
214 |
EOF |
215 |
doenvd "${T}/44qt4" |
216 |
|
217 |
dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo || die "dodir failed" |
218 |
mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ |
219 |
|| die "Failed to move qconfig.pri" |
220 |
|
221 |
# Framework hacking |
222 |
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then |
223 |
#TODO do this better |
224 |
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ |
225 |
"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ |
226 |
|| die "sed for qconfig.h failed." |
227 |
dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo || |
228 |
die "dosym failed" |
229 |
else |
230 |
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ |
231 |
"${D}${QTHEADERDIR}"/QtCore/qconfig.h \ |
232 |
"${D}${QTHEADERDIR}"/Qt/qconfig.h \ |
233 |
|| die "sed for qconfig.h failed" |
234 |
fi |
235 |
|
236 |
if use glib; then |
237 |
QCONFIG_DEFINE="$(use glib && echo QT_GLIB) |
238 |
$(use ssl && echo QT_OPENSSL)" |
239 |
install_qconfigs |
240 |
fi |
241 |
|
242 |
# remove .la files |
243 |
find "${D}${QTLIBDIR}" -name "*.la" -print0 | xargs -0 rm |
244 |
|
245 |
keepdir "${QTSYSCONFDIR#${EPREFIX}}" |
246 |
|
247 |
# Framework magic |
248 |
fix_includes |
249 |
} |