Gentoo Archives: gentoo-commits

From: Jimi Huotari <chiitoo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebchannel/, dev-qt/qtpositioning/, ...
Date: Wed, 01 Dec 2021 19:09:26
Message-Id: 1638385618.d268c99c3b0d0d8498981e7a3ca3e673a282b31c.chiitoo@gentoo
1 commit: d268c99c3b0d0d8498981e7a3ca3e673a282b31c
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 1 14:36:07 2021 +0000
4 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 1 19:06:58 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d268c99c
7
8 dev-qt: add version 6.2.2
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
12
13 dev-qt/qtbase/Manifest | 1 +
14 dev-qt/qtbase/qtbase-6.2.2.ebuild | 184 +++++++++++++++++++++++
15 dev-qt/qtdeclarative/Manifest | 1 +
16 dev-qt/qtdeclarative/qtdeclarative-6.2.2.ebuild | 20 +++
17 dev-qt/qtmultimedia/Manifest | 1 +
18 dev-qt/qtmultimedia/qtmultimedia-6.2.2.ebuild | 40 +++++
19 dev-qt/qtpositioning/Manifest | 1 +
20 dev-qt/qtpositioning/qtpositioning-6.2.2.ebuild | 18 +++
21 dev-qt/qtshadertools/Manifest | 1 +
22 dev-qt/qtshadertools/qtshadertools-6.2.2.ebuild | 17 +++
23 dev-qt/qtsvg/Manifest | 1 +
24 dev-qt/qtsvg/qtsvg-6.2.2.ebuild | 19 +++
25 dev-qt/qttools/Manifest | 1 +
26 dev-qt/qttools/qttools-6.2.2.ebuild | 18 +++
27 dev-qt/qtwebchannel/Manifest | 1 +
28 dev-qt/qtwebchannel/qtwebchannel-6.2.2.ebuild | 18 +++
29 dev-qt/qtwebengine/Manifest | 1 +
30 dev-qt/qtwebengine/qtwebengine-6.2.2.ebuild | 192 ++++++++++++++++++++++++
31 18 files changed, 535 insertions(+)
32
33 diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
34 index dc12e1cb..9af966f1 100644
35 --- a/dev-qt/qtbase/Manifest
36 +++ b/dev-qt/qtbase/Manifest
37 @@ -1 +1,2 @@
38 DIST qtbase-everywhere-src-6.2.1.tar.xz 46641424 BLAKE2B 2c60afc31d5cde123c140eafabb4372c39c5b152cc3332d514a0d3bd92b2696b331adee1ad847dcb05eb642d242704fa5fd26f9a8298269f60ab64c3bd95e08c SHA512 9c1c3db8589ce085e1e895dfe6346f2f7a1928defb19e5ea87829f05138f4ceb78e8390c70bda86f430f5c059c4ab73a28e230f792be3cccf38951bdc1ee5dc2
39 +DIST qtbase-everywhere-src-6.2.2.tar.xz 46649016 BLAKE2B ae14ed74e06e2de2798b6b1d95dc4c4c2c61c839aabf7f5271ce1f6f6320d21c02f933974badbe94d882465ebe9cb43396305fa74d11445b50f3329590c57a15 SHA512 769dbf2b271083cfb9c72e6bd99cd52cdfd7d9d303d88d05175e4f0da5e8da5df9724bd48ad664e1d8e829a3529fa166654138c48cb36636f4787d0b26ff4b3b
40
41 diff --git a/dev-qt/qtbase/qtbase-6.2.2.ebuild b/dev-qt/qtbase/qtbase-6.2.2.ebuild
42 new file mode 100644
43 index 00000000..c0867b42
44 --- /dev/null
45 +++ b/dev-qt/qtbase/qtbase-6.2.2.ebuild
46 @@ -0,0 +1,184 @@
47 +# Copyright 2021 Gentoo Authors
48 +# Distributed under the terms of the GNU General Public License v2
49 +
50 +EAPI=8
51 +
52 +inherit qt6-build
53 +
54 +DESCRIPTION="Cross-platform application development framework"
55 +
56 +if [[ ${QT6_BUILD_TYPE} == release ]]; then
57 + KEYWORDS="~amd64"
58 +fi
59 +
60 +# Qt Modules
61 +IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml"
62 +REQUIRED_USE="
63 + opengl? ( gui ) widgets? ( gui )
64 + X? ( || ( evdev libinput ) )
65 +"
66 +
67 +QTGUI_IUSE="accessibility egl eglfs evdev +gif gles2-only +ico +jpeg +libinput tslib tuio vulkan +X"
68 +QTNETWORK_IUSE="gssapi libproxy sctp +ssl vnc"
69 +QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
70 +IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
71 +# QtPrintSupport = QtGui + QtWidgets enabled.
72 +# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
73 +# moved vnc logically to QtNetwork as that is upstream condition for it
74 +REQUIRED_USE+="
75 + $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
76 + $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
77 + $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
78 + accessibility? ( dbus X )
79 + cups? ( gui widgets )
80 + eglfs? ( egl )
81 + gtk? ( widgets )
82 + gui? ( || ( eglfs X ) || ( libinput X ) )
83 + libinput? ( udev )
84 + sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
85 + X? ( gles2-only? ( egl ) )
86 +"
87 +
88 +# TODO:
89 +# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
90 +# qtnetwork: connman, networkmanager
91 +DEPEND="
92 + app-arch/brotli:=
93 + app-arch/libarchive[zstd]
94 + app-arch/zstd:=
95 + app-crypt/libb2
96 + dev-libs/double-conversion:=
97 + dev-libs/glib:2
98 + dev-libs/libpcre2:=[pcre16,unicode]
99 + dev-util/gtk-update-icon-cache
100 + media-libs/fontconfig
101 + >=media-libs/freetype-2.6.1:2
102 + >=media-libs/harfbuzz-1.6.0:=
103 + media-libs/tiff:0
104 + >=sys-apps/dbus-1.4.20
105 + sys-libs/zlib:=
106 + virtual/opengl
107 + egl? ( media-libs/mesa[egl] )
108 + evdev? ( sys-libs/mtdev )
109 + freetds? ( dev-db/freetds )
110 + gles2-only? ( media-libs/mesa[gles2] )
111 + gssapi? ( virtual/krb5 )
112 + gtk? (
113 + x11-libs/gtk+:3
114 + x11-libs/libX11
115 + x11-libs/pango
116 + )
117 + gui? ( media-libs/libpng:0= )
118 + icu? ( dev-libs/icu:= )
119 + !icu? ( virtual/libiconv )
120 + jpeg? ( virtual/jpeg:0 )
121 + libinput? (
122 + dev-libs/libinput:=
123 + >=x11-libs/libxkbcommon-0.5.0
124 + )
125 + libproxy? ( net-libs/libproxy )
126 + mysql? ( dev-db/mysql-connector-c:= )
127 + oci8? ( dev-db/oracle-instantclient:=[sdk] )
128 + odbc? ( dev-db/unixODBC )
129 + postgres? ( dev-db/postgresql:* )
130 + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
131 + sqlite? ( dev-db/sqlite:3 )
132 + ssl? ( dev-libs/openssl:0= )
133 + systemd? ( sys-apps/systemd:= )
134 + tslib? ( >=x11-libs/tslib-1.21 )
135 + udev? ( virtual/libudev:= )
136 + vulkan? ( dev-util/vulkan-headers )
137 + X? (
138 + x11-libs/libdrm
139 + x11-libs/libICE
140 + x11-libs/libSM
141 + x11-libs/libX11
142 + >=x11-libs/libxcb-1.12:=[xkb]
143 + >=x11-libs/libxkbcommon-0.5.0[X]
144 + x11-libs/xcb-util-image
145 + x11-libs/xcb-util-keysyms
146 + x11-libs/xcb-util-renderutil
147 + x11-libs/xcb-util-wm
148 + )
149 +"
150 +RDEPEND="${DEPEND}"
151 +
152 +src_prepare() {
153 + qt6-build_src_prepare
154 +
155 + # TODO: fails without QtGui
156 + sed -e "/androiddeployqt/s/^/#DONT/" -e "/androidtestrunner/s/^/#DONT/" \
157 + -i src/tools/CMakeLists.txt || die
158 +}
159 +
160 +src_configure() {
161 + local mycmakeargs=(
162 + -DINSTALL_BINDIR=${QT6_BINDIR}
163 + -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
164 + -DINSTALL_LIBDIR=${QT6_LIBDIR}
165 + -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
166 + -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
167 + -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
168 + -DINSTALL_QMLDIR=${QT6_QMLDIR}
169 + -DINSTALL_DATADIR=${QT6_DATADIR}
170 + -DINSTALL_DOCDIR=${QT6_DOCDIR}
171 + -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
172 + -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
173 + -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
174 + -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
175 + -DQT_FEATURE_zstd=ON
176 + $(qt_feature concurrent)
177 + $(qt_feature dbus)
178 + $(qt_feature gui)
179 + $(qt_feature icu)
180 + $(qt_feature network)
181 + $(qt_feature sql)
182 + $(qt_feature systemd journald)
183 + -DQT_FEATURE_testlib=ON # TODO: install QtTest by default?
184 + $(qt_feature udev libudev)
185 + $(qt_feature xml)
186 + )
187 + use gui && mycmakeargs+=(
188 + $(qt_feature accessibility accessibility_atspi_bridge)
189 + $(qt_feature egl)
190 + $(qt_feature eglfs eglfs_egldevice)
191 + $(qt_feature eglfs eglfs_gbm)
192 + $(qt_feature evdev)
193 + $(qt_feature evdev mtdev)
194 + $(qt_feature gif)
195 + $(qt_feature jpeg)
196 + $(qt_feature opengl)
197 + $(qt_feature gles2-only opengles2)
198 + $(qt_feature libinput)
199 + $(qt_feature tslib)
200 + $(qt_feature tuio tuiotouch)
201 + $(qt_feature vulkan)
202 + $(qt_feature widgets)
203 + $(qt_feature X xcb)
204 + $(qt_feature X xcb_xlib)
205 + )
206 + use widgets && mycmakeargs+=(
207 + $(qt_feature cups)
208 + $(qt_feature gtk gtk3)
209 + )
210 + if use libinput || use X; then
211 + mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
212 + fi
213 + use network && mycmakeargs+=(
214 + $(qt_feature gssapi)
215 + $(qt_feature libproxy)
216 + $(qt_feature sctp)
217 + $(qt_feature ssl openssl)
218 + $(qt_feature vnc)
219 + )
220 + use sql && mycmakeargs+=(
221 + $(qt_feature freetds sql_tds)
222 + $(qt_feature mysql sql_mysql)
223 + $(qt_feature oci8 sql_oci)
224 + $(qt_feature odbc sql_odbc)
225 + $(qt_feature postgres sql_psql)
226 + $(qt_feature sqlite sql_sqlite)
227 + $(qt_feature sqlite system_sqlite)
228 + )
229 + qt6-build_src_configure
230 +}
231
232 diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
233 index 1d293487..b08805c1 100644
234 --- a/dev-qt/qtdeclarative/Manifest
235 +++ b/dev-qt/qtdeclarative/Manifest
236 @@ -1 +1,2 @@
237 DIST qtdeclarative-everywhere-src-6.2.1.tar.xz 29764804 BLAKE2B 1d738a04ad18661b3483321771a5ba0559ed73c84640bc5b07d236f527a1068c8d143c76fbb66768d52bb96e0417fa38e0a4875a0ba6729ab647181d5ec5a962 SHA512 b581718823de27915e4a59284a522fc1d2b869167d92af2ea20caba9f4e43f2fadb83f5bf6aaeda42f5f316c976cd9a3a313437c99f2a0eba1cff55ba7735cbe
238 +DIST qtdeclarative-everywhere-src-6.2.2.tar.xz 29455560 BLAKE2B 30b439d4dcc563ea6dc1f101d5bff87aae13cf5f2a16d330af9d5e51be6926abeaf2243b8881645686354c62697ef8c8010ce9dff0dd58f039eba6e00197fcad SHA512 2cfa9814a104e7e046d73a0c3ca191c8c94410e5d28bcb62c3a816c188514fd3d857d35d5f71d06aa902523e2210a3818756b15ac98fecf9a35f624a89ee2e86
239
240 diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.2.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.2.2.ebuild
241 new file mode 100644
242 index 00000000..66011c10
243 --- /dev/null
244 +++ b/dev-qt/qtdeclarative/qtdeclarative-6.2.2.ebuild
245 @@ -0,0 +1,20 @@
246 +# Copyright 2021 Gentoo Authors
247 +# Distributed under the terms of the GNU General Public License v2
248 +
249 +EAPI=8
250 +
251 +inherit qt6-build
252 +
253 +DESCRIPTION="Qt Declarative (Quick 2)"
254 +
255 +if [[ ${QT6_BUILD_TYPE} == release ]]; then
256 + KEYWORDS="~amd64"
257 +fi
258 +
259 +DEPEND="
260 + =dev-qt/qtbase-${PV}*
261 + =dev-qt/qtshadertools-${PV}*
262 +"
263 +RDEPEND="${DEPEND}"
264 +
265 +# TODO: qml/quick automagic
266
267 diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
268 index 787e47a3..7ed9ed05 100644
269 --- a/dev-qt/qtmultimedia/Manifest
270 +++ b/dev-qt/qtmultimedia/Manifest
271 @@ -1 +1,2 @@
272 DIST qtmultimedia-everywhere-src-6.2.1.tar.xz 3710324 BLAKE2B 8d0275d525a449fc734af56a781bdad759feb612d7eb794a94a3c9e22eae20c71d2a07b76abf8492f9e20b589492abc6a121c407a5e6d158217e8d3ba1d1ae07 SHA512 6e6fba8c059106b99ccd94ce87f6df17d56de24ccafdd8e3e4d42e312895166c52492dfe425bbb1851e37a49636a560383982580fe184b7a345048e93e8ee05c
273 +DIST qtmultimedia-everywhere-src-6.2.2.tar.xz 3771836 BLAKE2B eb19531f9068462f45994eab15a478a91eb4123a08954d48b53338ba5a29d64bc1bf780b2c92ead08f7793499afc671fab2ea0dea0b72188eb17ad94b1421607 SHA512 70eaa88742f0fe5b4106e6ec0ed864fca439b8c4e8c2478894c4f550410b57eee829b2fecf2d199d4892073f0d4754b0acbbea8b8c6ab897ed480730cd9cac15
274
275 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.2.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.2.2.ebuild
276 new file mode 100644
277 index 00000000..4c0400d1
278 --- /dev/null
279 +++ b/dev-qt/qtmultimedia/qtmultimedia-6.2.2.ebuild
280 @@ -0,0 +1,40 @@
281 +# Copyright 2021 Gentoo Authors
282 +# Distributed under the terms of the GNU General Public License v2
283 +
284 +EAPI=8
285 +
286 +inherit qt6-build
287 +
288 +DESCRIPTION="Qt Multimedia"
289 +
290 +if [[ ${QT6_BUILD_TYPE} == release ]]; then
291 + KEYWORDS="~amd64"
292 +fi
293 +
294 +IUSE="gstreamer"
295 +
296 +RDEPEND="
297 + =dev-qt/qtbase-${PV}*
298 + =dev-qt/qtdeclarative-${PV}*
299 + =dev-qt/qtshadertools-${PV}*
300 + gstreamer? (
301 + dev-libs/glib:2
302 + media-libs/gstreamer:1.0
303 + media-libs/gst-plugins-bad:1.0
304 + media-libs/gst-plugins-base:1.0
305 + media-libs/libglvnd
306 + )
307 +"
308 +DEPEND="${RDEPEND}
309 + gstreamer? ( x11-base/xorg-proto )
310 +"
311 +
312 +src_configure() {
313 + # TODO: linux_v4l automagic
314 + local mycmakeargs=(
315 + -DQT_FEATURE_alsa=off
316 + -DQT_FEATURE_pulseaudio=off
317 + $(qt_feature gstreamer)
318 + )
319 + qt6-build_src_configure
320 +}
321
322 diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
323 new file mode 100644
324 index 00000000..ce00b4ee
325 --- /dev/null
326 +++ b/dev-qt/qtpositioning/Manifest
327 @@ -0,0 +1 @@
328 +DIST qtpositioning-everywhere-src-6.2.2.tar.xz 1490532 BLAKE2B 4971b21e87b4cc0a8430c886b25a3b1aa2cde6af32c9e705ef76722df403456910909ea9a58b91cee6a40bf94c95713fa25852b3ce1ebb8a797080bd8e412ea3 SHA512 0e0fdffe01637e29af2ad7c717413adeb613156ce8cd9311e52629b410b9dc8278a75c2002643345b5db3833bc05735e20a638ef8df5e655349c72a17386d9c4
329
330 diff --git a/dev-qt/qtpositioning/qtpositioning-6.2.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.2.2.ebuild
331 new file mode 100644
332 index 00000000..4f2eb63e
333 --- /dev/null
334 +++ b/dev-qt/qtpositioning/qtpositioning-6.2.2.ebuild
335 @@ -0,0 +1,18 @@
336 +# Copyright 2021 Gentoo Authors
337 +# Distributed under the terms of the GNU General Public License v2
338 +
339 +EAPI=8
340 +
341 +inherit qt6-build
342 +
343 +DESCRIPTION="Physical position determination library for the Qt6 framework"
344 +
345 +if [[ ${QT6_BUILD_TYPE} == release ]]; then
346 + KEYWORDS="~amd64"
347 +fi
348 +
349 +DEPEND="
350 + =dev-qt/qtbase-${PV}*
351 + =dev-qt/qtdeclarative-${PV}*
352 +"
353 +RDEPEND="${DEPEND}"
354
355 diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest
356 index 7cfcf189..7f27b9d9 100644
357 --- a/dev-qt/qtshadertools/Manifest
358 +++ b/dev-qt/qtshadertools/Manifest
359 @@ -1 +1,2 @@
360 DIST qtshadertools-everywhere-src-6.2.1.tar.xz 986656 BLAKE2B c7bb167986167373766a242b4e69413b3cc61aedd865779c1c3ba4268a74e70b0df8b796329a1df204834e0e7fc6f75bef8afdec2962212c5c905799d1a0e1e0 SHA512 94e6bab0211e38e72cbd970b3c69da04a0c78fd51bb3539ad6c7cd39e9573d22cf59cb7155a7e77ea64ea434d877da17fa593d230ecf0cc72785aa4b4b7d0e3f
361 +DIST qtshadertools-everywhere-src-6.2.2.tar.xz 986604 BLAKE2B 771c1f8fb407855c0ab75d070934864f695bad6df066a388372c5d5dce0d7eab1b29a5f57bafadf898d7bc45070366771f3c46ed3438f24860c785356a6eca73 SHA512 ff05db03bd0bee5226d03b64299d0afd63ea84dd0b6545ccb41e965f2354f01b867b3ff7ff1f2e80f18f16cc6ae597c22fe028d278d85e23167bee03a3b245c7
362
363 diff --git a/dev-qt/qtshadertools/qtshadertools-6.2.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.2.2.ebuild
364 new file mode 100644
365 index 00000000..44a0d914
366 --- /dev/null
367 +++ b/dev-qt/qtshadertools/qtshadertools-6.2.2.ebuild
368 @@ -0,0 +1,17 @@
369 +# Copyright 2021 Gentoo Authors
370 +# Distributed under the terms of the GNU General Public License v2
371 +
372 +EAPI=8
373 +
374 +inherit qt6-build
375 +
376 +DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
377 +
378 +if [[ ${QT6_BUILD_TYPE} == release ]]; then
379 + KEYWORDS="~amd64"
380 +fi
381 +
382 +DEPEND="
383 + =dev-qt/qtbase-${PV}*
384 +"
385 +RDEPEND="${DEPEND}"
386
387 diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
388 index 2ff15335..7dad246e 100644
389 --- a/dev-qt/qtsvg/Manifest
390 +++ b/dev-qt/qtsvg/Manifest
391 @@ -1 +1,2 @@
392 DIST qtsvg-everywhere-src-6.2.1.tar.xz 1717684 BLAKE2B 0e5dee2741d80f5d4d72f3b8e385100db123598bf823673c8523fb590cc9b4034e23b9c6778f39629b3fe8fc010b161ecc9ceacdda5c5b96ccd5237e48007fd8 SHA512 807357ea22042788cb573b5132ac3f0caeb011d3a20f338aaf87f229625da26d7aab2bce87174ded33f2a668c2046855c06ff5169af0e30e400219efc8e00964
393 +DIST qtsvg-everywhere-src-6.2.2.tar.xz 1718020 BLAKE2B 2629bc1d1971dd11d793e2462f72de767e4d679edec0261fba8a570f4787673468b106a8fd5d31b30930751de09da6f3fef6fef2e55598390e9928df9e3cdfa0 SHA512 2a1361d2b1fa5eb2cf1bfb6f3beeb765d144043e12eda5f002ddae3c89d110d1b4e55a7c4be55985c5613c2f22e5d57dd2d7bbf0cbdc2f7bbe58403efedcba1a
394
395 diff --git a/dev-qt/qtsvg/qtsvg-6.2.2.ebuild b/dev-qt/qtsvg/qtsvg-6.2.2.ebuild
396 new file mode 100644
397 index 00000000..4857ed61
398 --- /dev/null
399 +++ b/dev-qt/qtsvg/qtsvg-6.2.2.ebuild
400 @@ -0,0 +1,19 @@
401 +# Copyright 2021 Gentoo Authors
402 +# Distributed under the terms of the GNU General Public License v2
403 +
404 +EAPI=8
405 +
406 +inherit qt6-build
407 +
408 +DESCRIPTION="SVG rendering library for the Qt6 framework"
409 +
410 +if [[ ${QT6_BUILD_TYPE} == release ]]; then
411 + KEYWORDS="~amd64"
412 +fi
413 +
414 +DEPEND="
415 + =dev-qt/qtbase-${PV}*
416 + sys-libs/zlib:=
417 +
418 +"
419 +RDEPEND="${DEPEND}"
420
421 diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
422 index 4413cdd7..07d6c052 100644
423 --- a/dev-qt/qttools/Manifest
424 +++ b/dev-qt/qttools/Manifest
425 @@ -1 +1,2 @@
426 DIST qttools-everywhere-src-6.2.1.tar.xz 8668512 BLAKE2B 45605dde132713c5f80f5d2aac1c4beb267d241880299a5c21b5cc1ddc2ec1d278379d7924d0bd65cc29416848230b40ea91fc3839a4016b800dee14e0cdfbb8 SHA512 2d64cd8e3feaa29314e3d80aa46ab5f4b58fe94c29fd0521a5fa4a238764a578aff2cd0901c91d36172f5da53d610159c6cfe90007e5a68f63b2ae6cde78780e
427 +DIST qttools-everywhere-src-6.2.2.tar.xz 8622800 BLAKE2B 47ba23c6e45080bb33e551104a856bd0205a58f1e4c61d8947b42dd162e183d14912723321b87da0d7b2f8e638a26aa5caf86d3898bc3b2377b628b3a772f982 SHA512 bce7ce96e64f423eed3f3655dd53d58588093287a6879da86067c4313962afd43d6f514d776c77f5b9462df31ce5801ab42a3232ebc8ef49209da6812fa9a304
428
429 diff --git a/dev-qt/qttools/qttools-6.2.2.ebuild b/dev-qt/qttools/qttools-6.2.2.ebuild
430 new file mode 100644
431 index 00000000..53ce00a4
432 --- /dev/null
433 +++ b/dev-qt/qttools/qttools-6.2.2.ebuild
434 @@ -0,0 +1,18 @@
435 +# Copyright 2021 Gentoo Authors
436 +# Distributed under the terms of the GNU General Public License v2
437 +
438 +EAPI=8
439 +
440 +inherit qt6-build
441 +
442 +DESCRIPTION="Qt Tools"
443 +
444 +if [[ ${QT6_BUILD_TYPE} == release ]]; then
445 + KEYWORDS="~amd64"
446 +fi
447 +
448 +DEPEND="
449 + =dev-qt/qtbase-${PV}*
450 + =dev-qt/qtdeclarative-${PV}*
451 +"
452 +RDEPEND="${DEPEND}"
453
454 diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
455 index ee928c7c..e1c3fdee 100644
456 --- a/dev-qt/qtwebchannel/Manifest
457 +++ b/dev-qt/qtwebchannel/Manifest
458 @@ -1 +1,2 @@
459 DIST qtwebchannel-everywhere-src-6.2.1.tar.xz 211188 BLAKE2B 5be9e1917996fd192b1a49c4868b0eaa1be065b61bf8b2b4d8571a00c2da9b271d046422f3b36e6040aa7204da05d0db39a173b31d2f5ed68875a75feba67384 SHA512 3bf57b86e0c88776d9bb3c223f7f9d5a4785047da757a2fc8d5dcc241dbfd09395fce53beb03b5fb4106c29234825987116735375cf8ab8ad0173e5c09d747f1
460 +DIST qtwebchannel-everywhere-src-6.2.2.tar.xz 211088 BLAKE2B ea9abec4b6a2343ff6d5a206c15c25301b75462d9bf21241d3735994ad0286e8a02a163b0c907b3300f8efb5292ea9c267a5906ed7a88548d081308529a3062a SHA512 0b2b3faf52126589cbf9a1072d68be60fcb0936e4fe52804a070aa15a248d9c4acf261ead42e119dfffdb33902a125a27cfe8611e5c047646d9a32e15f2b6bde
461
462 diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.2.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.2.2.ebuild
463 new file mode 100644
464 index 00000000..719f560d
465 --- /dev/null
466 +++ b/dev-qt/qtwebchannel/qtwebchannel-6.2.2.ebuild
467 @@ -0,0 +1,18 @@
468 +# Copyright 2021 Gentoo Authors
469 +# Distributed under the terms of the GNU General Public License v2
470 +
471 +EAPI=8
472 +
473 +inherit qt6-build
474 +
475 +DESCRIPTION="Qt WebChannel"
476 +
477 +if [[ ${QT6_BUILD_TYPE} == release ]]; then
478 + KEYWORDS="~amd64"
479 +fi
480 +
481 +DEPEND="
482 + =dev-qt/qtbase-${PV}*
483 + =dev-qt/qtdeclarative-${PV}*
484 +"
485 +RDEPEND="${DEPEND}"
486
487 diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
488 index 29d93b25..b1f83ed2 100644
489 --- a/dev-qt/qtwebengine/Manifest
490 +++ b/dev-qt/qtwebengine/Manifest
491 @@ -1,2 +1,3 @@
492 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
493 DIST qtwebengine-everywhere-src-6.2.1.tar.xz 369758400 BLAKE2B ddbc533be3b51dc4c8503a5107f74c540cde7825bfe3401e7a74deebcd6db46453b05be4538dca4c2618960e29b691ad656c1b13e52aeac6991e8ae93ea97158 SHA512 ff7d766889f982b8a87ac5f804d38827e457079fefbee5e992368d4cff9c9fee58add02779c8c123c1bc8da30513169cb5c028e76f209ec699093f0493c44bc1
494 +DIST qtwebengine-everywhere-src-6.2.2.tar.xz 369695600 BLAKE2B 93affc7039e45429060ba35db10131a8873f19fa1188fecf3f28e83afc0e6f25f6ac5b6ad8e3dd6a65216a9e5f7b831ea21b431d652db16d7aff62bb26c365e0 SHA512 7bc7a6ada9125d02995a71a962ae464ae3f452e30b409a004aed245c4636af4b6e6736fbeb9349ecc4ecfeec7328ac96bc9193ed53221de322ebc913ea2a833f
495
496 diff --git a/dev-qt/qtwebengine/qtwebengine-6.2.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.2.2.ebuild
497 new file mode 100644
498 index 00000000..ee95eff6
499 --- /dev/null
500 +++ b/dev-qt/qtwebengine/qtwebengine-6.2.2.ebuild
501 @@ -0,0 +1,192 @@
502 +# Copyright 2021 Gentoo Authors
503 +# Distributed under the terms of the GNU General Public License v2
504 +
505 +EAPI=8
506 +
507 +PYTHON_COMPAT=( python2_7 )
508 +PYTHON_REQ_USE="xml(+)"
509 +CHROMIUM_VER="90.0.4430.228"
510 +CHROMIUM_PATCHES_VER="94.0.4606.61"
511 +
512 +inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
513 +
514 +DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
515 +
516 +if [[ ${QT6_BUILD_TYPE} == release ]]; then
517 + KEYWORDS="~amd64"
518 +fi
519 +
520 +IUSE="
521 + alsa bindist designer geolocation +jumbo-build kerberos pipewire pulseaudio
522 + +system-ffmpeg +system-icu widgets
523 +"
524 +REQUIRED_USE="designer? ( widgets )"
525 +
526 +BDEPEND="${PYTHON_DEPS}
527 + >=dev-util/gn-0.1807
528 + dev-util/gperf
529 + dev-util/ninja
530 + dev-util/re2c
531 + net-libs/nodejs[ssl]
532 + sys-devel/bison
533 + sys-devel/flex
534 +"
535 +RDEPEND="
536 + app-arch/snappy:=
537 + dev-libs/glib:2
538 + dev-libs/nspr
539 + dev-libs/nss
540 + dev-libs/expat
541 + dev-libs/libevent:=
542 + dev-libs/libxml2[icu]
543 + dev-libs/libxslt
544 + dev-libs/re2:=
545 + =dev-qt/qtdeclarative-${PV}*
546 + =dev-qt/qtwebchannel-${PV}*
547 + media-libs/fontconfig
548 + media-libs/freetype
549 + media-libs/harfbuzz:=
550 + media-libs/lcms:2
551 + media-libs/libjpeg-turbo:=
552 + media-libs/libpng:0=
553 + >=media-libs/libvpx-1.5:=[svc(+)]
554 + media-libs/libwebp:=
555 + media-libs/opus
556 + sys-apps/dbus
557 + sys-apps/pciutils
558 + sys-libs/zlib[minizip]
559 + virtual/libudev
560 + x11-libs/libdrm
561 + x11-libs/libX11
562 + x11-libs/libXcomposite
563 + x11-libs/libXcursor
564 + x11-libs/libxcb:=
565 + x11-libs/libXdamage
566 + x11-libs/libXext
567 + x11-libs/libXfixes
568 + x11-libs/libXi
569 + x11-libs/libxkbcommon
570 + x11-libs/libxkbfile
571 + x11-libs/libXrandr
572 + x11-libs/libXrender
573 + x11-libs/libXScrnSaver
574 + x11-libs/libXtst
575 + alsa? ( media-libs/alsa-lib )
576 + geolocation? ( =dev-qt/qtpositioning-${PV}* )
577 + kerberos? ( virtual/krb5 )
578 + pipewire? ( media-video/pipewire )
579 + pulseaudio? ( media-sound/pulseaudio:= )
580 + system-ffmpeg? ( media-video/ffmpeg:0= )
581 + system-icu? ( >=dev-libs/icu-69.1:= )
582 + widgets? (
583 + =dev-qt/qtbase-${PV}*[widgets]
584 + )
585 +"
586 +DEPEND="${RDEPEND}
587 + media-libs/libglvnd
588 +"
589 +
590 +pkg_preinst() {
591 + elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
592 + elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
593 + elog "list of backports is impossible to evaluate, but always bound to be behind"
594 + elog "Chromium's release schedule."
595 + elog "In addition, various online services may deny service based on an outdated"
596 + elog "user agent version (and/or other checks). Google is already known to do so."
597 + elog
598 + elog "tldr: Your web browsing experience will be compromised."
599 +}
600 +
601 +src_unpack() {
602 + # bug 307861
603 + eshopts_push -s extglob
604 + if is-flagq '-g?(gdb)?([1-9])'; then
605 + ewarn
606 + ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
607 + ewarn "You may experience really long compilation times and/or increased memory usage."
608 + ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
609 + ewarn
610 + fi
611 + eshopts_pop
612 +
613 + default
614 +}
615 +
616 +src_prepare() {
617 + # bug 620444 - ensure local headers are used
618 + find "${S}" -type f -name "*.pr[fio]" | \
619 + xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
620 +
621 + if use system-icu; then
622 + # Sanity check to ensure that bundled copy of ICU is not used.
623 + # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
624 + # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
625 + # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
626 + # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
627 + # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
628 + local file
629 + while read file; do
630 + echo "#error This file should not be used!" > "${file}" || die
631 + done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
632 + fi
633 +
634 + qt6-build_src_prepare
635 +}
636 +
637 +src_configure() {
638 + export NINJA_PATH=/usr/bin/ninja
639 + export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
640 +
641 + local mycmakeargs=(
642 +# -DQT_FEATURE_accessibility=off
643 +# -DQT_FEATURE_force_asserts=off
644 +# -DQT_FEATURE_opengl=off
645 +# -DQT_FEATURE_printer=off
646 + -DQT_FEATURE_qtpdf_build=off
647 + -DQT_FEATURE_qtpdf_quick_build=off
648 + -DQT_FEATURE_qtpdf_widgets_build=off
649 + -DQT_FEATURE_qtwebengine_build=on
650 + -DQT_FEATURE_qtwebengine_quick_build=on
651 + -DQT_FEATURE_qtwebengine_widgets_build=on
652 +# -DQT_FEATURE_ssl=off
653 +# -DQT_FEATURE_static=off
654 +# -DQT_FEATURE_system_zlib=off
655 +# -DQT_FEATURE_system_png=off
656 +# -DQT_FEATURE_system_jpeg=off
657 +# -DQT_FEATURE_system_freetype=off
658 +# -DQT_FEATURE_system_harfbuzz=off
659 +# -DQT_FEATURE_use_gold_linker=off
660 +# -DQT_FEATURE_use_lld_linker=off
661 + -DQT_FEATURE_webengine_embedded_build=off
662 + -DQT_FEATURE_webengine_extensions=on
663 +# -DQT_FEATURE_webengine_full_debug_info=$(usex debug)
664 + -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
665 + -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
666 +# -DQT_FEATURE_webengine_jumbo_file_merge_limit
667 + -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
668 + -DQT_FEATURE_webengine_native_spellchecker=off
669 + -DQT_FEATURE_webengine_ozone_x11=on
670 + -DQT_FEATURE_webengine_pepper_plugins=on
671 + -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
672 + -DQT_FEATURE_webengine_printing_and_pdf=on
673 + -DQT_FEATURE_webengine_sanitizer=on
674 + -DQT_FEATURE_webengine_spellchecker=on
675 + -DQT_FEATURE_webengine_system_opus=on
676 + -DQT_FEATURE_webengine_system_libwebp=on
677 + -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
678 + -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
679 + -DQT_FEATURE_webengine_system_gn=on
680 + -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
681 + -DQT_FEATURE_webengine_system_libevent=on
682 + -DQT_FEATURE_webengine_system_libpci=on
683 + -DQT_FEATURE_webengine_system_libpng=on
684 + -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
685 + -DQT_FEATURE_webengine_system_zlib=on
686 + -DQT_FEATURE_webengine_webchannel=on
687 + -DQT_FEATURE_webengine_webrtc=on
688 + -DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
689 +# -DQT_FEATURE_xcb=off
690 + )
691 +
692 + qt6-build_src_configure
693 +}