1 |
commit: dd935560f537ad88a3eea9794103cb6bb3b2bff9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 16 08:02:46 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 19 23:51:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd935560 |
7 |
|
8 |
dev-qt: Drop 5.14.0 w/o USE X |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-qt/qtgui/qtgui-5.14.0-r2.ebuild | 187 --------------------- |
14 |
.../qtvirtualkeyboard-5.14.0.ebuild | 42 ----- |
15 |
dev-qt/qtwidgets/qtwidgets-5.14.0.ebuild | 56 ------ |
16 |
dev-qt/qtx11extras/qtx11extras-5.14.0.ebuild | 21 --- |
17 |
4 files changed, 306 deletions(-) |
18 |
|
19 |
diff --git a/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild b/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild |
20 |
deleted file mode 100644 |
21 |
index 1f814dd0fe5..00000000000 |
22 |
--- a/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild |
23 |
+++ /dev/null |
24 |
@@ -1,187 +0,0 @@ |
25 |
-# Copyright 1999-2020 Gentoo Authors |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
- |
28 |
-EAPI=7 |
29 |
-QT5_MODULE="qtbase" |
30 |
-inherit qt5-build |
31 |
- |
32 |
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" |
33 |
- |
34 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
35 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
36 |
-fi |
37 |
- |
38 |
-# TODO: linuxfb |
39 |
- |
40 |
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus |
41 |
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" |
42 |
-REQUIRED_USE=" |
43 |
- || ( eglfs xcb ) |
44 |
- accessibility? ( dbus xcb ) |
45 |
- eglfs? ( egl ) |
46 |
- ibus? ( dbus ) |
47 |
- libinput? ( udev ) |
48 |
- xcb? ( gles2? ( egl ) ) |
49 |
-" |
50 |
- |
51 |
-COMMON_DEPEND=" |
52 |
- dev-libs/glib:2 |
53 |
- ~dev-qt/qtcore-${PV} |
54 |
- dev-util/gtk-update-icon-cache |
55 |
- media-libs/fontconfig |
56 |
- >=media-libs/freetype-2.6.1:2 |
57 |
- >=media-libs/harfbuzz-1.6.0:= |
58 |
- sys-libs/zlib:= |
59 |
- virtual/opengl |
60 |
- dbus? ( ~dev-qt/qtdbus-${PV} ) |
61 |
- egl? ( media-libs/mesa[egl] ) |
62 |
- eglfs? ( |
63 |
- media-libs/mesa[gbm] |
64 |
- x11-libs/libdrm |
65 |
- ) |
66 |
- evdev? ( sys-libs/mtdev ) |
67 |
- gles2? ( media-libs/mesa[gles2] ) |
68 |
- jpeg? ( virtual/jpeg:0 ) |
69 |
- libinput? ( |
70 |
- dev-libs/libinput:= |
71 |
- >=x11-libs/libxkbcommon-0.5.0 |
72 |
- ) |
73 |
- png? ( media-libs/libpng:0= ) |
74 |
- tslib? ( >=x11-libs/tslib-1.21 ) |
75 |
- tuio? ( ~dev-qt/qtnetwork-${PV} ) |
76 |
- udev? ( virtual/libudev:= ) |
77 |
- vnc? ( ~dev-qt/qtnetwork-${PV} ) |
78 |
- xcb? ( |
79 |
- x11-libs/libICE |
80 |
- x11-libs/libSM |
81 |
- x11-libs/libX11 |
82 |
- >=x11-libs/libxcb-1.12:=[xkb] |
83 |
- >=x11-libs/libxkbcommon-0.5.0[X] |
84 |
- x11-libs/xcb-util-image |
85 |
- x11-libs/xcb-util-keysyms |
86 |
- x11-libs/xcb-util-renderutil |
87 |
- x11-libs/xcb-util-wm |
88 |
- ) |
89 |
-" |
90 |
-DEPEND="${COMMON_DEPEND} |
91 |
- evdev? ( sys-kernel/linux-headers ) |
92 |
- udev? ( sys-kernel/linux-headers ) |
93 |
-" |
94 |
-# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules |
95 |
-RDEPEND="${COMMON_DEPEND} |
96 |
- !<dev-qt/qtimageformats-5.14.0:5 |
97 |
- !<dev-qt/qtsvg-5.14.0:5 |
98 |
- !<dev-qt/qtvirtualkeyboard-5.14.0:5 |
99 |
- !<dev-qt/qtwayland-5.14.0:5 |
100 |
-" |
101 |
-PDEPEND=" |
102 |
- ibus? ( app-i18n/ibus ) |
103 |
- wayland? ( ~dev-qt/qtwayland-${PV} ) |
104 |
-" |
105 |
- |
106 |
-QT5_TARGET_SUBDIRS=( |
107 |
- src/tools/qvkgen |
108 |
- src/gui |
109 |
- src/openglextensions |
110 |
- src/platformheaders |
111 |
- src/platformsupport |
112 |
- src/plugins/generic |
113 |
- src/plugins/imageformats |
114 |
- src/plugins/platforms |
115 |
- src/plugins/platforminputcontexts |
116 |
-) |
117 |
- |
118 |
-QT5_GENTOO_CONFIG=( |
119 |
- accessibility:accessibility-atspi-bridge |
120 |
- egl:egl: |
121 |
- eglfs:eglfs: |
122 |
- eglfs:eglfs_egldevice: |
123 |
- eglfs:eglfs_gbm: |
124 |
- evdev:evdev: |
125 |
- evdev:mtdev: |
126 |
- :fontconfig: |
127 |
- :system-freetype:FREETYPE |
128 |
- !:no-freetype: |
129 |
- !gif:no-gif: |
130 |
- gles2::OPENGL_ES |
131 |
- gles2:opengles2:OPENGL_ES_2 |
132 |
- !:no-gui: |
133 |
- :system-harfbuzz: |
134 |
- !:no-harfbuzz: |
135 |
- jpeg:system-jpeg:IMAGEFORMAT_JPEG |
136 |
- !jpeg:no-jpeg: |
137 |
- libinput |
138 |
- libinput:xkbcommon: |
139 |
- :opengl |
140 |
- png:png: |
141 |
- png:system-png:IMAGEFORMAT_PNG |
142 |
- !png:no-png: |
143 |
- tslib:tslib: |
144 |
- udev:libudev: |
145 |
- xcb:xcb: |
146 |
- xcb:xcb-glx: |
147 |
- xcb:xcb-plugin: |
148 |
- xcb:xcb-render: |
149 |
- xcb:xcb-sm: |
150 |
- xcb:xcb-xlib: |
151 |
- xcb:xcb-xinput: |
152 |
-) |
153 |
- |
154 |
-QT5_GENTOO_PRIVATE_CONFIG=( |
155 |
- :gui |
156 |
-) |
157 |
- |
158 |
-PATCHES=( |
159 |
- "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 |
160 |
- "${FILESDIR}/${PN}-5.13.2-no-xcb-no-xkbcommon.patch" # bug 699110 |
161 |
- "${FILESDIR}/${P}-restore-scaling.patch" # QTBUG-80967, in Qt 5.14.1 |
162 |
-) |
163 |
- |
164 |
-src_prepare() { |
165 |
- # don't add -O3 to CXXFLAGS, bug 549140 |
166 |
- sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
167 |
- |
168 |
- # egl_x11 is activated when both egl and xcb are enabled |
169 |
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
170 |
- |
171 |
- qt_use_disable_config dbus dbus \ |
172 |
- src/platformsupport/themes/genericunix/genericunix.pri |
173 |
- |
174 |
- qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro |
175 |
- |
176 |
- qt_use_disable_mod ibus dbus \ |
177 |
- src/plugins/platforminputcontexts/platforminputcontexts.pro |
178 |
- |
179 |
- use vnc || sed -i -e '/SUBDIRS += vnc/d' \ |
180 |
- src/plugins/platforms/platforms.pro || die |
181 |
- |
182 |
- qt5-build_src_prepare |
183 |
-} |
184 |
- |
185 |
-src_configure() { |
186 |
- local myconf=( |
187 |
- $(usex dbus -dbus-linked '') |
188 |
- $(qt_use egl) |
189 |
- $(qt_use eglfs) |
190 |
- $(usex eglfs '-gbm -kms' '') |
191 |
- $(qt_use evdev) |
192 |
- $(qt_use evdev mtdev) |
193 |
- -fontconfig |
194 |
- -system-freetype |
195 |
- $(usex gif '' -no-gif) |
196 |
- -gui |
197 |
- -system-harfbuzz |
198 |
- $(qt_use jpeg libjpeg system) |
199 |
- $(qt_use libinput) |
200 |
- -opengl $(usex gles2 es2 desktop) |
201 |
- $(qt_use png libpng system) |
202 |
- $(qt_use tslib) |
203 |
- $(qt_use udev libudev) |
204 |
- $(qt_use xcb xcb system) |
205 |
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') |
206 |
- ) |
207 |
- if use libinput || use xcb; then |
208 |
- myconf+=( -xkbcommon ) |
209 |
- fi |
210 |
- qt5-build_src_configure |
211 |
-} |
212 |
|
213 |
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0.ebuild |
214 |
deleted file mode 100644 |
215 |
index d950674827c..00000000000 |
216 |
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.0.ebuild |
217 |
+++ /dev/null |
218 |
@@ -1,42 +0,0 @@ |
219 |
-# Copyright 1999-2019 Gentoo Authors |
220 |
-# Distributed under the terms of the GNU General Public License v2 |
221 |
- |
222 |
-EAPI=7 |
223 |
-inherit qt5-build |
224 |
- |
225 |
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt" |
226 |
- |
227 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
228 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
229 |
-fi |
230 |
- |
231 |
-# TODO: unbudle libraries for more layouts |
232 |
-IUSE="handwriting +spell +xcb" |
233 |
- |
234 |
-DEPEND=" |
235 |
- ~dev-qt/qtcore-${PV} |
236 |
- ~dev-qt/qtdeclarative-${PV} |
237 |
- ~dev-qt/qtgui-${PV} |
238 |
- ~dev-qt/qtsvg-${PV} |
239 |
- spell? ( app-text/hunspell:= ) |
240 |
- xcb? ( x11-libs/libxcb:= ) |
241 |
-" |
242 |
-RDEPEND="${DEPEND}" |
243 |
- |
244 |
-src_configure() { |
245 |
- local myqmakeargs=( |
246 |
- $(usex handwriting CONFIG+=lipi-toolkit '') |
247 |
- $(usex spell '' CONFIG+=disable-hunspell) |
248 |
- $(usex xcb '' CONFIG+=disable-desktop) |
249 |
- CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \ |
250 |
- lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \ |
251 |
- lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \ |
252 |
- lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \ |
253 |
- lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \ |
254 |
- lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \ |
255 |
- lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \ |
256 |
- lang-uk_UA lang-vi_VN" |
257 |
- ) |
258 |
- |
259 |
- qt5-build_src_configure |
260 |
-} |
261 |
|
262 |
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.0.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.0.ebuild |
263 |
deleted file mode 100644 |
264 |
index 700b6405241..00000000000 |
265 |
--- a/dev-qt/qtwidgets/qtwidgets-5.14.0.ebuild |
266 |
+++ /dev/null |
267 |
@@ -1,56 +0,0 @@ |
268 |
-# Copyright 1999-2019 Gentoo Authors |
269 |
-# Distributed under the terms of the GNU General Public License v2 |
270 |
- |
271 |
-EAPI=7 |
272 |
-QT5_MODULE="qtbase" |
273 |
-inherit qt5-build |
274 |
- |
275 |
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework" |
276 |
- |
277 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
278 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
279 |
-fi |
280 |
- |
281 |
-# keep IUSE defaults in sync with qtgui |
282 |
-IUSE="gles2 gtk +png +xcb" |
283 |
- |
284 |
-DEPEND=" |
285 |
- ~dev-qt/qtcore-${PV} |
286 |
- ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?] |
287 |
- gtk? ( |
288 |
- ~dev-qt/qtgui-${PV}[dbus] |
289 |
- x11-libs/gtk+:3 |
290 |
- x11-libs/libX11 |
291 |
- x11-libs/pango |
292 |
- ) |
293 |
-" |
294 |
-RDEPEND="${DEPEND}" |
295 |
- |
296 |
-QT5_TARGET_SUBDIRS=( |
297 |
- src/tools/uic |
298 |
- src/widgets |
299 |
- src/plugins/platformthemes |
300 |
-) |
301 |
- |
302 |
-QT5_GENTOO_CONFIG=( |
303 |
- gtk:gtk3: |
304 |
- ::widgets |
305 |
- !:no-widgets: |
306 |
-) |
307 |
- |
308 |
-QT5_GENTOO_PRIVATE_CONFIG=( |
309 |
- :widgets |
310 |
-) |
311 |
- |
312 |
-src_configure() { |
313 |
- local myconf=( |
314 |
- -opengl $(usex gles2 es2 desktop) |
315 |
- $(qt_use gtk) |
316 |
- -gui |
317 |
- $(qt_use png libpng system) |
318 |
- -widgets |
319 |
- $(qt_use xcb xcb system) |
320 |
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '') |
321 |
- ) |
322 |
- qt5-build_src_configure |
323 |
-} |
324 |
|
325 |
diff --git a/dev-qt/qtx11extras/qtx11extras-5.14.0.ebuild b/dev-qt/qtx11extras/qtx11extras-5.14.0.ebuild |
326 |
deleted file mode 100644 |
327 |
index a27428572cf..00000000000 |
328 |
--- a/dev-qt/qtx11extras/qtx11extras-5.14.0.ebuild |
329 |
+++ /dev/null |
330 |
@@ -1,21 +0,0 @@ |
331 |
-# Copyright 1999-2019 Gentoo Authors |
332 |
-# Distributed under the terms of the GNU General Public License v2 |
333 |
- |
334 |
-EAPI=7 |
335 |
-inherit qt5-build |
336 |
- |
337 |
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework" |
338 |
- |
339 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
340 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
341 |
-fi |
342 |
- |
343 |
-IUSE="" |
344 |
- |
345 |
-RDEPEND=" |
346 |
- ~dev-qt/qtcore-${PV} |
347 |
- ~dev-qt/qtgui-${PV}[xcb] |
348 |
-" |
349 |
-DEPEND="${RDEPEND} |
350 |
- test? ( ~dev-qt/qtwidgets-${PV} ) |
351 |
-" |