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

Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt: qt-3.3.8-r4.ebuild ChangeLog qt-3.3.8b.ebuild
Date: Tue, 28 Oct 2008 23:50:13
Message-Id: E1KuyK9-0006sH-SM@stork.gentoo.org
1 yngwin 08/10/28 23:50:09
2
3 Modified: qt-3.3.8-r4.ebuild ChangeLog qt-3.3.8b.ebuild
4 Log:
5 Add patches/fixes for qt3 bugs 172219, 229567 and 244732
6 (Portage version: 2.2_rc12_p11688/cvs/Linux 2.6.26-hh3 i686)
7
8 Revision Changes Path
9 1.9 x11-libs/qt/qt-3.3.8-r4.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild?rev=1.9&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild?rev=1.9&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild?r1=1.8&r2=1.9
14
15 Index: qt-3.3.8-r4.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v
18 retrieving revision 1.8
19 retrieving revision 1.9
20 diff -u -r1.8 -r1.9
21 --- qt-3.3.8-r4.ebuild 19 May 2008 20:23:47 -0000 1.8
22 +++ qt-3.3.8-r4.ebuild 28 Oct 2008 23:50:09 -0000 1.9
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2008 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.8 2008/05/19 20:23:47 dev-zero Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.9 2008/10/28 23:50:09 yngwin Exp $
28
29 # *** Please remember to update qt3.eclass when revbumping this ***
30
31 @@ -47,7 +47,7 @@
32 immqt-bc? ( x11-proto/xineramaproto )"
33 PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
34
35 -S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
36 +S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}"
37
38 QTBASE=/usr/qt/3
39
40 @@ -66,7 +66,7 @@
41 ewarn
42 fi
43
44 - export QTDIR=${S}
45 + export QTDIR="${S}"
46
47 CXX=$(tc-getCXX)
48 if [[ ${CXX/g++/} != ${CXX} ]]; then
49 @@ -99,45 +99,48 @@
50
51 src_unpack() {
52 unpack ${A}
53 - cd ${S}
54 + cd "${S}"
55
56 sed -i -e 's:read acceptance:acceptance=yes:' configure
57
58 # Do not link with -rpath. See bug #75181.
59 - find ${S}/mkspecs -name qmake.conf | xargs \
60 + find "${S}"/mkspecs -name qmake.conf | xargs \
61 sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
62
63 # Patch for uic includehint errors (aseigo patch)
64 - epatch ${FILESDIR}/${P}-uic-fix.patch
65 + epatch "${FILESDIR}"/${P}-uic-fix.patch
66
67 # Patch for mysql unload crash (Bug #171883)
68 - epatch ${FILESDIR}/${P}-mysql-unload-crash.diff
69 + epatch "${FILESDIR}"/${P}-mysql-unload-crash.diff
70
71 # KDE related patches
72 - epatch ${FILESDIR}/0001-dnd_optimization.patch
73 - epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
74 - epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
75 - epatch ${FILESDIR}/0044-qscrollview-windowactivate-fix.diff
76 - epatch ${FILESDIR}/0047-fix-kmenu-widget.diff
77 - epatch ${FILESDIR}/0048-qclipboard_hack_80072.patch
78 + epatch "${FILESDIR}"/0001-dnd_optimization.patch
79 + epatch "${FILESDIR}"/0002-dnd_active_window_fix.patch
80 + epatch "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch
81 + epatch "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff
82 + epatch "${FILESDIR}"/0047-fix-kmenu-widget.diff
83 + epatch "${FILESDIR}"/0048-qclipboard_hack_80072.patch
84
85 # possible rce, CVE-2007-3388
86 - epatch ${FILESDIR}/0081-format-string-fixes.diff
87 + epatch "${FILESDIR}"/0081-format-string-fixes.diff
88
89 # Bug #192472
90 - epatch ${FILESDIR}/${P}-unicode-off-by-one.patch
91 + epatch "${FILESDIR}"/${P}-unicode-off-by-one.patch
92
93 # ulibc patch (bug #100246)
94 - epatch ${FILESDIR}/qt-ulibc.patch
95 + epatch "${FILESDIR}"/qt-ulibc.patch
96
97 # xinerama patch: http://ktown.kde.org/~seli/xinerama/
98 - epatch "${FILESDIR}/${P}-seli-xinerama.patch"
99 + epatch "${FILESDIR}"/${P}-seli-xinerama.patch
100
101 - epatch ${FILESDIR}/utf8-bug-qt3.diff
102 + epatch "${FILESDIR}"/utf8-bug-qt3.diff
103
104 # Visibility patch, apply only on GCC 4.1 and later for safety
105 # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \
106 - epatch "${FILESDIR}/${P}-visibility.patch"
107 + epatch "${FILESDIR}"/${P}-visibility.patch
108 +
109 + # Fix configure to correctly pick up gcc version, bug 244732
110 + epatch "${FILESDIR}"/${P}-fix-compiler-detection.patch
111
112 if use immqt || use immqt-bc ; then
113 epatch ../${IMMQT_P}.diff
114 @@ -168,16 +171,16 @@
115 -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
116 -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
117 -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
118 - ${S}/mkspecs/${PLATFORM}/qmake.conf || die
119 + "${S}"/mkspecs/${PLATFORM}/qmake.conf || die
120
121 if [ $(get_libdir) != "lib" ] ; then
122 sed -i -e "s:/lib$:/$(get_libdir):" \
123 - ${S}/mkspecs/${PLATFORM}/qmake.conf || die
124 + "${S}"/mkspecs/${PLATFORM}/qmake.conf || die
125 fi
126 }
127
128 src_compile() {
129 - export SYSCONF=${D}${QTBASE}/etc/settings
130 + export SYSCONF="${D}${QTBASE}/etc/settings"
131
132 # Let's just allow writing to these directories during Qt emerge
133 # as it makes Qt much happier.
134 @@ -234,12 +237,12 @@
135 fi
136
137 # Make the msg2qm utility (not made by default)
138 - cd ${S}/tools/msg2qm
139 + cd "${S}"/tools/msg2qm
140 ../../bin/qmake
141 emake
142
143 # Make the qembed utility (not made by default)
144 - cd ${S}/tools/qembed
145 + cd "${S}"/tools/qembed
146 ../../bin/qmake
147 emake
148
149 @@ -247,7 +250,7 @@
150
151 src_install() {
152 # binaries
153 - into ${QTBASE}
154 + into "${QTBASE}"
155 dobin bin/*
156 dobin tools/msg2qm/msg2qm
157 dobin tools/qembed/qembed
158 @@ -255,10 +258,10 @@
159 # libraries
160 if use ppc-macos; then
161 # dolib is broken on BSD because of missing readlink(1)
162 - dodir ${QTBASE}/$(get_libdir)
163 - cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die
164 + dodir "${QTBASE}"/$(get_libdir)
165 + cp -fR lib/*.{dylib,la,a} "${D}/${QTBASE}"/$(get_libdir) || die
166
167 - cd ${D}/${QTBASE}/$(get_libdir)
168 + cd "${D}/${QTBASE}"/$(get_libdir)
169 for lib in libqt-mt* ; do
170 ln -s ${lib} ${lib/-mt/}
171 done
172 @@ -266,7 +269,7 @@
173 dolib.so lib/lib{editor,qassistantclient,designercore}.a
174 dolib.so lib/libqt-mt.la
175 dolib.so lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0
176 - cd ${D}/${QTBASE}/$(get_libdir)
177 + cd "${D}/${QTBASE}"/$(get_libdir)
178
179 for x in libqui.so ; do
180 ln -s $x.1.0.0 $x.1.0
181 @@ -287,10 +290,10 @@
182 fi
183
184 # plugins
185 - cd ${S}
186 + cd "${S}"
187 local plugins=$(find plugins -name "lib*.so" -print)
188 for x in ${plugins}; do
189 - exeinto ${QTBASE}/$(dirname ${x})
190 + exeinto "${QTBASE}"/$(dirname ${x})
191 doexe ${x}
192 done
193
194 @@ -298,19 +301,19 @@
195 is_final_abi || return 0
196
197 # includes
198 - cd ${S}
199 - dodir ${QTBASE}/include/private
200 - cp include/* ${D}/${QTBASE}/include/
201 - cp include/private/* ${D}/${QTBASE}/include/private/
202 + cd "${S}"
203 + dodir "${QTBASE}"/include/private
204 + cp include/* "${D}/${QTBASE}"/include/
205 + cp include/private/* "${D}/${QTBASE}"/include/private/
206
207 # prl files
208 - sed -i -e "s:${S}:${QTBASE}:g" ${S}/lib/*.prl
209 - insinto ${QTBASE}/$(get_libdir)
210 - doins ${S}/lib/*.prl
211 + sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl
212 + insinto "${QTBASE}"/$(get_libdir)
213 + doins "${S}"/lib/*.prl
214
215 # pkg-config file
216 - insinto ${QTBASE}/$(get_libdir)/pkgconfig
217 - doins ${S}/lib/*.pc
218 + insinto "${QTBASE}"/$(get_libdir)/pkgconfig
219 + doins "${S}"/lib/*.pc
220
221 # List all the multilib libdirs
222 local libdirs
223 @@ -320,7 +323,7 @@
224
225 # environment variables
226 if use ppc-macos; then
227 - cat <<EOF > ${T}/45qt3
228 + cat <<EOF > "${T}"/45qt3
229 PATH=${QTBASE}/bin
230 ROOTPATH=${QTBASE}/bin
231 DYLD_LIBRARY_PATH=${libdirs:1}
232 @@ -329,7 +332,7 @@
233 PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
234 EOF
235 else
236 - cat <<EOF > ${T}/45qt3
237 + cat <<EOF > "${T}"/45qt3
238 PATH=${QTBASE}/bin
239 ROOTPATH=${QTBASE}/bin
240 LDPATH=${libdirs:1}
241 @@ -338,54 +341,54 @@
242 PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
243 EOF
244 fi
245 - cat <<EOF > ${T}/50qtdir3
246 + cat <<EOF > "${T}"/50qtdir3
247 QTDIR=${QTBASE}
248 EOF
249
250 - cat <<EOF > ${T}/50-qt3-revdep
251 + cat <<EOF > "${T}"/50-qt3-revdep
252 SEARCH_DIRS="${QTBASE}"
253 EOF
254
255 insinto /etc/revdep-rebuild
256 - doins ${T}/50-qt3-revdep
257 + doins "${T}"/50-qt3-revdep
258
259 - doenvd ${T}/45qt3 ${T}/50qtdir3
260 + doenvd "${T}"/45qt3 "${T}"/50qtdir3
261
262 if [ "${SYMLINK_LIB}" = "yes" ]; then
263 - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
264 + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) "${QTBASE}"/lib
265 fi
266
267 - insinto ${QTBASE}/tools/designer
268 + insinto "${QTBASE}"/tools/designer
269 doins -r tools/designer/templates
270
271 - insinto ${QTBASE}
272 + insinto "${QTBASE}"
273 doins -r translations
274
275 - keepdir ${QTBASE}/etc/settings
276 + keepdir "${QTBASE}"/etc/settings
277
278 if use doc; then
279 - insinto ${QTBASE}
280 - doins -r ${S}/doc
281 + insinto "${QTBASE}"
282 + doins -r "${S}"/doc
283 fi
284
285 if use examples; then
286 - find ${S}/examples ${S}/tutorial -name Makefile | \
287 + find "${S}"/examples "${S}"/tutorial -name Makefile | \
288 xargs sed -i -e "s:${S}:${QTBASE}:g"
289
290 - cp -r ${S}/examples ${D}${QTBASE}/
291 - cp -r ${S}/tutorial ${D}${QTBASE}/
292 + cp -r "${S}"/examples "${D}${QTBASE}"/
293 + cp -r "${S}"/tutorial "${D}${QTBASE}"/
294 fi
295
296 # misc build reqs
297 - insinto ${QTBASE}/mkspecs
298 - doins -r ${S}/mkspecs/${PLATFORM}
299 + insinto "${QTBASE}"/mkspecs
300 + doins -r "${S}/mkspecs/${PLATFORM}"
301
302 sed -e "s:${S}:${QTBASE}:g" \
303 - ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
304 + "${S}"/.qmake.cache > "${D}${QTBASE}"/.qmake.cache
305
306 dodoc FAQ README README-QT.TXT changes*
307 if use immqt || use immqt-bc ; then
308 - dodoc ${S}/README.immodule
309 + dodoc "${S}"/README.immodule
310 fi
311 }
312
313
314
315
316 1.549 x11-libs/qt/ChangeLog
317
318 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?rev=1.549&view=markup
319 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?rev=1.549&content-type=text/plain
320 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?r1=1.548&r2=1.549
321
322 Index: ChangeLog
323 ===================================================================
324 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v
325 retrieving revision 1.548
326 retrieving revision 1.549
327 diff -u -r1.548 -r1.549
328 --- ChangeLog 19 Sep 2008 00:07:53 -0000 1.548
329 +++ ChangeLog 28 Oct 2008 23:50:09 -0000 1.549
330 @@ -1,6 +1,11 @@
331 # ChangeLog for x11-libs/qt
332 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
333 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.548 2008/09/19 00:07:53 yngwin Exp $
334 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.549 2008/10/28 23:50:09 yngwin Exp $
335 +
336 + 28 Oct 2008; Ben de Groot <yngwin@g.o>
337 + +files/qt-3.3.8-fix-compiler-detection.patch,
338 + +files/qt-3.3.8b-cjk-fix.patch, qt-3.3.8-r4.ebuild, qt-3.3.8b.ebuild:
339 + Add patches/fixes for bugs 172219, 229567 and 244732
340
341 *qt-4.4.2 (18 Sep 2008)
342
343
344
345
346 1.2 x11-libs/qt/qt-3.3.8b.ebuild
347
348 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8b.ebuild?rev=1.2&view=markup
349 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8b.ebuild?rev=1.2&content-type=text/plain
350 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8b.ebuild?r1=1.1&r2=1.2
351
352 Index: qt-3.3.8b.ebuild
353 ===================================================================
354 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b.ebuild,v
355 retrieving revision 1.1
356 retrieving revision 1.2
357 diff -u -r1.1 -r1.2
358 --- qt-3.3.8b.ebuild 26 Jul 2008 21:01:44 -0000 1.1
359 +++ qt-3.3.8b.ebuild 28 Oct 2008 23:50:09 -0000 1.2
360 @@ -1,6 +1,6 @@
361 # Copyright 1999-2008 Gentoo Foundation
362 # Distributed under the terms of the GNU General Public License v2
363 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b.ebuild,v 1.1 2008/07/26 21:01:44 carlo Exp $
364 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b.ebuild,v 1.2 2008/10/28 23:50:09 yngwin Exp $
365
366 # *** Please remember to update qt3.eclass when revbumping this ***
367
368 @@ -130,6 +130,12 @@
369 # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \
370 epatch "${FILESDIR}"/qt-3.3.8-visibility.patch
371
372 + # Fix configure to correctly pick up gcc version, bug 244732
373 + epatch "${FILESDIR}"/qt-3.3.8-fix-compiler-detection.patch
374 +
375 + # Fix CJK script rendering, bug 229567
376 + epatch "${FILESDIR}"/qt-3.3.8b-cjk-fix.patch
377 +
378 if use immqt || use immqt-bc ; then
379 epatch ../${IMMQT_P}.diff
380 sh make-symlinks.sh || die "make symlinks failed"
381 @@ -165,10 +171,14 @@
382 sed -i -e "s:/lib$:/${libdir}:" \
383 "${S}"/mkspecs/${PLATFORM}/qmake.conf || die
384 fi
385 +
386 + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
387 + -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
388 + "${S}"/qmake/Makefile.unix || die
389 }
390
391 src_compile() {
392 - export SYSCONF="${D}"${QTBASE}/etc/settings
393 + export SYSCONF="${D}${QTBASE}"/etc/settings
394
395 # Let's just allow writing to these directories during Qt emerge
396 # as it makes Qt much happier.
Report Message
Find on MARC Find on Google Groups