Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtserialbus/, dev-qt/qtmultimedia/files/, dev-qt/qtnetwork/files/, ...
Date: Sun, 18 Oct 2020 16:16:17
Message-Id: 1603037728.1c0947091db651f4e7d136e22d4887b47d9245cd.asturm@gentoo
1 5.14.2.ebuild dev-qt/qtmultimedia/Manifest dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild dev-qt/qtnetwork/Manifest dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild dev-qt/qtnetworkauth/Manifest dev-qt/qtnetworkauth/qtnetworkauth-5.14.2.ebuild dev-qt/qtopengl/Manifest dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild dev-qt/qtpaths/Manifest dev-qt/qtpaths/qtpaths-5.14.2.ebuild dev-qt/qtplugininfo/Manifest dev-qt/qtplugininfo/qtplugininfo-5.14.2.ebuild dev-qt/qtpositioning/Manifest dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild dev-qt/qtprintsupport/Manifest dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild dev-qt/qtquickcontrols/Manifest dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.ebuild dev-qt/qtquickcontrols2/Manifest dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch dev-qt/qtquickcontrols2/qtquickcontrols2-5.
2 14.2-r1.ebuild dev-qt/qtscript/Manifest dev-qt/qtscript/qtscript-5.14.2.ebuild dev-qt/qtscxml/Manifest dev-qt/qtscxml/qtscxml-5.14.2.ebuild dev-qt/qtsensors/Manifest dev-qt/qtsensors/qtsensors-5.14.2.ebuild dev-qt/qtserialbus/Manifest dev-qt/qtserialbus/qtserialbus-5.14.2.ebuild dev-qt/qtserialport/Manifest dev-qt/qtserialport/qtserialport-5.14.2.ebuild dev-qt/qtspeech/Manifest dev-qt/qtspeech/qtspeech-5.14.2.ebuild dev-qt/qtsql/Manifest dev-qt/qtsql/qtsql-5.14.2.ebuild dev-qt/qtsvg/Manifest dev-qt/qtsvg/qtsvg-5.14.2.ebuild dev-qt/qttest/Manifest dev-qt/qttest/qttest-5.14.2.ebuild dev-qt/qttranslations/Manifest dev-qt/qttranslations/qttranslations-5.14.2.ebuild dev-qt/qtvirtualkeyboard/Manifest dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.2.ebuild dev-qt/qtwayland/Manifest dev-qt/qtwayland/qtwayland-5.14.2.ebuild dev-qt/qtwebchannel/Manifest dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild dev-qt/qtwebengine/Manifest dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warning
3 s.patch dev-qt/qtwebengine/files/qtwebengine-5.14.2-g
4 cc-10.patch dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild dev-qt/qtwebsockets/Manifest dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild dev-qt/qtwebview/Manifest dev-qt/qtwebview/qtwebview-5.14.2.ebuild dev-qt/qtwidgets/Manifest dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild dev-qt/qtx11extras/Manifest dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild dev-qt/qtxml/Manifest dev-qt/qtxml/qtxml-5.14.2.ebuild dev-qt/qtxmlpatterns/Manifest dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild
5 X-VCS-Directories: dev-qt/qtsvg/ dev-qt/qtxml/ dev-qt/linguist-tools/ dev-qt/qtwebengine/ dev-qt/qtdiag/ dev-qt/qt3d/ dev-qt/qtbluetooth/ dev-qt/qtnetwork/files/ dev-qt/qtserialbus/ dev-qt/qtmultimedia/files/ dev-qt/qttranslations/ dev-qt/qtimageformats/ dev-qt/qtdbus/ dev-qt/qtdeclarative/ dev-qt/qdbusviewer/ dev-qt/qtsql/ dev-qt/linguist/ dev-qt/qtlocation/files/ dev-qt/designer/ dev-qt/qtxmlpatterns/ dev-qt/qtplugininfo/ dev-qt/qtvirtualkeyboard/ dev-qt/qtcore/files/ dev-qt/qtwebchannel/ dev-qt/qtpaths/ dev-qt/qtwebengine/files/ dev-qt/qtquickcontrols2/files/ dev-qt/qtwebview/ dev-qt/qtmultimedia/ dev-qt/qtgamepad/ dev-qt/qtwayland/ dev-qt/qtdatavis3d/ dev-qt/qttest/ dev-qt/qtcharts/ dev-qt/qtgui/ dev-qt/qtquickcontrols/ dev-qt/qtsensors/ dev-qt/qtgui/files/ dev-qt/qtnetwork/ dev-qt/qtwidgets/ dev-qt/qtscxml/ dev-qt/qdbus/ dev-qt/qtserialport/ dev-qt/qtquickcontrols2/ dev-qt/qt-docs/ dev-qt/qtx11extras/ dev-qt/qdoc/ dev-qt/qtprintsupport/ dev-qt/assistant/ dev-qt/qthelp/ dev-qt/pi
6 xeltool/ dev-qt/qtconcurrent/ dev-qt/qtgraphicaleffects/ dev-qt/qtnetworkauth/ dev-qt/qtscript/ dev-qt/qtopengl/ dev-qt/qtpositioning/ dev-qt/qtwebsockets/ dev-qt/qtdeclarative/files/ dev-qt/qtcore/ dev-qt/qtspeech/ dev-qt/qtlocation/
7 X-VCS-Committer: asturm
8 X-VCS-Committer-Name: Andreas Sturmlechner
9 X-VCS-Revision: 1c0947091db651f4e7d136e22d4887b47d9245cd
10 X-VCS-Branch: master
11 Date: Sun, 18 Oct 2020 16:16:13 +0000 (UTC)
12
13 commit: 1c0947091db651f4e7d136e22d4887b47d9245cd
14 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
15 AuthorDate: Tue Oct 13 14:26:11 2020 +0000
16 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
17 CommitDate: Sun Oct 18 16:15:28 2020 +0000
18 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c094709
19
20 dev-qt: Drop Qt 5.14.2
21
22 Bug: https://bugs.gentoo.org/734600
23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
24
25 dev-qt/assistant/Manifest | 1 -
26 dev-qt/assistant/assistant-5.14.2.ebuild | 55 ------
27 dev-qt/designer/Manifest | 1 -
28 dev-qt/designer/designer-5.14.2.ebuild | 57 -------
29 dev-qt/linguist-tools/Manifest | 1 -
30 dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild | 35 ----
31 dev-qt/linguist/Manifest | 1 -
32 dev-qt/linguist/linguist-5.14.2.ebuild | 48 ------
33 dev-qt/pixeltool/Manifest | 1 -
34 dev-qt/pixeltool/pixeltool-5.14.2.ebuild | 25 ---
35 dev-qt/qdbus/Manifest | 1 -
36 dev-qt/qdbus/qdbus-5.14.2.ebuild | 25 ---
37 dev-qt/qdbusviewer/Manifest | 1 -
38 dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild | 45 -----
39 dev-qt/qdoc/Manifest | 1 -
40 dev-qt/qdoc/qdoc-5.14.2.ebuild | 41 -----
41 dev-qt/qt-docs/Manifest | 55 ------
42 dev-qt/qt-docs/metadata.xml | 1 -
43 .../qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild | 103 ------------
44 dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild | 102 ------------
45 dev-qt/qt3d/Manifest | 1 -
46 dev-qt/qt3d/qt3d-5.14.2.ebuild | 34 ----
47 dev-qt/qtbluetooth/Manifest | 1 -
48 dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild | 33 ----
49 dev-qt/qtcharts/Manifest | 1 -
50 dev-qt/qtcharts/qtcharts-5.14.2.ebuild | 29 ----
51 dev-qt/qtconcurrent/Manifest | 1 -
52 dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild | 23 ---
53 dev-qt/qtcore/Manifest | 1 -
54 .../files/qtcore-5.14.2-QLibrary-deadlock.patch | 106 ------------
55 dev-qt/qtcore/qtcore-5.14.2.ebuild | 103 ------------
56 dev-qt/qtdatavis3d/Manifest | 1 -
57 dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild | 31 ----
58 dev-qt/qtdbus/Manifest | 1 -
59 dev-qt/qtdbus/qtdbus-5.14.2.ebuild | 43 -----
60 dev-qt/qtdeclarative/Manifest | 1 -
61 ....2-QQuickMouseArea-stuck-in-pressed-state.patch | 55 ------
62 ...ative-5.14.2-fix-subpixel-positioned-text.patch | 64 -------
63 .../qtdeclarative/qtdeclarative-5.14.2-r4.ebuild | 59 -------
64 dev-qt/qtdiag/Manifest | 1 -
65 dev-qt/qtdiag/qtdiag-5.14.2.ebuild | 36 ----
66 dev-qt/qtgamepad/Manifest | 1 -
67 dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild | 35 ----
68 dev-qt/qtgraphicaleffects/Manifest | 1 -
69 .../qtgraphicaleffects-5.14.2.ebuild | 21 ---
70 dev-qt/qtgui/Manifest | 1 -
71 .../qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch | 39 -----
72 dev-qt/qtgui/qtgui-5.14.2-r1.ebuild | 185 ---------------------
73 dev-qt/qthelp/Manifest | 1 -
74 dev-qt/qthelp/qthelp-5.14.2.ebuild | 29 ----
75 dev-qt/qtimageformats/Manifest | 1 -
76 dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild | 30 ----
77 dev-qt/qtlocation/Manifest | 1 -
78 .../files/qtlocation-5.14.2-gcc-10.patch | 36 ----
79 dev-qt/qtlocation/qtlocation-5.14.2.ebuild | 49 ------
80 dev-qt/qtmultimedia/Manifest | 1 -
81 .../qtmultimedia-5.14.2-gstreamer-buffering.patch | 38 -----
82 dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild | 72 --------
83 dev-qt/qtnetwork/Manifest | 1 -
84 .../files/qtnetwork-5.14.2-CVE-2020-13962.patch | 172 -------------------
85 dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild | 66 --------
86 dev-qt/qtnetworkauth/Manifest | 1 -
87 dev-qt/qtnetworkauth/qtnetworkauth-5.14.2.ebuild | 20 ---
88 dev-qt/qtopengl/Manifest | 1 -
89 dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild | 34 ----
90 dev-qt/qtpaths/Manifest | 1 -
91 dev-qt/qtpaths/qtpaths-5.14.2.ebuild | 23 ---
92 dev-qt/qtplugininfo/Manifest | 1 -
93 dev-qt/qtplugininfo/qtplugininfo-5.14.2.ebuild | 23 ---
94 dev-qt/qtpositioning/Manifest | 1 -
95 dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild | 40 -----
96 dev-qt/qtprintsupport/Manifest | 1 -
97 dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild | 42 -----
98 dev-qt/qtquickcontrols/Manifest | 1 -
99 .../qtquickcontrols/qtquickcontrols-5.14.2.ebuild | 32 ----
100 dev-qt/qtquickcontrols2/Manifest | 1 -
101 ...14.2-account-for-scale-before-positioning.patch | 61 -------
102 .../qtquickcontrols2-5.14.2-r1.ebuild | 34 ----
103 dev-qt/qtscript/Manifest | 1 -
104 dev-qt/qtscript/qtscript-5.14.2.ebuild | 36 ----
105 dev-qt/qtscxml/Manifest | 1 -
106 dev-qt/qtscxml/qtscxml-5.14.2.ebuild | 19 ---
107 dev-qt/qtsensors/Manifest | 1 -
108 dev-qt/qtsensors/qtsensors-5.14.2.ebuild | 28 ----
109 dev-qt/qtserialbus/Manifest | 1 -
110 dev-qt/qtserialbus/qtserialbus-5.14.2.ebuild | 20 ---
111 dev-qt/qtserialport/Manifest | 1 -
112 dev-qt/qtserialport/qtserialport-5.14.2.ebuild | 27 ---
113 dev-qt/qtspeech/Manifest | 1 -
114 dev-qt/qtspeech/qtspeech-5.14.2.ebuild | 20 ---
115 dev-qt/qtsql/Manifest | 1 -
116 dev-qt/qtsql/qtsql-5.14.2.ebuild | 55 ------
117 dev-qt/qtsvg/Manifest | 1 -
118 dev-qt/qtsvg/qtsvg-5.14.2.ebuild | 23 ---
119 dev-qt/qttest/Manifest | 1 -
120 dev-qt/qttest/qttest-5.14.2.ebuild | 33 ----
121 dev-qt/qttranslations/Manifest | 1 -
122 dev-qt/qttranslations/qttranslations-5.14.2.ebuild | 19 ---
123 dev-qt/qtvirtualkeyboard/Manifest | 1 -
124 .../qtvirtualkeyboard-5.14.2.ebuild | 43 -----
125 dev-qt/qtwayland/Manifest | 1 -
126 dev-qt/qtwayland/qtwayland-5.14.2.ebuild | 45 -----
127 dev-qt/qtwebchannel/Manifest | 1 -
128 dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild | 26 ---
129 dev-qt/qtwebengine/Manifest | 1 -
130 ...qtwebengine-5.14.1-disable-fatal-warnings.patch | 12 --
131 .../files/qtwebengine-5.14.2-gcc-10.patch | 89 ----------
132 .../files/qtwebengine-5.14.2-icu67.patch | 169 -------------------
133 .../files/qtwebengine-5.15.0-bison-3.7-build.patch | 54 ------
134 dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild | 152 -----------------
135 dev-qt/qtwebsockets/Manifest | 1 -
136 dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild | 27 ---
137 dev-qt/qtwebview/Manifest | 1 -
138 dev-qt/qtwebview/qtwebview-5.14.2.ebuild | 21 ---
139 dev-qt/qtwidgets/Manifest | 1 -
140 dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild | 57 -------
141 dev-qt/qtx11extras/Manifest | 1 -
142 dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild | 22 ---
143 dev-qt/qtxml/Manifest | 1 -
144 dev-qt/qtxml/qtxml-5.14.2.ebuild | 29 ----
145 dev-qt/qtxmlpatterns/Manifest | 1 -
146 dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild | 30 ----
147 122 files changed, 3398 deletions(-)
148
149 diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
150 index 203fdae199c..3792b4301e9 100644
151 --- a/dev-qt/assistant/Manifest
152 +++ b/dev-qt/assistant/Manifest
153 @@ -1,2 +1 @@
154 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
155 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
156
157 diff --git a/dev-qt/assistant/assistant-5.14.2.ebuild b/dev-qt/assistant/assistant-5.14.2.ebuild
158 deleted file mode 100644
159 index fca5047fefa..00000000000
160 --- a/dev-qt/assistant/assistant-5.14.2.ebuild
161 +++ /dev/null
162 @@ -1,55 +0,0 @@
163 -# Copyright 1999-2020 Gentoo Authors
164 -# Distributed under the terms of the GNU General Public License v2
165 -
166 -EAPI=7
167 -QT5_MODULE="qttools"
168 -inherit desktop qt5-build xdg-utils
169 -
170 -DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
171 -
172 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
173 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
174 -fi
175 -
176 -IUSE="webkit"
177 -
178 -DEPEND="
179 - ~dev-qt/qtcore-${PV}:5=
180 - ~dev-qt/qtgui-${PV}
181 - ~dev-qt/qthelp-${PV}
182 - ~dev-qt/qtnetwork-${PV}
183 - ~dev-qt/qtprintsupport-${PV}
184 - ~dev-qt/qtsql-${PV}[sqlite]
185 - ~dev-qt/qtwidgets-${PV}
186 - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
187 -"
188 -RDEPEND="${DEPEND}"
189 -
190 -QT5_TARGET_SUBDIRS=(
191 - src/assistant/assistant
192 -)
193 -
194 -src_prepare() {
195 - qt_use_disable_mod webkit webkitwidgets \
196 - src/assistant/assistant/assistant.pro
197 -
198 - qt5-build_src_prepare
199 -}
200 -
201 -src_install() {
202 - qt5-build_src_install
203 -
204 - doicon -s 32 src/assistant/assistant/images/assistant.png
205 - newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
206 - make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
207 -}
208 -
209 -pkg_postinst() {
210 - qt5-build_pkg_postinst
211 - xdg_icon_cache_update
212 -}
213 -
214 -pkg_postrm() {
215 - qt5-build_pkg_postrm
216 - xdg_icon_cache_update
217 -}
218
219 diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
220 index 203fdae199c..3792b4301e9 100644
221 --- a/dev-qt/designer/Manifest
222 +++ b/dev-qt/designer/Manifest
223 @@ -1,2 +1 @@
224 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
225 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
226
227 diff --git a/dev-qt/designer/designer-5.14.2.ebuild b/dev-qt/designer/designer-5.14.2.ebuild
228 deleted file mode 100644
229 index 29ac650d089..00000000000
230 --- a/dev-qt/designer/designer-5.14.2.ebuild
231 +++ /dev/null
232 @@ -1,57 +0,0 @@
233 -# Copyright 1999-2020 Gentoo Authors
234 -# Distributed under the terms of the GNU General Public License v2
235 -
236 -EAPI=7
237 -QT5_MODULE="qttools"
238 -inherit desktop qt5-build xdg-utils
239 -
240 -DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
241 -
242 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
243 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
244 -fi
245 -
246 -IUSE="declarative webkit"
247 -
248 -DEPEND="
249 - ~dev-qt/qtcore-${PV}:5=
250 - ~dev-qt/qtgui-${PV}:5=
251 - ~dev-qt/qtnetwork-${PV}
252 - ~dev-qt/qtprintsupport-${PV}
253 - ~dev-qt/qtwidgets-${PV}
254 - ~dev-qt/qtxml-${PV}
255 - declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
256 - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
257 -"
258 -RDEPEND="${DEPEND}"
259 -
260 -QT5_TARGET_SUBDIRS=(
261 - src/designer
262 -)
263 -
264 -src_prepare() {
265 - qt_use_disable_mod declarative quickwidgets \
266 - src/designer/src/plugins/plugins.pro
267 -
268 - qt_use_disable_mod webkit webkitwidgets \
269 - src/designer/src/plugins/plugins.pro
270 -
271 - qt5-build_src_prepare
272 -}
273 -
274 -src_install() {
275 - qt5-build_src_install
276 -
277 - doicon -s 128 src/designer/src/designer/images/designer.png
278 - make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
279 -}
280 -
281 -pkg_postinst() {
282 - qt5-build_pkg_postinst
283 - xdg_icon_cache_update
284 -}
285 -
286 -pkg_postrm() {
287 - qt5-build_pkg_postrm
288 - xdg_icon_cache_update
289 -}
290
291 diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
292 index 203fdae199c..3792b4301e9 100644
293 --- a/dev-qt/linguist-tools/Manifest
294 +++ b/dev-qt/linguist-tools/Manifest
295 @@ -1,2 +1 @@
296 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
297 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
298
299 diff --git a/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
300 deleted file mode 100644
301 index ea280072e0e..00000000000
302 --- a/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
303 +++ /dev/null
304 @@ -1,35 +0,0 @@
305 -# Copyright 1999-2020 Gentoo Authors
306 -# Distributed under the terms of the GNU General Public License v2
307 -
308 -EAPI=7
309 -QT5_MODULE="qttools"
310 -inherit qt5-build
311 -
312 -DESCRIPTION="Tools for working with Qt translation data files"
313 -
314 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
315 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
316 -fi
317 -
318 -IUSE="qml"
319 -
320 -DEPEND="
321 - ~dev-qt/qtcore-${PV}:5=
322 - ~dev-qt/qtxml-${PV}
323 - qml? ( ~dev-qt/qtdeclarative-${PV} )
324 -"
325 -RDEPEND="${DEPEND}"
326 -
327 -QT5_TARGET_SUBDIRS=(
328 - src/linguist
329 -)
330 -
331 -src_prepare() {
332 - sed -i -e '/SUBDIRS += linguist/d' \
333 - src/linguist/linguist.pro || die
334 -
335 - qt_use_disable_mod qml qmldevtools-private \
336 - src/linguist/lupdate/lupdate.pro
337 -
338 - qt5-build_src_prepare
339 -}
340
341 diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
342 index 203fdae199c..3792b4301e9 100644
343 --- a/dev-qt/linguist/Manifest
344 +++ b/dev-qt/linguist/Manifest
345 @@ -1,2 +1 @@
346 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
347 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
348
349 diff --git a/dev-qt/linguist/linguist-5.14.2.ebuild b/dev-qt/linguist/linguist-5.14.2.ebuild
350 deleted file mode 100644
351 index b1887a6ebd6..00000000000
352 --- a/dev-qt/linguist/linguist-5.14.2.ebuild
353 +++ /dev/null
354 @@ -1,48 +0,0 @@
355 -# Copyright 1999-2020 Gentoo Authors
356 -# Distributed under the terms of the GNU General Public License v2
357 -
358 -EAPI=7
359 -QT5_MODULE="qttools"
360 -inherit desktop qt5-build xdg-utils
361 -
362 -DESCRIPTION="Graphical tool for translating Qt applications"
363 -
364 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
365 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
366 -fi
367 -
368 -IUSE=""
369 -
370 -DEPEND="
371 - ~dev-qt/designer-${PV}
372 - ~dev-qt/qtcore-${PV}:5=
373 - ~dev-qt/qtgui-${PV}:5=
374 - ~dev-qt/qtprintsupport-${PV}
375 - ~dev-qt/qtwidgets-${PV}
376 - ~dev-qt/qtxml-${PV}
377 -"
378 -RDEPEND="${DEPEND}"
379 -
380 -QT5_TARGET_SUBDIRS=(
381 - src/linguist/linguist
382 -)
383 -
384 -src_install() {
385 - qt5-build_src_install
386 -
387 - local size
388 - for size in 16 32 48 64 128; do
389 - newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
390 - done
391 - make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
392 -}
393 -
394 -pkg_postinst() {
395 - qt5-build_pkg_postinst
396 - xdg_icon_cache_update
397 -}
398 -
399 -pkg_postrm() {
400 - qt5-build_pkg_postrm
401 - xdg_icon_cache_update
402 -}
403
404 diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
405 index 203fdae199c..3792b4301e9 100644
406 --- a/dev-qt/pixeltool/Manifest
407 +++ b/dev-qt/pixeltool/Manifest
408 @@ -1,2 +1 @@
409 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
410 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
411
412 diff --git a/dev-qt/pixeltool/pixeltool-5.14.2.ebuild b/dev-qt/pixeltool/pixeltool-5.14.2.ebuild
413 deleted file mode 100644
414 index 5298dc39f7b..00000000000
415 --- a/dev-qt/pixeltool/pixeltool-5.14.2.ebuild
416 +++ /dev/null
417 @@ -1,25 +0,0 @@
418 -# Copyright 1999-2020 Gentoo Authors
419 -# Distributed under the terms of the GNU General Public License v2
420 -
421 -EAPI=7
422 -QT5_MODULE="qttools"
423 -inherit qt5-build
424 -
425 -DESCRIPTION="Qt screen magnifier"
426 -
427 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
428 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
429 -fi
430 -
431 -IUSE=""
432 -
433 -DEPEND="
434 - ~dev-qt/qtcore-${PV}:5=
435 - ~dev-qt/qtgui-${PV}:5=
436 - ~dev-qt/qtwidgets-${PV}
437 -"
438 -RDEPEND="${DEPEND}"
439 -
440 -QT5_TARGET_SUBDIRS=(
441 - src/pixeltool
442 -)
443
444 diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
445 index 203fdae199c..3792b4301e9 100644
446 --- a/dev-qt/qdbus/Manifest
447 +++ b/dev-qt/qdbus/Manifest
448 @@ -1,2 +1 @@
449 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
450 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
451
452 diff --git a/dev-qt/qdbus/qdbus-5.14.2.ebuild b/dev-qt/qdbus/qdbus-5.14.2.ebuild
453 deleted file mode 100644
454 index 0446d75dde0..00000000000
455 --- a/dev-qt/qdbus/qdbus-5.14.2.ebuild
456 +++ /dev/null
457 @@ -1,25 +0,0 @@
458 -# Copyright 1999-2020 Gentoo Authors
459 -# Distributed under the terms of the GNU General Public License v2
460 -
461 -EAPI=7
462 -QT5_MODULE="qttools"
463 -inherit qt5-build
464 -
465 -DESCRIPTION="Interface to Qt applications communicating over D-Bus"
466 -
467 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
468 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
469 -fi
470 -
471 -IUSE=""
472 -
473 -DEPEND="
474 - ~dev-qt/qtcore-${PV}
475 - ~dev-qt/qtdbus-${PV}
476 - ~dev-qt/qtxml-${PV}
477 -"
478 -RDEPEND="${DEPEND}"
479 -
480 -QT5_TARGET_SUBDIRS=(
481 - src/qdbus/qdbus
482 -)
483
484 diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
485 index 203fdae199c..3792b4301e9 100644
486 --- a/dev-qt/qdbusviewer/Manifest
487 +++ b/dev-qt/qdbusviewer/Manifest
488 @@ -1,2 +1 @@
489 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
490 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
491
492 diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild
493 deleted file mode 100644
494 index 8fc278009e4..00000000000
495 --- a/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild
496 +++ /dev/null
497 @@ -1,45 +0,0 @@
498 -# Copyright 1999-2020 Gentoo Authors
499 -# Distributed under the terms of the GNU General Public License v2
500 -
501 -EAPI=7
502 -QT5_MODULE="qttools"
503 -inherit desktop qt5-build xdg-utils
504 -
505 -DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
506 -
507 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
508 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
509 -fi
510 -
511 -IUSE=""
512 -
513 -DEPEND="
514 - ~dev-qt/qtcore-${PV}
515 - ~dev-qt/qtdbus-${PV}
516 - ~dev-qt/qtgui-${PV}
517 - ~dev-qt/qtwidgets-${PV}
518 - ~dev-qt/qtxml-${PV}
519 -"
520 -RDEPEND="${DEPEND}"
521 -
522 -QT5_TARGET_SUBDIRS=(
523 - src/qdbus/qdbusviewer
524 -)
525 -
526 -src_install() {
527 - qt5-build_src_install
528 -
529 - doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
530 - newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
531 - make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
532 -}
533 -
534 -pkg_postinst() {
535 - qt5-build_pkg_postinst
536 - xdg_icon_cache_update
537 -}
538 -
539 -pkg_postrm() {
540 - qt5-build_pkg_postrm
541 - xdg_icon_cache_update
542 -}
543
544 diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
545 index 203fdae199c..3792b4301e9 100644
546 --- a/dev-qt/qdoc/Manifest
547 +++ b/dev-qt/qdoc/Manifest
548 @@ -1,2 +1 @@
549 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
550 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
551
552 diff --git a/dev-qt/qdoc/qdoc-5.14.2.ebuild b/dev-qt/qdoc/qdoc-5.14.2.ebuild
553 deleted file mode 100644
554 index 989eea074d8..00000000000
555 --- a/dev-qt/qdoc/qdoc-5.14.2.ebuild
556 +++ /dev/null
557 @@ -1,41 +0,0 @@
558 -# Copyright 1999-2020 Gentoo Authors
559 -# Distributed under the terms of the GNU General Public License v2
560 -
561 -EAPI=7
562 -QT5_MODULE="qttools"
563 -inherit qt5-build
564 -
565 -DESCRIPTION="Qt documentation generator"
566 -
567 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
568 - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
569 -fi
570 -
571 -IUSE="qml"
572 -
573 -DEPEND="
574 - ~dev-qt/qtcore-${PV}:5=
575 - sys-devel/clang:=
576 - qml? ( ~dev-qt/qtdeclarative-${PV} )
577 -"
578 -RDEPEND="${DEPEND}"
579 -
580 -QT5_TARGET_SUBDIRS=(
581 - src/qdoc
582 -)
583 -
584 -src_prepare() {
585 - qt_use_disable_mod qml qmldevtools-private \
586 - src/qdoc/qdoc.pro
587 -
588 - qt5-build_src_prepare
589 -}
590 -
591 -src_configure() {
592 - # src/qdoc requires files that are only generated when qmake is
593 - # run in the root directory. bug 676948; same fix as bug 633776
594 - mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
595 - qt5_qmake "${QT5_BUILD_DIR}"
596 - cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
597 - qt5-build_src_configure
598 -}
599
600 diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
601 index 40638f49f08..bcce12949db 100644
602 --- a/dev-qt/qt-docs/Manifest
603 +++ b/dev-qt/qt-docs/Manifest
604 @@ -1,58 +1,3 @@
605 -DIST 5.14.2-0-202003291239qdoc-documentation.7z 548115 BLAKE2B a3f889d3a5a3a28dd59d0cfa34d15c3ef3609e971feaf9c66dfbcc4a2e2d085a2f1288a576d67b8b3f56572b17c99e1483b2f3411797efbc43c75c38100be1bc SHA512 61f9e88dadc1b06a548e2ea2cb5d9a07710f88d8997983391b105e0d5d0bb61ab248d49ea5ba90dd88c902ed9fd28355a9f730667e5fe10300203ca2a54b0674
606 -DIST 5.14.2-0-202003291239qmake-documentation.7z 338952 BLAKE2B 9cef2a5cc058eb3dd8f937b60c798d786d3ae4a3cc1c750a8a9aa6535f44322212f54c6d9d6b89f77636eb4298445645764af2b89edbd47eac111778ed8ccb09 SHA512 4e4108898847fe75c286a6c445db8b75aa92c2cc260a425bf04575de18ac0e775a4f289fe5b814e5cbd00724e484c8c5fb6103b89bfa46eaf6c1c5248e632cf0
607 -DIST 5.14.2-0-202003291239qt3d-documentation.7z 5839936 BLAKE2B 0dba528d2b88b9f294bc92c6c05602d229e537de3215839116b9435e0cb6d49e57c3d69bd9ffe8e3f84dfb17c41ffa96f1cbf9b1ed303db08139cb818f445799 SHA512 c9f6eb528db99913e9d00a0973d8c12930dc319fa7e56f625e5874666379e5012483515b3382306c9515a2c5e1ade196bb8dc90587e13ea290a8bcecd64418f1
608 -DIST 5.14.2-0-202003291239qtassistant-documentation.7z 452240 BLAKE2B b16632f75a16b86e086e575bc5a1fe37dea7bd2da70baa057c2fad837c2327be760c92034c108a0df271c5f3a9c7ab74199c15a4cf6c33554d82a0196c376f7f SHA512 7364bce0517161ace8593e2fcc42e6b8cf402db96608dab2b647390905c3f1dd1ab47fceed54c6c3b766f97e16387e64f9fb444a7eda8f76f9cb79967b4ba27b
609 -DIST 5.14.2-0-202003291239qtbluetooth-documentation.7z 2137974 BLAKE2B 1345822a0bec50fb2613fd47f023ef331b82631a39af171ed22f9efba106beeead5db96a6a39f298581f64c834a42bb7a700a72c0f1da169b4e79f62268de839 SHA512 5d4c6e550a238d6eaf1c599d2a4dd2d22fa096b1d6024a3a9309a14fa3394af81cdd641b5256754cc808656dffaf1a985c4eee4b35ac4fed3b627781527dad94
610 -DIST 5.14.2-0-202003291239qtcharts-documentation.7z 8724264 BLAKE2B ff7035a2c8d76cfd993a61aa5090596537b9cf758c147c9ef14bf901224d143e9cff772762f8b073ba48f71af068cd27771e84ca4d580068e058709df28d8098 SHA512 388e783c46d81ac8dba57dc7a7e40d09c97384f74454008948a4a66ba7bcf513a3566e450e58ce356475e8afbe42e9a70ec35c36bb8c8d7abd12eafc3be318e1
611 -DIST 5.14.2-0-202003291239qtconcurrent-documentation.7z 122431 BLAKE2B 79f0e929d462080ff89798d9085cd9e13afddcd96d468c91aa30f81529be60d4f54be7275eef82cbe17e45f6dec0e4f74a4da120cb23df50b643ddbcaa180667 SHA512 443c91b2159ce82e3ef2791abe74ef2e6fde0560bc22f343dd6209974440fcb40b491a3d67691fa4150968af139331a1797fa428df76227ca24086db746cc841
612 -DIST 5.14.2-0-202003291239qtcore-documentation.7z 6523725 BLAKE2B 7fb8e451eb8a20b9e8f276efa3395205a895a611e3fc5233553bab4c822b01ef4d9313fe73dc91b6465612f78332746c13983517e19df37fd3614c4c27d364e0 SHA512 c932390025ac31a2b9b9251727700624f4b3578221f133868a133c467d0130d8d8d5bc2910c35dd4ad0a1bce306c722c437a8a3e4924968ebf0dc1d467b0f875
613 -DIST 5.14.2-0-202003291239qtdatavisualization-documentation.7z 6106581 BLAKE2B 2814d1eeed7f92814d39ecc6d434be187728a09615f5346f2c8552befba105c893467ca2c56f9f48d3263ff309c7b947e9cd8a6211923a4a0023cc66a82bb701 SHA512 f9e0bde2d88da6e3bdf4606b0711b062b1f4a0039b4722dd6dad969b0cb0942f471adcc089da5fe1532f472ffa1ad562824b85fc4e4f3fd25e1b14e8783f240a
614 -DIST 5.14.2-0-202003291239qtdbus-documentation.7z 396511 BLAKE2B 5e8812ea9c964a1c2cbc1b66aabde7c58650966a6918ec8b74e3456b63e03994dda812d70d53df46dc1e63983fd9bb094c231140529ac02cf8a7abde55757ced SHA512 7e9453ebba72fe950abc6898a07efe1e5428059811e0a6c7f9018bfb9badcbc772d4bf9c63b4870f8da4b208ec555d91263bec5e562add1e432cd8c9dc13ff70
615 -DIST 5.14.2-0-202003291239qtdesigner-documentation.7z 3531000 BLAKE2B 56ddb89623ae6ed02f3f60b91b784da636eafb4f6e74b63013475a4c3cead74b945f92dfc82eea973dcdd8c0ea0fa3acccb5c7f34fb1def4d7d6452bb8929602 SHA512 e582ad0adf4b5f33ab0b32a0e7db71483908efe2fd56e42102a28ebd050b21517c5d5420100816f8d43ab89040f62189db4d80d469d24cdc738696d224c6552b
616 -DIST 5.14.2-0-202003291239qtdoc-documentation.7z 10116385 BLAKE2B b631d107620fe8f9018848fee343a775e14cf02cea9d1fc4c0170429def5dec52e44a52babf2d047934a50b6a287f61411a42aa2bdc08c13b59550dd7208af2d SHA512 0994508646d8e52dcb013ea1326070276f0d6fbd7fd835cef3d78371a24b15792bc6ebfc905bc926191d2eb47b1a60d9e75edf66ef9d3e07bdf20393811d18a7
617 -DIST 5.14.2-0-202003291239qtgamepad-documentation.7z 238732 BLAKE2B 2e24aed01ecb77d28c476a077663e3e289d7bb8badad74e8a5f20c9a64e056995263bdb9d73c44b34f0cc3358e165604aafb6db60c1130da27c2eb6493a92a87 SHA512 f9b33da7b7824bf12cc50f6ab4dbeac180ff6a938de9bbce1b04bad400451fcfea74e55e15f4f39218a6f63ee9f85c0c4db89122bdc1bfdc5f90220644edda06
618 -DIST 5.14.2-0-202003291239qtgraphicaleffects-documentation.7z 15994331 BLAKE2B 35b6a3ec3b6325ceac1009779ac5e1d28497082569e67e644a8800e4a89c09f55a6a994baacdce3e3874cf0f969525fd15691c2fe1dbd63a3f90228a6cafbcf2 SHA512 8d50be92bd25d9e70c90c1cd3a62beb08161d1a16590fbf281c9098761adaa40bef56de66c27e101cd6fe409fff560a185b141ba5f8eee8fb8abda86bf88fee7
619 -DIST 5.14.2-0-202003291239qtgui-documentation.7z 7431093 BLAKE2B 8e32dd369f9f21fc3b6d4f71d04d2df059a60e41d4350b53df7f9d0c4beb5498742e8d499cbc0eea970c1f107b445ffaafff68f087665221369c851ff66842f2 SHA512 1b7633f7b0b3647cac60e7fdcdf5040743321867e8c7583b388d451b40a72322c293e8fba8014a5978ae47934d3a7081fe954cb2471411cdbeaa636d6d04558e
620 -DIST 5.14.2-0-202003291239qthelp-documentation.7z 199198 BLAKE2B 5e04b96af4eb27446bf6eafb00c9338c37f09ed5ef4a43b9e33fdc63a992471ffbdf49e860205c93ac795863c8f516500c717468c27e9798618511c3ae9436b0 SHA512 4e34cc37c01096feda4fc6e5422749697e4f1990bf2a3d9c756ef5b08f73ec93837236bc30ba2aa6e2a6a98ddfafb2e92d650ddcb8fc8dc3d08f83247f2a2fbb
621 -DIST 5.14.2-0-202003291239qtimageformats-documentation.7z 29042 BLAKE2B 64b4c90bd02d8ac93009f11ab923a65b5182ce11c44268e00c32c50c80fa422f555c3217ceb2ebccab79dd85ea5e2b27c1a3c48714752dc35dcfebe33cab54da SHA512 84c4eec9c11f41d236fa391ac9dab32647221972720f70446fdd6007521ed41039ce4fd6a28464087861e1c80e9077bc880b2fe1a2f5ae7c56e3a8c1508cbb1e
622 -DIST 5.14.2-0-202003291239qtlinguist-documentation.7z 968571 BLAKE2B 04aeb56ca406cea61a3cb0dd898fba7b1a5b32369d947ac3a293d2f1d3a3a9f5b128e02a734f6da4d59ecc7f14cc03079e99caf3df13899fbabf2ddf1a987865 SHA512 ec807c1f824eaa0181d705fc5dcf6c0e855e83c06fd2ef0ac3e351c83e099613a1fc437714a2bc81ebe988f72e8f481a6ee0d33770a78ab7df8982e93046eb9c
623 -DIST 5.14.2-0-202003291239qtlocation-documentation.7z 2766777 BLAKE2B 89f2e8b74f75fade05045598ef340c9d5b0f9c459a941670b058309e780eb0295676116c09ffffad795591633277306d29ec8071b98c349c43908b1c25b7c13e SHA512 74fd76499dfe8ee8b0fde9b97af290784707021aa446498509c92b89db559d2e5050347050efc7f111f2eada2cf6cca941d7025f58dd05bdd44373f600799b3c
624 -DIST 5.14.2-0-202003291239qtmultimedia-documentation.7z 2802759 BLAKE2B 1f616a2b8391f659a83ca165ae31410af7c67d860c10b38ae06d4ebd774eb3b9bfa7ef7e405b8ad4bd0370cd915f4dfd5156390845a1ebf748ae30704bcd464c SHA512 fb4234ab57d70a5f92f73d91b23d8e5731c75a914ef213aba5dc5e7f868e142b4d647bef50d048b2d92a4f98c695ac57bf8fbcbd603dda985aaf1752d6010219
625 -DIST 5.14.2-0-202003291239qtnetwork-documentation.7z 1499902 BLAKE2B 68fb52b35bc38b602ab1a7c434cd8b07c75e4747e43f7b165eab5b32669279d0396eca99c79d825f59646df75f82c90b8e066add39209adc2f25b5ad0db59ecb SHA512 c9679aab71c645cbc8ca73ac57b7b2da994c69998699c533f4bb84821147a920b974474c9df36362adca054bb1a8825be5e1ab760a069acd04262581922db368
626 -DIST 5.14.2-0-202003291239qtnetworkauth-documentation.7z 244223 BLAKE2B 7e883362bc9c692999c073554b3b306cf8de55ce37e9ea73f558ce9f4f6f1359db1c4365bc080a5cf0a64abddeb8a3f63ffdf71c6176fa1b1dc4e9fb112633b6 SHA512 cc86171689e60fb6cd885f838a13603652d216b46956106b03117ed4f9c4bb17e57c9c77267b146076010e08a16b966274ee39420757372db110a187e6da7b9e
627 -DIST 5.14.2-0-202003291239qtopengl-documentation.7z 836338 BLAKE2B 4202512854b7f1eb0221054a125e6ef987a3acc80683cfc60abf83708a5a52685f3283dd79807b74c8845c26ca84b7d365e8c729648d9084ce2d742b932f3bdb SHA512 a0b7309f9b183867be6bd4132992e4f258770afa5b7488377835db4d3ffb64b8a8abecab438b9de8e557b492da5183a66f4bd6822168da71f65e611b96204a99
628 -DIST 5.14.2-0-202003291239qtplatformheaders-documentation.7z 78675 BLAKE2B d4ead7ca1511dabd6aedca080ad62860f520a87103f09d82de247889d4ec5e5e6c26d5d136a9c1cc5280c13e9b0972da42a1ebae6715b2b5aaadb4b83b96b693 SHA512 ac836a953fc5bb51f8bef5340a425924430422a9b1aa949a9e2c28a2a9ef1b10eb2b60fe2c58945b8da2b60824c40b516d6c30877325de2483ad0ceb36da05eb
629 -DIST 5.14.2-0-202003291239qtpositioning-documentation.7z 587458 BLAKE2B cfbbdca9664da130975707b97a0a04c21fc8677be3e1368c402c30a00d2c68f06f5927e711c432eb14589440a14d4df20bb8cd3c7131db2e18e413f4bae8ed92 SHA512 87066ff7f35a664ef1c5f3ec8c28827b445cbd56e40501c5a152fa7fc4ded10447aceb03afef57a21ae2f0502f1376e3133db11948b2d809261a228117d40b4e
630 -DIST 5.14.2-0-202003291239qtprintsupport-documentation.7z 376410 BLAKE2B 65da643907e6216d3b8f67dc504fb7e9838a17493ddef8543259512aa39c6a81c9ecb69cb9bae9f85e4439c037292fcfe66ff5ad9896a38749fcec507a303011 SHA512 d6afb912757c722c8371e1a4ecc61ce01a5a5f3ae9ac581a97b25faed3517fdf189a41c84df78e89ea81ff63c2d4bf8ab3bb25d42f28a863699dc14a9c950271
631 -DIST 5.14.2-0-202003291239qtqml-documentation.7z 1526503 BLAKE2B cf17ff5e2a953a7df579bd3b2a39a4e604dc8e9a240ebbc60f7947d0c4d91b62bbeb8ed03ebb80deed63a8f5560e68c4a31f0347038304cac96a68df3ec273cb SHA512 21fb46fe61bf74000a364b62c55d7896664d5620429f62961c97d1c018bf4922662978bec32d8e7c95e9088f91d4ed0cf567f3e6d5e550e620797f394e5a496d
632 -DIST 5.14.2-0-202003291239qtqmltest-documentation.7z 81719 BLAKE2B a99e255af7d6aadf1db94b17cdf81ef39babbb937dbcd462f073b7acff8b51bb6fb9b1d51e9b731196ffa90083139d46c3707db8f646db1566ca6d71fcf6dd17 SHA512 6982352ca75111e1b7a0fa78675ca4f40c29b153a5908670442c78f4acfd349ae89d80ee1597a1dd08fcd0874a82f2846b26df5c7e9d4592e23b59489b59a4f8
633 -DIST 5.14.2-0-202003291239qtquick-documentation.7z 16639611 BLAKE2B 3b33273a5b110497f59e5ddc6eb0236a8fda86ed6c172ab36abd36a6ac05cbcdba2170c67b12fbee014f8a17c0546b454b8ed2168533ccd517f10614aa21a8c5 SHA512 78c3a1abf5d0ea503cf19d165125cbee91ec04807a52333410b97b35847c2123eab74988c119a7a24daceaa13cd95bc6d7a10b70131ab7d289e128e7b6a3d8bc
634 -DIST 5.14.2-0-202003291239qtquickcontrols-documentation.7z 9331828 BLAKE2B 08d52b7c0213b20226d46cd1a5a715771c3a4938b05ac40021006d7e5ff7c45fccd69bb728698e71e50d95045e9c26d5d05da38214eeb390c86ebb93a7c49057 SHA512 d1aff40d5fe89dc2d14d5755fe3d39881c00e922eab3828c93e2b448270263a6a79fb43a9df0ed72b66325477f015d2145b35e75be179575d1a4450dc82766df
635 -DIST 5.14.2-0-202003291239qtquickcontrols1-documentation.7z 1961340 BLAKE2B 46b1795874e9e29019427259c502ddd644c5de6e985700416fff1494b199b6f518fca17e07168cb3de1a201a2754518c4055559442301254f2bd86e87b1c354f SHA512 bf715dffa72e0369faa159d67ba9bacf31154da382a87a031577729acf7caa51af55cbf2fb94ab529afbfaa5dd65f1a011ef8e52b8ce764dbfff037358d0f22c
636 -DIST 5.14.2-0-202003291239qtquickdialogs-documentation.7z 183373 BLAKE2B e1b1d4ddb85ce48e9c744ce7566f1ec2789b2fcf03f65c2616fa63b2a7ccdabc0a2ab60811bc723f3e9aa4bfa304b04bcd5097b0e617dd4f8c72b19d499e2ee0 SHA512 18a0914c7d398fdeb065829e9f93f51efddb58c35e43962fc891a46538807ce7dad27644acd976886fbb441e8b9e35790f4ed1271546a155da38b9dcd803a027
637 -DIST 5.14.2-0-202003291239qtquickextras-documentation.7z 673822 BLAKE2B d06bead9f468325f1457fd41d047797f3618322131e5fbc095c1a78e0926b020a5f3012f86f251c96d52e8d52b0d79c05f4639c19338d67f0e6de65901bb5af7 SHA512 d6fa5acb6558fc840d731da25d9061fe3dfa4e3bbb47354bc8760afe0431bcdbd1cb21491416d7773bb171108492b35e14d2f5df0fdf67e307e3ccd6fa0cc598
638 -DIST 5.14.2-0-202003291239qtquicktimeline-documentation.7z 149836 BLAKE2B 28cc7173aea37167a7aaada170bb0fa7fa378ddf270c6237836c47bf2b741aefd7f0454e33be4c089742644bb72b91f9aec1e00d54d837790b21349d1d66092b SHA512 b92c321d486a49a586569dd248cf9a6f49a5acb7806bd3ba60e1f29b85919d2ef79749cef644d9f53be5cb242ef9475bf1358e38bfb4bdaedb4b02f2f90de86c
639 -DIST 5.14.2-0-202003291239qtscript-documentation.7z 601309 BLAKE2B 24b63ae7f20f60d5e2b2c1cbbc5dc47f3f19cc1bb0bc1dade609bcb0a253f483d49359a7b2f9f508936a8c3d22802907fdb64fcf388e4c6b42cb60c6b154f2d7 SHA512 8cbff7316c0b0f2dfd302b374bb78fb6b7f4f466e886299d9c2aa22097ff2b871e4a41bad2f4262c49b065e13892f1e155f1dd6aa179b9a9e898227bb0641d76
640 -DIST 5.14.2-0-202003291239qtscripttools-documentation.7z 85919 BLAKE2B 9da6dfdc7bb18e4fbb6bad8326040e35e55ac8be556d8cc7e280b8fb481d56c9e26fa1f8bce4fa47acb0024bf622c2d46f99f5199cf0dd8412626c23f3b06767 SHA512 545e3b7cfe5fc2a76928e5c75866e350f2a80c7d47104171252e734e9d0c2966c4dae3100118730854f3de9bba7e1bc84167f60f44956730db0e0543a10819a8
641 -DIST 5.14.2-0-202003291239qtscxml-documentation.7z 622979 BLAKE2B 6243b5dc2c17eb6c0727174f61327a7a687a0af6cdc99a27d6f3c796f29358873e2fdadc2384341bf4ebe57078ada9ba2e9633c64699a280c1dd148bff273f29 SHA512 19e836eda1e1f7d9dc278a2195309665a0962ba4ba339511a2060217751de5288e137139833dc6e5825a7a5914ec66f234ceb58497058ae183f57b663b7b9cd3
642 -DIST 5.14.2-0-202003291239qtsensors-documentation.7z 3404679 BLAKE2B 33732ef14e76dbb2bb8e9a296eba8963f4ffbacabe2d6ab7521ae4c44fe44e246c32101f90a6b84bbf232b5172714eb5f9003e25de4197d53c18b60efc3767d9 SHA512 09146cc94ea1b97ecf5eff0127424dfb7e07bdf7751c60be58559c274ca29bbabf710b18d874a596548ebad2557804c1f2ea07792c3efa1e1692c0b806b2b10b
643 -DIST 5.14.2-0-202003291239qtserialbus-documentation.7z 367915 BLAKE2B 734832b230a62f9cc7789cd20821c0ef7bd627cfd5f28dbd71f522348b4da0c863dc276e35fd66a52a14e033090c68f0f7301f31978f61bb66e1d37c2d8719ff SHA512 9f00f877376cd0ddc847f907ae223acd0ca87f4d693673b2468a6a603f3ba2c5d8548588507f071511252311268e6006ccc2beeeaea45059ee0d7f4fdb0b61a2
644 -DIST 5.14.2-0-202003291239qtserialport-documentation.7z 278435 BLAKE2B 3ccc904b861ecce946945586122063c6bb383179e67d0a2324ec57661e91396ddd6e01c1d01843ea7b5da4ff23841f4162769417fef1eda1f8fcfb1e1bb5f496 SHA512 5e8e8c7d8d8315fa74330294dd0933713aa390fb52f39b4f9b90eeef74346d02fd4255f4e2ec860ddf8cbc4a06df13a371c78c7f1ae033d97a016c782fce5d61
645 -DIST 5.14.2-0-202003291239qtspeech-documentation.7z 134032 BLAKE2B 8d7671a8a71e8f112a98b9868ee5a0cfea4dc3eb63ff42fc60aaf9c5142be0b821583fafdf1cbdee2d66786f84949760d0be8a589747e2e811fd380ee09919e2 SHA512 e6eae003f852f04ddb438c73f02346e5a8040f206af8e444c5d6e28d8af5988f8f24a3c1853496a7da545a8fca1ab2f9ce6b7b4d3e9a8b7d2cf35d70e32a8cfd
646 -DIST 5.14.2-0-202003291239qtsql-documentation.7z 882769 BLAKE2B 5044c05764d02836f1dbc05f60fe969a4463d0f48c8858fabdebcdc5b374482e92af1deef80775adac202a31d9cf81b1c02e979d28c4d8024850f9a3c66b9942 SHA512 be3381013c78ae871ebf8e1ba4978b0845a1ddd6790e67ab5799a6d59e3d70ce0467f81aa207f9c3f58fb5bd86264b8a8a2a7336c7ecf6cbf6e75e4f7b7273f4
647 -DIST 5.14.2-0-202003291239qtsvg-documentation.7z 252552 BLAKE2B 516068324ce1d2f476c10e3934c96cce5fefa3f31511772614486ba71f5bd2facd9f3ac925769bcedaf2130651e6fa0aa67eac05dc351f1b65353150597ee14d SHA512 387b822eca333ef8226c79cdc55146fa5011165edae48fe06ad8fe9d951191a1528273a9fd14d7f60e9c1be49ef3224474a7e1ebda31672f727aa2c37c277541
648 -DIST 5.14.2-0-202003291239qttestlib-documentation.7z 219524 BLAKE2B 33f6d3dd6d217c7eec5d6ec4e3f346e9b263123be1d802cadf3bb1a15247ab02ccf768e0b5b1b98db32e5da919a1a4fdbaaba85c5ca8ee6d4d76d97fe1ae1be2 SHA512 4b7220b7473138729c48c135d70f3b2631d7a60461617b0bcdea30ce18917aa597d56cd5abbd1827e9701e17695c1bebacd49091dedea48ec908e3d0616a9fc7
649 -DIST 5.14.2-0-202003291239qtuitools-documentation.7z 158530 BLAKE2B 970493230cd91086e29545932ea9e7699aedc2bf68e0ea9b46682ae012074b5bfcb9845704714d9c3e653c77160bc4b9914405f827e3b3783840aacc18b88bca SHA512 531d9d2ea2796a7142468fc63b7894385299ec490b480450d160e6e1861d300582d19ea1cda706554a58b0f26438a4dd509362ffe05323a37445767d96525677
650 -DIST 5.14.2-0-202003291239qtvirtualkeyboard-documentation.7z 2037666 BLAKE2B f741913404fb8ba1747b785579e4c4c3728878c7238287f1426b32498def5019db2d2baea2818cf66f377ad01dbf0a5e3a2f5b3121efe4edb2a58e299ef2c1b5 SHA512 686ffc453726eba33d1cb6765cf3a66999f0f6ca3020ff20e9e6c1dc010f458ca88136c8f04c50b89fec7bfdf0dd54f62ae66e4cc43f9dacb77146517efc3d80
651 -DIST 5.14.2-0-202003291239qtwaylandcompositor-documentation.7z 586165 BLAKE2B 7f3f3046950301052fe6bc3fd611537290e9949b40939094b4595eb36f787e39ad5d678e42b3dfcb4efa149c7add225569a68b5d0f6c1f85f4d7680b38849be7 SHA512 c518c03515e21d5d3bbcf03cb1b704b9fb24be178aa9fae2d478d152d97c3766476b031b5e170b7b504344121be31da823ddfc5110217caaf99eaf0ee11e32c4
652 -DIST 5.14.2-0-202003291239qtwebchannel-documentation.7z 163023 BLAKE2B 594bf502959024a63365ed4098e624c5bb9627b40a98d98ed9a3e8d0bb6447a29e85385d94ee2039b11099cfba3da93d0fac2b772447c425d096a07947471faf SHA512 05aca7034070847201a4011d2b5952cf526124d8f3afc0cba5b03511b50f54e892e280465ccfed1efa849391babd1ecd0f528b14c0a36294a999be43fd4f2bc5
653 -DIST 5.14.2-0-202003291239qtwebengine-documentation.7z 2983056 BLAKE2B 97b3c0558e7d2a0c91bc9ae62d5bb78b3116f5b3586bb8d0a9bffd58a9e0e9bbc1a1a0275cc1869f84291d26e1ddb6d4c39605a60cf0f4d2942373ba80859312 SHA512 cfee5d5a76c05d668fca7dc6bc342d1f2f9e95a34c5782805069d1b260e5e3793d7dc0db1c6a1b3e96e8dec38e48e226c393c08fc354c7bb95dd889f27cbf93c
654 -DIST 5.14.2-0-202003291239qtwebsockets-documentation.7z 306861 BLAKE2B e7715265e92039d953d4bb711252f6ced098bdd227ec44f0c8597cd0bb021b2f4a9ebd76a65ad416dc91afaa04c0af538786160c6045b5bf60ba087e8b53d13b SHA512 0879de8d72f6e8201677caf3f7d26b4f1761f13fd8dcbb1d6c211663a16b96fca487f5fc96acaa77108ba148fb0fd1733af3a4ab35dddb5e5b5fae377de07cfe
655 -DIST 5.14.2-0-202003291239qtwebview-documentation.7z 120314 BLAKE2B 22bd0a4a09a9bf35679095ee06416a6285abb8b40d976168d63d9d0828dc5992887d1b381a530aac35259943141b2afe55c4769ee65fd5083d34e7b76132fcca SHA512 82c7e399d0468c6548e526f30315af6ff3498ca846c2c762139fbbc75ee0006edba4a5e921d60a2f5200e308f678fe45914144d5aadb28e79690af29c9a7fc09
656 -DIST 5.14.2-0-202003291239qtwidgets-documentation.7z 26796173 BLAKE2B 6383a2be3148bd0d40d09f8ebf044b3ca1f5648de0813ba21892246edfad9da2d6ff66e45495443531f840e762517caa399401f0a0de80ca3ccf181d378c7c78 SHA512 f81066289080709bad87c529be13fa16b9652d35d8a0f1671d9aad914101c6b9a934ce5504cd6133671cbe0cefaf6174caba3b0bc5e46741d8329ad2ed42b908
657 -DIST 5.14.2-0-202003291239qtx11extras-documentation.7z 36888 BLAKE2B 0f7757cb82a7fea064e9b484e08cbd3b1cefd5f29117ab283f0b26ffddae142e494f674744f2fca4f210da5c86b86500ef26781ca7e5bb0f13b0c12af9195d4d SHA512 728814ee896cdc429e843bbdc136931795d54b4b70bf0d54bc8ac9b8edac42986981d39c134f3ea5329984a9b15e0f0089df716c44889cf13368fef92cbbff5e
658 -DIST 5.14.2-0-202003291239qtxml-documentation.7z 499466 BLAKE2B 82ce65d6c4dfb39aa3202e20acafd0cb970e57ef24f35a2c4d64b3a550cc3e041b8bd2e74489b4738651ff1125247ae18e7e2885e919346f0b89776c36697846 SHA512 62b7d24f724721bb007c4de36bc2bb9578cb719de8acac72c5c144e1acb4a12a0a15930a3f0b8aff3ed557f236d2ab124045f86dc33b2d195da05e61133fd100
659 -DIST 5.14.2-0-202003291239qtxmlpatterns-documentation.7z 1193876 BLAKE2B ac7c92c265fb0bc4b5ed7ccf267c50389ca840bdf91a35abce127e14608e585b20191cfe84924864e2fc607b4d360207e50b85424c8517fce136d971de2c47a9 SHA512 2d012722d64b27c6ec11726e5b457ae1b87448e681271809489ea521ab0ac65553dc2d8c105bedc65501abc5af7d6921afc2d3cf5ac69fd17548405076f66146
660 DIST 5.15.1-0-202009071124qdoc-documentation.7z 538292 BLAKE2B 2bfddf75b83783a515f7278e4c9e384e96d58a64f5326d640278dce7d730e011a0fd028ce41efb43d47c36c45cb378101a78c62779600cabff6c108db7146af9 SHA512 48ce574f1a4a888a40ed6ea8b81bb3baaec538c15c534dde15038eaf017bf97bf6714dd711b22a9d00332f4f79041ee20b27a4e0987ef98d48e7fb651df86f32
661 DIST 5.15.1-0-202009071124qmake-documentation.7z 343276 BLAKE2B e4b4220bf97cb668b70021c3264713005fbb2b890cad7f19573f079726b84b181764789e0e46557eb8999ca84668e40b1c59836cd8ba4837f38754182d272313 SHA512 56bb705c4dde6e348bc995a0077b36c765e0295622490496d7c634effe5d9ad6e5f8a8239dd799ad0d61cbeb0d244904938d6e97ff91f761cc5f0c057e81ff86
662 DIST 5.15.1-0-202009071124qt3d-documentation.7z 5832015 BLAKE2B d68bd281fcbf4c665f2b72602a4f2de779203cebdd870935f21c9514921062e1ca28d802f7d77779ec978752514b692f76f54487d0694c84397efadefcfa52bf SHA512 54d49afed958dc0231880d364c3385f017c72ab9226e1044b9d2b146685d5b5adf8fee44ed2ca58fa0d8f06fa01898724d570185f5b5995b93c5e028206fe959
663
664 diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
665 index af49c1ea8e0..d54e1fe9c86 100644
666 --- a/dev-qt/qt-docs/metadata.xml
667 +++ b/dev-qt/qt-docs/metadata.xml
668 @@ -11,7 +11,6 @@
669 <flag name="bluetooth">Install documentation for <pkg>dev-qt/qtbluetooth</pkg></flag>
670 <flag name="charts">Install documentation for <pkg>dev-qt/qtcharts</pkg></flag>
671 <flag name="concurrent">Install documentation for <pkg>dev-qt/qtconcurrent</pkg></flag>
672 - <flag name="core">Install documentation for <pkg>dev-qt/qtcore</pkg></flag>
673 <flag name="datavis">Install documentation for <pkg>dev-qt/qtdatavis3d</pkg></flag>
674 <flag name="declarative">Install documentation for <pkg>dev-qt/qtdeclarative</pkg></flag>
675 <flag name="designer">Install documentation for <pkg>dev-qt/designer</pkg></flag>
676
677 diff --git a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild
678 deleted file mode 100644
679 index 9014281d55f..00000000000
680 --- a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild
681 +++ /dev/null
682 @@ -1,103 +0,0 @@
683 -# Copyright 1999-2020 Gentoo Authors
684 -# Distributed under the terms of the GNU General Public License v2
685 -
686 -EAPI=7
687 -
688 -PV_FULL=${PV/_p/-0-}
689 -PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
690 -BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
691 -
692 -declare -A QT5_DOCS=(
693 - [3d]="qt3d"
694 - [assistant]="qtassistant"
695 - [bluetooth]="qtbluetooth"
696 - [concurrent]="qtconcurrent"
697 - [core]="qtcore qmake qtdoc"
698 - [dbus]="qtdbus"
699 - [declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
700 - [designer]="qtdesigner qtuitools"
701 - [gamepad]="qtgamepad"
702 - [graphicaleffects]="qtgraphicaleffects"
703 - [gui]="qtgui qtplatformheaders"
704 - [help]="qthelp"
705 - [imageformats]="qtimageformats"
706 - [linguist]="qtlinguist"
707 - [location]="qtlocation"
708 - [multimedia]="qtmultimedia"
709 - [network]="qtnetwork"
710 - [opengl]="qtopengl"
711 - [positioning]="qtpositioning"
712 - [printsupport]="qtprintsupport"
713 - [qdoc]="qdoc"
714 - [quickcontrols2]="qtquickcontrols"
715 - [quickcontrols]="qtquickcontrols1"
716 - [scxml]="qtscxml"
717 - [sensors]="qtsensors"
718 - [serialbus]="qtserialbus"
719 - [serialport]="qtserialport"
720 - [speech]="qtspeech"
721 - [sql]="qtsql"
722 - [svg]="qtsvg"
723 - [test]="qttestlib"
724 - [wayland]="qtwaylandcompositor"
725 - [webchannel]="qtwebchannel"
726 - [websockets]="qtwebsockets"
727 - [webview]="qtwebview"
728 - [widgets]="qtwidgets"
729 - [x11extras]="qtx11extras"
730 - [xml]="qtxml"
731 - [xmlpatterns]="qtxmlpatterns"
732 -)
733 -
734 -DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
735 -HOMEPAGE="https://doc.qt.io/"
736 -
737 -LICENSE="FDL-1.3"
738 -SLOT="5"
739 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
740 -
741 -IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine"
742 -REQUIRED_USE="|| ( html qch )"
743 -
744 -SRC_URI="
745 - charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
746 - datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
747 - networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
748 - script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
749 - ${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
750 - timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-documentation.7z )
751 - virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
752 - webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
753 -"
754 -
755 -for DOCUSE in ${!QT5_DOCS[@]}; do
756 - IUSE+=" +${DOCUSE}"
757 - for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
758 - SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
759 - done
760 -done
761 -unset DOCTAR DOCUSE
762 -
763 -BDEPEND="
764 - app-arch/p7zip
765 - media-libs/libpng:0
766 -"
767 -
768 -S=${WORKDIR}/Docs/Qt-${PV%_p*}
769 -
770 -src_prepare() {
771 - default
772 -
773 - # Fix broken png file, bug 679146
774 - local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
775 - pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
776 - [[ $? -gt 15 ]] && die "Failed to fix ${png}"
777 - mv -f ${png/.png/fixed.png} ${png} || die
778 -}
779 -
780 -src_install() {
781 - # must be the same as QT5_DOCDIR
782 - insinto /usr/share/qt5-doc
783 - use html && doins -r */
784 - use qch && doins *.qch
785 -}
786
787 diff --git a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild
788 deleted file mode 100644
789 index 0aa5c59ac2d..00000000000
790 --- a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild
791 +++ /dev/null
792 @@ -1,102 +0,0 @@
793 -# Copyright 1999-2020 Gentoo Authors
794 -# Distributed under the terms of the GNU General Public License v2
795 -
796 -EAPI=7
797 -
798 -PV_FULL=${PV/_p/-0-}
799 -PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
800 -BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
801 -
802 -declare -A QT5_DOCS=(
803 - [3d]="qt3d"
804 - [assistant]="qtassistant"
805 - [bluetooth]="qtbluetooth"
806 - [concurrent]="qtconcurrent"
807 - [core]="qtcore qmake qtdoc"
808 - [dbus]="qtdbus"
809 - [declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
810 - [designer]="qtdesigner qtuitools"
811 - [gamepad]="qtgamepad"
812 - [graphicaleffects]="qtgraphicaleffects"
813 - [gui]="qtgui qtplatformheaders"
814 - [help]="qthelp"
815 - [imageformats]="qtimageformats"
816 - [linguist]="qtlinguist"
817 - [location]="qtlocation"
818 - [multimedia]="qtmultimedia"
819 - [network]="qtnetwork"
820 - [opengl]="qtopengl"
821 - [positioning]="qtpositioning"
822 - [printsupport]="qtprintsupport"
823 - [qdoc]="qdoc"
824 - [quickcontrols2]="qtquickcontrols"
825 - [quickcontrols]="qtquickcontrols1"
826 - [scxml]="qtscxml"
827 - [sensors]="qtsensors"
828 - [serialbus]="qtserialbus"
829 - [serialport]="qtserialport"
830 - [speech]="qtspeech"
831 - [sql]="qtsql"
832 - [svg]="qtsvg"
833 - [test]="qttestlib"
834 - [wayland]="qtwaylandcompositor"
835 - [webchannel]="qtwebchannel"
836 - [websockets]="qtwebsockets"
837 - [webview]="qtwebview"
838 - [widgets]="qtwidgets"
839 - [x11extras]="qtx11extras"
840 - [xml]="qtxml"
841 - [xmlpatterns]="qtxmlpatterns"
842 -)
843 -
844 -DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
845 -HOMEPAGE="https://doc.qt.io/"
846 -
847 -LICENSE="FDL-1.3"
848 -SLOT="5"
849 -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
850 -
851 -IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine"
852 -REQUIRED_USE="|| ( html qch )"
853 -
854 -SRC_URI="
855 - charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
856 - datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
857 - networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
858 - script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
859 - ${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
860 - virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
861 - webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
862 -"
863 -
864 -for DOCUSE in ${!QT5_DOCS[@]}; do
865 - IUSE+=" +${DOCUSE}"
866 - for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
867 - SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
868 - done
869 -done
870 -unset DOCTAR DOCUSE
871 -
872 -BDEPEND="
873 - app-arch/p7zip
874 - media-libs/libpng:0
875 -"
876 -
877 -S=${WORKDIR}/Docs/Qt-${PV%_p*}
878 -
879 -src_prepare() {
880 - default
881 -
882 - # Fix broken png file, bug 679146
883 - local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
884 - pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
885 - [[ $? -gt 15 ]] && die "Failed to fix ${png}"
886 - mv -f ${png/.png/fixed.png} ${png} || die
887 -}
888 -
889 -src_install() {
890 - # must be the same as QT5_DOCDIR
891 - insinto /usr/share/qt5-doc
892 - use html && doins -r */
893 - use qch && doins *.qch
894 -}
895
896 diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
897 index e96656130e2..178c3750596 100644
898 --- a/dev-qt/qt3d/Manifest
899 +++ b/dev-qt/qt3d/Manifest
900 @@ -1,2 +1 @@
901 -DIST qt3d-everywhere-src-5.14.2.tar.xz 81576496 BLAKE2B 39077430fa58a14d0636ef56607b687636651d8fb798093d00b150ae023c462780245f06d61eac214560b336a1f445c2fbeca397c1dc7e7ee0331cc008692a3c SHA512 43053d001d59094bfac19c5bf3ad17df277c64d0c214b72d4cf02231396d9109a231da8d9d72ebe79822bc09ee24fa2387b4b120dbad43d69a49e3d66ee21da8
902 DIST qt3d-everywhere-src-5.15.1.tar.xz 81919836 BLAKE2B e0c617e777dc2562caaee02483bb4c9ec2fd17214ea02505942b074b82e698a82e4c81ef552705872c6c10be3cbab65a1fc3c5aff2c87637639f223583a04ae6 SHA512 5d35f39bd3cb65a4b7490fd3d57a4f62b3ccaad25c7963613d67641927bdc9d895fb436d049de5485a9e8e067c716951e376349cbfc3996af6765adda73d51d5
903
904 diff --git a/dev-qt/qt3d/qt3d-5.14.2.ebuild b/dev-qt/qt3d/qt3d-5.14.2.ebuild
905 deleted file mode 100644
906 index 26d5cfdc5fd..00000000000
907 --- a/dev-qt/qt3d/qt3d-5.14.2.ebuild
908 +++ /dev/null
909 @@ -1,34 +0,0 @@
910 -# Copyright 1999-2020 Gentoo Authors
911 -# Distributed under the terms of the GNU General Public License v2
912 -
913 -EAPI=7
914 -inherit qt5-build
915 -
916 -DESCRIPTION="3D rendering module for the Qt5 framework"
917 -
918 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
919 - KEYWORDS="amd64 arm64 x86"
920 -fi
921 -
922 -# TODO: tools
923 -IUSE="gamepad gles2-only qml"
924 -
925 -DEPEND="
926 - ~dev-qt/qtconcurrent-${PV}
927 - ~dev-qt/qtcore-${PV}
928 - ~dev-qt/qtgui-${PV}
929 - ~dev-qt/qtnetwork-${PV}
930 - >=media-libs/assimp-4.0.0
931 - gamepad? ( ~dev-qt/qtgamepad-${PV} )
932 - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
933 -"
934 -RDEPEND="${DEPEND}"
935 -
936 -src_prepare() {
937 - rm -r src/3rdparty/assimp/{code,contrib,include} || die
938 -
939 - qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
940 - qt_use_disable_mod qml quick src/src.pro
941 -
942 - qt5-build_src_prepare
943 -}
944
945 diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
946 index d52059437dd..9bd72b0c690 100644
947 --- a/dev-qt/qtbluetooth/Manifest
948 +++ b/dev-qt/qtbluetooth/Manifest
949 @@ -1,2 +1 @@
950 -DIST qtconnectivity-everywhere-src-5.14.2.tar.xz 2804940 BLAKE2B d72e1159877049865d45c5aea8281fce87d797bb41cd82aac534463f48752f8144d018a9a1a23d153adc41b64559c0aa160c00ad1c30ce7790abb11f4ee1d87f SHA512 948050b915f6f2e1fffcb2c8b55d9061f25a82314d02e7a39faa9b88e065bb924ce5f8a7c26ed1f07b29b986d47acd5678f57bb96668d1c1ecd93ad3a7e40c7a
951 DIST qtconnectivity-everywhere-src-5.15.1.tar.xz 2814984 BLAKE2B b1c4e0525fd50af4971d97a4f735e5a9c2fd1bdb72bf2ee01e7136ce57da576d10e4083da7ecd3257471b7a9f7fed3b925b473dcc99ef81a3576fc81abbb7971 SHA512 ad7bad604c466461bcc7bfd889ecbb36e010c89ea1ecf7736f8b0ad49e682a1800cd2507b8d8c0b582c424b176f8179aeec85a6b0fc4ed933f8b6032e935d39a
952
953 diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild
954 deleted file mode 100644
955 index e9b3e7f2f77..00000000000
956 --- a/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild
957 +++ /dev/null
958 @@ -1,33 +0,0 @@
959 -# Copyright 1999-2020 Gentoo Authors
960 -# Distributed under the terms of the GNU General Public License v2
961 -
962 -EAPI=7
963 -QT5_MODULE="qtconnectivity"
964 -inherit qt5-build
965 -
966 -DESCRIPTION="Bluetooth support library for the Qt5 framework"
967 -
968 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
969 - KEYWORDS="amd64 arm arm64 x86"
970 -fi
971 -
972 -IUSE="qml"
973 -
974 -RDEPEND="
975 - ~dev-qt/qtconcurrent-${PV}
976 - ~dev-qt/qtcore-${PV}:5=
977 - ~dev-qt/qtdbus-${PV}
978 - >=net-wireless/bluez-5:=
979 - qml? ( ~dev-qt/qtdeclarative-${PV} )
980 -"
981 -DEPEND="${RDEPEND}
982 - ~dev-qt/qtnetwork-${PV}
983 -"
984 -
985 -src_prepare() {
986 - sed -i -e 's/nfc//' src/src.pro || die
987 -
988 - qt_use_disable_mod qml quick src/src.pro
989 -
990 - qt5-build_src_prepare
991 -}
992
993 diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
994 index 16104b4ec74..27e2f880d1b 100644
995 --- a/dev-qt/qtcharts/Manifest
996 +++ b/dev-qt/qtcharts/Manifest
997 @@ -1,2 +1 @@
998 -DIST qtcharts-everywhere-src-5.14.2.tar.xz 4250508 BLAKE2B 0f6839bceee19215e82355d66972af69a714e28a75609a0920cee0792e593070fea237e6760b86bda81299ecb9d6bd3561c0a90dafbd571d3a14b72212ddacb0 SHA512 2776db3dfe6f6f1047bd19d8d936d3f72de46c0807bbf02ba874053113d76df4cf80497d5ed2cee192ad94abb8e12b4fbce8359a63d8beb1190d491fc2da35bc
999 DIST qtcharts-everywhere-src-5.15.1.tar.xz 4251664 BLAKE2B 392464bfd9fecadf59f759284ff530a5dbeefa0ea31a2ec134538f0abe21ef517be319ab51ff0f0d0a29f68a4c7b3a2c8905484cd193a33626e6381c11880822 SHA512 7e644d4a674f175745646f8b541c8cfd972853fdf3a3ee5d0f7c23f035ae81cef0671292535fe65b1c276e4c54c7a48db1a1d2f9be97834513d154eea1666f3c
1000
1001 diff --git a/dev-qt/qtcharts/qtcharts-5.14.2.ebuild b/dev-qt/qtcharts/qtcharts-5.14.2.ebuild
1002 deleted file mode 100644
1003 index 8a4f4e2ff53..00000000000
1004 --- a/dev-qt/qtcharts/qtcharts-5.14.2.ebuild
1005 +++ /dev/null
1006 @@ -1,29 +0,0 @@
1007 -# Copyright 1999-2020 Gentoo Authors
1008 -# Distributed under the terms of the GNU General Public License v2
1009 -
1010 -EAPI=7
1011 -inherit qt5-build
1012 -
1013 -DESCRIPTION="Chart component library for the Qt5 framework"
1014 -LICENSE="GPL-3"
1015 -
1016 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1017 - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
1018 -fi
1019 -
1020 -IUSE="qml"
1021 -
1022 -DEPEND="
1023 - ~dev-qt/qtcore-${PV}
1024 - ~dev-qt/qtgui-${PV}
1025 - ~dev-qt/qtwidgets-${PV}
1026 - qml? ( ~dev-qt/qtdeclarative-${PV} )
1027 -"
1028 -RDEPEND="${DEPEND}"
1029 -
1030 -src_prepare() {
1031 - qt_use_disable_mod qml quick \
1032 - src/src.pro
1033 -
1034 - qt5-build_src_prepare
1035 -}
1036
1037 diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
1038 index d72f3b48819..98e054ddcf5 100644
1039 --- a/dev-qt/qtconcurrent/Manifest
1040 +++ b/dev-qt/qtconcurrent/Manifest
1041 @@ -1,2 +1 @@
1042 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
1043 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
1044
1045 diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild
1046 deleted file mode 100644
1047 index 5dc681ed53a..00000000000
1048 --- a/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild
1049 +++ /dev/null
1050 @@ -1,23 +0,0 @@
1051 -# Copyright 1999-2020 Gentoo Authors
1052 -# Distributed under the terms of the GNU General Public License v2
1053 -
1054 -EAPI=7
1055 -QT5_MODULE="qtbase"
1056 -inherit qt5-build
1057 -
1058 -DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
1059 -
1060 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1061 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
1062 -fi
1063 -
1064 -IUSE=""
1065 -
1066 -DEPEND="
1067 - ~dev-qt/qtcore-${PV}:5=
1068 -"
1069 -RDEPEND="${DEPEND}"
1070 -
1071 -QT5_TARGET_SUBDIRS=(
1072 - src/concurrent
1073 -)
1074
1075 diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
1076 index d72f3b48819..98e054ddcf5 100644
1077 --- a/dev-qt/qtcore/Manifest
1078 +++ b/dev-qt/qtcore/Manifest
1079 @@ -1,2 +1 @@
1080 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
1081 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
1082
1083 diff --git a/dev-qt/qtcore/files/qtcore-5.14.2-QLibrary-deadlock.patch b/dev-qt/qtcore/files/qtcore-5.14.2-QLibrary-deadlock.patch
1084 deleted file mode 100644
1085 index 6a9c9921b7d..00000000000
1086 --- a/dev-qt/qtcore/files/qtcore-5.14.2-QLibrary-deadlock.patch
1087 +++ /dev/null
1088 @@ -1,106 +0,0 @@
1089 -From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001
1090 -From: Thiago Macieira <thiago.macieira@×××××.com>
1091 -Date: Thu, 2 Apr 2020 12:08:41 -0300
1092 -Subject: [PATCH] QLibrary: fix deadlock caused by fix to QTBUG-39642
1093 -
1094 -Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around
1095 -the entire load_sys(). We had reasoed that deadlocks would only occur if
1096 -the object creation in instance() recursed into its own instance(),
1097 -which was already a bug. But we had forgotten that dlopen()/
1098 -LoadLibrary() executes initialization code from the module being loaded,
1099 -which could cause a recursion back into the same QPluginLoader or
1100 -QLibrary object. This recursion is benign because the module *is* loaded
1101 -and dlopen()/LoadLibrary() returns the same handle.
1102 -
1103 -[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that
1104 -would happen if the plugin or library being loaded has load-time
1105 -initialization code (C++ global variables) that recursed back into the
1106 -same QLibrary or QPluginLoader object.
1107 -
1108 -PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex
1109 -lock, so pluginState should be made an atomic variable. Once that is
1110 -done, we'll only need locking the mutex to update errorString (no
1111 -locking before loading).
1112 -
1113 -Fixes: QTBUG-83207
1114 -Task-number: QTBUG-39642
1115 -Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb
1116 -Reviewed-by: Volker Hilsheimer <volker.hilsheimer@××.io>
1117 -Reviewed-by: David Faure <david.faure@××××.com>
1118 ----
1119 - src/corelib/plugin/qlibrary.cpp | 2 --
1120 - src/corelib/plugin/qlibrary_unix.cpp | 4 ++++
1121 - src/corelib/plugin/qlibrary_win.cpp | 3 +++
1122 - 3 files changed, 7 insertions(+), 2 deletions(-)
1123 -
1124 -diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
1125 -index ddb053c26fa..be9d92b2048 100644
1126 ---- a/src/corelib/plugin/qlibrary.cpp
1127 -+++ b/src/corelib/plugin/qlibrary.cpp
1128 -@@ -576,9 +576,7 @@ bool QLibraryPrivate::load()
1129 -
1130 - Q_TRACE(QLibraryPrivate_load_entry, fileName);
1131 -
1132 -- mutex.lock();
1133 - bool ret = load_sys();
1134 -- mutex.unlock();
1135 - if (qt_debug_component()) {
1136 - if (ret) {
1137 - qDebug() << "loaded library" << fileName;
1138 -diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
1139 -index 017aa97b66a..a5c72f81d96 100644
1140 ---- a/src/corelib/plugin/qlibrary_unix.cpp
1141 -+++ b/src/corelib/plugin/qlibrary_unix.cpp
1142 -@@ -123,6 +123,7 @@ QStringList QLibraryPrivate::prefixes_sys()
1143 -
1144 - bool QLibraryPrivate::load_sys()
1145 - {
1146 -+ QMutexLocker locker(&mutex);
1147 - QString attempt;
1148 - QFileSystemEntry fsEntry(fileName);
1149 -
1150 -@@ -213,6 +214,7 @@ bool QLibraryPrivate::load_sys()
1151 - }
1152 - #endif
1153 -
1154 -+ locker.unlock();
1155 - bool retry = true;
1156 - Handle hnd = nullptr;
1157 - for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) {
1158 -@@ -273,6 +275,8 @@ bool QLibraryPrivate::load_sys()
1159 - }
1160 - }
1161 - #endif
1162 -+
1163 -+ locker.relock();
1164 - if (!hnd) {
1165 - errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror());
1166 - }
1167 -diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
1168 -index 000bf762763..ef58724be8e 100644
1169 ---- a/src/corelib/plugin/qlibrary_win.cpp
1170 -+++ b/src/corelib/plugin/qlibrary_win.cpp
1171 -@@ -78,6 +78,7 @@ bool QLibraryPrivate::load_sys()
1172 - // fileName
1173 - //
1174 - // NB If it's a plugin we do not ever try the ".dll" extension
1175 -+ QMutexLocker locker(&mutex);
1176 - QStringList attempts;
1177 -
1178 - if (pluginState != IsAPlugin)
1179 -@@ -95,6 +96,7 @@ bool QLibraryPrivate::load_sys()
1180 - attempts.prepend(QDir::rootPath() + fileName);
1181 - #endif
1182 -
1183 -+ locker.unlock();
1184 - Handle hnd = nullptr;
1185 - for (const QString &attempt : qAsConst(attempts)) {
1186 - #ifndef Q_OS_WINRT
1187 -@@ -115,6 +117,7 @@ bool QLibraryPrivate::load_sys()
1188 - #ifndef Q_OS_WINRT
1189 - SetErrorMode(oldmode);
1190 - #endif
1191 -+ locker.relock();
1192 - if (!hnd) {
1193 - errorString = QLibrary::tr("Cannot load library %1: %2").arg(
1194 - QDir::toNativeSeparators(fileName), qt_error_string());
1195
1196 diff --git a/dev-qt/qtcore/qtcore-5.14.2.ebuild b/dev-qt/qtcore/qtcore-5.14.2.ebuild
1197 deleted file mode 100644
1198 index 48df292f53b..00000000000
1199 --- a/dev-qt/qtcore/qtcore-5.14.2.ebuild
1200 +++ /dev/null
1201 @@ -1,103 +0,0 @@
1202 -# Copyright 1999-2020 Gentoo Authors
1203 -# Distributed under the terms of the GNU General Public License v2
1204 -
1205 -EAPI=7
1206 -
1207 -QT5_MODULE="qtbase"
1208 -inherit linux-info qt5-build
1209 -
1210 -DESCRIPTION="Cross-platform application development framework"
1211 -SLOT=5/$(ver_cut 1-3)
1212 -
1213 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1214 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
1215 -fi
1216 -
1217 -IUSE="icu old-kernel systemd"
1218 -
1219 -DEPEND="
1220 - dev-libs/double-conversion:=
1221 - dev-libs/glib:2
1222 - dev-libs/libpcre2[pcre16,unicode]
1223 - sys-libs/zlib:=
1224 - icu? ( dev-libs/icu:= )
1225 - !icu? ( virtual/libiconv )
1226 - systemd? ( sys-apps/systemd:= )
1227 -"
1228 -RDEPEND="${DEPEND}
1229 - !<dev-qt/qtcore-4.8.7-r4:4
1230 -"
1231 -
1232 -QT5_TARGET_SUBDIRS=(
1233 - src/tools/bootstrap
1234 - src/tools/moc
1235 - src/tools/rcc
1236 - src/corelib
1237 - src/tools/qlalr
1238 - doc
1239 -)
1240 -
1241 -QT5_GENTOO_PRIVATE_CONFIG=(
1242 - !:network
1243 - !:sql
1244 - !:testlib
1245 - !:xml
1246 -)
1247 -
1248 -PATCHES=(
1249 - "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
1250 - "${FILESDIR}/${P}-QLibrary-deadlock.patch" # QTBUG-83207
1251 -)
1252 -
1253 -pkg_pretend() {
1254 - use kernel_linux || return
1255 - get_running_version
1256 - if kernel_is -lt 3 17 && ! use old-kernel; then
1257 - ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for"
1258 - ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994."
1259 - fi
1260 -}
1261 -
1262 -src_prepare() {
1263 - # don't add -O3 to CXXFLAGS, bug 549140
1264 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
1265 -
1266 - # fix missing qt_version_tag symbol w/ LTO, bug 674382
1267 - sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
1268 -
1269 - qt5-build_src_prepare
1270 -}
1271 -
1272 -src_configure() {
1273 - local myconf=(
1274 - -no-feature-statx # bug 672856
1275 - $(qt_use icu)
1276 - $(qt_use !icu iconv)
1277 - $(qt_use systemd journald)
1278 - )
1279 - use old-kernel && myconf+=(
1280 - -no-feature-renameat2 # needs Linux 3.16, bug 669994
1281 - -no-feature-getentropy # needs Linux 3.17, bug 669994
1282 - )
1283 - qt5-build_src_configure
1284 -}
1285 -
1286 -src_install() {
1287 - qt5-build_src_install
1288 -
1289 - local flags=(
1290 - DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
1291 - OPENGL OPENSSL SSL WIDGETS
1292 - )
1293 -
1294 - for flag in ${flags[@]}; do
1295 - cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
1296 -
1297 - #if defined(QT_NO_${flag}) && defined(QT_${flag})
1298 - # undef QT_NO_${flag}
1299 - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
1300 - # define QT_NO_${flag}
1301 - #endif
1302 - _EOF_
1303 - done
1304 -}
1305
1306 diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
1307 index c40e59ba351..be5bbdcc3e6 100644
1308 --- a/dev-qt/qtdatavis3d/Manifest
1309 +++ b/dev-qt/qtdatavis3d/Manifest
1310 @@ -1,2 +1 @@
1311 -DIST qtdatavis3d-everywhere-src-5.14.2.tar.xz 5190800 BLAKE2B 2e60bb97526bfac4c9bd70aae8885fc5f9b7704f8dbe8cff726ef6a60d83507f4d9c59a92b45a3fce78c21ed6d7e41466acec00910e96921a73b5d9bc9fa130d SHA512 25d207e045e58f9edc3a661b641225f6a11eb45f723847281007fa53b753430dc5792e31bdd142c95e886bfda5f6d29826cd151cb23a1e1a81cc0b91d5f7a2f6
1312 DIST qtdatavis3d-everywhere-src-5.15.1.tar.xz 5191624 BLAKE2B ac6f6591f12e00bd9e473da0441d6863b1ffc44d125998a530a3993e9489ee56ed5c9d30e9842fc2b4a4b22110a0296709834582025d50c34653f90be5f08393 SHA512 3f11cddebd29aa90ce62fa19f9ab33026393bf95525bea7c4514e04acef23db9dbfdf000aa885aa2f823b1cd6ca99ac2a1f8afaabe67ee13785d5e4650aa4c97
1313
1314 diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild
1315 deleted file mode 100644
1316 index b14bfaf7cb4..00000000000
1317 --- a/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild
1318 +++ /dev/null
1319 @@ -1,31 +0,0 @@
1320 -# Copyright 1999-2020 Gentoo Authors
1321 -# Distributed under the terms of the GNU General Public License v2
1322 -
1323 -EAPI=7
1324 -inherit qt5-build
1325 -
1326 -DESCRIPTION="3D data visualization library for the Qt5 framework"
1327 -LICENSE="GPL-3"
1328 -
1329 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1330 - KEYWORDS="amd64 arm64 x86"
1331 -fi
1332 -
1333 -IUSE="gles2-only qml"
1334 -
1335 -DEPEND="
1336 - ~dev-qt/qtcore-${PV}
1337 - ~dev-qt/qtgui-${PV}[gles2-only=]
1338 - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
1339 -"
1340 -RDEPEND="${DEPEND}"
1341 -
1342 -src_prepare() {
1343 - # eliminate bogus dependency on qtwidgets
1344 - sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
1345 -
1346 - qt_use_disable_mod qml quick \
1347 - src/src.pro
1348 -
1349 - qt5-build_src_prepare
1350 -}
1351
1352 diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
1353 index d72f3b48819..98e054ddcf5 100644
1354 --- a/dev-qt/qtdbus/Manifest
1355 +++ b/dev-qt/qtdbus/Manifest
1356 @@ -1,2 +1 @@
1357 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
1358 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
1359
1360 diff --git a/dev-qt/qtdbus/qtdbus-5.14.2.ebuild b/dev-qt/qtdbus/qtdbus-5.14.2.ebuild
1361 deleted file mode 100644
1362 index f0425f0dc00..00000000000
1363 --- a/dev-qt/qtdbus/qtdbus-5.14.2.ebuild
1364 +++ /dev/null
1365 @@ -1,43 +0,0 @@
1366 -# Copyright 1999-2020 Gentoo Authors
1367 -# Distributed under the terms of the GNU General Public License v2
1368 -
1369 -EAPI=7
1370 -QT5_MODULE="qtbase"
1371 -inherit qt5-build
1372 -
1373 -DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
1374 -
1375 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1376 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
1377 -fi
1378 -
1379 -IUSE=""
1380 -
1381 -DEPEND="
1382 - ~dev-qt/qtcore-${PV}:5=
1383 - >=sys-apps/dbus-1.4.20
1384 -"
1385 -RDEPEND="${DEPEND}"
1386 -
1387 -QT5_TARGET_SUBDIRS=(
1388 - src/dbus
1389 - src/tools/qdbusxml2cpp
1390 - src/tools/qdbuscpp2xml
1391 -)
1392 -
1393 -QT5_GENTOO_CONFIG=(
1394 - :dbus
1395 - :dbus-linked:
1396 -)
1397 -
1398 -QT5_GENTOO_PRIVATE_CONFIG=(
1399 - :dbus
1400 - :dbus-linked
1401 -)
1402 -
1403 -src_configure() {
1404 - local myconf=(
1405 - -dbus-linked
1406 - )
1407 - qt5-build_src_configure
1408 -}
1409
1410 diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
1411 index fc9e295e584..a84d768da2c 100644
1412 --- a/dev-qt/qtdeclarative/Manifest
1413 +++ b/dev-qt/qtdeclarative/Manifest
1414 @@ -1,2 +1 @@
1415 -DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004
1416 DIST qtdeclarative-everywhere-src-5.15.1.tar.xz 21558724 BLAKE2B 15da5471799e461e5f5983fb0d947cad9d635a1bb0760da0b709f273ba9a9846df442f424d2009e857d831695d14a92c9be941270a07dc0f33cc46382ba44e6f SHA512 193ec706b764330a2ae00614b13482b7586642f9cfd32458e8c975daa07ba25f0f9887de0918c4034f52f613b860677c09c46a3b7d07d4229446cfc0805bcccd
1417
1418 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch
1419 deleted file mode 100644
1420 index 1dd0ff1155d..00000000000
1421 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch
1422 +++ /dev/null
1423 @@ -1,55 +0,0 @@
1424 -From 8ace780b5aa298e3c01903bfd57f766a42209191 Mon Sep 17 00:00:00 2001
1425 -From: Frederik Gladhorn <frederik.gladhorn@××××××××××.com>
1426 -Date: Sat, 28 Mar 2020 15:14:41 +0100
1427 -Subject: [PATCH] Fix QQuickMouseArea getting stuck in pressed state when
1428 - hiding in press
1429 -MIME-Version: 1.0
1430 -Content-Type: text/plain; charset=utf8
1431 -Content-Transfer-Encoding: 8bit
1432 -
1433 -In 78c1fcbc49f56463064eef738a475d9018357b24 we stopped giving the
1434 -exclusive grab to hidden or disabled items with is good. But the change
1435 -did not take into consideration how mouse area handles its internal
1436 -state.
1437 -
1438 -As a simple example: A mouse area that would set itself hiddin in the
1439 -press handler, would continue to have d->pressed == true, which means it
1440 -would not react to any future press events.
1441 -
1442 -The fix is to let mouse area check in its change handler whether it has
1443 -become invisible.
1444 -The test also checks that enabled behaves the same way. There is no
1445 -action needed, since mouse area does completely custom handling of
1446 -enabled (maybe something to fix in Qt 6), disabling a mouse area doesn't
1447 -disable its children for example, it doesn't invoke
1448 -QQuickItem::setEnabled at all. Due to this circumventing the common
1449 -behavior, by chance disabling a mouse area in the on pressed handler
1450 -works.
1451 -
1452 -Fixes: QTBUG-74987
1453 -Change-Id: Idb8499b3e5bcb744fbba203fdea5c46695bd5077
1454 -Reviewed-by: Jan Arve Sæther <jan-arve.saether@××.io>
1455 ----
1456 - src/quick/items/qquickmousearea.cpp | 6 ++++
1457 - 3 files changed, 80 insertions(+)
1458 - create mode 100644 tests/auto/quick/qquickmousearea/data/settingHiddenInPressUngrabs.qml
1459 -
1460 -diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
1461 -index 368379f5c40..dc60712a9cd 100644
1462 ---- a/src/quick/items/qquickmousearea.cpp
1463 -+++ b/src/quick/items/qquickmousearea.cpp
1464 -@@ -1083,6 +1083,12 @@ void QQuickMouseArea::itemChange(ItemChange change, const ItemChangeData &value)
1465 - }
1466 - setHovered(!d->hovered);
1467 - }
1468 -+ if (d->pressed && (!isVisible())) {
1469 -+ // This happens when the mouse area sets itself disabled or hidden
1470 -+ // inside the press handler. In that case we should not keep the internal
1471 -+ // state as pressed, since we never became the mouse grabber.
1472 -+ ungrabMouse();
1473 -+ }
1474 - break;
1475 - default:
1476 - break;
1477 ---
1478 -2.16.3
1479
1480 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch
1481 deleted file mode 100644
1482 index 23eaa7d5100..00000000000
1483 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch
1484 +++ /dev/null
1485 @@ -1,64 +0,0 @@
1486 -From e807f9d1d80559b8ff91f1c3cfdd755b3da56a6d Mon Sep 17 00:00:00 2001
1487 -From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@××.io>
1488 -Date: Tue, 5 May 2020 11:36:24 +0200
1489 -Subject: [PATCH] Fix subpixel positioned text with Text.NativeRendering
1490 -
1491 -We would be generating subpixel positioned glyphs based on the
1492 -relative positions of the glyphs, ignoring the fractional part
1493 -contributed by the origin of the text. So if the text origin was
1494 -inside a pixel, the subpixel antialiasing would be wrong and we
1495 -would see kerning errors.
1496 -
1497 -This was especially visible when using AlignHCenter on text
1498 -with hinting disabled and resizing the item it was aligning to.
1499 -
1500 -Pick-to: 5.15
1501 -Task-number: QTBUG-49646
1502 -Change-Id: I0e709ba2b5d2440e34c94c6f819befe0a65a113a
1503 -Reviewed-by: Lars Knoll <lars.knoll@××.io>
1504 -Reviewed-by: Konstantin Ritt <ritt.ks@×××××.com>
1505 ----
1506 - src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 9 ++++-----
1507 - 1 file changed, 4 insertions(+), 5 deletions(-)
1508 -
1509 -diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
1510 -index cfa645bfd03..f73b64f537f 100644
1511 ---- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
1512 -+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
1513 -@@ -789,11 +789,12 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
1514 - const QMargins &margins)
1515 - {
1516 - Q_ASSERT(m_font.isValid());
1517 -+ QPointF position(p.x(), p.y() - m_font.ascent());
1518 - QVector<QFixedPoint> fixedPointPositions;
1519 - const int glyphPositionsSize = glyphPositions.size();
1520 - fixedPointPositions.reserve(glyphPositionsSize);
1521 - for (int i=0; i < glyphPositionsSize; ++i)
1522 -- fixedPointPositions.append(QFixedPoint::fromPointF(glyphPositions.at(i)));
1523 -+ fixedPointPositions.append(QFixedPoint::fromPointF(position + glyphPositions.at(i)));
1524 -
1525 - QTextureGlyphCache *cache = glyphCache();
1526 -
1527 -@@ -815,18 +816,16 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
1528 - Q_ASSERT(geometry->sizeOfVertex() == sizeof(QVector4D));
1529 - ushort *ip = geometry->indexDataAsUShort();
1530 -
1531 -- QPointF position(p.x(), p.y() - m_font.ascent());
1532 - bool supportsSubPixelPositions = fontD->fontEngine->supportsSubPixelPositions();
1533 - for (int i=0; i<glyphIndexes.size(); ++i) {
1534 -+ QPointF glyphPosition = glyphPositions.at(i) + position;
1535 - QFixed subPixelPosition;
1536 - if (supportsSubPixelPositions)
1537 -- subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPositions.at(i).x()));
1538 -+ subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPosition.x()));
1539 -
1540 - QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition);
1541 - const QTextureGlyphCache::Coord &c = cache->coords.value(glyph);
1542 -
1543 -- QPointF glyphPosition = glyphPositions.at(i) + position;
1544 --
1545 - // On a retina screen the glyph positions are not pre-scaled (as opposed to
1546 - // eg. the raster paint engine). To ensure that we get the same behavior as
1547 - // the raster engine (and CoreText itself) when it comes to rounding of the
1548 ---
1549 -2.16.3
1550
1551 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild
1552 deleted file mode 100644
1553 index ee5e2c5a785..00000000000
1554 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild
1555 +++ /dev/null
1556 @@ -1,59 +0,0 @@
1557 -# Copyright 2009-2020 Gentoo Authors
1558 -# Distributed under the terms of the GNU General Public License v2
1559 -
1560 -EAPI=7
1561 -PYTHON_COMPAT=( python3_{6,7,8} )
1562 -inherit python-any-r1 qt5-build
1563 -
1564 -DESCRIPTION="The QML and Quick modules for the Qt5 framework"
1565 -
1566 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1567 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
1568 -fi
1569 -
1570 -IUSE="gles2-only +jit localstorage vulkan +widgets"
1571 -
1572 -BDEPEND="${PYTHON_DEPS}"
1573 -# qtgui[gles2-only=] is needed because of bug 504322
1574 -DEPEND="
1575 - ~dev-qt/qtcore-${PV}
1576 - ~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
1577 - ~dev-qt/qtnetwork-${PV}
1578 - ~dev-qt/qttest-${PV}
1579 - localstorage? ( ~dev-qt/qtsql-${PV} )
1580 - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
1581 -"
1582 -RDEPEND="${DEPEND}
1583 - !<dev-qt/qtquickcontrols-5.7:5
1584 -"
1585 -
1586 -PATCHES=(
1587 - "${FILESDIR}/${P}-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
1588 - "${FILESDIR}/${P}-fix-subpixel-positioned-text.patch" # QTBUG-49646
1589 - "${FILESDIR}/${P}-QQuickMouseArea-stuck-in-pressed-state.patch" # QTBUG-74987
1590 -)
1591 -
1592 -src_prepare() {
1593 - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
1594 -
1595 - qt_use_disable_mod localstorage sql \
1596 - src/imports/imports.pro
1597 -
1598 - qt_use_disable_mod widgets widgets \
1599 - src/src.pro \
1600 - src/qmltest/qmltest.pro \
1601 - tests/auto/auto.pro \
1602 - tools/tools.pro \
1603 - tools/qmlscene/qmlscene.pro \
1604 - tools/qml/qml.pro
1605 -
1606 - qt5-build_src_prepare
1607 -}
1608 -
1609 -src_configure() {
1610 - local myqmakeargs=(
1611 - --
1612 - -qml-debug
1613 - )
1614 - qt5-build_src_configure
1615 -}
1616
1617 diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
1618 index 203fdae199c..3792b4301e9 100644
1619 --- a/dev-qt/qtdiag/Manifest
1620 +++ b/dev-qt/qtdiag/Manifest
1621 @@ -1,2 +1 @@
1622 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
1623 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
1624
1625 diff --git a/dev-qt/qtdiag/qtdiag-5.14.2.ebuild b/dev-qt/qtdiag/qtdiag-5.14.2.ebuild
1626 deleted file mode 100644
1627 index cdbb37ad3e6..00000000000
1628 --- a/dev-qt/qtdiag/qtdiag-5.14.2.ebuild
1629 +++ /dev/null
1630 @@ -1,36 +0,0 @@
1631 -# Copyright 1999-2020 Gentoo Authors
1632 -# Distributed under the terms of the GNU General Public License v2
1633 -
1634 -EAPI=7
1635 -QT5_MODULE="qttools"
1636 -inherit qt5-build
1637 -
1638 -DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
1639 -
1640 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1641 - KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
1642 -fi
1643 -
1644 -IUSE="+network +widgets"
1645 -
1646 -DEPEND="
1647 - ~dev-qt/qtcore-${PV}:5=
1648 - ~dev-qt/qtgui-${PV}:5=
1649 - network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
1650 - widgets? ( ~dev-qt/qtwidgets-${PV} )
1651 -"
1652 -RDEPEND="${DEPEND}"
1653 -
1654 -QT5_TARGET_SUBDIRS=(
1655 - src/qtdiag
1656 -)
1657 -
1658 -src_prepare() {
1659 - qt_use_disable_mod network network \
1660 - src/qtdiag/qtdiag.pro
1661 -
1662 - qt_use_disable_mod widgets widgets \
1663 - src/qtdiag/qtdiag.pro
1664 -
1665 - qt5-build_src_prepare
1666 -}
1667
1668 diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
1669 index 5585a9d58dc..c45e2180a9a 100644
1670 --- a/dev-qt/qtgamepad/Manifest
1671 +++ b/dev-qt/qtgamepad/Manifest
1672 @@ -1,2 +1 @@
1673 -DIST qtgamepad-everywhere-src-5.14.2.tar.xz 386940 BLAKE2B e1f9312f5007eea0f8126bd1145be603958a6e0833e74f2fe116595d7afa07ba7868d4dce91281440755ce7ff98445bdb38fc09e54ef35ec57dd156fadcaf23e SHA512 23971fae9b1626afc005dccae3bb715f719695bf5e24a1711b3e7049ce49ef5c72097e1eb702464ab7663d41750bf4103e4ed78ee7954269921e3064b79f4c05
1674 DIST qtgamepad-everywhere-src-5.15.1.tar.xz 387004 BLAKE2B 26e7e766121b18851f28c514e4cb7c144f1cce506ef80dc9db4034639df0c77671b5be618d318bb20c8aba290f1a3ed1d99d3a23fac83bc0942063d2cb4f77c2 SHA512 f74933f9e28d0db03d30743e7d75c7a1ba28fa03d97aa894b5cbc306a2d501c27ec40eb84c6b999a6e5ed01b3126bfa992a3a3ca28246310edfe1f2fc12c1d88
1675
1676 diff --git a/dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild b/dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild
1677 deleted file mode 100644
1678 index 5354d14f6fb..00000000000
1679 --- a/dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild
1680 +++ /dev/null
1681 @@ -1,35 +0,0 @@
1682 -# Copyright 1999-2020 Gentoo Authors
1683 -# Distributed under the terms of the GNU General Public License v2
1684 -
1685 -EAPI=7
1686 -inherit qt5-build
1687 -
1688 -DESCRIPTION="Qt module to support gamepad hardware"
1689 -
1690 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1691 - KEYWORDS="amd64 arm64 x86"
1692 -fi
1693 -
1694 -IUSE="evdev qml sdl"
1695 -
1696 -DEPEND="
1697 - ~dev-qt/qtcore-${PV}
1698 - ~dev-qt/qtgui-${PV}[evdev?]
1699 - evdev? ( virtual/libudev:= )
1700 - qml? ( ~dev-qt/qtdeclarative-${PV} )
1701 - sdl? ( media-libs/libsdl )
1702 -"
1703 -RDEPEND="${DEPEND}"
1704 -
1705 -src_prepare() {
1706 - qt_use_disable_mod qml quick \
1707 - src/src.pro
1708 -
1709 - qt_use_disable_config evdev evdev \
1710 - src/plugins/gamepads/gamepads.pro
1711 -
1712 - qt_use_disable_config sdl sdl2 \
1713 - src/plugins/gamepads/gamepads.pro
1714 -
1715 - qt5-build_src_prepare
1716 -}
1717
1718 diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
1719 index d4149856750..ce038e4cbf1 100644
1720 --- a/dev-qt/qtgraphicaleffects/Manifest
1721 +++ b/dev-qt/qtgraphicaleffects/Manifest
1722 @@ -1,2 +1 @@
1723 -DIST qtgraphicaleffects-everywhere-src-5.14.2.tar.xz 14040880 BLAKE2B 7fe0d534b9365e02c6a9499a7d0ef5d2e87a9c46819f05ad5052a23400bf90070b6ec9e7aad8a76de63760bea7853c29a1e01eb055956588f46347525a86f2e1 SHA512 fa6ed3eff243675f9d0bfa71b2886804e4902cf9d7d91d5dec0f8e4f060ee7c347ba7775a89e3f8effd0ffed8314f916b55f09056902abc892ee27e79ce2925c
1724 DIST qtgraphicaleffects-everywhere-src-5.15.1.tar.xz 14040940 BLAKE2B 1e49e58efeedadccb76c680ef80b017fbf5ff62df25140e0ef7012caacab0db67307f1a6ffd0cfe28e76b67ace61c858b1e34994c700b2a533233b9659efb970 SHA512 651f8d96199b6324726fcf97eebf16a3ee40e5a9523a3c03255ca4201228b8d02314d5dd9722f59d44f09b4ff8dd722fb276b9af7f65728693a2c4ee62f781c1
1725
1726 diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild
1727 deleted file mode 100644
1728 index f778c7d5a49..00000000000
1729 --- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild
1730 +++ /dev/null
1731 @@ -1,21 +0,0 @@
1732 -# Copyright 1999-2020 Gentoo Authors
1733 -# Distributed under the terms of the GNU General Public License v2
1734 -
1735 -EAPI=7
1736 -VIRTUALX_REQUIRED="test"
1737 -inherit qt5-build
1738 -
1739 -DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
1740 -
1741 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1742 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
1743 -fi
1744 -
1745 -IUSE=""
1746 -
1747 -RDEPEND="
1748 - ~dev-qt/qtcore-${PV}
1749 - ~dev-qt/qtdeclarative-${PV}
1750 - ~dev-qt/qtgui-${PV}
1751 -"
1752 -DEPEND="${RDEPEND}"
1753
1754 diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
1755 index d72f3b48819..98e054ddcf5 100644
1756 --- a/dev-qt/qtgui/Manifest
1757 +++ b/dev-qt/qtgui/Manifest
1758 @@ -1,2 +1 @@
1759 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
1760 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
1761
1762 diff --git a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch b/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch
1763 deleted file mode 100644
1764 index cad9aa4b682..00000000000
1765 --- a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch
1766 +++ /dev/null
1767 @@ -1,39 +0,0 @@
1768 -From 1616c71921b73b227f56ccb3f2c49a994ec23440 Mon Sep 17 00:00:00 2001
1769 -From: Allan Sandfeld Jensen <allan.jensen@××.io>
1770 -Date: Thu, 23 Jul 2020 11:48:48 +0200
1771 -Subject: Fix buffer overflow in XBM parser
1772 -
1773 -Avoid parsing over the buffer limit, or interpreting non-hex
1774 -as hex.
1775 -
1776 -This still leaves parsing of lines longer than 300 chars
1777 -unreliable
1778 -
1779 -Change-Id: I1c57a7e530c4380f6f9040b2ec729ccd7dc7a5fb
1780 -Reviewed-by: Robert Loehning <robert.loehning@××.io>
1781 -Reviewed-by: Eirik Aavitsland <eirik.aavitsland@××.io>
1782 -(cherry picked from commit c562c1fc19629fb505acd0f6380604840b634211)
1783 -Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@××××××××××.org>
1784 ----
1785 - src/gui/image/qxbmhandler.cpp | 4 ++-
1786 - .../gui/image/qimagereader/tst_qimagereader.cpp | 38 ++++++++++++++++++++++
1787 - 2 files changed, 41 insertions(+), 1 deletion(-)
1788 -
1789 -diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
1790 -index f06561690c..72ce7f7ecd 100644
1791 ---- a/src/gui/image/qxbmhandler.cpp
1792 -+++ b/src/gui/image/qxbmhandler.cpp
1793 -@@ -159,7 +159,9 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage)
1794 - w = (w+7)/8; // byte width
1795 -
1796 - while (y < h) { // for all encoded bytes...
1797 -- if (p) { // p = "0x.."
1798 -+ if (p && p < (buf + readBytes - 3)) { // p = "0x.."
1799 -+ if (!isxdigit(p[2]) || !isxdigit(p[3]))
1800 -+ return false;
1801 - *b++ = hex2byte(p+2);
1802 - p += 2;
1803 - if (++x == w && ++y < h) {
1804 ---
1805 -cgit v1.2.1
1806 -
1807
1808 diff --git a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
1809 deleted file mode 100644
1810 index 1f42c15329e..00000000000
1811 --- a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
1812 +++ /dev/null
1813 @@ -1,185 +0,0 @@
1814 -# Copyright 1999-2020 Gentoo Authors
1815 -# Distributed under the terms of the GNU General Public License v2
1816 -
1817 -EAPI=7
1818 -
1819 -QT5_MODULE="qtbase"
1820 -inherit qt5-build
1821 -
1822 -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
1823 -SLOT=5/$(ver_cut 1-3) # bug 707658
1824 -
1825 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
1826 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
1827 -fi
1828 -
1829 -# TODO: linuxfb
1830 -
1831 -IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
1832 - +libinput +png tslib tuio +udev vnc vulkan wayland +X"
1833 -REQUIRED_USE="
1834 - || ( eglfs X )
1835 - accessibility? ( dbus X )
1836 - eglfs? ( egl )
1837 - ibus? ( dbus )
1838 - libinput? ( udev )
1839 - X? ( gles2-only? ( egl ) )
1840 -"
1841 -
1842 -RDEPEND="
1843 - dev-libs/glib:2
1844 - ~dev-qt/qtcore-${PV}:5=
1845 - dev-util/gtk-update-icon-cache
1846 - media-libs/fontconfig
1847 - >=media-libs/freetype-2.6.1:2
1848 - >=media-libs/harfbuzz-1.6.0:=
1849 - sys-libs/zlib:=
1850 - virtual/opengl
1851 - dbus? ( ~dev-qt/qtdbus-${PV} )
1852 - egl? ( media-libs/mesa[egl] )
1853 - eglfs? (
1854 - media-libs/mesa[gbm]
1855 - x11-libs/libdrm
1856 - )
1857 - evdev? ( sys-libs/mtdev )
1858 - gles2-only? ( media-libs/mesa[gles2] )
1859 - jpeg? ( virtual/jpeg:0 )
1860 - libinput? (
1861 - dev-libs/libinput:=
1862 - >=x11-libs/libxkbcommon-0.5.0
1863 - )
1864 - png? ( media-libs/libpng:0= )
1865 - tslib? ( >=x11-libs/tslib-1.21 )
1866 - tuio? ( ~dev-qt/qtnetwork-${PV} )
1867 - udev? ( virtual/libudev:= )
1868 - vnc? ( ~dev-qt/qtnetwork-${PV} )
1869 - vulkan? ( dev-util/vulkan-headers )
1870 - X? (
1871 - x11-libs/libICE
1872 - x11-libs/libSM
1873 - x11-libs/libX11
1874 - >=x11-libs/libxcb-1.12:=[xkb]
1875 - >=x11-libs/libxkbcommon-0.5.0[X]
1876 - x11-libs/xcb-util-image
1877 - x11-libs/xcb-util-keysyms
1878 - x11-libs/xcb-util-renderutil
1879 - x11-libs/xcb-util-wm
1880 - )
1881 -"
1882 -DEPEND="${RDEPEND}
1883 - evdev? ( sys-kernel/linux-headers )
1884 - udev? ( sys-kernel/linux-headers )
1885 -"
1886 -PDEPEND="
1887 - ibus? ( app-i18n/ibus )
1888 - wayland? ( ~dev-qt/qtwayland-${PV} )
1889 -"
1890 -
1891 -QT5_TARGET_SUBDIRS=(
1892 - src/tools/qvkgen
1893 - src/gui
1894 - src/openglextensions
1895 - src/platformheaders
1896 - src/platformsupport
1897 - src/plugins/generic
1898 - src/plugins/imageformats
1899 - src/plugins/platforms
1900 - src/plugins/platforminputcontexts
1901 -)
1902 -
1903 -QT5_GENTOO_CONFIG=(
1904 - accessibility:accessibility-atspi-bridge
1905 - egl:egl:
1906 - eglfs:eglfs:
1907 - eglfs:eglfs_egldevice:
1908 - eglfs:eglfs_gbm:
1909 - evdev:evdev:
1910 - evdev:mtdev:
1911 - :fontconfig:
1912 - :system-freetype:FREETYPE
1913 - !:no-freetype:
1914 - !gif:no-gif:
1915 - gles2-only::OPENGL_ES
1916 - gles2-only:opengles2:OPENGL_ES_2
1917 - !:no-gui:
1918 - :system-harfbuzz:
1919 - !:no-harfbuzz:
1920 - jpeg:system-jpeg:IMAGEFORMAT_JPEG
1921 - !jpeg:no-jpeg:
1922 - libinput
1923 - libinput:xkbcommon:
1924 - :opengl
1925 - png:png:
1926 - png:system-png:IMAGEFORMAT_PNG
1927 - !png:no-png:
1928 - tslib:tslib:
1929 - udev:libudev:
1930 - vulkan:vulkan:
1931 - X:xcb:
1932 - X:xcb-glx:
1933 - X:xcb-plugin:
1934 - X:xcb-render:
1935 - X:xcb-sm:
1936 - X:xcb-xlib:
1937 - X:xcb-xinput:
1938 -)
1939 -
1940 -QT5_GENTOO_PRIVATE_CONFIG=(
1941 - :gui
1942 -)
1943 -
1944 -PATCHES=(
1945 - "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
1946 - "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
1947 - "${FILESDIR}/${PN}-5.14.2-CVE-2020-17507.patch" # bug 736924
1948 -)
1949 -
1950 -src_prepare() {
1951 - # don't add -O3 to CXXFLAGS, bug 549140
1952 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
1953 -
1954 - # egl_x11 is activated when both egl and X are enabled
1955 - use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
1956 -
1957 - qt_use_disable_config dbus dbus \
1958 - src/platformsupport/themes/genericunix/genericunix.pri
1959 -
1960 - qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
1961 -
1962 - qt_use_disable_mod ibus dbus \
1963 - src/plugins/platforminputcontexts/platforminputcontexts.pro
1964 -
1965 - use vnc || sed -i -e '/SUBDIRS += vnc/d' \
1966 - src/plugins/platforms/platforms.pro || die
1967 -
1968 - qt5-build_src_prepare
1969 -}
1970 -
1971 -src_configure() {
1972 - local myconf=(
1973 - $(usex dbus -dbus-linked '')
1974 - $(qt_use egl)
1975 - $(qt_use eglfs)
1976 - $(usex eglfs '-gbm -kms' '')
1977 - $(qt_use evdev)
1978 - $(qt_use evdev mtdev)
1979 - -fontconfig
1980 - -system-freetype
1981 - $(usex gif '' -no-gif)
1982 - -gui
1983 - -system-harfbuzz
1984 - $(qt_use jpeg libjpeg system)
1985 - $(qt_use libinput)
1986 - -opengl $(usex gles2-only es2 desktop)
1987 - $(qt_use png libpng system)
1988 - $(qt_use tslib)
1989 - $(qt_use udev libudev)
1990 - $(qt_use vulkan)
1991 - $(qt_use X xcb system)
1992 - $(usex X '-xcb-xlib -xcb-xinput -xkb' '')
1993 - )
1994 - if use libinput || use X; then
1995 - myconf+=( -xkbcommon )
1996 - fi
1997 - qt5-build_src_configure
1998 -}
1999
2000 diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
2001 index 203fdae199c..3792b4301e9 100644
2002 --- a/dev-qt/qthelp/Manifest
2003 +++ b/dev-qt/qthelp/Manifest
2004 @@ -1,2 +1 @@
2005 -DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
2006 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
2007
2008 diff --git a/dev-qt/qthelp/qthelp-5.14.2.ebuild b/dev-qt/qthelp/qthelp-5.14.2.ebuild
2009 deleted file mode 100644
2010 index 5dddcc287a3..00000000000
2011 --- a/dev-qt/qthelp/qthelp-5.14.2.ebuild
2012 +++ /dev/null
2013 @@ -1,29 +0,0 @@
2014 -# Copyright 1999-2020 Gentoo Authors
2015 -# Distributed under the terms of the GNU General Public License v2
2016 -
2017 -EAPI=7
2018 -QT5_MODULE="qttools"
2019 -inherit qt5-build
2020 -
2021 -DESCRIPTION="Qt5 module for integrating online documentation into applications"
2022 -
2023 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2024 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
2025 -fi
2026 -
2027 -IUSE=""
2028 -
2029 -DEPEND="
2030 - ~dev-qt/qtcore-${PV}:5=
2031 - ~dev-qt/qtgui-${PV}
2032 - ~dev-qt/qtnetwork-${PV}
2033 - ~dev-qt/qtsql-${PV}[sqlite]
2034 - ~dev-qt/qtwidgets-${PV}
2035 -"
2036 -RDEPEND="${DEPEND}"
2037 -
2038 -QT5_TARGET_SUBDIRS=(
2039 - src/assistant/help
2040 - src/assistant/qcollectiongenerator
2041 - src/assistant/qhelpgenerator
2042 -)
2043
2044 diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
2045 index 29aa8d1d492..429ca869184 100644
2046 --- a/dev-qt/qtimageformats/Manifest
2047 +++ b/dev-qt/qtimageformats/Manifest
2048 @@ -1,2 +1 @@
2049 -DIST qtimageformats-everywhere-src-5.14.2.tar.xz 1805208 BLAKE2B 115939d859478ccb2190c68ea3e93484537d372f62fc03f42931e69c5b7e0f1f84b376659986c3a36082e05930cafd076579c9786f9f4669ebecbb4254ee8d35 SHA512 e835489bdd1cf19aaa1c04e6ae1c480d4077cf24eee1d46b2f4deb03c093f64df6beaf83adb69b7edcba67c952a60deb89a26923addf2b4254aff18bc2ebf6a6
2050 DIST qtimageformats-everywhere-src-5.15.1.tar.xz 1807112 BLAKE2B d90e99c7a374c7aea73a04ba58c537225bb1c3e24d6af7c68e247f8473583dadd6eb369f7c2d9a71f56e27ddc84560ade933c63c549a4739f8e22c8a4cb5d0da SHA512 90da1c76b16dc5ea4ba99372208e3b10619efc4d131686ac6ab4a963ab0177ff9eee9155af564d72052f4ae1c21f06431ab66aa4e55b3c864f015b63ad75c107
2051
2052 diff --git a/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
2053 deleted file mode 100644
2054 index e839a0613b3..00000000000
2055 --- a/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
2056 +++ /dev/null
2057 @@ -1,30 +0,0 @@
2058 -# Copyright 1999-2020 Gentoo Authors
2059 -# Distributed under the terms of the GNU General Public License v2
2060 -
2061 -EAPI=7
2062 -inherit qt5-build
2063 -
2064 -DESCRIPTION="Additional format plugins for the Qt image I/O system"
2065 -
2066 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2067 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
2068 -fi
2069 -
2070 -IUSE="mng"
2071 -
2072 -DEPEND="
2073 - ~dev-qt/qtcore-${PV}
2074 - ~dev-qt/qtgui-${PV}
2075 - media-libs/libwebp:=
2076 - media-libs/tiff:0
2077 - mng? ( media-libs/libmng:= )
2078 -"
2079 -RDEPEND="${DEPEND}"
2080 -
2081 -src_configure() {
2082 - sed -e 's/qtConfig(jasper)/false:/' \
2083 - -i src/plugins/imageformats/imageformats.pro || die
2084 - qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
2085 -
2086 - qt5-build_src_configure
2087 -}
2088
2089 diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
2090 index ce54b624614..bccd0d823c9 100644
2091 --- a/dev-qt/qtlocation/Manifest
2092 +++ b/dev-qt/qtlocation/Manifest
2093 @@ -1,2 +1 @@
2094 -DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
2095 DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
2096
2097 diff --git a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch b/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
2098 deleted file mode 100644
2099 index e7cc6f70d05..00000000000
2100 --- a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
2101 +++ /dev/null
2102 @@ -1,36 +0,0 @@
2103 -From 0853378b2f2de82c59501e31d18906694ec6e27e Mon Sep 17 00:00:00 2001
2104 -From: Bruno de Oliveira Abinader <bruno@××××××.com>
2105 -Date: Wed, 22 Apr 2020 19:54:53 +0300
2106 -Subject: Fix compilation issues on GCC 9
2107 -
2108 ----
2109 - platform/default/bidi.cpp | 1 +
2110 - src/mbgl/util/convert.cpp | 2 ++
2111 - 2 files changed, 3 insertions(+)
2112 -
2113 -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
2114 -index d475c387b..c1710a6f1 100644
2115 ---- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
2116 -+++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
2117 -@@ -5,6 +5,7 @@
2118 - #include <unicode/ushape.h>
2119 -
2120 - #include <memory>
2121 -+#include <stdexcept>
2122 -
2123 - namespace mbgl {
2124 -
2125 -diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
2126 -index 97bfe9108..510ff2386 100644
2127 ---- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
2128 -+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
2129 -@@ -1,5 +1,7 @@
2130 - #include <mbgl/util/convert.hpp>
2131 -
2132 -+#include <cstdint>
2133 -+
2134 - namespace mbgl {
2135 - namespace util {
2136 -
2137 ---
2138 -cgit v1.2.1
2139
2140 diff --git a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
2141 deleted file mode 100644
2142 index 6aa228fb575..00000000000
2143 --- a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
2144 +++ /dev/null
2145 @@ -1,49 +0,0 @@
2146 -# Copyright 1999-2020 Gentoo Authors
2147 -# Distributed under the terms of the GNU General Public License v2
2148 -
2149 -EAPI=7
2150 -inherit qt5-build
2151 -
2152 -DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
2153 -
2154 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2155 - KEYWORDS="amd64 arm arm64 x86"
2156 -fi
2157 -
2158 -IUSE=""
2159 -
2160 -RDEPEND="
2161 - dev-libs/icu:=
2162 - ~dev-qt/qtcore-${PV}
2163 - ~dev-qt/qtdeclarative-${PV}
2164 - ~dev-qt/qtgui-${PV}
2165 - ~dev-qt/qtnetwork-${PV}
2166 - ~dev-qt/qtpositioning-${PV}[qml]
2167 - ~dev-qt/qtsql-${PV}
2168 - sys-libs/zlib
2169 -"
2170 -DEPEND="${RDEPEND}
2171 - ~dev-qt/qtconcurrent-${PV}
2172 -"
2173 -
2174 -QT5_TARGET_SUBDIRS=(
2175 - src/3rdparty/clipper
2176 - src/3rdparty/poly2tri
2177 - src/3rdparty/clip2tri
2178 - src/3rdparty/mapbox-gl-native
2179 - src/location
2180 - src/imports/location
2181 - src/imports/locationlabs
2182 - src/plugins/geoservices
2183 -)
2184 -
2185 -PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" ) # bug 722102
2186 -
2187 -src_configure() {
2188 - # src/plugins/geoservices requires files that are only generated when
2189 - # qmake is run in the root directory. Bug 633776.
2190 - mkdir -p "${QT5_BUILD_DIR}"/src/location || die
2191 - qt5_qmake "${QT5_BUILD_DIR}"
2192 - cp src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
2193 - qt5-build_src_configure
2194 -}
2195
2196 diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
2197 index 1e04e0e9fcc..388380dc4ea 100644
2198 --- a/dev-qt/qtmultimedia/Manifest
2199 +++ b/dev-qt/qtmultimedia/Manifest
2200 @@ -1,2 +1 @@
2201 -DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559
2202 DIST qtmultimedia-everywhere-src-5.15.1.tar.xz 3825940 BLAKE2B 8a86e77b37c7af0226420025f23bcea6aaffcf885f7c56945faa8606bdaf003b29013b452ee2cd44cb1abe7adf260af06f099b7af23664110a97a0dab0574a36 SHA512 9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9
2203
2204 diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch
2205 deleted file mode 100644
2206 index 5d17b079613..00000000000
2207 --- a/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch
2208 +++ /dev/null
2209 @@ -1,38 +0,0 @@
2210 -From d8d072417b08dd75734b3f0aa86c3a49db934770 Mon Sep 17 00:00:00 2001
2211 -From: Roman Valov <roman.valov@×××××.com>
2212 -Date: Mon, 13 Apr 2020 12:54:09 +0000
2213 -Subject: [PATCH] Gstreamer: fix stream buffering
2214 -
2215 -Gstreamer client should handle GST_MESSAGE_BUFFERING to play and pause
2216 -streams based on buffer-percent value and Qt does it properly.
2217 -However `updateSessionState` of QGstreamerPlayerControl was implemented
2218 -to go back into playing state each time session state becomes paused.
2219 -That behavior resulted into choppy stream playback.
2220 -Fix with condition to un-pause playback only if it's already buffered.
2221 -
2222 -Fixes: QTBUG-83417
2223 -Change-Id: Ida4a9e2e196de00050bdc64725fa818c7e939785
2224 -Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@××.io>
2225 ----
2226 - src/gsttools/qgstreamerplayercontrol.cpp | 6 ++++--
2227 - 1 file changed, 4 insertions(+), 2 deletions(-)
2228 -
2229 -diff --git a/src/gsttools/qgstreamerplayercontrol.cpp b/src/gsttools/qgstreamerplayercontrol.cpp
2230 -index 165978288..d65102e2f 100644
2231 ---- a/src/gsttools/qgstreamerplayercontrol.cpp
2232 -+++ b/src/gsttools/qgstreamerplayercontrol.cpp
2233 -@@ -439,8 +439,10 @@ void QGstreamerPlayerControl::updateSessionState(QMediaPlayer::State state)
2234 - }
2235 - m_pendingSeekPosition = -1;
2236 -
2237 -- if (m_currentState == QMediaPlayer::PlayingState)
2238 -- m_session->play();
2239 -+ if (m_currentState == QMediaPlayer::PlayingState) {
2240 -+ if (m_mediaStatus == QMediaPlayer::BufferedMedia)
2241 -+ m_session->play();
2242 -+ }
2243 - }
2244 -
2245 - updateMediaStatus();
2246 ---
2247 -2.16.3
2248
2249 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild
2250 deleted file mode 100644
2251 index fdcd87079b9..00000000000
2252 --- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild
2253 +++ /dev/null
2254 @@ -1,72 +0,0 @@
2255 -# Copyright 1999-2020 Gentoo Authors
2256 -# Distributed under the terms of the GNU General Public License v2
2257 -
2258 -EAPI=7
2259 -inherit qt5-build
2260 -
2261 -DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
2262 -
2263 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
2264 - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
2265 -fi
2266 -
2267 -IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
2268 -
2269 -RDEPEND="
2270 - ~dev-qt/qtcore-${PV}
2271 - ~dev-qt/qtgui-${PV}[gles2-only=]
2272 - ~dev-qt/qtnetwork-${PV}
2273 - alsa? ( media-libs/alsa-lib )
2274 - gstreamer? (
2275 - dev-libs/glib:2
2276 - media-libs/gstreamer:1.0
2277 - media-libs/gst-plugins-bad:1.0
2278 - media-libs/gst-plugins-base:1.0
2279 - )
2280 - pulseaudio? ( media-sound/pulseaudio[glib] )
2281 - qml? (
2282 - ~dev-qt/qtdeclarative-${PV}
2283 - gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
2284 - openal? ( media-libs/openal )
2285 - )
2286 - widgets? (
2287 - ~dev-qt/qtopengl-${PV}
2288 - ~dev-qt/qtwidgets-${PV}[gles2-only=]
2289 - )
2290 -"
2291 -DEPEND="${RDEPEND}
2292 - gstreamer? ( x11-base/xorg-proto )
2293 -"
2294 -
2295 -PATCHES=(
2296 - "${FILESDIR}/${P}-gstreamer-buffering.patch" # QTBUG-83417
2297 -)
2298 -
2299 -src_prepare() {
2300 - sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
2301 - src/multimedia/multimedia.pro || die
2302 -
2303 - qt_use_disable_config openal openal \
2304 - src/imports/imports.pro
2305 -
2306 - qt_use_disable_mod qml quick \
2307 - src/src.pro \
2308 - src/plugins/plugins.pro
2309 -
2310 - qt_use_disable_mod widgets widgets \
2311 - src/src.pro \
2312 - src/gsttools/gsttools.pro \
2313 - src/plugins/gstreamer/common.pri
2314 -
2315 - qt5-build_src_prepare
2316 -}
2317 -
2318 -src_configure() {
2319 - local myqmakeargs=(
2320 - --
2321 - $(qt_use alsa)
2322 - $(qt_use gstreamer)
2323 - $(qt_use pulseaudio)
2324 - )
2325 - qt5-build_src_configure
2326 -}
2327
2328 diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
2329 index d72f3b48819..98e054ddcf5 100644
2330 --- a/dev-qt/qtnetwork/Manifest
2331 +++ b/dev-qt/qtnetwork/Manifest
2332 @@ -1,2 +1 @@
2333 -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
2334 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
2335
2336 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch b/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch
2337 deleted file mode 100644
2338 index 9bbdda61a25..00000000000
2339 --- a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch
2340 +++ /dev/null
2341 @@ -1,172 +0,0 @@
2342 -From 8ddffc6ba4f38bb8dbeb0cf61b6b10ee73505bbb Mon Sep 17 00:00:00 2001
2343 -From: Timur Pocheptsov <timur.pocheptsov@××.io>
2344 -Date: Mon, 13 Apr 2020 20:31:34 +0200
2345 -Subject: [PATCH] OpenSSL: handle SSL_shutdown's errors properly
2346 -MIME-Version: 1.0
2347 -Content-Type: text/plain; charset=utf8
2348 -Content-Transfer-Encoding: 8bit
2349 -
2350 -Do not call SSL_shutdown on a session that is in handshake state (SSL_in_init(s)
2351 -returns 1). Also, do not call SSL_shutdown if a session encountered a fatal
2352 -error (SSL_ERROR_SYSCALL or SSL_ERROR_SSL was found before). If SSL_shutdown
2353 -was unsuccessful (returned code != 1), we have to clear the error(s) it queued.
2354 -Unfortunately, SSL_in_init was a macro in OpenSSL 1.0.x. We have to
2355 -resolve SSL_state to implement SSL_in_init.
2356 -
2357 -Fixes: QTBUG-83450
2358 -Change-Id: I6326119f4e79605429263045ac20605c30dccca3
2359 -Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@××.io>
2360 -(cherry picked from commit 8907635da59c2ae0e8db01f27b24a841b830e655)
2361 ----
2362 - src/network/ssl/qsslsocket.cpp | 2 +-
2363 - src/network/ssl/qsslsocket_openssl.cpp | 23 ++++++++++++++++------
2364 - src/network/ssl/qsslsocket_openssl11_symbols_p.h | 7 +++++++
2365 - src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++
2366 - .../ssl/qsslsocket_opensslpre11_symbols_p.h | 2 ++
2367 - src/network/ssl/qsslsocket_p.h | 1 +
2368 - 6 files changed, 36 insertions(+), 7 deletions(-)
2369 -
2370 -diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
2371 -index 4e9e9472631..5c9e589ec39 100644
2372 ---- a/src/network/ssl/qsslsocket.cpp
2373 -+++ b/src/network/ssl/qsslsocket.cpp
2374 -@@ -2166,7 +2166,7 @@ void QSslSocketPrivate::init()
2375 - pendingClose = false;
2376 - flushTriggered = false;
2377 - ocspResponses.clear();
2378 --
2379 -+ systemOrSslErrorDetected = false;
2380 - // we don't want to clear the ignoreErrorsList, so
2381 - // that it is possible setting it before connecting
2382 - // ignoreErrorsList.clear();
2383 -diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
2384 -index 51510f1c60b..855865209bc 100644
2385 ---- a/src/network/ssl/qsslsocket_openssl.cpp
2386 -+++ b/src/network/ssl/qsslsocket_openssl.cpp
2387 -@@ -648,10 +648,16 @@ bool QSslSocketBackendPrivate::initSslContext()
2388 - void QSslSocketBackendPrivate::destroySslContext()
2389 - {
2390 - if (ssl) {
2391 -- // We do not send a shutdown alert here. Just mark the session as
2392 -- // resumable for qhttpnetworkconnection's "optimization", otherwise
2393 -- // OpenSSL won't start a session resumption.
2394 -- q_SSL_shutdown(ssl);
2395 -+ if (!q_SSL_in_init(ssl) && !systemOrSslErrorDetected) {
2396 -+ // We do not send a shutdown alert here. Just mark the session as
2397 -+ // resumable for qhttpnetworkconnection's "optimization", otherwise
2398 -+ // OpenSSL won't start a session resumption.
2399 -+ if (q_SSL_shutdown(ssl) != 1) {
2400 -+ // Some error may be queued, clear it.
2401 -+ const auto errors = getErrorsFromOpenSsl();
2402 -+ Q_UNUSED(errors);
2403 -+ }
2404 -+ }
2405 - q_SSL_free(ssl);
2406 - ssl = nullptr;
2407 - }
2408 -@@ -1084,6 +1090,7 @@ void QSslSocketBackendPrivate::transmit()
2409 - case SSL_ERROR_SSL: // error in the SSL library
2410 - // we do not know exactly what the error is, nor whether we can recover from it,
2411 - // so just return to prevent an endless loop in the outer "while" statement
2412 -+ systemOrSslErrorDetected = true;
2413 - {
2414 - const ScopedBool bg(inSetAndEmitError, true);
2415 - setErrorAndEmit(QAbstractSocket::SslInternalError,
2416 -@@ -1681,8 +1688,12 @@ bool QSslSocketBackendPrivate::checkOcspStatus()
2417 - void QSslSocketBackendPrivate::disconnectFromHost()
2418 - {
2419 - if (ssl) {
2420 -- if (!shutdown) {
2421 -- q_SSL_shutdown(ssl);
2422 -+ if (!shutdown && !q_SSL_in_init(ssl) && !systemOrSslErrorDetected) {
2423 -+ if (q_SSL_shutdown(ssl) != 1) {
2424 -+ // Some error may be queued, clear it.
2425 -+ const auto errors = getErrorsFromOpenSsl();
2426 -+ Q_UNUSED(errors);
2427 -+ }
2428 - shutdown = true;
2429 - transmit();
2430 - }
2431 -diff --git a/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/src/network/ssl/qsslsocket_openssl11_symbols_p.h
2432 -index 0fe0899d4fd..b7193ad1807 100644
2433 ---- a/src/network/ssl/qsslsocket_openssl11_symbols_p.h
2434 -+++ b/src/network/ssl/qsslsocket_openssl11_symbols_p.h
2435 -@@ -192,4 +192,11 @@ typedef int (*q_SSL_psk_use_session_cb_func_t)(SSL *, const EVP_MD *, const unsi
2436 - }
2437 - void q_SSL_set_psk_use_session_callback(SSL *s, q_SSL_psk_use_session_cb_func_t);
2438 -
2439 -+#if OPENSSL_VERSION_NUMBER < 0x10101000L
2440 -+// What a mess!
2441 -+int q_SSL_in_init(SSL *s);
2442 -+#else
2443 -+int q_SSL_in_init(const SSL *s);
2444 -+#endif // 1.1.1 or 1.1.0
2445 -+
2446 - #endif
2447 -diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
2448 -index 85029a6ff3f..d1bd84cf25f 100644
2449 ---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
2450 -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
2451 -@@ -160,6 +160,11 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
2452 - DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
2453 - DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
2454 - DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
2455 -+#if OPENSSL_VERSION_NUMBER < 0x10101000L
2456 -+DEFINEFUNC(int, SSL_in_init, SSL *a, a, return 0, return)
2457 -+#else
2458 -+DEFINEFUNC(int, SSL_in_init, const SSL *a, a, return 0, return)
2459 -+#endif
2460 - #ifdef TLS1_3_VERSION
2461 - DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
2462 - DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
2463 -@@ -242,6 +247,7 @@ DEFINEFUNC2(void, BIO_set_shutdown, BIO *a, a, int shut, shut, return, DUMMYARG)
2464 - // Functions below are either deprecated or removed in OpenSSL >= 1.1:
2465 -
2466 - DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return nullptr, return)
2467 -+DEFINEFUNC(int, SSL_state, const SSL *a, a, return 0, return)
2468 -
2469 - #ifdef SSLEAY_MACROS
2470 - DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, return nullptr, return)
2471 -@@ -971,6 +977,7 @@ bool q_resolveOpenSslSymbols()
2472 - #if QT_CONFIG(opensslv11)
2473 -
2474 - RESOLVEFUNC(OPENSSL_init_ssl)
2475 -+ RESOLVEFUNC(SSL_in_init)
2476 - RESOLVEFUNC(OPENSSL_init_crypto)
2477 - RESOLVEFUNC(ASN1_STRING_get0_data)
2478 - RESOLVEFUNC(EVP_CIPHER_CTX_reset)
2479 -@@ -1066,6 +1073,7 @@ bool q_resolveOpenSslSymbols()
2480