1 |
commit: 2f38ee0ac7e073edbf0018b93b78e035081ff595 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 17:05:51 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 31 14:29:09 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f38ee0a |
7 |
|
8 |
dev-qt: remove 4.8.5 |
9 |
|
10 |
dev-qt/assistant/assistant-4.8.5.ebuild | 65 ------- |
11 |
dev-qt/designer/designer-4.8.5.ebuild | 84 -------- |
12 |
dev-qt/linguist/linguist-4.8.5.ebuild | 51 ----- |
13 |
dev-qt/pixeltool/pixeltool-4.8.5.ebuild | 45 ----- |
14 |
dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild | 51 ----- |
15 |
dev-qt/qt-meta/qt-meta-4.8.5.ebuild | 41 ---- |
16 |
dev-qt/qt3support/qt3support-4.8.5.ebuild | 45 ----- |
17 |
dev-qt/qtbearer/qtbearer-4.8.5.ebuild | 58 ------ |
18 |
...isallow-deep-or-widely-nested-entity-refs.patch | 114 ----------- |
19 |
.../CVE-2013-4549-02-fully-expand-entities.patch | 124 ------------ |
20 |
dev-qt/qtcore/qtcore-4.8.5-r2.ebuild | 178 ----------------- |
21 |
dev-qt/qtdbus/qtdbus-4.8.5.ebuild | 53 ----- |
22 |
dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild | 76 -------- |
23 |
dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild | 116 ----------- |
24 |
.../files/qtgui-4.8.5-keyboard-shortcuts.patch | 41 ---- |
25 |
dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch | 84 -------- |
26 |
dev-qt/qtgui/qtgui-4.8.5-r4.ebuild | 216 --------------------- |
27 |
dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch | 21 -- |
28 |
dev-qt/qthelp/qthelp-4.8.5-r2.ebuild | 127 ------------ |
29 |
dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild | 60 ------ |
30 |
dev-qt/qtopengl/qtopengl-4.8.5.ebuild | 64 ------ |
31 |
dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild | 62 ------ |
32 |
dev-qt/qtphonon/qtphonon-4.8.5.ebuild | 54 ------ |
33 |
.../qtscript/files/4.8.2-javascriptcore-x32.patch | 12 -- |
34 |
dev-qt/qtscript/qtscript-4.8.5.ebuild | 62 ------ |
35 |
dev-qt/qtsql/qtsql-4.8.5.ebuild | 73 ------- |
36 |
dev-qt/qtsvg/qtsvg-4.8.5.ebuild | 61 ------ |
37 |
dev-qt/qttest/qttest-4.8.5.ebuild | 45 ----- |
38 |
.../files/qtwebkit-4.8.1-no-use-ld-gold.patch | 17 -- |
39 |
dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild | 83 -------- |
40 |
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild | 48 ----- |
41 |
31 files changed, 2231 deletions(-) |
42 |
|
43 |
diff --git a/dev-qt/assistant/assistant-4.8.5.ebuild b/dev-qt/assistant/assistant-4.8.5.ebuild |
44 |
deleted file mode 100644 |
45 |
index d08564e..0000000 |
46 |
--- a/dev-qt/assistant/assistant-4.8.5.ebuild |
47 |
+++ /dev/null |
48 |
@@ -1,65 +0,0 @@ |
49 |
-# Copyright 1999-2014 Gentoo Foundation |
50 |
-# Distributed under the terms of the GNU General Public License v2 |
51 |
-# $Id$ |
52 |
- |
53 |
-EAPI=5 |
54 |
- |
55 |
-inherit eutils qt4-build |
56 |
- |
57 |
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format" |
58 |
-SLOT="4" |
59 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
60 |
- KEYWORDS="" |
61 |
-else |
62 |
- KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
63 |
-fi |
64 |
- |
65 |
-IUSE="webkit" |
66 |
- |
67 |
-DEPEND=" |
68 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
69 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=] |
70 |
- ~dev-qt/qthelp-${PV}[aqua=,debug=] |
71 |
- ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite] |
72 |
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) |
73 |
-" |
74 |
-RDEPEND="${DEPEND}" |
75 |
- |
76 |
-PATCHES=( |
77 |
- "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch" |
78 |
-) |
79 |
- |
80 |
-pkg_setup() { |
81 |
- QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant" |
82 |
- QT4_EXTRACT_DIRECTORIES=" |
83 |
- include |
84 |
- src |
85 |
- tools" |
86 |
- |
87 |
- qt4-build_pkg_setup |
88 |
-} |
89 |
- |
90 |
-src_prepare() { |
91 |
- # bug 401173 |
92 |
- use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch") |
93 |
- |
94 |
- qt4-build_src_prepare |
95 |
-} |
96 |
- |
97 |
-src_configure() { |
98 |
- myconf+=" |
99 |
- -system-libpng -system-libjpeg -system-zlib |
100 |
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc |
101 |
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
102 |
- -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns |
103 |
- $(qt_use webkit)" |
104 |
- |
105 |
- qt4-build_src_configure |
106 |
-} |
107 |
- |
108 |
-src_install() { |
109 |
- qt4-build_src_install |
110 |
- |
111 |
- doicon tools/assistant/tools/assistant/images/assistant.png |
112 |
- make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation' |
113 |
-} |
114 |
|
115 |
diff --git a/dev-qt/designer/designer-4.8.5.ebuild b/dev-qt/designer/designer-4.8.5.ebuild |
116 |
deleted file mode 100644 |
117 |
index da1ffbd..0000000 |
118 |
--- a/dev-qt/designer/designer-4.8.5.ebuild |
119 |
+++ /dev/null |
120 |
@@ -1,84 +0,0 @@ |
121 |
-# Copyright 1999-2015 Gentoo Foundation |
122 |
-# Distributed under the terms of the GNU General Public License v2 |
123 |
-# $Id$ |
124 |
- |
125 |
-EAPI=5 |
126 |
- |
127 |
-inherit eutils qt4-build |
128 |
- |
129 |
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs" |
130 |
-SLOT="4" |
131 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
132 |
- KEYWORDS="" |
133 |
-else |
134 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
135 |
-fi |
136 |
- |
137 |
-DESIGNER_PLUGINS="declarative phonon qt3support webkit" |
138 |
-IUSE="${DESIGNER_PLUGINS} kde" |
139 |
- |
140 |
-DEPEND=" |
141 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
142 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=] |
143 |
- ~dev-qt/qtscript-${PV}[aqua=,debug=] |
144 |
- declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=] ) |
145 |
- phonon? ( !kde? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] ) ) |
146 |
- qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] ) |
147 |
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) |
148 |
-" |
149 |
-RDEPEND="${DEPEND}" |
150 |
-PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )" |
151 |
- |
152 |
-pkg_setup() { |
153 |
- QT4_TARGET_DIRECTORIES="tools/designer" |
154 |
- QT4_EXTRACT_DIRECTORIES=" |
155 |
- include |
156 |
- src |
157 |
- tools" |
158 |
- |
159 |
- qt4-build_pkg_setup |
160 |
-} |
161 |
- |
162 |
-src_prepare() { |
163 |
- qt4-build_src_prepare |
164 |
- |
165 |
- local plugin |
166 |
- for plugin in ${DESIGNER_PLUGINS}; do |
167 |
- if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde ); then |
168 |
- sed -i -e "/\<${plugin}\>/d" \ |
169 |
- tools/designer/src/plugins/plugins.pro || die |
170 |
- fi |
171 |
- done |
172 |
-} |
173 |
- |
174 |
-src_configure() { |
175 |
- myconf+=" |
176 |
- -system-libpng -system-libjpeg -system-zlib |
177 |
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
178 |
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
179 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
180 |
- |
181 |
- qt4-build_src_configure |
182 |
-} |
183 |
- |
184 |
-src_install() { |
185 |
- qt4-build_src_install |
186 |
- |
187 |
- # qt-creator |
188 |
- # some qt-creator headers are located |
189 |
- # under /usr/include/qt4/QtDesigner/private. |
190 |
- # those headers are just includes of the headers |
191 |
- # which are located under tools/designer/src/lib/* |
192 |
- # So instead of installing both, we create the private folder |
193 |
- # and drop tools/designer/src/lib/* headers in it. |
194 |
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
195 |
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ |
196 |
- else |
197 |
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/ |
198 |
- fi |
199 |
- doins "${S}"/tools/designer/src/lib/shared/* |
200 |
- doins "${S}"/tools/designer/src/lib/sdk/* |
201 |
- |
202 |
- doicon tools/designer/src/designer/images/designer.png |
203 |
- make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' |
204 |
-} |
205 |
|
206 |
diff --git a/dev-qt/linguist/linguist-4.8.5.ebuild b/dev-qt/linguist/linguist-4.8.5.ebuild |
207 |
deleted file mode 100644 |
208 |
index 89e537d..0000000 |
209 |
--- a/dev-qt/linguist/linguist-4.8.5.ebuild |
210 |
+++ /dev/null |
211 |
@@ -1,51 +0,0 @@ |
212 |
-# Copyright 1999-2014 Gentoo Foundation |
213 |
-# Distributed under the terms of the GNU General Public License v2 |
214 |
-# $Id$ |
215 |
- |
216 |
-EAPI=5 |
217 |
- |
218 |
-inherit eutils qt4-build |
219 |
- |
220 |
-DESCRIPTION="Graphical tool for translating Qt applications" |
221 |
-SLOT="4" |
222 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
223 |
- KEYWORDS="" |
224 |
-else |
225 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
226 |
-fi |
227 |
- |
228 |
-IUSE="" |
229 |
- |
230 |
-DEPEND=" |
231 |
- ~dev-qt/designer-${PV}[aqua=,debug=] |
232 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
233 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=] |
234 |
-" |
235 |
-RDEPEND="${DEPEND}" |
236 |
- |
237 |
-pkg_setup() { |
238 |
- QT4_TARGET_DIRECTORIES="tools/linguist/linguist" |
239 |
- QT4_EXTRACT_DIRECTORIES=" |
240 |
- include |
241 |
- src |
242 |
- tools" |
243 |
- |
244 |
- qt4-build_pkg_setup |
245 |
-} |
246 |
- |
247 |
-src_configure() { |
248 |
- myconf+=" |
249 |
- -system-libpng -system-libjpeg -system-zlib |
250 |
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
251 |
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
252 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
253 |
- |
254 |
- qt4-build_src_configure |
255 |
-} |
256 |
- |
257 |
-src_install() { |
258 |
- qt4-build_src_install |
259 |
- |
260 |
- newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png |
261 |
- make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation' |
262 |
-} |
263 |
|
264 |
diff --git a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild b/dev-qt/pixeltool/pixeltool-4.8.5.ebuild |
265 |
deleted file mode 100644 |
266 |
index 0f74e18..0000000 |
267 |
--- a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild |
268 |
+++ /dev/null |
269 |
@@ -1,45 +0,0 @@ |
270 |
-# Copyright 1999-2014 Gentoo Foundation |
271 |
-# Distributed under the terms of the GNU General Public License v2 |
272 |
-# $Id$ |
273 |
- |
274 |
-EAPI=5 |
275 |
- |
276 |
-inherit qt4-build |
277 |
- |
278 |
-DESCRIPTION="Qt screen magnifier" |
279 |
-SLOT="4" |
280 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
281 |
- KEYWORDS="" |
282 |
-else |
283 |
- KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
284 |
-fi |
285 |
- |
286 |
-IUSE="" |
287 |
- |
288 |
-DEPEND=" |
289 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
290 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=] |
291 |
- !<dev-qt/qthelp-4.8.5:4 |
292 |
-" |
293 |
-RDEPEND="${DEPEND}" |
294 |
- |
295 |
-pkg_setup() { |
296 |
- QT4_TARGET_DIRECTORIES="tools/pixeltool" |
297 |
- QT4_EXTRACT_DIRECTORIES=" |
298 |
- include |
299 |
- src/corelib |
300 |
- src/gui |
301 |
- tools/pixeltool" |
302 |
- |
303 |
- qt4-build_pkg_setup |
304 |
-} |
305 |
- |
306 |
-src_configure() { |
307 |
- myconf+=" |
308 |
- -system-libpng -system-libjpeg -system-zlib |
309 |
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
310 |
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
311 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
312 |
- |
313 |
- qt4-build_src_configure |
314 |
-} |
315 |
|
316 |
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild |
317 |
deleted file mode 100644 |
318 |
index 233cfeb..0000000 |
319 |
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild |
320 |
+++ /dev/null |
321 |
@@ -1,51 +0,0 @@ |
322 |
-# Copyright 1999-2014 Gentoo Foundation |
323 |
-# Distributed under the terms of the GNU General Public License v2 |
324 |
-# $Id$ |
325 |
- |
326 |
-EAPI=5 |
327 |
- |
328 |
-inherit eutils qt4-build |
329 |
- |
330 |
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages" |
331 |
-SLOT="4" |
332 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
333 |
- KEYWORDS="" |
334 |
-else |
335 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
336 |
-fi |
337 |
- |
338 |
-IUSE="" |
339 |
- |
340 |
-DEPEND=" |
341 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
342 |
- ~dev-qt/qtdbus-${PV}[aqua=,debug=] |
343 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=] |
344 |
-" |
345 |
-RDEPEND="${DEPEND}" |
346 |
- |
347 |
-pkg_setup() { |
348 |
- QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer" |
349 |
- QT4_EXTRACT_DIRECTORIES=" |
350 |
- include |
351 |
- src |
352 |
- tools/qdbus" |
353 |
- |
354 |
- qt4-build_pkg_setup |
355 |
-} |
356 |
- |
357 |
-src_configure() { |
358 |
- myconf+=" |
359 |
- -system-libpng -system-libjpeg -system-zlib |
360 |
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
361 |
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
362 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
363 |
- |
364 |
- qt4-build_src_configure |
365 |
-} |
366 |
- |
367 |
-src_install() { |
368 |
- qt4-build_src_install |
369 |
- |
370 |
- newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png |
371 |
- make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development' |
372 |
-} |
373 |
|
374 |
diff --git a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild b/dev-qt/qt-meta/qt-meta-4.8.5.ebuild |
375 |
deleted file mode 100644 |
376 |
index b812f55..0000000 |
377 |
--- a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild |
378 |
+++ /dev/null |
379 |
@@ -1,41 +0,0 @@ |
380 |
-# Copyright 1999-2015 Gentoo Foundation |
381 |
-# Distributed under the terms of the GNU General Public License v2 |
382 |
-# $Id$ |
383 |
- |
384 |
-EAPI=5 |
385 |
- |
386 |
-DESCRIPTION="Cross-platform application development framework (metapackage)" |
387 |
-HOMEPAGE="https://www.qt.io/" |
388 |
- |
389 |
-LICENSE="metapackage" |
390 |
-SLOT="4" |
391 |
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" |
392 |
-IUSE="+dbus examples kde openvg +qt3support +webkit" |
393 |
- |
394 |
-DEPEND="" |
395 |
-RDEPEND=" |
396 |
- >=dev-qt/assistant-${PV}:4 |
397 |
- >=dev-qt/designer-${PV}:4 |
398 |
- >=dev-qt/linguist-${PV}:4 |
399 |
- >=dev-qt/pixeltool-${PV}:4 |
400 |
- dbus? ( >=dev-qt/qdbusviewer-${PV}:4 ) |
401 |
- qt3support? ( >=dev-qt/qt3support-${PV}:4 ) |
402 |
- >=dev-qt/qtbearer-${PV}:4 |
403 |
- >=dev-qt/qtcore-${PV}:4 |
404 |
- dbus? ( >=dev-qt/qtdbus-${PV}:4 ) |
405 |
- >=dev-qt/qtdeclarative-${PV}:4 |
406 |
- examples? ( >=dev-qt/qtdemo-${PV}:4 ) |
407 |
- >=dev-qt/qtgui-${PV}:4 |
408 |
- >=dev-qt/qthelp-${PV}:4 |
409 |
- >=dev-qt/qtmultimedia-${PV}:4 |
410 |
- >=dev-qt/qtopengl-${PV}:4 |
411 |
- openvg? ( >=dev-qt/qtopenvg-${PV}:4 ) |
412 |
- kde? ( media-libs/phonon[qt4] ) |
413 |
- !kde? ( || ( >=dev-qt/qtphonon-${PV}:4 media-libs/phonon[qt4] ) ) |
414 |
- >=dev-qt/qtscript-${PV}:4 |
415 |
- >=dev-qt/qtsql-${PV}:4 |
416 |
- >=dev-qt/qtsvg-${PV}:4 |
417 |
- >=dev-qt/qttest-${PV}:4 |
418 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:4 ) |
419 |
- >=dev-qt/qtxmlpatterns-${PV}:4 |
420 |
-" |
421 |
|
422 |
diff --git a/dev-qt/qt3support/qt3support-4.8.5.ebuild b/dev-qt/qt3support/qt3support-4.8.5.ebuild |
423 |
deleted file mode 100644 |
424 |
index 62467da..0000000 |
425 |
--- a/dev-qt/qt3support/qt3support-4.8.5.ebuild |
426 |
+++ /dev/null |
427 |
@@ -1,45 +0,0 @@ |
428 |
-# Copyright 1999-2014 Gentoo Foundation |
429 |
-# Distributed under the terms of the GNU General Public License v2 |
430 |
-# $Id$ |
431 |
- |
432 |
-EAPI=4 |
433 |
- |
434 |
-inherit qt4-build |
435 |
- |
436 |
-DESCRIPTION="The Qt3Support module for the Qt toolkit" |
437 |
-SLOT="4" |
438 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
439 |
- KEYWORDS="" |
440 |
-else |
441 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" |
442 |
-fi |
443 |
-IUSE="+accessibility" |
444 |
- |
445 |
-DEPEND=" |
446 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support] |
447 |
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support] |
448 |
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support] |
449 |
-" |
450 |
-RDEPEND="${DEPEND}" |
451 |
- |
452 |
-pkg_setup() { |
453 |
- QT4_TARGET_DIRECTORIES=" |
454 |
- src/qt3support |
455 |
- src/tools/uic3 |
456 |
- tools/porting" |
457 |
- |
458 |
- QT4_EXTRACT_DIRECTORIES=" |
459 |
- src |
460 |
- include |
461 |
- tools" |
462 |
- |
463 |
- qt4-build_pkg_setup |
464 |
-} |
465 |
- |
466 |
-src_configure() { |
467 |
- myconf+=" |
468 |
- -qt3support |
469 |
- $(qt_use accessibility)" |
470 |
- |
471 |
- qt4-build_src_configure |
472 |
-} |
473 |
|
474 |
diff --git a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild b/dev-qt/qtbearer/qtbearer-4.8.5.ebuild |
475 |
deleted file mode 100644 |
476 |
index 1278869..0000000 |
477 |
--- a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild |
478 |
+++ /dev/null |
479 |
@@ -1,58 +0,0 @@ |
480 |
-# Copyright 1999-2014 Gentoo Foundation |
481 |
-# Distributed under the terms of the GNU General Public License v2 |
482 |
-# $Id$ |
483 |
- |
484 |
-EAPI=4 |
485 |
- |
486 |
-inherit qt4-build |
487 |
- |
488 |
-DESCRIPTION="The network bearer plugins for the Qt toolkit" |
489 |
-SLOT="4" |
490 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
491 |
- KEYWORDS="" |
492 |
-else |
493 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" |
494 |
-fi |
495 |
-IUSE="connman networkmanager" |
496 |
- |
497 |
-DEPEND=" |
498 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
499 |
- connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) |
500 |
- networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) |
501 |
-" |
502 |
-RDEPEND="${DEPEND} |
503 |
- connman? ( net-misc/connman ) |
504 |
- networkmanager? ( net-misc/networkmanager ) |
505 |
-" |
506 |
- |
507 |
-pkg_setup() { |
508 |
- QT4_EXTRACT_DIRECTORIES=" |
509 |
- include/QtCore |
510 |
- include/QtDBus |
511 |
- include/QtNetwork |
512 |
- src/corelib |
513 |
- src/dbus |
514 |
- src/network |
515 |
- src/plugins/bearer |
516 |
- src/plugins/qpluginbase.pri" |
517 |
- |
518 |
- QT4_TARGET_DIRECTORIES=" |
519 |
- src/plugins/bearer/generic |
520 |
- $(use connman && echo src/plugins/bearer/connman) |
521 |
- $(use networkmanager && echo src/plugins/bearer/networkmanager)" |
522 |
- |
523 |
- qt4-build_pkg_setup |
524 |
-} |
525 |
- |
526 |
-src_configure() { |
527 |
- myconf+=" |
528 |
- $(use connman || use networkmanager || echo -no-dbus) |
529 |
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon |
530 |
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative |
531 |
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg |
532 |
- -no-cups -no-gtkstyle -no-nas-sound -no-opengl |
533 |
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
534 |
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" |
535 |
- |
536 |
- qt4-build_src_configure |
537 |
-} |
538 |
|
539 |
diff --git a/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch b/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch |
540 |
deleted file mode 100644 |
541 |
index c472d42..0000000 |
542 |
--- a/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch |
543 |
+++ /dev/null |
544 |
@@ -1,114 +0,0 @@ |
545 |
-From 512a1ce0698d370c313bb561bbf078935fa0342e Mon Sep 17 00:00:00 2001 |
546 |
-From: Mitch Curtis <mitch.curtis@×××××.com> |
547 |
-Date: Thu, 7 Nov 2013 09:36:29 +0100 |
548 |
-Subject: Disallow deep or widely nested entity references. |
549 |
- |
550 |
-Nested references with a depth of 2 or greater will fail. References |
551 |
-that partially expand to greater than 1024 characters will also fail. |
552 |
- |
553 |
-This is a backport of 46a8885ae486e238a39efa5119c2714f328b08e4. |
554 |
- |
555 |
-Change-Id: I0c2e1fa13d6ccb5f88641dae2ed3f28bfdeaf609 |
556 |
-Reviewed-by: Richard J. Moore <rich@×××.org> |
557 |
-Reviewed-by: Lars Knoll <lars.knoll@×××××.com> |
558 |
- |
559 |
-diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp |
560 |
-index a1777c5..3904632 100644 |
561 |
---- a/src/xml/sax/qxml.cpp |
562 |
-+++ b/src/xml/sax/qxml.cpp |
563 |
-@@ -424,6 +424,10 @@ private: |
564 |
- int stringValueLen; |
565 |
- QString emptyStr; |
566 |
- |
567 |
-+ // The limit to the amount of times the DTD parsing functions can be called |
568 |
-+ // for the DTD currently being parsed. |
569 |
-+ int dtdRecursionLimit; |
570 |
-+ |
571 |
- const QString &string(); |
572 |
- void stringClear(); |
573 |
- void stringAddC(QChar); |
574 |
-@@ -492,6 +496,7 @@ private: |
575 |
- void unexpectedEof(ParseFunction where, int state); |
576 |
- void parseFailed(ParseFunction where, int state); |
577 |
- void pushParseState(ParseFunction function, int state); |
578 |
-+ bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage); |
579 |
- |
580 |
- Q_DECLARE_PUBLIC(QXmlSimpleReader) |
581 |
- QXmlSimpleReader *q_ptr; |
582 |
-@@ -2759,6 +2764,7 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader) |
583 |
- useNamespacePrefixes = false; |
584 |
- reportWhitespaceCharData = true; |
585 |
- reportEntities = false; |
586 |
-+ dtdRecursionLimit = 2; |
587 |
- } |
588 |
- |
589 |
- QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate() |
590 |
-@@ -5018,6 +5024,11 @@ bool QXmlSimpleReaderPrivate::parseDoctype() |
591 |
- } |
592 |
- break; |
593 |
- case Mup: |
594 |
-+ if (dtdRecursionLimit > 0 && parameterEntities.size() > dtdRecursionLimit) { |
595 |
-+ reportParseError(QString::fromLatin1( |
596 |
-+ "DTD parsing exceeded recursion limit of %1.").arg(dtdRecursionLimit)); |
597 |
-+ return false; |
598 |
-+ } |
599 |
- if (!parseMarkupdecl()) { |
600 |
- parseFailed(&QXmlSimpleReaderPrivate::parseDoctype, state); |
601 |
- return false; |
602 |
-@@ -6627,6 +6638,37 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq() |
603 |
- return false; |
604 |
- } |
605 |
- |
606 |
-+bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage) |
607 |
-+{ |
608 |
-+ const QString value = string(); |
609 |
-+ QMap<QString, int> referencedEntityCounts; |
610 |
-+ foreach (QString entityName, entities.keys()) { |
611 |
-+ for (int i = 0; i < value.size() && i != -1; ) { |
612 |
-+ i = value.indexOf(entityName, i); |
613 |
-+ if (i != -1) { |
614 |
-+ // The entityName we're currently trying to find |
615 |
-+ // was matched in this string; increase our count. |
616 |
-+ ++referencedEntityCounts[entityName]; |
617 |
-+ i += entityName.size(); |
618 |
-+ } |
619 |
-+ } |
620 |
-+ } |
621 |
-+ |
622 |
-+ foreach (QString entityName, referencedEntityCounts.keys()) { |
623 |
-+ const int timesReferenced = referencedEntityCounts[entityName]; |
624 |
-+ const QString entityValue = entities[entityName]; |
625 |
-+ if (entityValue.size() * timesReferenced > 1024) { |
626 |
-+ if (errorMessage) { |
627 |
-+ *errorMessage = QString::fromLatin1("The XML entity \"%1\"" |
628 |
-+ "expands too a string that is too large to process when " |
629 |
-+ "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced); |
630 |
-+ } |
631 |
-+ return true; |
632 |
-+ } |
633 |
-+ } |
634 |
-+ return false; |
635 |
-+} |
636 |
-+ |
637 |
- /* |
638 |
- Parse a EntityDecl [70]. |
639 |
- |
640 |
-@@ -6721,6 +6763,15 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl() |
641 |
- switch (state) { |
642 |
- case EValue: |
643 |
- if ( !entityExist(name())) { |
644 |
-+ QString errorMessage; |
645 |
-+ if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) { |
646 |
-+ // The entity at entityName is entityValue.size() characters |
647 |
-+ // long in its unexpanded form, and was mentioned timesReferenced times, |
648 |
-+ // resulting in a string that would be greater than 1024 characters. |
649 |
-+ reportParseError(errorMessage); |
650 |
-+ return false; |
651 |
-+ } |
652 |
-+ |
653 |
- entities.insert(name(), string()); |
654 |
- if (declHnd) { |
655 |
- if (!declHnd->internalEntityDecl(name(), string())) { |
656 |
--- |
657 |
-1.8.5.2 |
658 |
- |
659 |
|
660 |
diff --git a/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch b/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch |
661 |
deleted file mode 100644 |
662 |
index 03ef64f..0000000 |
663 |
--- a/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch |
664 |
+++ /dev/null |
665 |
@@ -1,124 +0,0 @@ |
666 |
-From cecceb0cdd87482124a73ecf537f3445d68be13e Mon Sep 17 00:00:00 2001 |
667 |
-From: Mitch Curtis <mitch.curtis@×××××.com> |
668 |
-Date: Tue, 12 Nov 2013 13:44:56 +0100 |
669 |
-Subject: Fully expand entities to ensure deep or widely nested ones fail |
670 |
- parsing |
671 |
- |
672 |
-With 512a1ce0698d370c313bb561bbf078935fa0342e, we failed when parsing |
673 |
-entities whose partially expanded size was greater than 1024 |
674 |
-characters. That was not enough, so now we fully expand all entities. |
675 |
- |
676 |
-This is a backport of f1053d94f59f053ce4acad9320df14f1fbe4faac. |
677 |
- |
678 |
-Change-Id: I41dd6f4525c63e82fd320a22d19248169627f7e0 |
679 |
-Reviewed-by: Richard J. Moore <rich@×××.org> |
680 |
- |
681 |
-diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp |
682 |
-index 3904632..befa801 100644 |
683 |
---- a/src/xml/sax/qxml.cpp |
684 |
-+++ b/src/xml/sax/qxml.cpp |
685 |
-@@ -426,7 +426,9 @@ private: |
686 |
- |
687 |
- // The limit to the amount of times the DTD parsing functions can be called |
688 |
- // for the DTD currently being parsed. |
689 |
-- int dtdRecursionLimit; |
690 |
-+ static const int dtdRecursionLimit = 2; |
691 |
-+ // The maximum amount of characters an entity value may contain, after expansion. |
692 |
-+ static const int entityCharacterLimit = 1024; |
693 |
- |
694 |
- const QString &string(); |
695 |
- void stringClear(); |
696 |
-@@ -496,7 +498,7 @@ private: |
697 |
- void unexpectedEof(ParseFunction where, int state); |
698 |
- void parseFailed(ParseFunction where, int state); |
699 |
- void pushParseState(ParseFunction function, int state); |
700 |
-- bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage); |
701 |
-+ bool isExpandedEntityValueTooLarge(QString *errorMessage); |
702 |
- |
703 |
- Q_DECLARE_PUBLIC(QXmlSimpleReader) |
704 |
- QXmlSimpleReader *q_ptr; |
705 |
-@@ -2764,7 +2766,6 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader) |
706 |
- useNamespacePrefixes = false; |
707 |
- reportWhitespaceCharData = true; |
708 |
- reportEntities = false; |
709 |
-- dtdRecursionLimit = 2; |
710 |
- } |
711 |
- |
712 |
- QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate() |
713 |
-@@ -6638,30 +6639,43 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq() |
714 |
- return false; |
715 |
- } |
716 |
- |
717 |
--bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage) |
718 |
-+bool QXmlSimpleReaderPrivate::isExpandedEntityValueTooLarge(QString *errorMessage) |
719 |
- { |
720 |
-- const QString value = string(); |
721 |
-- QMap<QString, int> referencedEntityCounts; |
722 |
-- foreach (QString entityName, entities.keys()) { |
723 |
-- for (int i = 0; i < value.size() && i != -1; ) { |
724 |
-- i = value.indexOf(entityName, i); |
725 |
-- if (i != -1) { |
726 |
-- // The entityName we're currently trying to find |
727 |
-- // was matched in this string; increase our count. |
728 |
-- ++referencedEntityCounts[entityName]; |
729 |
-- i += entityName.size(); |
730 |
-+ QMap<QString, int> literalEntitySizes; |
731 |
-+ // The entity at (QMap<QString,) referenced the entities at (QMap<QString,) (int>) times. |
732 |
-+ QMap<QString, QMap<QString, int> > referencesToOtherEntities; |
733 |
-+ QMap<QString, int> expandedSizes; |
734 |
-+ |
735 |
-+ // For every entity, check how many times all entity names were referenced in its value. |
736 |
-+ foreach (QString toSearch, entities.keys()) { |
737 |
-+ // The amount of characters that weren't entity names, but literals, like 'X'. |
738 |
-+ QString leftOvers = entities.value(toSearch); |
739 |
-+ // How many times was entityName referenced by toSearch? |
740 |
-+ foreach (QString entityName, entities.keys()) { |
741 |
-+ for (int i = 0; i < leftOvers.size() && i != -1; ) { |
742 |
-+ i = leftOvers.indexOf(QString::fromLatin1("&%1;").arg(entityName), i); |
743 |
-+ if (i != -1) { |
744 |
-+ leftOvers.remove(i, entityName.size() + 2); |
745 |
-+ // The entityName we're currently trying to find was matched in this string; increase our count. |
746 |
-+ ++referencesToOtherEntities[toSearch][entityName]; |
747 |
-+ } |
748 |
- } |
749 |
- } |
750 |
-+ literalEntitySizes[toSearch] = leftOvers.size(); |
751 |
- } |
752 |
- |
753 |
-- foreach (QString entityName, referencedEntityCounts.keys()) { |
754 |
-- const int timesReferenced = referencedEntityCounts[entityName]; |
755 |
-- const QString entityValue = entities[entityName]; |
756 |
-- if (entityValue.size() * timesReferenced > 1024) { |
757 |
-+ foreach (QString entity, referencesToOtherEntities.keys()) { |
758 |
-+ expandedSizes[entity] = literalEntitySizes[entity]; |
759 |
-+ foreach (QString referenceTo, referencesToOtherEntities.value(entity).keys()) { |
760 |
-+ const int references = referencesToOtherEntities.value(entity).value(referenceTo); |
761 |
-+ // The total size of an entity's value is the expanded size of all of its referenced entities, plus its literal size. |
762 |
-+ expandedSizes[entity] += expandedSizes[referenceTo] * references + literalEntitySizes[referenceTo] * references; |
763 |
-+ } |
764 |
-+ |
765 |
-+ if (expandedSizes[entity] > entityCharacterLimit) { |
766 |
- if (errorMessage) { |
767 |
-- *errorMessage = QString::fromLatin1("The XML entity \"%1\"" |
768 |
-- "expands too a string that is too large to process when " |
769 |
-- "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced); |
770 |
-+ *errorMessage = QString::fromLatin1("The XML entity \"%1\" expands too a string that is too large to process (%2 characters > %3)."); |
771 |
-+ *errorMessage = (*errorMessage).arg(entity).arg(expandedSizes[entity]).arg(entityCharacterLimit); |
772 |
- } |
773 |
- return true; |
774 |
- } |
775 |
-@@ -6764,10 +6778,7 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl() |
776 |
- case EValue: |
777 |
- if ( !entityExist(name())) { |
778 |
- QString errorMessage; |
779 |
-- if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) { |
780 |
-- // The entity at entityName is entityValue.size() characters |
781 |
-- // long in its unexpanded form, and was mentioned timesReferenced times, |
782 |
-- // resulting in a string that would be greater than 1024 characters. |
783 |
-+ if (isExpandedEntityValueTooLarge(&errorMessage)) { |
784 |
- reportParseError(errorMessage); |
785 |
- return false; |
786 |
- } |
787 |
--- |
788 |
-1.8.5.2 |
789 |
- |
790 |
|
791 |
diff --git a/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild |
792 |
deleted file mode 100644 |
793 |
index d1dacc5..0000000 |
794 |
--- a/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild |
795 |
+++ /dev/null |
796 |
@@ -1,178 +0,0 @@ |
797 |
-# Copyright 1999-2015 Gentoo Foundation |
798 |
-# Distributed under the terms of the GNU General Public License v2 |
799 |
-# $Id$ |
800 |
- |
801 |
-EAPI=5 |
802 |
- |
803 |
-inherit qt4-build |
804 |
- |
805 |
-DESCRIPTION="Cross-platform application development framework" |
806 |
-SLOT="4" |
807 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
808 |
- KEYWORDS="" |
809 |
-else |
810 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
811 |
-fi |
812 |
-IUSE="+glib iconv icu qt3support ssl" |
813 |
- |
814 |
-DEPEND=" |
815 |
- sys-libs/zlib |
816 |
- glib? ( dev-libs/glib:2 ) |
817 |
- icu? ( >=dev-libs/icu-49:= ) |
818 |
- ssl? ( dev-libs/openssl:0 ) |
819 |
- !dev-qt/qttranslations:4 |
820 |
- !<x11-libs/cairo-1.10.2-r2 |
821 |
-" |
822 |
-RDEPEND="${DEPEND}" |
823 |
-PDEPEND=" |
824 |
- qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) |
825 |
-" |
826 |
- |
827 |
-PATCHES=( |
828 |
- "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch" |
829 |
- "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968 |
830 |
- "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968 |
831 |
- "${FILESDIR}/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch" |
832 |
- "${FILESDIR}/CVE-2013-4549-02-fully-expand-entities.patch" |
833 |
-) |
834 |
- |
835 |
-pkg_setup() { |
836 |
- QT4_TARGET_DIRECTORIES=" |
837 |
- src/tools/bootstrap |
838 |
- src/tools/moc |
839 |
- src/tools/rcc |
840 |
- src/tools/uic |
841 |
- src/corelib |
842 |
- src/xml |
843 |
- src/network |
844 |
- src/plugins/codecs |
845 |
- tools/linguist/lconvert |
846 |
- tools/linguist/lrelease |
847 |
- tools/linguist/lupdate" |
848 |
- |
849 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
850 |
- include |
851 |
- src/plugins/plugins.pro |
852 |
- src/plugins/qpluginbase.pri |
853 |
- src/src.pro |
854 |
- src/3rdparty/des |
855 |
- src/3rdparty/harfbuzz |
856 |
- src/3rdparty/md4 |
857 |
- src/3rdparty/md5 |
858 |
- src/3rdparty/sha1 |
859 |
- src/3rdparty/easing |
860 |
- src/3rdparty/zlib_dependency.pri |
861 |
- src/declarative |
862 |
- src/gui |
863 |
- src/script |
864 |
- tools/shared |
865 |
- tools/linguist/shared |
866 |
- translations" |
867 |
- |
868 |
- qt4-build_pkg_setup |
869 |
-} |
870 |
- |
871 |
-src_prepare() { |
872 |
- # Don't pre-strip, bug 235026 |
873 |
- for i in kr jp cn tw; do |
874 |
- echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro |
875 |
- done |
876 |
- |
877 |
- qt4-build_src_prepare |
878 |
- |
879 |
- # bug 172219 |
880 |
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ |
881 |
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" |
882 |
- sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
883 |
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" |
884 |
- |
885 |
- # bug 427782 |
886 |
- sed -i -e "/^CPPFLAGS/s/-g//" \ |
887 |
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" |
888 |
- sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ |
889 |
- -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ |
890 |
- "${S}/configure" || die "sed configure setBootstrapVariable failed" |
891 |
-} |
892 |
- |
893 |
-src_configure() { |
894 |
- myconf+=" |
895 |
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon |
896 |
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative |
897 |
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg |
898 |
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg |
899 |
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
900 |
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb |
901 |
- $(qt_use glib) |
902 |
- $(qt_use iconv) |
903 |
- $(qt_use icu) |
904 |
- $(use ssl && echo -openssl-linked || echo -no-openssl) |
905 |
- $(qt_use qt3support)" |
906 |
- |
907 |
- qt4-build_src_configure |
908 |
-} |
909 |
- |
910 |
-src_install() { |
911 |
- dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} |
912 |
- |
913 |
- install_directories src/{corelib,xml,network,plugins/codecs} |
914 |
- |
915 |
- emake INSTALL_ROOT="${D}" install_mkspecs |
916 |
- |
917 |
- # install private headers |
918 |
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private |
919 |
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + |
920 |
- |
921 |
- # use freshly built libraries |
922 |
- local DYLD_FPATH= |
923 |
- [[ -d "${S}"/lib/QtCore.framework ]] \ |
924 |
- && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done) |
925 |
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ |
926 |
- LD_LIBRARY_PATH="${S}/lib" \ |
927 |
- "${S}"/bin/lrelease translations/*.ts \ |
928 |
- || die "generating translations failed" |
929 |
- insinto "${QTTRANSDIR#${EPREFIX}}" |
930 |
- doins translations/*.qm |
931 |
- |
932 |
- setqtenv |
933 |
- fix_library_files |
934 |
- |
935 |
- # List all the multilib libdirs |
936 |
- local libdirs= |
937 |
- for libdir in $(get_all_libdirs); do |
938 |
- libdirs+=":${EPREFIX}/usr/${libdir}/qt4" |
939 |
- done |
940 |
- |
941 |
- cat <<-EOF > "${T}"/44qt4 |
942 |
- LDPATH="${libdirs:1}" |
943 |
- EOF |
944 |
- doenvd "${T}"/44qt4 |
945 |
- |
946 |
- dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo |
947 |
- mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ |
948 |
- || die "failed to move qconfig.pri" |
949 |
- |
950 |
- # Framework hacking |
951 |
- if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then |
952 |
- # TODO: do this better |
953 |
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ |
954 |
- "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ |
955 |
- || die "sed for qconfig.h failed." |
956 |
- dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo |
957 |
- else |
958 |
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ |
959 |
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ |
960 |
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \ |
961 |
- || die "sed for qconfig.h failed" |
962 |
- fi |
963 |
- |
964 |
- QCONFIG_DEFINE="QT_ZLIB" |
965 |
- install_qconfigs |
966 |
- |
967 |
- # remove .la files |
968 |
- prune_libtool_files |
969 |
- |
970 |
- keepdir "${QTSYSCONFDIR#${EPREFIX}}" |
971 |
- |
972 |
- # Framework magic |
973 |
- fix_includes |
974 |
-} |
975 |
|
976 |
diff --git a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild b/dev-qt/qtdbus/qtdbus-4.8.5.ebuild |
977 |
deleted file mode 100644 |
978 |
index d37d32d..0000000 |
979 |
--- a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild |
980 |
+++ /dev/null |
981 |
@@ -1,53 +0,0 @@ |
982 |
-# Copyright 1999-2014 Gentoo Foundation |
983 |
-# Distributed under the terms of the GNU General Public License v2 |
984 |
-# $Id$ |
985 |
- |
986 |
-EAPI=4 |
987 |
- |
988 |
-inherit qt4-build |
989 |
- |
990 |
-DESCRIPTION="The DBus module for the Qt toolkit" |
991 |
-SLOT="4" |
992 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
993 |
- KEYWORDS="" |
994 |
-else |
995 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
996 |
-fi |
997 |
-IUSE="" |
998 |
- |
999 |
-DEPEND=" |
1000 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
1001 |
- >=sys-apps/dbus-1.2 |
1002 |
-" |
1003 |
-RDEPEND="${DEPEND}" |
1004 |
- |
1005 |
-PATCHES=( |
1006 |
- "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch" |
1007 |
- "${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch" |
1008 |
-) |
1009 |
- |
1010 |
-pkg_setup() { |
1011 |
- QT4_TARGET_DIRECTORIES=" |
1012 |
- src/dbus |
1013 |
- tools/qdbus/qdbus |
1014 |
- tools/qdbus/qdbusxml2cpp |
1015 |
- tools/qdbus/qdbuscpp2xml" |
1016 |
- |
1017 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
1018 |
- include/QtCore |
1019 |
- include/QtDBus |
1020 |
- include/QtXml |
1021 |
- src/corelib |
1022 |
- src/xml" |
1023 |
- |
1024 |
- QCONFIG_ADD="dbus dbus-linked" |
1025 |
- QCONFIG_DEFINE="QT_DBUS" |
1026 |
- |
1027 |
- qt4-build_pkg_setup |
1028 |
-} |
1029 |
- |
1030 |
-src_configure() { |
1031 |
- myconf+=" -dbus-linked" |
1032 |
- |
1033 |
- qt4-build_src_configure |
1034 |
-} |
1035 |
|
1036 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild |
1037 |
deleted file mode 100644 |
1038 |
index cba6eb6..0000000 |
1039 |
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild |
1040 |
+++ /dev/null |
1041 |
@@ -1,76 +0,0 @@ |
1042 |
-# Copyright 1999-2014 Gentoo Foundation |
1043 |
-# Distributed under the terms of the GNU General Public License v2 |
1044 |
-# $Id$ |
1045 |
- |
1046 |
-EAPI=4 |
1047 |
- |
1048 |
-inherit qt4-build |
1049 |
- |
1050 |
-DESCRIPTION="The Declarative module for the Qt toolkit" |
1051 |
-SLOT="4" |
1052 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
1053 |
- KEYWORDS="" |
1054 |
-else |
1055 |
- KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" |
1056 |
-fi |
1057 |
-IUSE="+accessibility qt3support webkit" |
1058 |
- |
1059 |
-DEPEND=" |
1060 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] |
1061 |
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=] |
1062 |
- ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=] |
1063 |
- ~dev-qt/qtscript-${PV}[aqua=,debug=] |
1064 |
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=] |
1065 |
- ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=] |
1066 |
- ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] |
1067 |
- qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=] ) |
1068 |
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) |
1069 |
-" |
1070 |
-RDEPEND="${DEPEND}" |
1071 |
- |
1072 |
-pkg_setup() { |
1073 |
- QT4_TARGET_DIRECTORIES=" |
1074 |
- src/declarative |
1075 |
- src/imports |
1076 |
- src/plugins/qmltooling |
1077 |
- tools/qml |
1078 |
- tools/qmlplugindump" |
1079 |
- |
1080 |
- if use webkit; then |
1081 |
- QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative" |
1082 |
- fi |
1083 |
- |
1084 |
- QT4_EXTRACT_DIRECTORIES=" |
1085 |
- include |
1086 |
- src |
1087 |
- tools |
1088 |
- translations" |
1089 |
- |
1090 |
- QCONFIG_ADD="declarative" |
1091 |
- QCONFIG_DEFINE="QT_DECLARATIVE" |
1092 |
- |
1093 |
- qt4-build_pkg_setup |
1094 |
-} |
1095 |
- |
1096 |
-src_configure() { |
1097 |
- myconf+=" |
1098 |
- -declarative -no-gtkstyle |
1099 |
- $(qt_use accessibility) |
1100 |
- $(qt_use qt3support) |
1101 |
- $(qt_use webkit)" |
1102 |
- qt4-build_src_configure |
1103 |
-} |
1104 |
- |
1105 |
-src_install() { |
1106 |
- qt4-build_src_install |
1107 |
- |
1108 |
- # install private headers |
1109 |
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
1110 |
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private |
1111 |
- # ran for the 2nd time, need it for the updated headers |
1112 |
- fix_includes |
1113 |
- else |
1114 |
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private |
1115 |
- fi |
1116 |
- find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} + |
1117 |
-} |
1118 |
|
1119 |
diff --git a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild |
1120 |
deleted file mode 100644 |
1121 |
index 2607b79..0000000 |
1122 |
--- a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild |
1123 |
+++ /dev/null |
1124 |
@@ -1,116 +0,0 @@ |
1125 |
-# Copyright 1999-2014 Gentoo Foundation |
1126 |
-# Distributed under the terms of the GNU General Public License v2 |
1127 |
-# $Id$ |
1128 |
- |
1129 |
-EAPI=4 |
1130 |
- |
1131 |
-inherit qt4-build |
1132 |
- |
1133 |
-DESCRIPTION="Demonstration module and examples for the Qt toolkit" |
1134 |
-SLOT="4" |
1135 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
1136 |
- KEYWORDS="" |
1137 |
-else |
1138 |
- KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-macos" |
1139 |
-fi |
1140 |
-IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns" |
1141 |
- |
1142 |
-DEPEND=" |
1143 |
- ~dev-qt/designer-${PV}[aqua=,debug=] |
1144 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support?] |
1145 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support?] |
1146 |
- ~dev-qt/qthelp-${PV}[aqua=,debug=] |
1147 |
- ~dev-qt/qtscript-${PV}[aqua=,debug=] |
1148 |
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support?] |
1149 |
- ~dev-qt/qtsvg-${PV}[aqua=,debug=] |
1150 |
- ~dev-qt/qttest-${PV}[aqua=,debug=] |
1151 |
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) |
1152 |
- declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] ) |
1153 |
- multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] ) |
1154 |
- opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] ) |
1155 |
- openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] ) |
1156 |
- phonon? ( |
1157 |
- kde? ( media-libs/phonon[aqua=,qt4] ) |
1158 |
- !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=,qt4] ) ) |
1159 |
- ) |
1160 |
- qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] ) |
1161 |
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) |
1162 |
- xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] ) |
1163 |
-" |
1164 |
-RDEPEND="${DEPEND}" |
1165 |
- |
1166 |
-PATCHES=( |
1167 |
- "${FILESDIR}/${PN}-4.6-plugandpaint.patch" |
1168 |
-) |
1169 |
- |
1170 |
-pkg_setup() { |
1171 |
- QT4_TARGET_DIRECTORIES=" |
1172 |
- demos |
1173 |
- examples" |
1174 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
1175 |
- doc/src/images |
1176 |
- include |
1177 |
- src |
1178 |
- tools" |
1179 |
- |
1180 |
- qt4-build_pkg_setup |
1181 |
-} |
1182 |
- |
1183 |
-src_prepare() { |
1184 |
- qt4-build_src_prepare |
1185 |
- |
1186 |
- # Array mapping USE flags to subdirs |
1187 |
- local flags_subdirs_map=( |
1188 |
- 'dbus' |
1189 |
- 'declarative:declarative' |
1190 |
- 'multimedia:spectrum' |
1191 |
- 'opengl:boxes|glhypnotizer' |
1192 |
- 'openvg' |
1193 |
- 'phonon:mediaplayer' |
1194 |
- 'webkit:browser' |
1195 |
- 'xmlpatterns' |
1196 |
- ) |
1197 |
- |
1198 |
- # Disable unwanted examples/demos |
1199 |
- for flag in "${flags_subdirs_map[@]}"; do |
1200 |
- if ! use ${flag%:*}; then |
1201 |
- einfo "Disabling ${flag%:*} examples" |
1202 |
- sed -i -e "/SUBDIRS += ${flag%:*}/d" \ |
1203 |
- examples/examples.pro || die |
1204 |
- |
1205 |
- if [[ ${flag} == *:* ]]; then |
1206 |
- einfo "Disabling ${flag%:*} demos" |
1207 |
- sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \ |
1208 |
- demos/demos.pro || die |
1209 |
- fi |
1210 |
- fi |
1211 |
- done |
1212 |
- |
1213 |
- if ! use qt3support; then |
1214 |
- einfo "Disabling qt3support examples" |
1215 |
- sed -i -e '/QT_CONFIG, qt3support/d' \ |
1216 |
- examples/graphicsview/graphicsview.pro || die |
1217 |
- fi |
1218 |
-} |
1219 |
- |
1220 |
-src_configure() { |
1221 |
- myconf+=" |
1222 |
- $(qt_use dbus) |
1223 |
- $(qt_use declarative) |
1224 |
- $(qt_use multimedia) -no-audio-backend |
1225 |
- $(qt_use opengl) |
1226 |
- $(qt_use openvg) |
1227 |
- $(qt_use phonon) -no-phonon-backend |
1228 |
- $(qt_use qt3support) |
1229 |
- $(qt_use webkit) |
1230 |
- $(qt_use xmlpatterns)" |
1231 |
- |
1232 |
- qt4-build_src_configure |
1233 |
-} |
1234 |
- |
1235 |
-src_install() { |
1236 |
- insinto "${QTDOCDIR#${EPREFIX}}"/src |
1237 |
- doins -r doc/src/images |
1238 |
- |
1239 |
- qt4-build_src_install |
1240 |
-} |
1241 |
|
1242 |
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch b/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch |
1243 |
deleted file mode 100644 |
1244 |
index c975ebf..0000000 |
1245 |
--- a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch |
1246 |
+++ /dev/null |
1247 |
@@ -1,41 +0,0 @@ |
1248 |
-From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001 |
1249 |
-From: Gatis Paeglis <gatis.paeglis@×××××.com> |
1250 |
-Date: Sat, 31 Aug 2013 21:22:47 +0200 |
1251 |
-Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb |
1252 |
- layout." |
1253 |
- |
1254 |
-The change which attempted to fix QTBUG-15319 broke keyboard |
1255 |
-shortcuts for non latin keyboard layouts. |
1256 |
- |
1257 |
-This patch reverts QTBUG-15319 (f45cdeda8) since it caused a |
1258 |
-regression. |
1259 |
- |
1260 |
-Task-number: QTBUG-32908 |
1261 |
- |
1262 |
-Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7 |
1263 |
-Reviewed-by: David Faure <david.faure@××××.com> |
1264 |
---- |
1265 |
- src/gui/kernel/qkeymapper_x11.cpp | 5 +---- |
1266 |
- 1 file changed, 1 insertion(+), 4 deletions(-) |
1267 |
- |
1268 |
-diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp |
1269 |
-index 005ff3f..7daa41d 100644 |
1270 |
---- a/src/gui/kernel/qkeymapper_x11.cpp |
1271 |
-+++ b/src/gui/kernel/qkeymapper_x11.cpp |
1272 |
-@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event) |
1273 |
- |
1274 |
- // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must |
1275 |
- // always use them when determining the baseKeySym) |
1276 |
-- // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to |
1277 |
-- // XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers. |
1278 |
-- // See https://bugreports.qt-project.org/browse/QTBUG-15319 . |
1279 |
- KeySym baseKeySym; |
1280 |
- uint consumedModifiers; |
1281 |
-- if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)), |
1282 |
-+ if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)), |
1283 |
- &consumedModifiers, &baseKeySym)) |
1284 |
- return QList<int>(); |
1285 |
- |
1286 |
--- |
1287 |
-1.8.3.2 |
1288 |
- |
1289 |
|
1290 |
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch b/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch |
1291 |
deleted file mode 100644 |
1292 |
index 47d35e2..0000000 |
1293 |
--- a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch |
1294 |
+++ /dev/null |
1295 |
@@ -1,84 +0,0 @@ |
1296 |
-From 2a9ea11f4dea51f9e75036aab8e7a23f0eb4bd1f Mon Sep 17 00:00:00 2001 |
1297 |
-From: aavit <eirik.aavitsland@×××××.com> |
1298 |
-Date: Tue, 10 Sep 2013 11:46:51 +0200 |
1299 |
-Subject: Compilation fix for libjpeg release 9 |
1300 |
-MIME-Version: 1.0 |
1301 |
-Content-Type: text/plain; charset=UTF-8 |
1302 |
-Content-Transfer-Encoding: 8bit |
1303 |
- |
1304 |
-In the latest libjpeg version, the "boolean" type is changed so that |
1305 |
-true and false no longer can be used instead of TRUE and FALSE. |
1306 |
- |
1307 |
-Also, purge some ancient code remains meant to support a now defunct |
1308 |
-OS´s idea about the boolean type. |
1309 |
- |
1310 |
-Task-number: QTBUG-33166 |
1311 |
-Change-Id: Iebbdf300cfdc22775954de65f985358424ed2b49 |
1312 |
-Reviewed-by: Gunnar Sletta <gunnar.sletta@×××××.com> |
1313 |
-(cherry picked from qtbase/fad6aa619bf6eb048821a58065433f6b598c10e4) |
1314 |
---- |
1315 |
- src/gui/image/qjpeghandler.cpp | 27 +++++---------------------- |
1316 |
- 1 file changed, 5 insertions(+), 22 deletions(-) |
1317 |
- |
1318 |
-diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp |
1319 |
-index a8700b7..ba5c469 100644 |
1320 |
---- a/src/gui/image/qjpeghandler.cpp |
1321 |
-+++ b/src/gui/image/qjpeghandler.cpp |
1322 |
-@@ -157,11 +157,7 @@ static boolean qt_fill_input_buffer(j_decompress_ptr cinfo) |
1323 |
- } else { |
1324 |
- src->bytes_in_buffer = num_read; |
1325 |
- } |
1326 |
--#if defined(Q_OS_UNIXWARE) |
1327 |
-- return B_TRUE; |
1328 |
--#else |
1329 |
-- return true; |
1330 |
--#endif |
1331 |
-+ return TRUE; |
1332 |
- } |
1333 |
- |
1334 |
- static void qt_skip_input_data(j_decompress_ptr cinfo, long num_bytes) |
1335 |
-@@ -489,11 +485,7 @@ static boolean qt_empty_output_buffer(j_compress_ptr cinfo) |
1336 |
- dest->next_output_byte = dest->buffer; |
1337 |
- dest->free_in_buffer = max_buf; |
1338 |
- |
1339 |
--#if defined(Q_OS_UNIXWARE) |
1340 |
-- return B_TRUE; |
1341 |
--#else |
1342 |
-- return true; |
1343 |
--#endif |
1344 |
-+ return TRUE; |
1345 |
- } |
1346 |
- |
1347 |
- static void qt_term_destination(j_compress_ptr cinfo) |
1348 |
-@@ -584,13 +576,8 @@ static bool write_jpeg_image(const QImage &image, QIODevice *device, int sourceQ |
1349 |
- |
1350 |
- |
1351 |
- int quality = sourceQuality >= 0 ? qMin(sourceQuality,100) : 75; |
1352 |
--#if defined(Q_OS_UNIXWARE) |
1353 |
-- jpeg_set_quality(&cinfo, quality, B_TRUE /* limit to baseline-JPEG values */); |
1354 |
-- jpeg_start_compress(&cinfo, B_TRUE); |
1355 |
--#else |
1356 |
-- jpeg_set_quality(&cinfo, quality, true /* limit to baseline-JPEG values */); |
1357 |
-- jpeg_start_compress(&cinfo, true); |
1358 |
--#endif |
1359 |
-+ jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */); |
1360 |
-+ jpeg_start_compress(&cinfo, TRUE); |
1361 |
- |
1362 |
- row_pointer[0] = new uchar[cinfo.image_width*cinfo.input_components]; |
1363 |
- int w = cinfo.image_width; |
1364 |
-@@ -751,11 +738,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device) |
1365 |
- err.error_exit = my_error_exit; |
1366 |
- |
1367 |
- if (!setjmp(err.setjmp_buffer)) { |
1368 |
-- #if defined(Q_OS_UNIXWARE) |
1369 |
-- (void) jpeg_read_header(&info, B_TRUE); |
1370 |
-- #else |
1371 |
-- (void) jpeg_read_header(&info, true); |
1372 |
-- #endif |
1373 |
-+ (void) jpeg_read_header(&info, TRUE); |
1374 |
- |
1375 |
- int width = 0; |
1376 |
- int height = 0; |
1377 |
--- |
1378 |
-2.0.0 |
1379 |
- |
1380 |
|
1381 |
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild |
1382 |
deleted file mode 100644 |
1383 |
index 4a61205..0000000 |
1384 |
--- a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild |
1385 |
+++ /dev/null |
1386 |
@@ -1,216 +0,0 @@ |
1387 |
-# Copyright 1999-2015 Gentoo Foundation |
1388 |
-# Distributed under the terms of the GNU General Public License v2 |
1389 |
-# $Id$ |
1390 |
- |
1391 |
-EAPI=5 |
1392 |
- |
1393 |
-inherit eutils qt4-build |
1394 |
- |
1395 |
-DESCRIPTION="The GUI module for the Qt toolkit" |
1396 |
-SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch" |
1397 |
- |
1398 |
-SLOT="4" |
1399 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
1400 |
- KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc" |
1401 |
-else |
1402 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
1403 |
-fi |
1404 |
- |
1405 |
-IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" |
1406 |
- |
1407 |
-REQUIRED_USE=" |
1408 |
- gtkstyle? ( glib ) |
1409 |
-" |
1410 |
- |
1411 |
-# cairo[-qt4] is needed because of bug 454066 |
1412 |
-RDEPEND=" |
1413 |
- app-eselect/eselect-qtgraphicssystem |
1414 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=] |
1415 |
- ~dev-qt/qtscript-${PV}[aqua=,debug=] |
1416 |
- media-libs/fontconfig |
1417 |
- media-libs/freetype:2 |
1418 |
- media-libs/libpng:0= |
1419 |
- sys-libs/zlib |
1420 |
- virtual/jpeg:0 |
1421 |
- !aqua? ( |
1422 |
- x11-libs/libICE |
1423 |
- x11-libs/libSM |
1424 |
- x11-libs/libX11 |
1425 |
- x11-libs/libXcursor |
1426 |
- x11-libs/libXext |
1427 |
- x11-libs/libXfixes |
1428 |
- x11-libs/libXi |
1429 |
- x11-libs/libXrandr |
1430 |
- x11-libs/libXrender |
1431 |
- xinerama? ( x11-libs/libXinerama ) |
1432 |
- xv? ( x11-libs/libXv ) |
1433 |
- ) |
1434 |
- cups? ( net-print/cups ) |
1435 |
- egl? ( media-libs/mesa[egl] ) |
1436 |
- glib? ( dev-libs/glib:2 ) |
1437 |
- gtkstyle? ( |
1438 |
- x11-libs/cairo[-qt4(-)] |
1439 |
- x11-libs/gtk+:2[aqua=] |
1440 |
- ) |
1441 |
- mng? ( >=media-libs/libmng-1.0.9:= ) |
1442 |
- nas? ( >=media-libs/nas-1.5 ) |
1443 |
- tiff? ( media-libs/tiff:0 ) |
1444 |
- !<dev-qt/qthelp-4.8.5:4 |
1445 |
-" |
1446 |
-DEPEND="${RDEPEND} |
1447 |
- !aqua? ( |
1448 |
- x11-proto/inputproto |
1449 |
- x11-proto/xextproto |
1450 |
- xinerama? ( x11-proto/xineramaproto ) |
1451 |
- xv? ( x11-proto/videoproto ) |
1452 |
- ) |
1453 |
-" |
1454 |
-PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )" |
1455 |
- |
1456 |
-PATCHES=( |
1457 |
- "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880 |
1458 |
- "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 |
1459 |
- "${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124 |
1460 |
- "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226 |
1461 |
- "${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984 |
1462 |
- "${FILESDIR}/${PN}-4.8.5-keyboard-shortcuts.patch" # bug 477796 |
1463 |
- "${FILESDIR}/${PN}-4.8.5-libjpeg-9.patch" # bug 480182 |
1464 |
- "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968 |
1465 |
- "${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972 |
1466 |
-) |
1467 |
- |
1468 |
-pkg_setup() { |
1469 |
- QT4_TARGET_DIRECTORIES=" |
1470 |
- src/gui |
1471 |
- src/scripttools |
1472 |
- src/plugins/imageformats/gif |
1473 |
- src/plugins/imageformats/ico |
1474 |
- src/plugins/imageformats/jpeg |
1475 |
- src/plugins/imageformats/tga |
1476 |
- src/plugins/inputmethods" |
1477 |
- |
1478 |
- QT4_EXTRACT_DIRECTORIES=" |
1479 |
- examples/desktop/systray |
1480 |
- include |
1481 |
- src" |
1482 |
- |
1483 |
- use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets" |
1484 |
- use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng" |
1485 |
- use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff" |
1486 |
- use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay" |
1487 |
- |
1488 |
- # mac version does not contain qtconfig? |
1489 |
- [[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig" |
1490 |
- |
1491 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" |
1492 |
- |
1493 |
- qt4-build_pkg_setup |
1494 |
-} |
1495 |
- |
1496 |
-src_prepare() { |
1497 |
- qt4-build_src_prepare |
1498 |
- |
1499 |
- # Add -xvideo to the list of accepted configure options |
1500 |
- sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die |
1501 |
-} |
1502 |
- |
1503 |
-src_configure() { |
1504 |
- myconf="$(qt_use accessibility) |
1505 |
- $(qt_use cups) |
1506 |
- $(qt_use glib) |
1507 |
- $(qt_use mng libmng system) |
1508 |
- $(qt_use nas nas-sound system) |
1509 |
- $(qt_use nis) |
1510 |
- $(qt_use tiff libtiff system) |
1511 |
- $(qt_use egl) |
1512 |
- $(qt_use qt3support) |
1513 |
- $(qt_use gtkstyle) |
1514 |
- $(qt_use xinerama) |
1515 |
- $(qt_use xv xvideo)" |
1516 |
- |
1517 |
- myconf+=" |
1518 |
- -system-libpng -system-libjpeg -system-zlib |
1519 |
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
1520 |
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
1521 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
1522 |
- |
1523 |
- # bug 367045 |
1524 |
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" |
1525 |
- |
1526 |
- qt4-build_src_configure |
1527 |
- |
1528 |
- if use gtkstyle; then |
1529 |
- sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed" |
1530 |
- fi |
1531 |
- |
1532 |
- sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed" |
1533 |
-} |
1534 |
- |
1535 |
-src_install() { |
1536 |
- QCONFIG_ADD=" |
1537 |
- mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync |
1538 |
- fontconfig system-freetype gif png system-png jpeg system-jpeg |
1539 |
- $(usev accessibility) |
1540 |
- $(usev cups) |
1541 |
- $(use mng && echo system-mng) |
1542 |
- $(usev nas) |
1543 |
- $(usev nis) |
1544 |
- $(use tiff && echo system-tiff) |
1545 |
- $(usev xinerama) |
1546 |
- $(use xv && echo xvideo)" |
1547 |
- QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" |
1548 |
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) |
1549 |
- $(use cups && echo QT_CUPS) |
1550 |
- $(use egl && echo QT_EGL) |
1551 |
- QT_FONTCONFIG QT_FREETYPE |
1552 |
- $(use gtkstyle && echo QT_STYLE_GTK) |
1553 |
- QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG |
1554 |
- $(use mng && echo QT_IMAGEFORMAT_MNG) |
1555 |
- $(use nas && echo QT_NAS) |
1556 |
- $(use nis && echo QT_NIS) |
1557 |
- $(use tiff && echo QT_IMAGEFORMAT_TIFF) |
1558 |
- QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES |
1559 |
- $(use xinerama && echo QT_XINERAMA) |
1560 |
- QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC |
1561 |
- $(use xv && echo QT_XVIDEO)" |
1562 |
- |
1563 |
- qt4-build_src_install |
1564 |
- |
1565 |
- # install private headers |
1566 |
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
1567 |
- insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ |
1568 |
- else |
1569 |
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private |
1570 |
- fi |
1571 |
- find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} + |
1572 |
- |
1573 |
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
1574 |
- # rerun to get links to headers right |
1575 |
- fix_includes |
1576 |
- fi |
1577 |
- |
1578 |
- # touch the available graphics systems |
1579 |
- dodir /usr/share/qt4/graphicssystems |
1580 |
- echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die |
1581 |
- echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die |
1582 |
- |
1583 |
- newicon tools/qtconfig/images/appicon.png qtconfig.png |
1584 |
- make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' |
1585 |
- |
1586 |
- # bug 388551 |
1587 |
- if use gtkstyle; then |
1588 |
- local tempfile=${T}/${PN}${SLOT}.sh |
1589 |
- cat <<-EOF > "${tempfile}" |
1590 |
- export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0 |
1591 |
- EOF |
1592 |
- insinto /etc/profile.d |
1593 |
- doins "${tempfile}" |
1594 |
- fi |
1595 |
-} |
1596 |
- |
1597 |
-pkg_postinst() { |
1598 |
- qt4-build_pkg_postinst |
1599 |
- |
1600 |
- # raster is the default graphicssystem, set it on first install |
1601 |
- eselect qtgraphicssystem set raster --use-old |
1602 |
-} |
1603 |
|
1604 |
diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch |
1605 |
deleted file mode 100644 |
1606 |
index cc76219..0000000 |
1607 |
--- a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch |
1608 |
+++ /dev/null |
1609 |
@@ -1,21 +0,0 @@ |
1610 |
---- tools/assistant/compat/compat.pro 2010-10-08 16:54:09.804000000 +0300 |
1611 |
-+++ tools/assistant/compat/compat.pro 2010-10-08 16:54:37.884000000 +0300 |
1612 |
-@@ -14,6 +14,8 @@ |
1613 |
- |
1614 |
- PROJECTNAME = Assistant |
1615 |
- |
1616 |
-+DESTDIR = ../../../bin |
1617 |
-+ |
1618 |
- FORMS += helpdialog.ui \ |
1619 |
- mainwindow.ui \ |
1620 |
- tabbedbrowser.ui \ |
1621 |
-@@ -59,6 +61,9 @@ |
1622 |
- TARGET = Assistant_adp |
1623 |
- } |
1624 |
- |
1625 |
-+target.path=$$[QT_INSTALL_BINS] |
1626 |
-+INSTALLS += target |
1627 |
-+ |
1628 |
- TRANSLATIONS = translations/assistant_adp_de.ts \ |
1629 |
- translations/assistant_adp_ja.ts \ |
1630 |
- translations/assistant_adp_pl.ts \ |
1631 |
|
1632 |
diff --git a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild |
1633 |
deleted file mode 100644 |
1634 |
index 6aff23c..0000000 |
1635 |
--- a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild |
1636 |
+++ /dev/null |
1637 |
@@ -1,127 +0,0 @@ |
1638 |
-# Copyright 1999-2015 Gentoo Foundation |
1639 |
-# Distributed under the terms of the GNU General Public License v2 |
1640 |
-# $Id$ |
1641 |
- |
1642 |
-EAPI=5 |
1643 |
- |
1644 |
-inherit eutils qt4-build |
1645 |
- |
1646 |
-DESCRIPTION="The Help module for the Qt toolkit" |
1647 |
-SRC_URI+=" |
1648 |
- compat? ( |
1649 |
- http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz |
1650 |
- https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz |
1651 |
- )" |
1652 |
- |
1653 |
-SLOT="4" |
1654 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
1655 |
- KEYWORDS="" |
1656 |
-else |
1657 |
- KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
1658 |
-fi |
1659 |
- |
1660 |
-IUSE="compat doc" |
1661 |
- |
1662 |
-DEPEND=" |
1663 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
1664 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=] |
1665 |
- ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite] |
1666 |
- compat? ( |
1667 |
- ~dev-qt/qtdbus-${PV}[aqua=,debug=] |
1668 |
- sys-libs/zlib |
1669 |
- ) |
1670 |
-" |
1671 |
-RDEPEND="${DEPEND}" |
1672 |
- |
1673 |
-pkg_setup() { |
1674 |
- QT4_TARGET_DIRECTORIES=" |
1675 |
- tools/assistant/lib/fulltextsearch |
1676 |
- tools/assistant/lib |
1677 |
- tools/assistant/tools/qhelpgenerator |
1678 |
- tools/assistant/tools/qcollectiongenerator |
1679 |
- tools/assistant/tools/qhelpconverter |
1680 |
- tools/qdoc3" |
1681 |
- QT4_EXTRACT_DIRECTORIES=" |
1682 |
- demos |
1683 |
- doc |
1684 |
- examples |
1685 |
- include |
1686 |
- src |
1687 |
- tools" |
1688 |
- |
1689 |
- use compat && QT4_TARGET_DIRECTORIES+=" |
1690 |
- tools/assistant/compat |
1691 |
- tools/assistant/compat/lib" |
1692 |
- |
1693 |
- qt4-build_pkg_setup |
1694 |
-} |
1695 |
- |
1696 |
-src_unpack() { |
1697 |
- qt4-build_src_unpack |
1698 |
- |
1699 |
- # compat version |
1700 |
- # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ |
1701 |
- if use compat; then |
1702 |
- unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \ |
1703 |
- qt-assistant-compat-headers-4.7.tar.gz |
1704 |
- mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \ |
1705 |
- "${S}"/tools/assistant/compat || die |
1706 |
- mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die |
1707 |
- fi |
1708 |
-} |
1709 |
- |
1710 |
-src_prepare() { |
1711 |
- qt4-build_src_prepare |
1712 |
- |
1713 |
- use compat && epatch "${FILESDIR}"/${PN}-4.8.5-fix-compat.patch |
1714 |
- |
1715 |
- # bug 348034 |
1716 |
- sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die |
1717 |
-} |
1718 |
- |
1719 |
-src_configure() { |
1720 |
- myconf+=" |
1721 |
- -system-libpng -system-libjpeg -system-zlib |
1722 |
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc |
1723 |
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
1724 |
- -no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns |
1725 |
- -no-nas-sound -no-cups -no-nis -fontconfig" |
1726 |
- |
1727 |
- qt4-build_src_configure |
1728 |
-} |
1729 |
- |
1730 |
-src_compile() { |
1731 |
- # help libQtHelp find freshly built libQtCLucene (bug #289811) |
1732 |
- export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}" |
1733 |
- export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework" |
1734 |
- |
1735 |
- qt4-build_src_compile |
1736 |
- |
1737 |
- # ugly hack to build docs |
1738 |
- "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die |
1739 |
- |
1740 |
- if use doc; then |
1741 |
- emake docs |
1742 |
- elif [[ ${QT4_BUILD_TYPE} == release ]]; then |
1743 |
- # live ebuild cannot build qch_docs, it will build them through emake docs |
1744 |
- emake qch_docs |
1745 |
- fi |
1746 |
-} |
1747 |
- |
1748 |
-src_install() { |
1749 |
- qt4-build_src_install |
1750 |
- |
1751 |
- emake INSTALL_ROOT="${D}" install_qchdocs |
1752 |
- |
1753 |
- # do not compress .qch files |
1754 |
- docompress -x "${QTDOCDIR}"/qch |
1755 |
- |
1756 |
- if use doc; then |
1757 |
- emake INSTALL_ROOT="${D}" install_htmldocs |
1758 |
- fi |
1759 |
- |
1760 |
- if use compat; then |
1761 |
- insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/features |
1762 |
- doins tools/assistant/compat/features/assistant.prf |
1763 |
- fi |
1764 |
-} |
1765 |
|
1766 |
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild |
1767 |
deleted file mode 100644 |
1768 |
index b1e129f..0000000 |
1769 |
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild |
1770 |
+++ /dev/null |
1771 |
@@ -1,60 +0,0 @@ |
1772 |
-# Copyright 1999-2013 Gentoo Foundation |
1773 |
-# Distributed under the terms of the GNU General Public License v2 |
1774 |
-# $Id$ |
1775 |
- |
1776 |
-EAPI=4 |
1777 |
- |
1778 |
-inherit qt4-build |
1779 |
- |
1780 |
-DESCRIPTION="The Multimedia module for the Qt toolkit" |
1781 |
-SLOT="4" |
1782 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
1783 |
- KEYWORDS="" |
1784 |
-else |
1785 |
- KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
1786 |
-fi |
1787 |
-IUSE="alsa" |
1788 |
- |
1789 |
-DEPEND=" |
1790 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
1791 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=] |
1792 |
- alsa? ( media-libs/alsa-lib ) |
1793 |
-" |
1794 |
-RDEPEND="${DEPEND}" |
1795 |
- |
1796 |
-PATCHES=( |
1797 |
- "${FILESDIR}/${PN}-4.8.0-alsa.patch" |
1798 |
-) |
1799 |
- |
1800 |
-pkg_setup() { |
1801 |
- QT4_TARGET_DIRECTORIES=" |
1802 |
- src/multimedia" |
1803 |
- |
1804 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
1805 |
- include/Qt |
1806 |
- include/QtCore |
1807 |
- include/QtGui |
1808 |
- include/QtMultimedia |
1809 |
- src/src.pro |
1810 |
- src/corelib |
1811 |
- src/gui" |
1812 |
- |
1813 |
- QCONFIG_ADD="multimedia" |
1814 |
- QCONFIG_DEFINE="QT_MULTIMEDIA" |
1815 |
- |
1816 |
- qt4-build_pkg_setup |
1817 |
-} |
1818 |
- |
1819 |
-src_configure() { |
1820 |
- myconf+=" |
1821 |
- -multimedia -audio-backend |
1822 |
- $(qt_use alsa) |
1823 |
- -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend |
1824 |
- -no-svg -no-webkit -no-script -no-scripttools -no-declarative |
1825 |
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl |
1826 |
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl |
1827 |
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
1828 |
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" |
1829 |
- |
1830 |
- qt4-build_src_configure |
1831 |
-} |
1832 |
|
1833 |
diff --git a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild b/dev-qt/qtopengl/qtopengl-4.8.5.ebuild |
1834 |
deleted file mode 100644 |
1835 |
index 683afb5..0000000 |
1836 |
--- a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild |
1837 |
+++ /dev/null |
1838 |
@@ -1,64 +0,0 @@ |
1839 |
-# Copyright 1999-2014 Gentoo Foundation |
1840 |
-# Distributed under the terms of the GNU General Public License v2 |
1841 |
-# $Id$ |
1842 |
- |
1843 |
-EAPI=4 |
1844 |
- |
1845 |
-inherit qt4-build |
1846 |
- |
1847 |
-DESCRIPTION="The OpenGL module for the Qt toolkit" |
1848 |
-SLOT="4" |
1849 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
1850 |
- KEYWORDS="" |
1851 |
-else |
1852 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
1853 |
-fi |
1854 |
-IUSE="egl qt3support" |
1855 |
- |
1856 |
-DEPEND=" |
1857 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] |
1858 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=] |
1859 |
- virtual/opengl |
1860 |
-" |
1861 |
-RDEPEND="${DEPEND}" |
1862 |
- |
1863 |
-pkg_setup() { |
1864 |
- QT4_TARGET_DIRECTORIES=" |
1865 |
- src/opengl |
1866 |
- src/plugins/graphicssystems/opengl" |
1867 |
- |
1868 |
- QT4_EXTRACT_DIRECTORIES=" |
1869 |
- include/QtCore |
1870 |
- include/QtGui |
1871 |
- include/QtOpenGL |
1872 |
- src/corelib |
1873 |
- src/gui |
1874 |
- src/opengl |
1875 |
- src/plugins |
1876 |
- src/3rdparty" |
1877 |
- |
1878 |
- QCONFIG_ADD="opengl" |
1879 |
- QCONFIG_DEFINE="QT_OPENGL" |
1880 |
- |
1881 |
- qt4-build_pkg_setup |
1882 |
-} |
1883 |
- |
1884 |
-src_configure() { |
1885 |
- myconf+=" |
1886 |
- -opengl |
1887 |
- $(qt_use qt3support) |
1888 |
- $(qt_use egl)" |
1889 |
- |
1890 |
- qt4-build_src_configure |
1891 |
- |
1892 |
- # Not building tools/designer/src/plugins/tools/view3d as it's |
1893 |
- # commented out of the build in the source |
1894 |
-} |
1895 |
- |
1896 |
-src_install() { |
1897 |
- qt4-build_src_install |
1898 |
- |
1899 |
- # touch the available graphics systems |
1900 |
- dodir /usr/share/qt4/graphicssystems |
1901 |
- echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die |
1902 |
-} |
1903 |
|
1904 |
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild |
1905 |
deleted file mode 100644 |
1906 |
index db2fdd7..0000000 |
1907 |
--- a/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild |
1908 |
+++ /dev/null |
1909 |
@@ -1,62 +0,0 @@ |
1910 |
-# Copyright 1999-2013 Gentoo Foundation |
1911 |
-# Distributed under the terms of the GNU General Public License v2 |
1912 |
-# $Id$ |
1913 |
- |
1914 |
-EAPI=4 |
1915 |
- |
1916 |
-inherit qt4-build |
1917 |
- |
1918 |
-DESCRIPTION="The OpenVG module for the Qt toolkit" |
1919 |
-SLOT="4" |
1920 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
1921 |
- KEYWORDS="" |
1922 |
-else |
1923 |
- KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
1924 |
-fi |
1925 |
-IUSE="qt3support" |
1926 |
- |
1927 |
-DEPEND=" |
1928 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] |
1929 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=] |
1930 |
- media-libs/mesa[egl,openvg] |
1931 |
-" |
1932 |
-RDEPEND="${DEPEND}" |
1933 |
- |
1934 |
-pkg_setup() { |
1935 |
- QT4_TARGET_DIRECTORIES=" |
1936 |
- src/openvg |
1937 |
- src/plugins/graphicssystems/openvg" |
1938 |
- |
1939 |
- QT4_EXTRACT_DIRECTORIES=" |
1940 |
- include/QtCore |
1941 |
- include/QtGui |
1942 |
- include/QtOpenVG |
1943 |
- src/corelib |
1944 |
- src/gui |
1945 |
- src/openvg |
1946 |
- src/plugins |
1947 |
- src/3rdparty" |
1948 |
- |
1949 |
- QCONFIG_ADD="openvg" |
1950 |
- QCONFIG_DEFINE="QT_OPENVG" |
1951 |
- |
1952 |
- qt4-build_pkg_setup |
1953 |
-} |
1954 |
- |
1955 |
-src_configure() { |
1956 |
- gltype="desktop" |
1957 |
- |
1958 |
- myconf+=" |
1959 |
- -openvg -egl |
1960 |
- $(qt_use qt3support)" |
1961 |
- |
1962 |
- qt4-build_src_configure |
1963 |
-} |
1964 |
- |
1965 |
-src_install() { |
1966 |
- qt4-build_src_install |
1967 |
- |
1968 |
- # touch the available graphics systems |
1969 |
- dodir /usr/share/qt4/graphicssystems |
1970 |
- echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die |
1971 |
-} |
1972 |
|
1973 |
diff --git a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild b/dev-qt/qtphonon/qtphonon-4.8.5.ebuild |
1974 |
deleted file mode 100644 |
1975 |
index b70091f..0000000 |
1976 |
--- a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild |
1977 |
+++ /dev/null |
1978 |
@@ -1,54 +0,0 @@ |
1979 |
-# Copyright 1999-2015 Gentoo Foundation |
1980 |
-# Distributed under the terms of the GNU General Public License v2 |
1981 |
-# $Id$ |
1982 |
- |
1983 |
-EAPI=4 |
1984 |
- |
1985 |
-inherit qt4-build |
1986 |
- |
1987 |
-DESCRIPTION="The Phonon module for the Qt toolkit" |
1988 |
-SLOT="4" |
1989 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
1990 |
- KEYWORDS="" |
1991 |
-else |
1992 |
- KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
1993 |
-fi |
1994 |
-IUSE="dbus qt3support" |
1995 |
- |
1996 |
-DEPEND=" |
1997 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=] |
1998 |
- !kde-apps/phonon-kde |
1999 |
- !kde-base/phonon-xine |
2000 |
- !media-libs/phonon |
2001 |
- !media-sound/phonon |
2002 |
- !aqua? ( media-libs/gstreamer:0.10 |
2003 |
- media-plugins/gst-plugins-meta:0.10 ) |
2004 |
- aqua? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=] ) |
2005 |
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) |
2006 |
-" |
2007 |
-RDEPEND="${DEPEND}" |
2008 |
- |
2009 |
-pkg_setup() { |
2010 |
- QT4_TARGET_DIRECTORIES=" |
2011 |
- src/phonon |
2012 |
- src/plugins/phonon" |
2013 |
- |
2014 |
- QT4_EXTRACT_DIRECTORIES=" |
2015 |
- include |
2016 |
- src" |
2017 |
- |
2018 |
- QCONFIG_ADD="phonon" |
2019 |
- QCONFIG_DEFINE="QT_PHONON |
2020 |
- $(use !aqua && echo QT_GSTREAMER)" |
2021 |
- |
2022 |
- qt4-build_pkg_setup |
2023 |
-} |
2024 |
- |
2025 |
-src_configure() { |
2026 |
- myconf+=" |
2027 |
- -phonon -phonon-backend -no-opengl -no-svg |
2028 |
- $(qt_use dbus qdbus) |
2029 |
- $(qt_use qt3support)" |
2030 |
- |
2031 |
- qt4-build_src_configure |
2032 |
-} |
2033 |
|
2034 |
diff --git a/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch |
2035 |
deleted file mode 100644 |
2036 |
index 35a1573..0000000 |
2037 |
--- a/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch |
2038 |
+++ /dev/null |
2039 |
@@ -1,12 +0,0 @@ |
2040 |
-diff -urN qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |
2041 |
---- qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2012-06-14 16:17:21.328043461 +0200 |
2042 |
-+++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2012-06-14 16:42:13.699386250 +0200 |
2043 |
-@@ -884,7 +884,7 @@ |
2044 |
- #endif |
2045 |
- |
2046 |
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) |
2047 |
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) |
2048 |
-+#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) |
2049 |
- #define WTF_USE_JSVALUE64 1 |
2050 |
- #elif CPU(ARM) || CPU(PPC64) |
2051 |
- #define WTF_USE_JSVALUE32 1 |
2052 |
|
2053 |
diff --git a/dev-qt/qtscript/qtscript-4.8.5.ebuild b/dev-qt/qtscript/qtscript-4.8.5.ebuild |
2054 |
deleted file mode 100644 |
2055 |
index af795b1..0000000 |
2056 |
--- a/dev-qt/qtscript/qtscript-4.8.5.ebuild |
2057 |
+++ /dev/null |
2058 |
@@ -1,62 +0,0 @@ |
2059 |
-# Copyright 1999-2014 Gentoo Foundation |
2060 |
-# Distributed under the terms of the GNU General Public License v2 |
2061 |
-# $Id$ |
2062 |
- |
2063 |
-EAPI=4 |
2064 |
- |
2065 |
-inherit qt4-build |
2066 |
- |
2067 |
-DESCRIPTION="The QtScript module for the Qt toolkit" |
2068 |
-SLOT="4" |
2069 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
2070 |
- KEYWORDS="" |
2071 |
-else |
2072 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
2073 |
-fi |
2074 |
-IUSE="iconv +jit" |
2075 |
- |
2076 |
-DEPEND=" |
2077 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
2078 |
-" |
2079 |
-RDEPEND="${DEPEND}" |
2080 |
- |
2081 |
-PATCHES=( "${FILESDIR}/4.8.2-javascriptcore-x32.patch" ) |
2082 |
- |
2083 |
-pkg_setup() { |
2084 |
- QT4_TARGET_DIRECTORIES=" |
2085 |
- src/script" |
2086 |
- |
2087 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
2088 |
- include/Qt |
2089 |
- include/QtCore |
2090 |
- include/QtScript |
2091 |
- src/3rdparty/javascriptcore |
2092 |
- src/corelib" |
2093 |
- |
2094 |
- QCONFIG_ADD="script" |
2095 |
- QCONFIG_DEFINE="QT_SCRIPT" |
2096 |
- |
2097 |
- qt4-build_pkg_setup |
2098 |
-} |
2099 |
- |
2100 |
-src_configure() { |
2101 |
- myconf+=" |
2102 |
- $(qt_use iconv) |
2103 |
- $(qt_use jit javascript-jit) |
2104 |
- -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama |
2105 |
- -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif |
2106 |
- -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
2107 |
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff |
2108 |
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg |
2109 |
- -no-gtkstyle" |
2110 |
- |
2111 |
- qt4-build_src_configure |
2112 |
-} |
2113 |
- |
2114 |
-src_install() { |
2115 |
- qt4-build_src_install |
2116 |
- |
2117 |
- # install private headers |
2118 |
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private |
2119 |
- find "${S}"/src/script -type f -name "*_p.h" -exec doins {} + |
2120 |
-} |
2121 |
|
2122 |
diff --git a/dev-qt/qtsql/qtsql-4.8.5.ebuild b/dev-qt/qtsql/qtsql-4.8.5.ebuild |
2123 |
deleted file mode 100644 |
2124 |
index 6bc8acc..0000000 |
2125 |
--- a/dev-qt/qtsql/qtsql-4.8.5.ebuild |
2126 |
+++ /dev/null |
2127 |
@@ -1,73 +0,0 @@ |
2128 |
-# Copyright 1999-2014 Gentoo Foundation |
2129 |
-# Distributed under the terms of the GNU General Public License v2 |
2130 |
-# $Id$ |
2131 |
- |
2132 |
-EAPI=4 |
2133 |
- |
2134 |
-inherit multilib qt4-build |
2135 |
- |
2136 |
-DESCRIPTION="The SQL module for the Qt toolkit" |
2137 |
-SLOT="4" |
2138 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
2139 |
- KEYWORDS="" |
2140 |
-else |
2141 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
2142 |
-fi |
2143 |
-IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite" |
2144 |
- |
2145 |
-REQUIRED_USE=" |
2146 |
- || ( firebird freetds mysql oci8 odbc postgres sqlite ) |
2147 |
-" |
2148 |
- |
2149 |
-DEPEND=" |
2150 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] |
2151 |
- firebird? ( dev-db/firebird ) |
2152 |
- freetds? ( dev-db/freetds ) |
2153 |
- mysql? ( virtual/mysql ) |
2154 |
- oci8? ( dev-db/oracle-instantclient-basic ) |
2155 |
- odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) |
2156 |
- postgres? ( dev-db/postgresql ) |
2157 |
- sqlite? ( dev-db/sqlite:3 ) |
2158 |
-" |
2159 |
-RDEPEND="${DEPEND}" |
2160 |
- |
2161 |
-pkg_setup() { |
2162 |
- QT4_TARGET_DIRECTORIES=" |
2163 |
- src/sql |
2164 |
- src/plugins/sqldrivers" |
2165 |
- |
2166 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
2167 |
- include/Qt |
2168 |
- include/QtCore |
2169 |
- include/QtSql |
2170 |
- src/src.pro |
2171 |
- src/corelib |
2172 |
- src/plugins |
2173 |
- src/tools/tools.pro" |
2174 |
- |
2175 |
- qt4-build_pkg_setup |
2176 |
-} |
2177 |
- |
2178 |
-src_configure() { |
2179 |
- myconf+=" |
2180 |
- $(qt_use firebird sql-ibase plugin) |
2181 |
- $(qt_use freetds sql-tds plugin) |
2182 |
- $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql") |
2183 |
- $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)") |
2184 |
- $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc") |
2185 |
- $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql") |
2186 |
- $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite) |
2187 |
- -no-sql-db2 |
2188 |
- -no-sql-sqlite2 |
2189 |
- -no-sql-symsql |
2190 |
- $(qt_use qt3support) |
2191 |
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon |
2192 |
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative |
2193 |
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl |
2194 |
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl |
2195 |
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
2196 |
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb |
2197 |
- -no-glib" |
2198 |
- |
2199 |
- qt4-build_src_configure |
2200 |
-} |
2201 |
|
2202 |
diff --git a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild b/dev-qt/qtsvg/qtsvg-4.8.5.ebuild |
2203 |
deleted file mode 100644 |
2204 |
index 23b3df6..0000000 |
2205 |
--- a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild |
2206 |
+++ /dev/null |
2207 |
@@ -1,61 +0,0 @@ |
2208 |
-# Copyright 1999-2014 Gentoo Foundation |
2209 |
-# Distributed under the terms of the GNU General Public License v2 |
2210 |
-# $Id$ |
2211 |
- |
2212 |
-EAPI=4 |
2213 |
- |
2214 |
-inherit qt4-build |
2215 |
- |
2216 |
-DESCRIPTION="The SVG module for the Qt toolkit" |
2217 |
-SLOT="4" |
2218 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
2219 |
- KEYWORDS="" |
2220 |
-else |
2221 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
2222 |
-fi |
2223 |
-IUSE="+accessibility" |
2224 |
- |
2225 |
-DEPEND=" |
2226 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
2227 |
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=] |
2228 |
- sys-libs/zlib |
2229 |
-" |
2230 |
-RDEPEND="${DEPEND}" |
2231 |
- |
2232 |
-pkg_setup() { |
2233 |
- QT4_TARGET_DIRECTORIES=" |
2234 |
- src/svg |
2235 |
- src/plugins/imageformats/svg |
2236 |
- src/plugins/iconengines/svgiconengine" |
2237 |
- |
2238 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
2239 |
- include/QtSvg |
2240 |
- include/Qt |
2241 |
- include/QtGui |
2242 |
- include/QtCore |
2243 |
- include/QtXml |
2244 |
- src/corelib |
2245 |
- src/gui |
2246 |
- src/plugins |
2247 |
- src/xml |
2248 |
- src/3rdparty" |
2249 |
- |
2250 |
- QCONFIG_ADD="svg" |
2251 |
- QCONFIG_DEFINE="QT_SVG" |
2252 |
- |
2253 |
- qt4-build_pkg_setup |
2254 |
-} |
2255 |
- |
2256 |
-src_configure() { |
2257 |
- myconf+=" |
2258 |
- -svg |
2259 |
- $(qt_use accessibility) |
2260 |
- -no-xkb -no-xrender |
2261 |
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm |
2262 |
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng |
2263 |
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
2264 |
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff |
2265 |
- -no-fontconfig -no-glib -no-gtkstyle" |
2266 |
- |
2267 |
- qt4-build_src_configure |
2268 |
-} |
2269 |
|
2270 |
diff --git a/dev-qt/qttest/qttest-4.8.5.ebuild b/dev-qt/qttest/qttest-4.8.5.ebuild |
2271 |
deleted file mode 100644 |
2272 |
index c712f12..0000000 |
2273 |
--- a/dev-qt/qttest/qttest-4.8.5.ebuild |
2274 |
+++ /dev/null |
2275 |
@@ -1,45 +0,0 @@ |
2276 |
-# Copyright 1999-2014 Gentoo Foundation |
2277 |
-# Distributed under the terms of the GNU General Public License v2 |
2278 |
-# $Id$ |
2279 |
- |
2280 |
-EAPI=4 |
2281 |
- |
2282 |
-inherit qt4-build |
2283 |
- |
2284 |
-DESCRIPTION="The QtTest module for unit testing Qt applications and libraries" |
2285 |
-SLOT="4" |
2286 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
2287 |
- KEYWORDS="" |
2288 |
-else |
2289 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
2290 |
-fi |
2291 |
-IUSE="" |
2292 |
- |
2293 |
-DEPEND=" |
2294 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
2295 |
-" |
2296 |
-RDEPEND="${DEPEND}" |
2297 |
- |
2298 |
-pkg_setup() { |
2299 |
- QT4_TARGET_DIRECTORIES=" |
2300 |
- src/testlib" |
2301 |
- |
2302 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
2303 |
- include/QtTest |
2304 |
- include/QtCore |
2305 |
- src/corelib" |
2306 |
- |
2307 |
- qt4-build_pkg_setup |
2308 |
-} |
2309 |
- |
2310 |
-src_configure() { |
2311 |
- myconf+=" |
2312 |
- -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor |
2313 |
- -no-xinerama -no-xshape -no-sm -no-opengl |
2314 |
- -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng |
2315 |
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
2316 |
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff |
2317 |
- -no-accessibility -no-fontconfig -no-glib -no-svg" |
2318 |
- |
2319 |
- qt4-build_src_configure |
2320 |
-} |
2321 |
|
2322 |
diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch b/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch |
2323 |
deleted file mode 100644 |
2324 |
index d29d5da..0000000 |
2325 |
--- a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch |
2326 |
+++ /dev/null |
2327 |
@@ -1,17 +0,0 @@ |
2328 |
-diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri |
2329 |
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:39:16.884473572 +0200 |
2330 |
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:41:14.245006363 +0200 |
2331 |
-@@ -3,13 +3,6 @@ |
2332 |
- contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 |
2333 |
- contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 |
2334 |
- |
2335 |
--linux-g++ { |
2336 |
--isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { |
2337 |
-- message(Using gold linker) |
2338 |
-- QMAKE_LFLAGS+=-fuse-ld=gold |
2339 |
--} |
2340 |
--} |
2341 |
-- |
2342 |
- # We use this flag on production branches |
2343 |
- # See https://bugs.webkit.org/show_bug.cgi?id=60824 |
2344 |
- CONFIG += production |
2345 |
|
2346 |
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild |
2347 |
deleted file mode 100644 |
2348 |
index d7de5b4..0000000 |
2349 |
--- a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild |
2350 |
+++ /dev/null |
2351 |
@@ -1,83 +0,0 @@ |
2352 |
-# Copyright 1999-2014 Gentoo Foundation |
2353 |
-# Distributed under the terms of the GNU General Public License v2 |
2354 |
-# $Id$ |
2355 |
- |
2356 |
-EAPI=5 |
2357 |
- |
2358 |
-inherit qt4-build flag-o-matic |
2359 |
- |
2360 |
-DESCRIPTION="The WebKit module for the Qt toolkit" |
2361 |
-SLOT="4" |
2362 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
2363 |
- KEYWORDS="" |
2364 |
-else |
2365 |
- KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" |
2366 |
-fi |
2367 |
-IUSE="+gstreamer icu +jit" |
2368 |
- |
2369 |
-# libxml2[!icu?] is needed for bugs 407315 and 411091 |
2370 |
-DEPEND=" |
2371 |
- dev-db/sqlite:3 |
2372 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl] |
2373 |
- ~dev-qt/qtgui-${PV}[aqua=,debug=] |
2374 |
- ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] |
2375 |
- x11-libs/libX11 |
2376 |
- x11-libs/libXrender |
2377 |
- gstreamer? ( |
2378 |
- dev-libs/glib:2 |
2379 |
- dev-libs/libxml2:2[!icu?] |
2380 |
- >=media-libs/gstreamer-0.10.36:0.10 |
2381 |
- >=media-libs/gst-plugins-base-0.10.36:0.10 |
2382 |
- ) |
2383 |
- icu? ( dev-libs/icu:= ) |
2384 |
-" |
2385 |
-RDEPEND="${DEPEND}" |
2386 |
- |
2387 |
-PATCHES=( |
2388 |
- "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch" |
2389 |
- "${FILESDIR}/4.8.2-javascriptcore-x32.patch" |
2390 |
-) |
2391 |
- |
2392 |
-pkg_setup() { |
2393 |
- QT4_TARGET_DIRECTORIES=" |
2394 |
- src/3rdparty/webkit/Source/JavaScriptCore |
2395 |
- src/3rdparty/webkit/Source/WebCore |
2396 |
- src/3rdparty/webkit/Source/WebKit/qt" |
2397 |
- |
2398 |
- QT4_EXTRACT_DIRECTORIES=" |
2399 |
- include |
2400 |
- src" |
2401 |
- |
2402 |
- QCONFIG_ADD="webkit" |
2403 |
- QCONFIG_DEFINE="QT_WEBKIT" |
2404 |
- |
2405 |
- qt4-build_pkg_setup |
2406 |
-} |
2407 |
- |
2408 |
-src_prepare() { |
2409 |
- # Fix version number in generated pkgconfig file, bug 406443 |
2410 |
- sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ |
2411 |
- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die |
2412 |
- |
2413 |
- # Remove -Werror from CXXFLAGS |
2414 |
- sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ |
2415 |
- src/3rdparty/webkit/Source/WebKit.pri || die |
2416 |
- |
2417 |
- if use icu; then |
2418 |
- sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ |
2419 |
- src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die |
2420 |
- fi |
2421 |
- |
2422 |
- qt4-build_src_prepare |
2423 |
-} |
2424 |
- |
2425 |
-src_configure() { |
2426 |
- myconf+=" |
2427 |
- -webkit |
2428 |
- -system-sqlite |
2429 |
- $(qt_use icu) |
2430 |
- $(qt_use jit javascript-jit) |
2431 |
- $(use gstreamer || echo -DENABLE_VIDEO=0)" |
2432 |
- |
2433 |
- qt4-build_src_configure |
2434 |
-} |
2435 |
|
2436 |
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild |
2437 |
deleted file mode 100644 |
2438 |
index 5a446e9..0000000 |
2439 |
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild |
2440 |
+++ /dev/null |
2441 |
@@ -1,48 +0,0 @@ |
2442 |
-# Copyright 1999-2014 Gentoo Foundation |
2443 |
-# Distributed under the terms of the GNU General Public License v2 |
2444 |
-# $Id$ |
2445 |
- |
2446 |
-EAPI=4 |
2447 |
- |
2448 |
-inherit qt4-build |
2449 |
- |
2450 |
-DESCRIPTION="The XmlPatterns module for the Qt toolkit" |
2451 |
-SLOT="4" |
2452 |
-if [[ ${QT4_BUILD_TYPE} == live ]]; then |
2453 |
- KEYWORDS="" |
2454 |
-else |
2455 |
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
2456 |
-fi |
2457 |
-IUSE="" |
2458 |
- |
2459 |
-DEPEND=" |
2460 |
- ~dev-qt/qtcore-${PV}[aqua=,debug=] |
2461 |
-" |
2462 |
-RDEPEND="${DEPEND}" |
2463 |
- |
2464 |
-pkg_setup() { |
2465 |
- QT4_TARGET_DIRECTORIES=" |
2466 |
- src/xmlpatterns |
2467 |
- tools/xmlpatterns |
2468 |
- tools/xmlpatternsvalidator" |
2469 |
- |
2470 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
2471 |
- include/QtCore |
2472 |
- include/QtNetwork |
2473 |
- include/QtXml |
2474 |
- include/QtXmlPatterns |
2475 |
- src/network |
2476 |
- src/xml |
2477 |
- src/corelib" |
2478 |
- |
2479 |
- QCONFIG_ADD="xmlpatterns" |
2480 |
- QCONFIG_DEFINE="QT_XMLPATTERNS" |
2481 |
- |
2482 |
- qt4-build_pkg_setup |
2483 |
-} |
2484 |
- |
2485 |
-src_configure() { |
2486 |
- myconf+=" -xmlpatterns" |
2487 |
- |
2488 |
- qt4-build_src_configure |
2489 |
-} |