1 |
yngwin 09/06/27 19:16:58 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: qt-core-4.5.2.ebuild |
5 |
Log: |
6 |
Qt 4.5.2 release version bump |
7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.56 x11-libs/qt-core/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.56&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.56&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.55&r2=1.56 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v |
19 |
retrieving revision 1.55 |
20 |
retrieving revision 1.56 |
21 |
diff -u -r1.55 -r1.56 |
22 |
--- ChangeLog 8 Jun 2009 22:27:04 -0000 1.55 |
23 |
+++ ChangeLog 27 Jun 2009 19:16:57 -0000 1.56 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for x11-libs/qt-core |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.55 2009/06/08 22:27:04 jer Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.56 2009/06/27 19:16:57 yngwin Exp $ |
29 |
+ |
30 |
+*qt-core-4.5.2 (27 Jun 2009) |
31 |
+ |
32 |
+ 27 Jun 2009; Ben de Groot <yngwin@g.o> +files/qt-4.5-nolibx11.diff, |
33 |
+ +qt-core-4.5.2.ebuild: |
34 |
+ Version bump |
35 |
|
36 |
08 Jun 2009; Jeroen Roovers <jer@g.o> qt-core-4.5.1.ebuild: |
37 |
Stable for HPPA (bug #266201). |
38 |
|
39 |
|
40 |
|
41 |
1.1 x11-libs/qt-core/qt-core-4.5.2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.5.2.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.5.2.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: qt-core-4.5.2.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2009 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.2.ebuild,v 1.1 2009/06/27 19:16:58 yngwin Exp $ |
51 |
|
52 |
EAPI="2" |
53 |
inherit qt4-build |
54 |
|
55 |
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" |
56 |
SLOT="4" |
57 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
58 |
IUSE="doc +glib iconv qt3support ssl" |
59 |
|
60 |
RDEPEND="sys-libs/zlib |
61 |
glib? ( dev-libs/glib ) |
62 |
ssl? ( dev-libs/openssl ) |
63 |
!<x11-libs/qt-4.4.0:4" |
64 |
DEPEND="${RDEPEND} |
65 |
dev-util/pkgconfig" |
66 |
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[qt3support] )" |
67 |
|
68 |
QT4_TARGET_DIRECTORIES=" |
69 |
src/tools/bootstrap |
70 |
src/tools/moc/ |
71 |
src/tools/rcc/ |
72 |
src/tools/uic/ |
73 |
src/corelib/ |
74 |
src/xml/ |
75 |
src/network/ |
76 |
src/plugins/codecs/" |
77 |
|
78 |
# Most ebuilds include almost everything for testing |
79 |
# Will clear out unneeded directories after everything else works OK |
80 |
QT4_EXTRACT_DIRECTORIES=" |
81 |
include/Qt/ |
82 |
include/QtCore/ |
83 |
include/QtNetwork/ |
84 |
include/QtScript/ |
85 |
include/QtXml/ |
86 |
src/plugins/plugins.pro |
87 |
src/plugins/qpluginbase.pri |
88 |
src/src.pro |
89 |
src/3rdparty/des/ |
90 |
src/3rdparty/harfbuzz/ |
91 |
src/3rdparty/md4/ |
92 |
src/3rdparty/md5/ |
93 |
src/3rdparty/sha1/ |
94 |
src/script/ |
95 |
translations/" |
96 |
|
97 |
PATCHES=( |
98 |
"${FILESDIR}/qt-4.5-nolibx11.diff" |
99 |
) |
100 |
|
101 |
pkg_setup() { |
102 |
qt4-build_pkg_setup |
103 |
|
104 |
if has_version x11-libs/qt-core; then |
105 |
# Check to see if they've changed the glib flag since the last time installing this package. |
106 |
if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then |
107 |
ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package." |
108 |
ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." |
109 |
elif ! use glib && built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then |
110 |
ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package." |
111 |
ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." |
112 |
fi |
113 |
|
114 |
# Check to see if they've changed the qt3support flag since the last time installing this package. |
115 |
# If so, give a list of packages they need to uninstall first. |
116 |
if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then |
117 |
local need_to_remove |
118 |
ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." |
119 |
for x in sql opengl gui qt3support; do |
120 |
local pkg="x11-libs/qt-${x}" |
121 |
if has_version $pkg; then |
122 |
need_to_remove="${need_to_remove} ${pkg}" |
123 |
fi |
124 |
done |
125 |
if [[ -n ${need_to_remove} ]]; then |
126 |
die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}" |
127 |
fi |
128 |
elif ! use qt3support && built_with_use x11-libs/qt-core qt3support ; then |
129 |
local need_to_remove |
130 |
ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." |
131 |
for x in sql opengl gui qt3support; do |
132 |
local pkg="x11-libs/qt-${x}" |
133 |
if has_version $pkg; then |
134 |
need_to_remove="${need_to_remove} ${pkg}" |
135 |
fi |
136 |
done |
137 |
if [[ -n ${need_to_remove} ]]; then |
138 |
die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}" |
139 |
fi |
140 |
fi |
141 |
fi |
142 |
} |
143 |
|
144 |
src_unpack() { |
145 |
if use doc; then |
146 |
QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES} |
147 |
doc/" |
148 |
QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
149 |
tools/qdoc3" |
150 |
fi |
151 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
152 |
${QT4_EXTRACT_DIRECTORIES}" |
153 |
|
154 |
qt4-build_src_unpack |
155 |
|
156 |
# Don't pre-strip, bug 235026 |
157 |
for i in kr jp cn tw ; do |
158 |
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro |
159 |
done |
160 |
} |
161 |
|
162 |
src_prepare() { |
163 |
qt4-build_src_prepare |
164 |
|
165 |
# bug 172219 |
166 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ |
167 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" |
168 |
sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
169 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" |
170 |
} |
171 |
|
172 |
src_configure() { |
173 |
unset QMAKESPEC |
174 |
|
175 |
myconf="${myconf} |
176 |
$(qt_use glib) |
177 |
$(qt_use iconv) |
178 |
$(qt_use ssl openssl) |
179 |
$(qt_use qt3support)" |
180 |
|
181 |
myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr |
182 |
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl |
183 |
-no-nas-sound -no-dbus -no-cups -no-gif -no-libpng |
184 |
-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns |
185 |
-no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl |
186 |
-no-svg -no-gtkstyle" |
187 |
|
188 |
if ! use doc; then |
189 |
myconf="${myconf} -nomake docs" |
190 |
fi |
191 |
|
192 |
cp -f "${FILESDIR}"/moc.pro "${S}"/src/tools/moc/ |
193 |
cp -f "${FILESDIR}"/rcc.pro "${S}"/src/tools/rcc/ |
194 |
cp -f "${FILESDIR}"/uic.pro "${S}"/src/tools/uic/ |
195 |
|
196 |
qt4-build_src_configure |
197 |
} |
198 |
|
199 |
src_compile() { |
200 |
# bug 259736 |
201 |
unset QMAKESPEC |
202 |
qt4-build_src_compile |
203 |
} |
204 |
|
205 |
src_install() { |
206 |
dobin "${S}"/bin/{qmake,moc,rcc,uic} || die "dobin failed" |
207 |
|
208 |
install_directories src/{corelib,xml,network,plugins/codecs} |
209 |
|
210 |
emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" |
211 |
|
212 |
if use doc; then |
213 |
emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed" |
214 |
fi |
215 |
|
216 |
emake INSTALL_ROOT="${D}" install_translations || die "emake install_translations failed" |
217 |
|
218 |
fix_library_files |
219 |
|
220 |
# List all the multilib libdirs |
221 |
local libdirs= |
222 |
for libdir in $(get_all_libdirs); do |
223 |
libdirs="${libdirs}:/usr/${libdir}/qt4" |
224 |
done |
225 |
|
226 |
cat <<-EOF > "${T}/44qt4" |
227 |
LDPATH=${libdirs:1} |
228 |
EOF |
229 |
doenvd "${T}/44qt4" |
230 |
|
231 |
dodir /${QTDATADIR}/mkspecs/gentoo |
232 |
mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ |
233 |
|| die "Failed to move qconfig.pri" |
234 |
|
235 |
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ |
236 |
"${D}${QTHEADERDIR}"/QtCore/qconfig.h \ |
237 |
"${D}${QTHEADERDIR}"/Qt/qconfig.h \ |
238 |
|| die "sed for qconfig.h failed" |
239 |
|
240 |
if use glib; then |
241 |
QCONFIG_DEFINE="$(use glib && echo QT_GLIB) |
242 |
$(use ssl && echo QT_OPENSSL)" |
243 |
install_qconfigs |
244 |
fi |
245 |
|
246 |
# remove some unnecessary headers |
247 |
rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\ |
248 |
qatomic_macosx.h,\ |
249 |
qatomic_windows.h,\ |
250 |
qatomic_windowsce.h,\ |
251 |
qt_windows.h} |
252 |
|
253 |
keepdir "${QTSYSCONFDIR}" |
254 |
} |