summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/assistant/Manifest4
-rw-r--r--dev-qt/assistant/assistant-5.15.3.ebuild (renamed from dev-qt/assistant/assistant-5.15.2-r11.ebuild)10
-rw-r--r--dev-qt/assistant/assistant-5.15.4.ebuild59
-rw-r--r--dev-qt/designer/Manifest4
-rw-r--r--dev-qt/designer/designer-5.15.3.ebuild (renamed from dev-qt/designer/designer-5.15.2-r11.ebuild)5
-rw-r--r--dev-qt/designer/designer-5.15.4.ebuild58
-rw-r--r--dev-qt/linguist-tools/Manifest4
-rw-r--r--dev-qt/linguist-tools/linguist-tools-5.15.3.ebuild (renamed from dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild)6
-rw-r--r--dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild36
-rw-r--r--dev-qt/linguist/Manifest4
-rw-r--r--dev-qt/linguist/linguist-5.15.3.ebuild (renamed from dev-qt/linguist/linguist-5.15.2-r11.ebuild)10
-rw-r--r--dev-qt/linguist/linguist-5.15.4.ebuild53
-rw-r--r--dev-qt/pixeltool/Manifest4
-rw-r--r--dev-qt/pixeltool/pixeltool-5.15.3.ebuild (renamed from dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild)14
-rw-r--r--dev-qt/pixeltool/pixeltool-5.15.4.ebuild34
-rw-r--r--dev-qt/qdbus/Manifest4
-rw-r--r--dev-qt/qdbus/qdbus-5.15.3.ebuild (renamed from dev-qt/qdbus/qdbus-5.15.2-r10.ebuild)14
-rw-r--r--dev-qt/qdbus/qdbus-5.15.4.ebuild34
-rw-r--r--dev-qt/qdbusviewer/Manifest4
-rw-r--r--dev-qt/qdbusviewer/qdbusviewer-5.15.3.ebuild (renamed from dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild)10
-rw-r--r--dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild50
-rw-r--r--dev-qt/qdoc/Manifest4
-rw-r--r--dev-qt/qdoc/qdoc-5.15.3.ebuild (renamed from dev-qt/qdoc/qdoc-5.15.2-r10.ebuild)4
-rw-r--r--dev-qt/qdoc/qdoc-5.15.4.ebuild42
-rw-r--r--dev-qt/qt-creator/Manifest1
-rw-r--r--dev-qt/qt-creator/metadata.xml2
-rw-r--r--dev-qt/qt-creator/qt-creator-4.15.1.ebuild233
-rw-r--r--dev-qt/qt3d/Manifest5
-rw-r--r--dev-qt/qt3d/qt3d-5.15.3.ebuild (renamed from dev-qt/qt3d/qt3d-5.15.2-r10.ebuild)22
-rw-r--r--dev-qt/qt3d/qt3d-5.15.4.ebuild46
-rw-r--r--dev-qt/qtbluetooth/Manifest5
-rw-r--r--dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch19
-rw-r--r--dev-qt/qtbluetooth/qtbluetooth-5.15.3.ebuild (renamed from dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild)12
-rw-r--r--dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild34
-rw-r--r--dev-qt/qtcharts/Manifest3
-rw-r--r--dev-qt/qtcharts/qtcharts-5.15.3.ebuild (renamed from dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild)4
-rw-r--r--dev-qt/qtcharts/qtcharts-5.15.4.ebuild30
-rw-r--r--dev-qt/qtchooser/files/qtchooser-66-qt-5.15.3-compat.patch33
-rw-r--r--dev-qt/qtchooser/qtchooser-66-r2.ebuild (renamed from dev-qt/qtchooser/qtchooser-66-r1.ebuild)10
-rw-r--r--dev-qt/qtconcurrent/Manifest5
-rw-r--r--dev-qt/qtconcurrent/qtconcurrent-5.15.3.ebuild (renamed from dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild)4
-rw-r--r--dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild25
-rw-r--r--dev-qt/qtcore/Manifest5
-rw-r--r--dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch50
-rw-r--r--dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch271
-rw-r--r--dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch47
-rw-r--r--dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch41
-rw-r--r--dev-qt/qtcore/qtcore-5.15.3.ebuild (renamed from dev-qt/qtcore/qtcore-5.15.2-r10.ebuild)14
-rw-r--r--dev-qt/qtcore/qtcore-5.15.4.ebuild102
-rw-r--r--dev-qt/qtdatavis3d/Manifest3
-rw-r--r--dev-qt/qtdatavis3d/qtdatavis3d-5.15.3.ebuild (renamed from dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild)4
-rw-r--r--dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild32
-rw-r--r--dev-qt/qtdbus/Manifest5
-rw-r--r--dev-qt/qtdbus/qtdbus-5.15.3.ebuild (renamed from dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild)6
-rw-r--r--dev-qt/qtdbus/qtdbus-5.15.4.ebuild45
-rw-r--r--dev-qt/qtdeclarative/Manifest6
-rw-r--r--dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch12
-rw-r--r--dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch18
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild (renamed from dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild)16
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild (renamed from dev-qt/qtdeclarative/qtdeclarative-5.15.2-r13.ebuild)16
-rw-r--r--dev-qt/qtdiag/Manifest4
-rw-r--r--dev-qt/qtdiag/qtdiag-5.15.3.ebuild (renamed from dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild)9
-rw-r--r--dev-qt/qtdiag/qtdiag-5.15.4.ebuild42
-rw-r--r--dev-qt/qtgamepad/Manifest3
-rw-r--r--dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild (renamed from dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild)4
-rw-r--r--dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild36
-rw-r--r--dev-qt/qtgraphicaleffects/Manifest3
-rw-r--r--dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.3.ebuild (renamed from dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild)2
-rw-r--r--dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild22
-rw-r--r--dev-qt/qtgui/Manifest6
-rw-r--r--dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch50
-rw-r--r--dev-qt/qtgui/qtgui-5.15.3.ebuild (renamed from dev-qt/qtgui/qtgui-5.15.2-r13.ebuild)27
-rw-r--r--dev-qt/qtgui/qtgui-5.15.4.ebuild (renamed from dev-qt/qtgui/qtgui-5.15.2-r14.ebuild)7
-rw-r--r--dev-qt/qthelp/Manifest4
-rw-r--r--dev-qt/qthelp/qthelp-5.15.3.ebuild (renamed from dev-qt/qthelp/qthelp-5.15.2-r10.ebuild)5
-rw-r--r--dev-qt/qthelp/qthelp-5.15.4.ebuild32
-rw-r--r--dev-qt/qtimageformats/Manifest4
-rw-r--r--dev-qt/qtimageformats/qtimageformats-5.15.3.ebuild (renamed from dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild)3
-rw-r--r--dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild32
-rw-r--r--dev-qt/qtlocation/Manifest6
-rw-r--r--dev-qt/qtlocation/qtlocation-5.15.3-r1.ebuild (renamed from dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild)13
-rw-r--r--dev-qt/qtlocation/qtlocation-5.15.4.ebuild49
-rw-r--r--dev-qt/qtmultimedia/Manifest3
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-5.15.3.ebuild (renamed from dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild)2
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-5.15.4.ebuild71
-rw-r--r--dev-qt/qtnetwork/Manifest6
-rw-r--r--dev-qt/qtnetwork/metadata.xml1
-rw-r--r--dev-qt/qtnetwork/qtnetwork-5.15.2-r12.ebuild74
-rw-r--r--dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild (renamed from dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild)8
-rw-r--r--dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild (renamed from dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild)4
-rw-r--r--dev-qt/qtnetworkauth/Manifest3
-rw-r--r--dev-qt/qtnetworkauth/qtnetworkauth-5.15.3.ebuild (renamed from dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild)4
-rw-r--r--dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild21
-rw-r--r--dev-qt/qtopengl/Manifest5
-rw-r--r--dev-qt/qtopengl/qtopengl-5.15.3.ebuild (renamed from dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild)4
-rw-r--r--dev-qt/qtopengl/qtopengl-5.15.4.ebuild35
-rw-r--r--dev-qt/qtpaths/Manifest4
-rw-r--r--dev-qt/qtpaths/qtpaths-5.15.3.ebuild (renamed from dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild)9
-rw-r--r--dev-qt/qtpaths/qtpaths-5.15.4.ebuild29
-rw-r--r--dev-qt/qtplugininfo/Manifest4
-rw-r--r--dev-qt/qtplugininfo/qtplugininfo-5.15.3.ebuild (renamed from dev-qt/qtplugininfo/qtplugininfo-5.15.2-r10.ebuild)4
-rw-r--r--dev-qt/qtplugininfo/qtplugininfo-5.15.4.ebuild24
-rw-r--r--dev-qt/qtpositioning/Manifest3
-rw-r--r--dev-qt/qtpositioning/qtpositioning-5.15.3.ebuild (renamed from dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild)2
-rw-r--r--dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild41
-rw-r--r--dev-qt/qtprintsupport/Manifest5
-rw-r--r--dev-qt/qtprintsupport/qtprintsupport-5.15.3.ebuild (renamed from dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild)6
-rw-r--r--dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild44
-rw-r--r--dev-qt/qtquickcontrols/Manifest3
-rw-r--r--dev-qt/qtquickcontrols/qtquickcontrols-5.15.3.ebuild (renamed from dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild)2
-rw-r--r--dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild33
-rw-r--r--dev-qt/qtquickcontrols2/Manifest5
-rw-r--r--dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.3.ebuild (renamed from dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild)4
-rw-r--r--dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild32
-rw-r--r--dev-qt/qtquicktimeline/Manifest3
-rw-r--r--dev-qt/qtquicktimeline/qtquicktimeline-5.15.3.ebuild (renamed from dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild)2
-rw-r--r--dev-qt/qtquicktimeline/qtquicktimeline-5.15.4.ebuild18
-rw-r--r--dev-qt/qtscript/Manifest3
-rw-r--r--dev-qt/qtscript/qtscript-5.15.3.ebuild (renamed from dev-qt/qtscript/qtscript-5.15.2-r1.ebuild)2
-rw-r--r--dev-qt/qtscript/qtscript-5.15.4.ebuild37
-rw-r--r--dev-qt/qtscxml/Manifest3
-rw-r--r--dev-qt/qtscxml/qtscxml-5.15.3.ebuild (renamed from dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild)4
-rw-r--r--dev-qt/qtscxml/qtscxml-5.15.4.ebuild20
-rw-r--r--dev-qt/qtsensors/Manifest3
-rw-r--r--dev-qt/qtsensors/qtsensors-5.15.3.ebuild (renamed from dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild)2
-rw-r--r--dev-qt/qtsensors/qtsensors-5.15.4.ebuild29
-rw-r--r--dev-qt/qtserialbus/Manifest3
-rw-r--r--dev-qt/qtserialbus/qtserialbus-5.15.3.ebuild (renamed from dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild)2
-rw-r--r--dev-qt/qtserialbus/qtserialbus-5.15.4.ebuild21
-rw-r--r--dev-qt/qtserialport/Manifest3
-rw-r--r--dev-qt/qtserialport/qtserialport-5.15.3.ebuild (renamed from dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild)2
-rw-r--r--dev-qt/qtserialport/qtserialport-5.15.4.ebuild28
-rw-r--r--dev-qt/qtspeech/Manifest5
-rw-r--r--dev-qt/qtspeech/qtspeech-5.15.3.ebuild (renamed from dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild)3
-rw-r--r--dev-qt/qtspeech/qtspeech-5.15.4.ebuild36
-rw-r--r--dev-qt/qtsql/Manifest6
-rw-r--r--dev-qt/qtsql/qtsql-5.15.3.ebuild (renamed from dev-qt/qtsql/qtsql-5.15.2-r10.ebuild)5
-rw-r--r--dev-qt/qtsql/qtsql-5.15.4.ebuild (renamed from dev-qt/qtsql/qtsql-5.15.2-r11.ebuild)5
-rw-r--r--dev-qt/qtsvg/Manifest7
-rw-r--r--dev-qt/qtsvg/files/qtsvg-5.15.3-QTBUG-90744-minus-binarypatch.patch142
-rw-r--r--dev-qt/qtsvg/qtsvg-5.15.3.ebuild (renamed from dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild)13
-rw-r--r--dev-qt/qtsvg/qtsvg-5.15.4.ebuild (renamed from dev-qt/qtsvg/qtsvg-5.15.2-r11.ebuild)4
-rw-r--r--dev-qt/qttest/Manifest5
-rw-r--r--dev-qt/qttest/qttest-5.15.3.ebuild (renamed from dev-qt/qttest/qttest-5.15.2-r10.ebuild)4
-rw-r--r--dev-qt/qttest/qttest-5.15.4.ebuild35
-rw-r--r--dev-qt/qttranslations/Manifest5
-rw-r--r--dev-qt/qttranslations/qttranslations-5.15.3.ebuild (renamed from dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild)4
-rw-r--r--dev-qt/qttranslations/qttranslations-5.15.4.ebuild18
-rw-r--r--dev-qt/qtvirtualkeyboard/Manifest5
-rw-r--r--dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.3.ebuild (renamed from dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild)4
-rw-r--r--dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild43
-rw-r--r--dev-qt/qtwayland/Manifest6
-rw-r--r--dev-qt/qtwayland/files/qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch131
-rw-r--r--dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch12
-rw-r--r--dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild (renamed from dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild)18
-rw-r--r--dev-qt/qtwayland/qtwayland-5.15.4.ebuild (renamed from dev-qt/qtwayland/qtwayland-5.15.2-r15.ebuild)14
-rw-r--r--dev-qt/qtwaylandscanner/Manifest2
-rw-r--r--dev-qt/qtwaylandscanner/metadata.xml12
-rw-r--r--dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.3.ebuild22
-rw-r--r--dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild22
-rw-r--r--dev-qt/qtwebchannel/Manifest5
-rw-r--r--dev-qt/qtwebchannel/qtwebchannel-5.15.3.ebuild (renamed from dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild)3
-rw-r--r--dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild28
-rw-r--r--dev-qt/qtwebengine/Manifest4
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch10
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch72
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch72
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch42
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch169
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch32
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch10
-rw-r--r--dev-qt/qtwebengine/metadata.xml13
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild (renamed from dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild)100
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild275
-rw-r--r--dev-qt/qtwebsockets/Manifest5
-rw-r--r--dev-qt/qtwebsockets/qtwebsockets-5.15.3.ebuild (renamed from dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild)4
-rw-r--r--dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild29
-rw-r--r--dev-qt/qtwebview/Manifest3
-rw-r--r--dev-qt/qtwebview/qtwebview-5.15.3.ebuild (renamed from dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild)2
-rw-r--r--dev-qt/qtwebview/qtwebview-5.15.4.ebuild22
-rw-r--r--dev-qt/qtwidgets/Manifest6
-rw-r--r--dev-qt/qtwidgets/qtwidgets-5.15.3.ebuild (renamed from dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild)4
-rw-r--r--dev-qt/qtwidgets/qtwidgets-5.15.4.ebuild (renamed from dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild)4
-rw-r--r--dev-qt/qtx11extras/Manifest3
-rw-r--r--dev-qt/qtx11extras/qtx11extras-5.15.3.ebuild (renamed from dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild)2
-rw-r--r--dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild22
-rw-r--r--dev-qt/qtxml/Manifest5
-rw-r--r--dev-qt/qtxml/qtxml-5.15.3.ebuild (renamed from dev-qt/qtxml/qtxml-5.15.2-r10.ebuild)6
-rw-r--r--dev-qt/qtxml/qtxml-5.15.4.ebuild31
-rw-r--r--dev-qt/qtxmlpatterns/Manifest3
-rw-r--r--dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.3.ebuild (renamed from dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2-r1.ebuild)12
-rw-r--r--dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild39
192 files changed, 3131 insertions, 1194 deletions
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/assistant/assistant-5.15.2-r11.ebuild b/dev-qt/assistant/assistant-5.15.3.ebuild
index 4fb7695223e..8c494de1f6d 100644
--- a/dev-qt/assistant/assistant-5.15.2-r11.ebuild
+++ b/dev-qt/assistant/assistant-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit desktop qt5-build xdg-utils
@@ -24,7 +24,10 @@ DEPEND="
=dev-qt/qtsql-${QT5_PV}*[sqlite]
=dev-qt/qtwidgets-${QT5_PV}*
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
QT5_TARGET_SUBDIRS=(
src/assistant/assistant
@@ -39,6 +42,7 @@ src_prepare() {
src_install() {
qt5-build_src_install
+ qt5_symlink_binary_to_path assistant
doicon -s 32 src/assistant/assistant/images/assistant.png
newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
diff --git a/dev-qt/assistant/assistant-5.15.4.ebuild b/dev-qt/assistant/assistant-5.15.4.ebuild
new file mode 100644
index 00000000000..52bf83ac3a7
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.15.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit desktop qt5-build xdg-utils
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*[png]
+ =dev-qt/qthelp-${QT5_PV}*
+ =dev-qt/qtnetwork-${QT5_PV}*
+ =dev-qt/qtprintsupport-${QT5_PV}*
+ =dev-qt/qtsql-${QT5_PV}*[sqlite]
+ =dev-qt/qtwidgets-${QT5_PV}*
+"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/assistant/assistant
+)
+
+src_prepare() {
+ sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
+ -i src/assistant/assistant/assistant.pro || die
+
+ qt5-build_src_prepare
+}
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path assistant
+
+ doicon -s 32 src/assistant/assistant/images/assistant.png
+ newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+ make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+ qt5-build_pkg_postinst
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ qt5-build_pkg_postrm
+ xdg_icon_cache_update
+}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/designer/designer-5.15.2-r11.ebuild b/dev-qt/designer/designer-5.15.3.ebuild
index 0d41f6d0c41..75e6e8635e0 100644
--- a/dev-qt/designer/designer-5.15.2-r11.ebuild
+++ b/dev-qt/designer/designer-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit desktop qt5-build xdg-utils
@@ -42,6 +42,7 @@ src_prepare() {
src_install() {
qt5-build_src_install
+ qt5_symlink_binary_to_path designer 5
doicon -s 128 src/designer/src/designer/images/designer.png
make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
diff --git a/dev-qt/designer/designer-5.15.4.ebuild b/dev-qt/designer/designer-5.15.4.ebuild
new file mode 100644
index 00000000000..ec136a990f4
--- /dev/null
+++ b/dev-qt/designer/designer-5.15.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit desktop qt5-build xdg-utils
+
+DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="declarative"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*:5=[png]
+ =dev-qt/qtnetwork-${QT5_PV}*
+ =dev-qt/qtprintsupport-${QT5_PV}*
+ =dev-qt/qtwidgets-${QT5_PV}*
+ =dev-qt/qtxml-${QT5_PV}*
+ declarative? ( =dev-qt/qtdeclarative-${QT5_PV}*[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/designer
+)
+
+src_prepare() {
+ qt_use_disable_mod declarative quickwidgets \
+ src/designer/src/plugins/plugins.pro
+
+ sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
+ -i src/designer/src/plugins/plugins.pro || die
+
+ qt5-build_src_prepare
+}
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path designer 5
+
+ doicon -s 128 src/designer/src/designer/images/designer.png
+ make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
+}
+
+pkg_postinst() {
+ qt5-build_pkg_postinst
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ qt5-build_pkg_postrm
+ xdg_icon_cache_update
+}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.3.ebuild
index b41bec10340..b226050c8bf 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit qt5-build
DESCRIPTION="Tools for working with Qt translation data files"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="qml"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild
new file mode 100644
index 00000000000..fa97b583628
--- /dev/null
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tools for working with Qt translation data files"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtxml-${QT5_PV}*
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/linguist
+)
+
+src_prepare() {
+ sed -i -e '/SUBDIRS += linguist/d' \
+ src/linguist/linguist.pro || die
+
+ qt_use_disable_mod qml qmldevtools-private \
+ src/linguist/lupdate/lupdate.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/linguist/linguist-5.15.2-r11.ebuild b/dev-qt/linguist/linguist-5.15.3.ebuild
index 686904fe227..1c62ca1e648 100644
--- a/dev-qt/linguist/linguist-5.15.2-r11.ebuild
+++ b/dev-qt/linguist/linguist-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit desktop qt5-build xdg-utils
@@ -23,7 +23,10 @@ DEPEND="
=dev-qt/qtwidgets-${QT5_PV}*
=dev-qt/qtxml-${QT5_PV}*
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
QT5_TARGET_SUBDIRS=(
src/linguist/linguist
@@ -31,6 +34,7 @@ QT5_TARGET_SUBDIRS=(
src_install() {
qt5-build_src_install
+ qt5_symlink_binary_to_path linguist
local size
for size in 16 32 48 64 128; do
diff --git a/dev-qt/linguist/linguist-5.15.4.ebuild b/dev-qt/linguist/linguist-5.15.4.ebuild
new file mode 100644
index 00000000000..d88d8a7a9f6
--- /dev/null
+++ b/dev-qt/linguist/linguist-5.15.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit desktop qt5-build xdg-utils
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/designer-${QT5_PV}*
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*:5=[png]
+ =dev-qt/qtprintsupport-${QT5_PV}*
+ =dev-qt/qtwidgets-${QT5_PV}*
+ =dev-qt/qtxml-${QT5_PV}*
+"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/linguist/linguist
+)
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path linguist
+
+ local size
+ for size in 16 32 48 64 128; do
+ newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
+ done
+ make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
+}
+
+pkg_postinst() {
+ qt5-build_pkg_postinst
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ qt5-build_pkg_postrm
+ xdg_icon_cache_update
+}
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild b/dev-qt/pixeltool/pixeltool-5.15.3.ebuild
index 3e456b213cc..13c14af80e0 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit qt5-build
@@ -20,8 +20,16 @@ DEPEND="
=dev-qt/qtgui-${QT5_PV}*:5=[png]
=dev-qt/qtwidgets-${QT5_PV}*
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
QT5_TARGET_SUBDIRS=(
src/pixeltool
)
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path pixeltool
+}
diff --git a/dev-qt/pixeltool/pixeltool-5.15.4.ebuild b/dev-qt/pixeltool/pixeltool-5.15.4.ebuild
new file mode 100644
index 00000000000..cd1802477ef
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-5.15.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt screen magnifier"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*:5=[png]
+ =dev-qt/qtwidgets-${QT5_PV}*
+"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/pixeltool
+)
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path pixeltool
+}
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild b/dev-qt/qdbus/qdbus-5.15.3.ebuild
index 2c7623dbaf8..cb0227d126d 100644
--- a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit qt5-build
@@ -20,8 +20,16 @@ DEPEND="
=dev-qt/qtdbus-${QT5_PV}*
=dev-qt/qtxml-${QT5_PV}*
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
QT5_TARGET_SUBDIRS=(
src/qdbus/qdbus
)
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qdbus
+}
diff --git a/dev-qt/qdbus/qdbus-5.15.4.ebuild b/dev-qt/qdbus/qdbus-5.15.4.ebuild
new file mode 100644
index 00000000000..f8db01b1f8c
--- /dev/null
+++ b/dev-qt/qdbus/qdbus-5.15.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Interface to Qt applications communicating over D-Bus"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdbus-${QT5_PV}*
+ =dev-qt/qtxml-${QT5_PV}*
+"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/qdbus/qdbus
+)
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qdbus
+}
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.3.ebuild
index 11f5c9a1d50..1479b2f5a0a 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit desktop qt5-build xdg-utils
@@ -22,7 +22,10 @@ DEPEND="
=dev-qt/qtwidgets-${QT5_PV}*
=dev-qt/qtxml-${QT5_PV}*
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
QT5_TARGET_SUBDIRS=(
src/qdbus/qdbusviewer
@@ -30,6 +33,7 @@ QT5_TARGET_SUBDIRS=(
src_install() {
qt5-build_src_install
+ qt5_symlink_binary_to_path qdbusviewer
doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild
new file mode 100644
index 00000000000..3394c5f160a
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit desktop qt5-build xdg-utils
+
+DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdbus-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtwidgets-${QT5_PV}*
+ =dev-qt/qtxml-${QT5_PV}*
+"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/qdbus/qdbusviewer
+)
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qdbusviewer
+
+ doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
+ newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+ make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
+}
+
+pkg_postinst() {
+ qt5-build_pkg_postinst
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ qt5-build_pkg_postrm
+ xdg_icon_cache_update
+}
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild b/dev-qt/qdoc/qdoc-5.15.3.ebuild
index dd6896da342..4abca25a217 100644
--- a/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit qt5-build
diff --git a/dev-qt/qdoc/qdoc-5.15.4.ebuild b/dev-qt/qdoc/qdoc-5.15.4.ebuild
new file mode 100644
index 00000000000..80459c8d443
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.15.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ sys-devel/clang:=
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/qdoc
+)
+
+src_prepare() {
+ qt_use_disable_mod qml qmldevtools-private \
+ src/qdoc/qdoc.pro
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ # qt5_tools_configure() not enough here, needs another fix, bug 676948
+ mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
+ qt5_qmake "${QT5_BUILD_DIR}"
+ cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
+
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 5c1ec986bbb..8613fc7c9b8 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a SHA512 a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3
DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348 SHA512 4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index d2e6af3e133..51e112b750a 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -40,8 +40,6 @@
<flag name="qbs">Build plugin for Qbs-based projects</flag>
<flag name="qmake">Build plugin for qmake-based projects</flag>
<flag name="qml">Build plugins for QML-based development (designer, editor, project manager)</flag>
- <flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag>
- <flag name="qmljs">Build the QML/JavaScript editor plugin</flag>
<flag name="qmlprofiler">Build the QML profiler plugin</flag>
<flag name="qnx">Build plugin for QNX devices</flag>
<flag name="remotelinux">Build plugin for deployment and execution on a remote Linux host</flag>
diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
deleted file mode 100644
index 18260cba542..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=12
-PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
-else
- MY_PV=${PV/_/-}
- MY_P=${PN}-opensource-src-${MY_PV}
- [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
- SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
- S=${WORKDIR}/${MY_P}
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
- '+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
- ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial
- modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner
- +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher
- subversion valgrind webassembly)
-IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- android? ( lsp )
- boot2qt? ( remotelinux )
- clang? ( test? ( qbs ) )
- mcu? ( baremetal cmake )
- python? ( lsp )
- qmldesigner? ( qmljs )
- qnx? ( remotelinux )
-"
-
-# minimum Qt version required
-QT_PV="5.14:5"
-
-BDEPEND="
- >=dev-qt/linguist-tools-${QT_PV}
- virtual/pkgconfig
- doc? ( >=dev-qt/qdoc-${QT_PV} )
-"
-CDEPEND="
- >=dev-qt/qtconcurrent-${QT_PV}
- >=dev-qt/qtcore-${QT_PV}
- >=dev-qt/qtdeclarative-${QT_PV}[widgets]
- >=dev-qt/qtgui-${QT_PV}
- >=dev-qt/qtnetwork-${QT_PV}[ssl]
- >=dev-qt/qtprintsupport-${QT_PV}
- >=dev-qt/qtquickcontrols-${QT_PV}
- >=dev-qt/qtscript-${QT_PV}
- >=dev-qt/qtsql-${QT_PV}[sqlite]
- >=dev-qt/qtsvg-${QT_PV}
- >=dev-qt/qtwidgets-${QT_PV}
- >=dev-qt/qtx11extras-${QT_PV}
- >=dev-qt/qtxml-${QT_PV}
- kde-frameworks/syntax-highlighting:5
- clang? (
- >=dev-cpp/yaml-cpp-0.6.2:=
- || (
- sys-devel/clang:12
- sys-devel/clang:11
- )
- <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
- )
- designer? ( >=dev-qt/designer-${QT_PV} )
- help? (
- >=dev-qt/qthelp-${QT_PV}
- webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
- )
- perfprofiler? ( dev-libs/elfutils )
- serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
- systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}
- test? (
- >=dev-qt/qtdeclarative-${QT_PV}[localstorage]
- >=dev-qt/qtquickcontrols2-${QT_PV}
- >=dev-qt/qttest-${QT_PV}
- >=dev-qt/qtxmlpatterns-${QT_PV}[qml]
- )
-"
-RDEPEND="${CDEPEND}
- sys-devel/gdb[python]
- autotools? ( sys-devel/autoconf )
- cmake? ( >=dev-util/cmake-3.14 )
- cppcheck? ( dev-util/cppcheck )
- cvs? ( dev-vcs/cvs )
- git? ( dev-vcs/git )
- mercurial? ( dev-vcs/mercurial )
- qbs? ( >=dev-util/qbs-1.18 )
- qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
- silversearcher? ( sys-apps/the_silver_searcher )
- subversion? ( dev-vcs/subversion )
- valgrind? ( dev-util/valgrind )
-"
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
- IUSE+=" l10n_${x}"
- RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-llvm_check_deps() {
- has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
- use clang && llvm_pkg_setup
-}
-
-src_prepare() {
- default
-
- # disable unwanted plugins
- for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
- if ! use ${plugin%:*}; then
- einfo "Disabling ${plugin%:*} plugin"
- sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
- src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
- fi
- done
- sed -i -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
- sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.pro || die
-
- # avoid building unused support libraries and tools
- if ! use clang; then
- sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die
- sed -i -e '/clangbackend/d' src/tools/tools.pro || die
- fi
- if ! use glsl; then
- sed -i -e '/glsl/d' src/libs/libs.pro || die
- fi
- if ! use lsp; then
- sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die
- fi
- if ! use modeling; then
- sed -i -e '/modelinglib/d' src/libs/libs.pro || die
- fi
- if ! use perfprofiler; then
- rm -r src/tools/perfparser || die
- if ! use ctfvisualizer && ! use qmlprofiler; then
- sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
- fi
- fi
- if ! use qmldesigner; then
- sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die
- sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
- sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
- fi
- if ! use qmljs; then
- sed -i -e '/qmleditorwidgets/d' src/libs/libs.pro || die
- fi
- if ! use valgrind; then
- sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
- sed -i -e '/valgrind/d' tests/auto/auto.pro || die
- fi
-
- # automagic dep on qtwebengine
- if ! use webengine; then
- sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
- fi
-
- # disable broken or unreliable tests
- sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
- sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die
- sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
- sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die
-
- # do not install test binaries
- sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die
-
- # fix path to some clang headers
- sed -i -e "/^CLANG_INCLUDE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
-
- # fix translations
- local lang languages=
- for lang in ${PLOCALES}; do
- use l10n_${lang} && languages+=" ${lang/-/_}"
- done
- sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
-
- # remove bundled syntax-highlighting
- rm -r src/libs/3rdparty/syntax-highlighting || die
-
- # remove bundled yaml-cpp
- rm -r src/libs/3rdparty/yaml-cpp || die
-
- # remove bundled qbs
- rm -r src/shared/qbs || die
-
- # TODO: unbundle sqlite
-}
-
-src_configure() {
- eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
- IDE_PACKAGE_MODE=1 \
- KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
- KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
- $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
- $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
- $(use systemd && echo CONFIG+=journald) \
- $(use test && echo BUILD_TESTS=1)
-}
-
-src_test() {
- cd tests/auto && virtx default
-}
-
-src_install() {
- emake INSTALL_ROOT="${ED}/usr" install
-
- dodoc dist/{changes-*,known-issues}
-
- # install documentation
- if use doc; then
- emake docs
- # don't use ${PF} or the doc will not be found
- insinto /usr/share/doc/qtcreator
- doins share/doc/qtcreator/qtcreator{,-dev}.qch
- docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
- fi
-}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 8978ff750be..15ea39d7096 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1 +1,4 @@
-DIST qt3d-5.15.2-7edec6e0.tar.gz 86196121 BLAKE2B c6009fa8b94da1a498e14f61680be40cbc5e32e390d89911b5a7b7d19bae7c66e048101e6f3b6c1f7e5cc4e64da7ea801f4bf95c346b35d28a49866d9541e146 SHA512 73941c2052aeb9611cf24bbb7b3ba317e53207c080070bb5d602c9f2725d2ab305674e0f29b737ea62ff7a285b362ec53b3588b31c18635e250bc90081d9b5e7
+DIST qt3d-5.15.3-gentoo-kde-1.tar.xz 19244 BLAKE2B 3274f171719204af30272e4c20fd509f180a48bd7f179d1656dfc2d638154ed51efc0952c371e6ca707e035142ab0d1e074f4587ca47673673150265f88305fd SHA512 d453cc8eb91214165c3257fa9379efcd1f2c3e4c605895df82366006a9405b37a1222f93334e7925aebf27c5118d576e0ab1b3e24d27aef68cc51f114bc9fbfc
+DIST qt3d-5.15.4-gentoo-kde-1.tar.xz 18844 BLAKE2B 2ed592d7bbf5bb4c0adee70ac74fd46207e78e769b19d083d6317d1d561618135769914ac8b4e9d266c28b09764e89fe5dbbe2237c81ff48b27efff99a0ee5a1 SHA512 bca5329a68a1ffc5b679db847a1b327e746170fb194a091feb1a61dbf6fe30b3af1cf9c9c57a3a1b16c6af4a0529bbb309eb2bd269613d65f666203164562cd4
+DIST qt3d-everywhere-opensource-src-5.15.3.tar.xz 81930768 BLAKE2B 4ead826b786074993b8c536b4b7c8d781126d402ea55da116201b3d1ea859c83b9d46618b7705b14371064fc41d8aa249efbc5db62f0e9e88fb1424c03bc7a45 SHA512 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c
+DIST qt3d-everywhere-opensource-src-5.15.4.tar.xz 81923836 BLAKE2B 60ca6a00bec8c20e1b2c209e4d15dd5b2e836eb578c98a90dbf02db89d5fc07642106cc0248a1fb356694793f5fdb5e3b6ab9898bc4e87730c379cbd3d1d8a48 SHA512 cb2ea961109a153e78147450310408f4f573186d12412ebdd71511eb273ca78113d3aede583ec8aa44fe19f5268bb6fab3386c5501142ad6a22e10890ce52f62
diff --git a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild b/dev-qt/qt3d/qt3d-5.15.3.ebuild
index b621640f927..66503e8aaf6 100644
--- a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=7edec6e014de27b9dd03f63875c471aac606a918
+QT5_KDEPATCHSET_REV=1
inherit qt5-build
DESCRIPTION="3D rendering module for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm64 x86"
+ KEYWORDS="amd64 ~arm arm64 ~riscv x86"
fi
# TODO: tools
@@ -28,14 +28,6 @@ DEPEND="${RDEPEND}
vulkan? ( dev-util/vulkan-headers )
"
-src_configure() {
- local myqmakeargs=(
- --
- -system-assimp
- )
- qt5-build_src_configure
-}
-
src_prepare() {
rm -r src/3rdparty/assimp/{code,contrib,include} || die
@@ -44,3 +36,11 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ -system-assimp
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qt3d/qt3d-5.15.4.ebuild b/dev-qt/qt3d/qt3d-5.15.4.ebuild
new file mode 100644
index 00000000000..f52e61e191a
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-5.15.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+inherit qt5-build
+
+DESCRIPTION="3D rendering module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+# TODO: tools
+IUSE="gamepad gles2-only qml vulkan"
+
+RDEPEND="
+ =dev-qt/qtconcurrent-${QT5_PV}*
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=]
+ =dev-qt/qtnetwork-${QT5_PV}*
+ >=media-libs/assimp-4.0.0
+ gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* )
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
+"
+DEPEND="${RDEPEND}
+ vulkan? ( dev-util/vulkan-headers )
+"
+
+src_prepare() {
+ rm -r src/3rdparty/assimp/{code,contrib,include} || die
+
+ qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
+ qt_use_disable_mod qml quick src/src.pro
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ -system-assimp
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index fb34f083fc7..feb1406cc09 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1 +1,4 @@
-DIST qtconnectivity-everywhere-src-5.15.2.tar.xz 2815492 BLAKE2B 0702601266d46669e0a39740b6df539b1d3f6dcb62d06b14f5ba89782e9bd38faa391892841434feccd9599eef09c7c7238efb82e11a0633e73f58dd721d3324 SHA512 a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c
+DIST qtconnectivity-5.15.3-gentoo-kde-1.tar.xz 4708 BLAKE2B 62a24b899b6ccb73eb8ffe3558fa6451ab5d5f9d08e583c527f6dad971f990f574c9aafa56e479e528ca6e92c96a1363cc05ac6e96b8e3444e8b115b0811a30a SHA512 ae37b972a3f8e789793f66123e3ce66cc2b739560cf69676b72c50139a39b903556c6bc52dba6f73335d7ae368eb377f3cad1892a5992d83bc89474c04dc23fe
+DIST qtconnectivity-5.15.4-gentoo-kde-1.tar.xz 3384 BLAKE2B 4dfddcfb0ba91bad7126fafa5f202f0d4d0cd7585438a9842ccbe4ba0bbeea98e74c11dc87cff48fc033fa17d66adce3d9333c9d2d2a91ad54308251ee3056eb SHA512 a5ded5e0bd97273d3cd5ba8abbd1e518dc70facbc5fefe78a18b4d8d7968042a899b4bd2bed4daccb308afd298e6842c93ebf2963b1927f8f146e042c5328d60
+DIST qtconnectivity-everywhere-opensource-src-5.15.3.tar.xz 2815220 BLAKE2B 0aa3124def801baaad42cfd683afca4d0388355b17232c6cb5e211a98f83fc3bef632677e8e36619b74f8a7c9f02f8999153879628f993ce858dd4e322f6f4ee SHA512 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534
+DIST qtconnectivity-everywhere-opensource-src-5.15.4.tar.xz 2816924 BLAKE2B 73edd81da73a1438a4e33d3b553259865c7fab0b97213935803b17b00444f737407baa665c31b0e708f1efef7c0eddfd6706f2883a563847a28ecd5ca18b9429 SHA512 3f2c0a59ff6be9531f5ebc81a4344e0b12c8ef92fbfa466f2777d4ed3b4b08657214e93e0aada856a0c6475b6b760aeeb06f0b2be894e61cd7b344c49fefaf95
diff --git a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch b/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch
deleted file mode 100644
index 7c27730574b..00000000000
--- a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0ae88b90f857bfcc2d0ea33d16753d8eed5db9e1 Mon Sep 17 00:00:00 2001
-From: Jeff Law <law@redhat.com>
-Date: Oct 16 2020 20:08:46 +0000
-Subject: Add missing #include for gcc-11
-
-
-diff --git a/src/bluetooth/lecmaccalculator.cpp b/src/bluetooth/lecmaccalculator.cpp
-index b150466..507603c 100644
---- a/src/bluetooth/lecmaccalculator.cpp
-+++ b/src/bluetooth/lecmaccalculator.cpp
-@@ -38,6 +38,8 @@
- ****************************************************************************/
- #include "lecmaccalculator_p.h"
-
-+#include <limits>
-+
- #include "bluez/bluez_data_p.h"
-
- #include <QtCore/qbytearray.h>
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.3.ebuild
index 1a88564f814..6fe2898f1aa 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtconnectivity"
inherit qt5-build
@@ -14,18 +15,15 @@ fi
IUSE="qml"
-RDEPEND="
+DEPEND="
=dev-qt/qtconcurrent-${QT5_PV}*
=dev-qt/qtcore-${QT5_PV}*:5=
=dev-qt/qtdbus-${QT5_PV}*
+ =dev-qt/qtnetwork-${QT5_PV}*
>=net-wireless/bluez-5:=
qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
"
-DEPEND="${RDEPEND}
- =dev-qt/qtnetwork-${QT5_PV}*
-"
-
-PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 752012
+RDEPEND="${DEPEND}"
src_prepare() {
sed -i -e 's/nfc//' src/src.pro || die
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild
new file mode 100644
index 00000000000..b99e015a61f
--- /dev/null
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+QT5_MODULE="qtconnectivity"
+inherit qt5-build
+
+DESCRIPTION="Bluetooth support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+ =dev-qt/qtconcurrent-${QT5_PV}*
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtdbus-${QT5_PV}*
+ =dev-qt/qtnetwork-${QT5_PV}*
+ >=net-wireless/bluez-5:=
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i -e 's/nfc//' src/src.pro || die
+
+ qt_use_disable_mod qml quick src/src.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 079eb701fa0..50e3f0515ba 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1 +1,2 @@
-DIST qtcharts-everywhere-src-5.15.2.tar.xz 4251992 BLAKE2B 84a683f0ef327437ce801f3b1e0622e31bbc69c33173b3a52e66191120189b6c46e5840ae72861093a9c2f37cf486494fd947a75bd40c8dc2fd54cfd0324eb41 SHA512 d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f
+DIST qtcharts-everywhere-opensource-src-5.15.3.tar.xz 4252036 BLAKE2B 38d7bb4b02aca7755f056845fa712ebeeeda1ad7c66f16500f53f98f4f82449f28725a2fe784297931ef4a2ea286acb6957aa78b0a2ea81c46a9e0e41582c642 SHA512 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48
+DIST qtcharts-everywhere-opensource-src-5.15.4.tar.xz 4253512 BLAKE2B 833ce3ab26feff3521aa8d67b276f2a67c0efa595309870288bb543ccb7b70f73ff8004a0e5f895a0458352cc56479ba0f43eb5694f9cdc6ba8a7f33da89968c SHA512 e7a4cac3b3a0c60c7ab509d5a533521dd8dc0cb5ad69d66a87f12671c73c1928d902e0be377efb77e0ddadefe1ef8800c0cf07e8213f44367bcd80a787342bcf
diff --git a/dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild b/dev-qt/qtcharts/qtcharts-5.15.3.ebuild
index a23f9413e20..0f505dbcc8d 100644
--- a/dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ DESCRIPTION="Chart component library for the Qt5 framework"
LICENSE="GPL-3"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtcharts/qtcharts-5.15.4.ebuild b/dev-qt/qtcharts/qtcharts-5.15.4.ebuild
new file mode 100644
index 00000000000..9f42180ede9
--- /dev/null
+++ b/dev-qt/qtcharts/qtcharts-5.15.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Chart component library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtwidgets-${QT5_PV}*
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ qt_use_disable_mod qml quick \
+ src/src.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtchooser/files/qtchooser-66-qt-5.15.3-compat.patch b/dev-qt/qtchooser/files/qtchooser-66-qt-5.15.3-compat.patch
new file mode 100644
index 00000000000..0a8569ff90b
--- /dev/null
+++ b/dev-qt/qtchooser/files/qtchooser-66-qt-5.15.3-compat.patch
@@ -0,0 +1,33 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,18 +1,13 @@
+ MKDIR = mkdir -p
+ prefix = /usr
+ bindir = $(prefix)/bin
+-TOOLS = assistant \
+- designer \
++TOOLS = designer \
+ lconvert \
+- linguist \
+ lrelease \
+ lupdate \
+ moc \
+- pixeltool \
+ qcollectiongenerator \
+- qdbus \
+ qdbuscpp2xml \
+- qdbusviewer \
+ qdbusxml2cpp \
+ qdoc \
+ qdoc3 \
+@@ -44,9 +39,7 @@
+ rcc \
+ repc \
+ uic \
+- uic3 \
+- xmlpatterns \
+- xmlpatternsvalidator \
++ uic3
+
+ # keep the above line empty
+
diff --git a/dev-qt/qtchooser/qtchooser-66-r1.ebuild b/dev-qt/qtchooser/qtchooser-66-r2.ebuild
index e25d6043764..5893c9538fd 100644
--- a/dev-qt/qtchooser/qtchooser-66-r1.ebuild
+++ b/dev-qt/qtchooser/qtchooser-66-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git"
inherit git-r3
else
- SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
+ SRC_URI="https://download.qt.io/official_releases/${PN}/${P}.tar.xz"
KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
@@ -25,9 +25,9 @@ DEPEND="test? (
dev-qt/qtcore:5
dev-qt/qttest:5
)"
-RDEPEND="
- !<dev-qt/qtcore-5.15.2-r10:5
-"
+RDEPEND="!<dev-qt/qtcore-5.15.3:5"
+
+PATCHES=( "${FILESDIR}/${PN}-66-qt-5.15.3-compat.patch" )
qtchooser_make() {
emake \
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 4b8920365b9..876cb884f82 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.3.ebuild
index f226909ed33..b21cf4ac111 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild
new file mode 100644
index 00000000000..e8ed5dd37b2
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/concurrent
+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 4b8920365b9..876cb884f82 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
deleted file mode 100644
index 30b5abc3975..00000000000
--- a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 9 Feb 2020 11:45:00 +0100
-Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14
-
-In upstream commit:
-
-https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
-
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument
-IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for
-QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland.
-During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some
-reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
-cmake files regenerated, leading to cmake errors like:
-
-https://bugs.gentoo.org/703306
-https://bugs.gentoo.org/705198
-
-From mkspecs/features/create_cmake.prf:
-
-# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
-# functions whether a Configuration specific generator expression needs to be added to the values
-# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
-# configuration specific values. For singular builds (only release or only debug), we want the
-# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
-# build a Debug configuration of an application, even if Qt was built in a Release configuration.
-
-qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
-optional and default to FALSE.
-
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100
-@@ -538,8 +538,14 @@
-
- file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
-
-- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
-- IsDebugAndRelease)
-+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
-+ set(IsDebugAndRelease FALSE)
-+ set (list_var ${ARGN})
-+ list(LENGTH list_var num_extra_arg)
-+ if (${num_extra_arg} GREATER 0)
-+ list(GET list_var 0 IsDebugAndRelease)
-+ endif()
-+
- set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
deleted file mode 100644
index 1c8f1e89e7d..00000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-From c337f6fae51b987ce7dbed1fd9bea41e6073efbb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 10 Oct 2020 19:26:13 +0200
-Subject: [PATCH 1/2] Revert "Cache system zone ID when fetched from the
- file-system"
-
-This reverts commit c70ce3d042025c858faffe661f85d2482a2a0d8c.
----
- src/corelib/time/qtimezoneprivate_tz.cpp | 205 +++++++----------------
- 1 file changed, 64 insertions(+), 141 deletions(-)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index c5c70b7364..01f9a6cce0 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -1,6 +1,5 @@
- /****************************************************************************
- **
--** Copyright (C) 2020 The Qt Company Ltd.
- ** Copyright (C) 2019 Crimson AS <info@crimson.no>
- ** Copyright (C) 2013 John Layt <jlayt@kde.org>
- ** Contact: https://www.qt.io/licensing/
-@@ -43,19 +42,18 @@
- #include "qtimezoneprivate_p.h"
- #include "private/qlocale_tools_p.h"
-
--#include <QtCore/QDataStream>
--#include <QtCore/QDateTime>
- #include <QtCore/QFile>
--#include <QtCore/QHash>
- #include <QtCore/QMutex>
-+#include <QtCore/QHash>
-+#include <QtCore/QDataStream>
-+#include <QtCore/QDateTime>
-
- #include <qdebug.h>
--#include <qplatformdefs.h>
-
- #include <algorithm>
- #include <errno.h>
- #include <limits.h>
--#ifndef Q_OS_INTEGRITY
-+#if !defined(Q_OS_INTEGRITY)
- #include <sys/param.h> // to use MAXSYMLINKS constant
- #endif
- #include <unistd.h> // to use _SC_SYMLOOP_MAX constant
-@@ -1102,146 +1100,28 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::previousTransition(qint64 beforeMSecs
- return last > tranCache().cbegin() ? dataForTzTransition(*--last) : invalidData();
- }
-
--bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
--{
-- return tzZones->contains(ianaId);
--}
--
--QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const
--{
-- QList<QByteArray> result = tzZones->keys();
-- std::sort(result.begin(), result.end());
-- return result;
--}
--
--QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const
-+static long getSymloopMax()
- {
-- // TODO AnyCountry
-- QList<QByteArray> result;
-- for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) {
-- if (it.value().country == country)
-- result << it.key();
-- }
-- std::sort(result.begin(), result.end());
-- return result;
--}
--
--// Getting the system zone's ID:
--
--namespace {
--class ZoneNameReader : public QObject
--{
--public:
-- QByteArray name()
-- {
-- /* Assumptions:
-- a) Systems don't change which of localtime and TZ they use without a
-- reboot.
-- b) When they change, they use atomic renames, hence a new device and
-- inode for the new file.
-- c) If we change which *name* is used for a zone, while referencing
-- the same final zoneinfo file, we don't care about the change of
-- name (e.g. if Europe/Oslo and Europe/Berlin are both symlinks to
-- the same CET file, continuing to use the old name, after
-- /etc/localtime changes which of the two it points to, is
-- harmless).
--
-- The alternative would be to use a file-system watcher, but they are a
-- scarce resource.
-- */
-- const StatIdent local = identify("/etc/localtime");
-- const StatIdent tz = identify("/etc/TZ");
-- if (!m_name.isEmpty() && m_last.isValid() && (m_last == local || m_last == tz))
-- return m_name;
--
-- m_name = etcLocalTime();
-- if (!m_name.isEmpty()) {
-- m_last = local;
-- return m_name;
-- }
--
-- m_name = etcTZ();
-- m_last = m_name.isEmpty() ? StatIdent() : tz;
-- return m_name;
-- }
--
--
--private:
-- QByteArray m_name;
-- struct StatIdent
-- {
-- static constexpr unsigned long bad = ~0ul;
-- unsigned long m_dev, m_ino;
-- StatIdent() : m_dev(bad), m_ino(bad) {}
-- StatIdent(const QT_STATBUF &data) : m_dev(data.st_dev), m_ino(data.st_ino) {}
-- bool isValid() { return m_dev != bad || m_ino != bad; }
-- bool operator==(const StatIdent &other)
-- { return other.m_dev == m_dev && other.m_ino == m_ino; }
-- };
-- StatIdent m_last;
--
-- static StatIdent identify(const char *path)
-- {
-- QT_STATBUF data;
-- return QT_STAT(path, &data) == -1 ? StatIdent() : StatIdent(data);
-- }
--
-- static QByteArray etcLocalTime()
-- {
-- // On most distros /etc/localtime is a symlink to a real file so extract
-- // name from the path
-- const QLatin1String zoneinfo("/zoneinfo/");
-- QString path = QStringLiteral("/etc/localtime");
-- long iteration = getSymloopMax();
-- // Symlink may point to another symlink etc. before being under zoneinfo/
-- // We stop on the first path under /zoneinfo/, even if it is itself a
-- // symlink, like America/Montreal pointing to America/Toronto
-- do {
-- path = QFile::symLinkTarget(path);
-- int index = path.indexOf(zoneinfo);
-- if (index >= 0) // Found zoneinfo file; extract zone name from path:
-- return path.midRef(index + zoneinfo.size()).toUtf8();
-- } while (!path.isEmpty() && --iteration > 0);
--
-- return QByteArray();
-- }
--
-- static QByteArray etcTZ()
-- {
-- // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
-- const QString path = QStringLiteral("/etc/TZ");
-- QFile zone(path);
-- if (zone.open(QIODevice::ReadOnly))
-- return zone.readAll().trimmed();
--
-- return QByteArray();
-- }
--
-- // Any chain of symlinks longer than this is assumed to be a loop:
-- static long getSymloopMax()
-- {
--#ifdef SYMLOOP_MAX
-- // If defined, at runtime it can only be greater than this, so this is a safe bet:
-- return SYMLOOP_MAX;
-+#if defined(SYMLOOP_MAX)
-+ return SYMLOOP_MAX; // if defined, at runtime it can only be greater than this, so this is a safe bet
- #else
-- errno = 0;
-- long result = sysconf(_SC_SYMLOOP_MAX);
-- if (result >= 0)
-- return result;
-- // result is -1, meaning either error or no limit
-- Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX
--
-- // therefore we can make up our own limit
--# ifdef MAXSYMLINKS
-- return MAXSYMLINKS;
-+ errno = 0;
-+ long result = sysconf(_SC_SYMLOOP_MAX);
-+ if (result >= 0)
-+ return result;
-+ // result is -1, meaning either error or no limit
-+ Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX
-+
-+ // therefore we can make up our own limit
-+# if defined(MAXSYMLINKS)
-+ return MAXSYMLINKS;
- # else
-- return 8;
-+ return 8;
- # endif
- #endif
-- }
--};
- }
-
-+// TODO Could cache the value and monitor the required files for any changes
- QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
- {
- // Check TZ env var first, if not populated try find it
-@@ -1256,9 +1136,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
- else if (ianaId.startsWith(':'))
- ianaId = ianaId.mid(1);
-
-+ // On most distros /etc/localtime is a symlink to a real file so extract name from the path
-+ if (ianaId.isEmpty()) {
-+ const QLatin1String zoneinfo("/zoneinfo/");
-+ QString path = QFile::symLinkTarget(QStringLiteral("/etc/localtime"));
-+ int index = -1;
-+ long iteration = getSymloopMax();
-+ // Symlink may point to another symlink etc. before being under zoneinfo/
-+ // We stop on the first path under /zoneinfo/, even if it is itself a
-+ // symlink, like America/Montreal pointing to America/Toronto
-+ while (iteration-- > 0 && !path.isEmpty() && (index = path.indexOf(zoneinfo)) < 0)
-+ path = QFile::symLinkTarget(path);
-+ if (index >= 0) {
-+ // /etc/localtime is a symlink to the current TZ file, so extract from path
-+ ianaId = path.midRef(index + zoneinfo.size()).toUtf8();
-+ }
-+ }
-+
-+ // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
- if (ianaId.isEmpty()) {
-- thread_local static ZoneNameReader reader;
-- ianaId = reader.name();
-+ QFile zone(QStringLiteral("/etc/TZ"));
-+ if (zone.open(QIODevice::ReadOnly))
-+ ianaId = zone.readAll().trimmed();
- }
-
- // Give up for now and return UTC
-@@ -1268,4 +1167,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
- return ianaId;
- }
-
-+bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
-+{
-+ return tzZones->contains(ianaId);
-+}
-+
-+QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const
-+{
-+ QList<QByteArray> result = tzZones->keys();
-+ std::sort(result.begin(), result.end());
-+ return result;
-+}
-+
-+QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const
-+{
-+ // TODO AnyCountry
-+ QList<QByteArray> result;
-+ for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) {
-+ if (it.value().country == country)
-+ result << it.key();
-+ }
-+ std::sort(result.begin(), result.end());
-+ return result;
-+}
-+
- QT_END_NAMESPACE
---
-2.28.0
-
diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch
deleted file mode 100644
index 611c979a469..00000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ffc9093a199a542791920b30d1835c3248920aa0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 10 Oct 2020 19:26:35 +0200
-Subject: [PATCH 2/2] Revert "Purge two old time-zone lookup fallbacks"
-
-This reverts commit b0383cbd388336f698ceeac11a4f50cdff931dd9.
----
- src/corelib/time/qtimezoneprivate_tz.cpp | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index 01f9a6cce0..eea6f5e962 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -1153,6 +1153,29 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
- }
- }
-
-+ // On Debian Etch up to Jessie, /etc/localtime is a copy of the relevant
-+ // zoneinfo file, whose name is recorded in /etc/timezone:
-+ if (ianaId.isEmpty()) {
-+ QFile tzif(QStringLiteral("/etc/timezone"));
-+ if (tzif.open(QIODevice::ReadOnly))
-+ ianaId = tzif.readAll().trimmed();
-+ }
-+
-+ // On some Red Hat distros /etc/localtime is real file with name held in /etc/sysconfig/clock
-+ // in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo"
-+ if (ianaId.isEmpty()) {
-+ QFile tzif(QStringLiteral("/etc/sysconfig/clock"));
-+ if (tzif.open(QIODevice::ReadOnly)) {
-+ while (ianaId.isEmpty() && !tzif.atEnd()) {
-+ const QByteArray line(tzif.readLine().trimmed());
-+ if (line.startsWith("ZONE="))
-+ ianaId = line.mid(6, line.length() - 7);
-+ else if (line.startsWith("TIMEZONE="))
-+ ianaId = line.mid(10, line.length() - 11);
-+ }
-+ }
-+ }
-+
- // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
- if (ianaId.isEmpty()) {
- QFile zone(QStringLiteral("/etc/TZ"));
---
-2.28.0
-
diff --git a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
new file mode 100644
index 00000000000..c83c59ac311
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
@@ -0,0 +1,41 @@
+# Use link option -pthread instead of -lpthread
+
+# https://github.com/riscv-collab/riscv-gcc/issues/12 use Option 4
+# https://stackoverflow.com/questions/23250863/difference-between-pthread-and-lpthread-while-compiling
+# In riscv, "-pthread" equivalent to add link option "--push-state --as-needed -latomic --pop-state"
+
+diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
+index 544cc227..add969be 100644
+--- a/mkspecs/common/linux.conf
++++ b/mkspecs/common/linux.conf
+@@ -33,7 +33,7 @@ QMAKE_LIBS_EGL = -lEGL
+ QMAKE_LIBS_OPENGL = -lGL
+ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
+ QMAKE_LIBS_OPENVG = -lOpenVG
+-QMAKE_LIBS_THREAD = -lpthread
++QMAKE_LIBS_THREAD = -pthread
+ QMAKE_LIBS_VULKAN =
+
+ QMAKE_INCDIR_WAYLAND =
+diff --git a/src/corelib/configure.json b/src/corelib/configure.json
+index 9b5d19d4..da028fb2 100644
+--- a/src/corelib/configure.json
++++ b/src/corelib/configure.json
+@@ -355,7 +355,7 @@
+ "std::future<int> f = std::async([]() { return 42; });",
+ "(void)f.get();"
+ ],
+- "qmake": "unix:LIBS += -lpthread"
++ "qmake": "unix:LIBS += -pthread"
+ }
+ },
+ "cxx11_random": {
+@@ -466,7 +466,7 @@
+ "shm_open(\"test\", O_RDWR | O_CREAT | O_EXCL, 0666);",
+ "shm_unlink(\"test\");"
+ ],
+- "qmake": "linux: LIBS += -lpthread -lrt"
++ "qmake": "linux: LIBS += -pthread -lrt"
+ }
+ },
+ "linkat": {
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.3.ebuild
index ee99b42e811..7f54b039a37 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit linux-info qt5-build
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
@@ -25,9 +25,7 @@ DEPEND="
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
"
-RDEPEND="${DEPEND}
- >=dev-qt/qtchooser-66-r1
-"
+RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
@@ -46,8 +44,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
)
PATCHES=(
- "${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
- "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
+ "${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470
)
pkg_pretend() {
@@ -85,6 +82,7 @@ src_configure() {
src_install() {
qt5-build_src_install
+ qt5_symlink_binary_to_path qmake 5
local flags=(
DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
diff --git a/dev-qt/qtcore/qtcore-5.15.4.ebuild b/dev-qt/qtcore/qtcore-5.15.4.ebuild
new file mode 100644
index 00000000000..ed8758faba1
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+QT5_MODULE="qtbase"
+inherit linux-info qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="icu old-kernel systemd"
+
+DEPEND="
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/libpcre2[pcre16,unicode]
+ sys-libs/zlib:=
+ icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
+ systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/tools/bootstrap
+ src/tools/moc
+ src/tools/rcc
+ src/corelib
+ src/tools/qlalr
+ doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+ !:network
+ !:sql
+ !:testlib
+ !:xml
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470
+)
+
+pkg_pretend() {
+ use kernel_linux || return
+ get_running_version
+ if kernel_is -lt 4 11 && ! use old-kernel; then
+ ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
+ ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
+ fi
+}
+
+src_prepare() {
+ # don't add -O3 to CXXFLAGS, bug 549140
+ sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
+
+ # fix missing qt_version_tag symbol w/ LTO, bug 674382
+ sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ local myconf=(
+ $(qt_use icu)
+ $(qt_use !icu iconv)
+ $(qt_use systemd journald)
+ )
+ use old-kernel && myconf+=(
+ -no-feature-renameat2 # needs Linux 3.16, bug 669994
+ -no-feature-getentropy # needs Linux 3.17, bug 669994
+ -no-feature-statx # needs Linux 4.11, bug 672856
+ )
+ qt5-build_src_configure
+}
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qmake 5
+
+ local flags=(
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+ OPENGL OPENSSL SSL WIDGETS
+ )
+
+ for flag in ${flags[@]}; do
+ cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+ #if defined(QT_NO_${flag}) && defined(QT_${flag})
+ # undef QT_NO_${flag}
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+ # define QT_NO_${flag}
+ #endif
+ _EOF_
+ done
+}
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 7a6cc71d24e..daea263bc3a 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1 +1,2 @@
-DIST qtdatavis3d-everywhere-src-5.15.2.tar.xz 5191436 BLAKE2B 2c319d7569f4dd62711f4de23661413f6d1a19ef1653543506afcdb455875447cb84980d780fefdb677f0856075e0b1df4525662bed92ae9b6272f91112c8f58 SHA512 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3
+DIST qtdatavis3d-everywhere-opensource-src-5.15.3.tar.xz 5191636 BLAKE2B 40e390f95e0c7d7aa28ec3add0ee51d9290c321118a5d2165eec7b03c5dddff2db0f3804173d776a19b76192ba4e8d0893603a26b916111c434298a6204b4794 SHA512 d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3
+DIST qtdatavis3d-everywhere-opensource-src-5.15.4.tar.xz 5193192 BLAKE2B 1e48b446f7858f956e8d1c407466d878203abd5651a8921d2847b49090f9e237118d22329cffe19dd331d6f733827c4d860a44b6345f94ef45311037a43b775a SHA512 044cdee342ef4d9beb62b910cee59f9cb362c85d517e19a1c0327dfa2b518b2fa484e36756ee9302fb043cc506340b501202861a858d374a5f69cbcddec18301
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.3.ebuild
index 4963f2fe39a..4ac3606b0fd 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
LICENSE="GPL-3"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm64 x86"
+ KEYWORDS="amd64 ~arm arm64 x86"
fi
IUSE="gles2-only qml"
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild
new file mode 100644
index 00000000000..a8546f72a25
--- /dev/null
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="3D data visualization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="gles2-only qml"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # eliminate bogus dependency on qtwidgets
+ sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
+
+ qt_use_disable_mod qml quick \
+ src/src.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 4b8920365b9..876cb884f82 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild b/dev-qt/qtdbus/qtdbus-5.15.3.ebuild
index 0d2d952579e..edf49e2dda2 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
@@ -17,7 +17,7 @@ IUSE=""
DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
- >=sys-apps/dbus-1.4.20
+ sys-apps/dbus
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdbus/qtdbus-5.15.4.ebuild b/dev-qt/qtdbus/qtdbus-5.15.4.ebuild
new file mode 100644
index 00000000000..8ff59f3bac5
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-5.15.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ sys-apps/dbus
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/dbus
+ src/tools/qdbusxml2cpp
+ src/tools/qdbuscpp2xml
+)
+
+QT5_GENTOO_CONFIG=(
+ :dbus
+ :dbus-linked:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :dbus
+ :dbus-linked
+)
+
+src_configure() {
+ local myconf=(
+ -dbus-linked
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 8d7d9bd201e..5d64396b770 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,2 +1,4 @@
-DIST qtdeclarative-5.15.2-1c33a9d0.tar.gz 24342460 BLAKE2B f83d01c9bd28842f53b5bf9e95d1b83738792ae6969309ef702fef2e943a4e886313445c7332a2a5cb72cd99aa5db7520a04a054b16d8065bc03b95cbe14026d SHA512 a1b6ae66c83cc7385c51845f1cbafb55cadd69c121196cd138abc92e964d0bb594ce20267244e4202a9108d92b9bf0f107536774f2a76da71b434692559c1fb4
-DIST qtdeclarative-5.15.2-55324650.tar.gz 24345065 BLAKE2B 0b5b3d25a93d742be7b4818692727293a710f105f48ff881d735f85871e8afb0d85461cd63b87294047d18b993b516dd8d0bac7faa83bca1faf6be3974cc3190 SHA512 bba93b2e1b35acd5bf961b527f0ade7aee5387e2ab9803f076e937f75bc12b8ed70560f02d2b13fcc94ea5294b7259323a60a15b14e59d6b8f39840dadb98d07
+DIST qtdeclarative-5.15.3-gentoo-kde-2.tar.xz 17340 BLAKE2B 5f5efae23cf6c1c3abf8d0d0594ac66ae3bf116e744626f7218d0a66e5f5598861a25e8b2d8aaec7c3dd444fa4e91de313b67b53ec624965f08472587fee460d SHA512 76d5bd8aa9f2b2e766ad4dd63a3c03b2e52da90b91cf11c777f3efd6fb3110100b358f05562639b60031bb49622fd1f4b135b6903a53493664bcbf1a0b6d69d7
+DIST qtdeclarative-5.15.4-gentoo-kde-1.tar.xz 17224 BLAKE2B 296db0b36c0fc560eb262133289fd845b5f7ebfc52efe71f9d8b08ddf8b3f470e599fa8876fb3efa60664526103d5c4b38a418b381f571895e433bc2f91676a7 SHA512 f99928400628e0d74f89cd68f315eee7e5bc886e9949c5a910887d60a288b77375a64de5d40e601f0fc304f67aa32f5336caef0e0597564919e6b945df2bddab
+DIST qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz 21567896 BLAKE2B 897aa6959f34bc6e5a3be04d9f56d13315e6681daadb935f0e2422f551865c8c6d49b0c15c5358439155d3215c1c139fe60acf0b4a7e766e8e1ff4ce85a0449e SHA512 c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597
+DIST qtdeclarative-everywhere-opensource-src-5.15.4.tar.xz 21573148 BLAKE2B 092d323c89de0f8be786cfd9dcc3bf84f51c54f3e984b3c0fac1d110a92c94f67f8ba7da43e96dbf5afe1cfb7de49f204a684ea9b189be7f412d1f61a838b121 SHA512 8a4ff61238fde7cc563f9d94b5d1f4fd71ecb95ace447e57d08f71da82400b37c42f4f1ecdcd561116bffa1ed483219e06fb550f91c90842e5a43487bc4706b6
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
deleted file mode 100644
index a619f3db833..00000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/qml/qml.pro b/src/qml/qml.pro
-index 7d5a92a..01f3b79 100644
---- a/src/qml/qml.pro
-+++ b/src/qml/qml.pro
-@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
-
- # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT.
- gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks
-+gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic
-
- DEFINES += QT_NO_FOREACH
-
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch
deleted file mode 100644
index 7799ef71b7e..00000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
-index 4b08194..224ddb1 100644
---- a/src/qml/jsruntime/qv4global_p.h
-+++ b/src/qml/jsruntime/qv4global_p.h
-@@ -96,8 +96,13 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
- # undef V4_ENABLE_JIT
- #endif
- #endif
-
-+// Gentoo note: disable the JIT due to USE="-jit"
-+#ifdef V4_ENABLE_JIT
-+#undef V4_ENABLE_JIT
-+#endif
-+
- // Do certain things depending on whether the JIT is enabled or disabled
-
- #ifdef V4_ENABLE_JIT
- #define ENABLE_YARR_JIT 1
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild
index 7987361ecfd..f632c6fb5e0 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2009-2021 Gentoo Authors
+# Copyright 2009-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=1c33a9d045897ce755a818ebff7ddecae97885d3
+QT5_KDEPATCHSET_REV=2
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 qt5-build
@@ -30,12 +30,9 @@ BDEPEND="${PYTHON_DEPS}"
PATCHES=(
"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
- "${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689
)
src_prepare() {
- use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" )
-
qt_use_disable_mod localstorage sql \
src/imports/imports.pro
@@ -54,6 +51,15 @@ src_configure() {
local myqmakeargs=(
--
-qml-debug
+ $(qt_use jit feature-qml-jit)
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qml 5
+ qt5_symlink_binary_to_path qmleasing 5
+ qt5_symlink_binary_to_path qmlpreview 5
+ qt5_symlink_binary_to_path qmlscene 5
+}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r13.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
index 41b8c9b7609..d344b2d4a67 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r13.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2009-2021 Gentoo Authors
+# Copyright 2009-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=55324650f9e759a43dce927f823c9858574106c3
+QT5_KDEPATCHSET_REV=1
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 qt5-build
@@ -30,12 +30,9 @@ BDEPEND="${PYTHON_DEPS}"
PATCHES=(
"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
- "${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689
)
src_prepare() {
- use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" )
-
qt_use_disable_mod localstorage sql \
src/imports/imports.pro
@@ -54,6 +51,15 @@ src_configure() {
local myqmakeargs=(
--
-qml-debug
+ $(qt_use jit feature-qml-jit)
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qml 5
+ qt5_symlink_binary_to_path qmleasing 5
+ qt5_symlink_binary_to_path qmlpreview 5
+ qt5_symlink_binary_to_path qmlscene 5
+}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild b/dev-qt/qtdiag/qtdiag-5.15.3.ebuild
index 34c84379c01..4e602dcb6d0 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit qt5-build
@@ -36,3 +36,8 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qtdiag 5
+}
diff --git a/dev-qt/qtdiag/qtdiag-5.15.4.ebuild b/dev-qt/qtdiag/qtdiag-5.15.4.ebuild
new file mode 100644
index 00000000000..29438215747
--- /dev/null
+++ b/dev-qt/qtdiag/qtdiag-5.15.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="+network +widgets"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*:5=
+ network? ( =dev-qt/qtnetwork-${QT5_PV}*[ssl] )
+ widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/qtdiag
+)
+
+src_prepare() {
+ qt_use_disable_mod network network \
+ src/qtdiag/qtdiag.pro
+
+ qt_use_disable_mod widgets widgets \
+ src/qtdiag/qtdiag.pro
+
+ qt5-build_src_prepare
+}
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qtdiag 5
+}
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index 98e03084456..737fa9c9e2d 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1 +1,2 @@
-DIST qtgamepad-everywhere-src-5.15.2.tar.xz 387084 BLAKE2B bced25244afb2f97adb7b05dbe68021923c45083abaeec92ff405a8c65b89910803dcfe28f4982f9d54dacab616b9917c7cd04b475ac7c36e8002bb6cbbc9b6a SHA512 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1
+DIST qtgamepad-everywhere-opensource-src-5.15.3.tar.xz 387112 BLAKE2B 63de9daa102e07718733dfd2d85aebbec214390b0f1d399013a292db37544f1eb6d55f7cc71ccd0caa14d2602aa9a63351e4340cafe4c7dc85b638ed866307c3 SHA512 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa
+DIST qtgamepad-everywhere-opensource-src-5.15.4.tar.xz 388656 BLAKE2B a061f95d4401b058fe66437e71394e3635c8d23e0fa686c3732979e1f1773bd02d2f7a65b6a08f91350d0e870e7653d9acd1069ef34a27e0fe81fcaee41915a7 SHA512 37eaad5338b6c5114571c6983fb806ff6537ba7d3dc4bf8d02899e693198a22ce17b0b3ddf2aa52447fcebb0ef97a3baa8e1bc3a7e3f265ad047509f53160ee9
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild
index 240fb4f4e8b..eaf359db97b 100644
--- a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt module to support gamepad hardware"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm64 x86"
+ KEYWORDS="amd64 ~arm arm64 ~riscv x86"
fi
IUSE="evdev qml sdl"
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild
new file mode 100644
index 00000000000..23b8279f774
--- /dev/null
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Qt module to support gamepad hardware"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+IUSE="evdev qml sdl"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*[evdev?]
+ evdev? ( virtual/libudev:= )
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+ sdl? ( media-libs/libsdl2 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ qt_use_disable_mod qml quick \
+ src/src.pro
+
+ qt_use_disable_config evdev evdev \
+ src/plugins/gamepads/gamepads.pro
+
+ qt_use_disable_config sdl sdl2 \
+ src/plugins/gamepads/gamepads.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 7b92e4abf1d..c4bc63dee5f 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1 +1,2 @@
-DIST qtgraphicaleffects-everywhere-src-5.15.2.tar.xz 14040900 BLAKE2B 15564a1f849520adcf5cdaecf9ce015a4143c2843e339f11b291c7799242210187336a8894fa67608c172a9f1df9695124da470c67fc0448b0d1fefe59a89238 SHA512 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d
+DIST qtgraphicaleffects-everywhere-opensource-src-5.15.3.tar.xz 14040888 BLAKE2B 78de4dc63d496bf621f31de8aa6f4a62bae3582682619db498a12ee618d422e825346f6f0dad24dd877049d4cee0fe45e975d58d4fefeda8ad2e3d1a9390d929 SHA512 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98
+DIST qtgraphicaleffects-everywhere-opensource-src-5.15.4.tar.xz 14043408 BLAKE2B 9e0eabcad7af03635b72433f19087e76dad85d63637de28afa97bfd4927bc8b811f42d0dcf9ea3553f9d6560e95fa82ef98334f8de9b78f5c4c0febdf219a99a SHA512 00cf02057dfc1624c84079e1a08a65ceb6fb7df712f05ac9cb0006de0add9241e56a8e3909eeb04d1f6a90d5032909a41d59341e002750ab99d2449f635e64e3
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.3.ebuild
index 216671e4f05..b338f84aa1b 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild
new file mode 100644
index 00000000000..99c25daaad8
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdeclarative-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 2487ae322ae..876cb884f82 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,2 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-c9fde86b.tar.gz 67960262 BLAKE2B d1a6a7dac78abce189a753c0a00185fbe03f9de97b226790535af73a9bc009b353fe1edeb754d2098a7beeb7cd1c6e7efb949797658269ef0d0f200f11909820 SHA512 99026537dd4da678bcb04214ebb717907422e373b44fd3b3716798565c330f8d492ec1fc67d936c5125292b30e44f23abe4bf6434b58b9fa76bada3680dfc9f8
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
deleted file mode 100644
index 30b5abc3975..00000000000
--- a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 9 Feb 2020 11:45:00 +0100
-Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14
-
-In upstream commit:
-
-https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
-
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument
-IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for
-QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland.
-During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some
-reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
-cmake files regenerated, leading to cmake errors like:
-
-https://bugs.gentoo.org/703306
-https://bugs.gentoo.org/705198
-
-From mkspecs/features/create_cmake.prf:
-
-# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
-# functions whether a Configuration specific generator expression needs to be added to the values
-# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
-# configuration specific values. For singular builds (only release or only debug), we want the
-# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
-# build a Debug configuration of an application, even if Qt was built in a Release configuration.
-
-qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
-optional and default to FALSE.
-
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100
-@@ -538,8 +538,14 @@
-
- file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
-
-- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
-- IsDebugAndRelease)
-+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
-+ set(IsDebugAndRelease FALSE)
-+ set (list_var ${ARGN})
-+ list(LENGTH list_var num_extra_arg)
-+ if (${num_extra_arg} GREATER 0)
-+ list(GET list_var 0 IsDebugAndRelease)
-+ endif()
-+
- set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild b/dev-qt/qtgui/qtgui-5.15.3.ebuild
index f7f9b5e7c58..724233bb493 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
@@ -17,7 +17,7 @@ fi
IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
- || ( eglfs X )
+ || ( eglfs linuxfb vnc X )
accessibility? ( dbus X )
eglfs? ( egl )
ibus? ( dbus )
@@ -30,22 +30,23 @@ RDEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
dev-util/gtk-update-icon-cache
media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/libglvnd
+ media-libs/freetype:2
+ media-libs/harfbuzz:=
sys-libs/zlib:=
dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
eglfs? (
- media-libs/mesa[gbm]
+ media-libs/mesa[gbm(+)]
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( virtual/jpeg )
+ gles2-only? ( media-libs/libglvnd )
+ !gles2-only? ( media-libs/libglvnd[X] )
libinput? (
dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
+ x11-libs/libxkbcommon
)
- png? ( media-libs/libpng:0= )
+ png? ( media-libs/libpng:= )
tslib? ( >=x11-libs/tslib-1.21 )
tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
udev? ( virtual/libudev:= )
@@ -55,8 +56,8 @@ RDEPEND="
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- >=x11-libs/libxcb-1.12:=[xkb]
- >=x11-libs/libxkbcommon-0.5.0[X]
+ x11-libs/libxcb:=[xkb]
+ x11-libs/libxkbcommon[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
@@ -65,6 +66,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
+ linuxfb? ( sys-kernel/linux-headers )
udev? ( sys-kernel/linux-headers )
"
PDEPEND="
@@ -127,7 +129,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=(
"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
- "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
)
src_prepare() {
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r14.ebuild b/dev-qt/qtgui/qtgui-5.15.4.ebuild
index 08a64432311..86a98eca5a7 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r14.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
@@ -39,7 +39,7 @@ RDEPEND="
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
- jpeg? ( virtual/jpeg )
+ jpeg? ( media-libs/libjpeg-turbo:= )
gles2-only? ( media-libs/libglvnd )
!gles2-only? ( media-libs/libglvnd[X] )
libinput? (
@@ -129,7 +129,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=(
"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
- "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
)
src_prepare() {
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild b/dev-qt/qthelp/qthelp-5.15.3.ebuild
index 94ca49f5643..90a95aba5a1 100644
--- a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit qt5-build
@@ -18,7 +18,6 @@ IUSE=""
DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*
- =dev-qt/qtnetwork-${QT5_PV}*
=dev-qt/qtsql-${QT5_PV}*[sqlite]
=dev-qt/qtwidgets-${QT5_PV}*
"
diff --git a/dev-qt/qthelp/qthelp-5.15.4.ebuild b/dev-qt/qthelp/qthelp-5.15.4.ebuild
new file mode 100644
index 00000000000..0495ddc0e67
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.15.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtsql-${QT5_PV}*[sqlite]
+ =dev-qt/qtwidgets-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
+
+# https://invent.kde.org/qt/qt/qttools/-/merge_requests/2
+PATCHES=( "${FILESDIR}/${PN}-5.15.3-bogusdep.patch" )
+
+QT5_TARGET_SUBDIRS=(
+ src/assistant/help
+ src/assistant/qcollectiongenerator
+ src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 2d7fa26c706..4fd44376f3d 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1 +1,3 @@
-DIST qtimageformats-5.15.2-cb82c743.tar.gz 2366626 BLAKE2B 76edd4d0fc2908d466e4b7f9af1e93c50cae086c1da1144d4b8230d19163e2c43704365e396769d9ba10d48f46b42a1ce793e49686d6757790c32a1c0ff4db2b SHA512 f202f3abcdea0b49ae4f286fd50c1855c8b84d502b89f8350666828c6e29c4fa0bafd72b891513330e2541dc407d298076ffb519a030b4bb50517b5196ff9a3f
+DIST qtimageformats-5.15.4-gentoo-kde-1.tar.xz 1588 BLAKE2B f73941b56aad237eda0a4bd34979c8b32ec4c76511cb4f2850ba47fdf5a06bea180e155256f2e7bd5591d4fc0b84b5a2bffb8f326e75bb1c5d0a3ab7d874cd4a SHA512 f4a6dde562dea96f0c6db2e859f3e4566f842d887908eb389ace0aeb0c60b02a65b4c14030b05039322745d4140e979240ef2bd2dcf6c0284c44d6fa4e51686e
+DIST qtimageformats-everywhere-opensource-src-5.15.3.tar.xz 1811496 BLAKE2B 1d061623497c7fb185ee4ede9ae6421b6ba91ac01457d8490b823b74355c3a1e3194a762e9ebe31ce0375326efd84a626831e8fffb9ccd4af366987968b05d5b SHA512 f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e
+DIST qtimageformats-everywhere-opensource-src-5.15.4.tar.xz 1830288 BLAKE2B 7eebd51fe37d7fb33b78bb176a15cd943f0350307774f62c2a6635f5a603578819201402dd065f99dd01546c4d8d1e5e2fedaafa822656f7c5aa894a60dd17ca SHA512 388a9ceebdca6d32f606615af37233f2d8394856d067c9a80486b88ad5714eac90263cd6555a3efd9c1b5fdcc27431b7f99eed6fc02760b1a9974515bfe70274
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.3.ebuild
index 5d58b6ffc55..b1c214ed860 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.3.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=cb82c74310837fe4e832c8ab72176a5d63e4355f
inherit qt5-build
DESCRIPTION="Additional format plugins for the Qt image I/O system"
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild
new file mode 100644
index 00000000000..0926524f47a
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+inherit qt5-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="mng"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+ media-libs/libwebp:=
+ media-libs/tiff:0
+ mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ sed -e 's/qtConfig(jasper)/false:/' \
+ -i src/plugins/imageformats/imageformats.pro || die
+ qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
+
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 169ed434c67..ace8e30d251 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,2 +1,4 @@
-DIST qtlocation-5.15.2-861e372b.tar.gz 5431120 BLAKE2B c66e81f7e726b53000a0f8a4eafa9a4a6168aa08c89d4d0e2ef11b02e3598fd0b3f30dbd21e6c5436814bb88fa69c96d141b0d0d79f13239ec61396269af089a SHA512 b7cac8cd42185504c6140f1dcd4e8c0c749e3d8f22bf9977e97268e0ad6fbd3733e571a255ab7824eba31e30e707e804b07317f2ec9b7be15a4a5756c78c9e41
-DIST qtlocation-mapboxgl-5.15.2-d3101bbc.tar.gz 3726244 BLAKE2B e571a72e041b80b155eae7d171cee7f996fbe223c8d3337f549ea2a40472fc2da9dd8abf54238f22c1828d467aaf01307a61acecd3aedc4f5f7cabc06f48d830 SHA512 6e38e5ca0b9e17de690af79f4702278bdc933a74561aa135b3e82245df7d795602403048bcc5bce00237f774ce3957540a8bded1a71f8730a08da05dec1f039f
+DIST qtlocation-5.15.3-gentoo-kde-2.tar.xz 1000 BLAKE2B bf03283153bed5f2e67cfcc42784fb6cec7574492cbc63979316602e9f2684fdd10f140b743f82076ec39e0831faa8a5a2074e9cfdf7c4743eff354e076b635f SHA512 f44f5aa2f6aac3a62fbc3cc6eaa88949d54f4238d1cbc12d770ba3b48f97712678c491083029ba871fb9eb31f5172296e8951e83a3f874ac2a8a1a78478559e4
+DIST qtlocation-5.15.4-gentoo-kde-1.tar.xz 1000 BLAKE2B d50546826373a9123f91d2e21f670c030a4a9530494c4ab173a4045f79ea7c6907e39c0acb57e7e3e872146ad72785c4b72b7257672e432ff5870730f66a54cc SHA512 5d2217a3d40b873cd6b0b7c7815a9a52aa19824b7c2aed1d1ea3dac2fafa8b2af9a62ff3dacbdcb588072f2edb1cb226bc808d094ca4c6240a58835d4e93854c
+DIST qtlocation-everywhere-opensource-src-5.15.3.tar.xz 6556680 BLAKE2B aa187e23ed544e380516d93f3cb83fcff73ee501e7b790eb55b9ca9ddcdbf96d31b8b645b70e003423bf6e8945e2fb06be0ba62785a1ba5680acca2129003d83 SHA512 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886
+DIST qtlocation-everywhere-opensource-src-5.15.4.tar.xz 6559260 BLAKE2B ea43ae7e788f7d117fea9db50660cc2f4e7b6f8cf4ae390b41ed3adfa794d66596d8d7ac184d1edc432d2aa6057727321459a29ddbe399201ad428d290982297 SHA512 6208052d6ac173d19dc77496d8108558e7f31696dc5792fcbbeef2029539db76a60c5a51a7d198f54ea6c0ec23977a57cd8c8f8fa80fe5eac9528d2510c3dbb3
diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild b/dev-qt/qtlocation/qtlocation-5.15.3-r1.ebuild
index 9b2d0f37d3b..3f67cfe608d 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.3-r1.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=861e372b6ad81570d4f496e42fb25a6699b72f2f
+QT5_KDEPATCHSET_REV=2
inherit qt5-build
DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- MAPBOXGL_COMMIT=d3101bbc22edd41c9036ea487d4a71eabd97823d
- SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz"
KEYWORDS="amd64 arm arm64 ~riscv x86"
fi
@@ -41,13 +39,6 @@ QT5_TARGET_SUBDIRS=(
src/plugins/geoservices
)
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-src_prepare() {
- mv "${WORKDIR}"/${PN}-mapboxgl-${MAPBOXGL_COMMIT}/* src/3rdparty/mapbox-gl-native || die
- qt5-build_src_prepare
-}
-fi
-
src_configure() {
# src/plugins/geoservices requires files that are only generated when
# qmake is run in the root directory. Bug 633776.
diff --git a/dev-qt/qtlocation/qtlocation-5.15.4.ebuild b/dev-qt/qtlocation/qtlocation-5.15.4.ebuild
new file mode 100644
index 00000000000..ba9e9fc91df
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-5.15.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+inherit qt5-build
+
+DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+ dev-libs/icu:=
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdeclarative-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtnetwork-${QT5_PV}*
+ =dev-qt/qtpositioning-${QT5_PV}*[qml]
+ =dev-qt/qtsql-${QT5_PV}*
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ =dev-qt/qtconcurrent-${QT5_PV}*
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/3rdparty/clipper
+ src/3rdparty/poly2tri
+ src/3rdparty/clip2tri
+ src/3rdparty/mapbox-gl-native
+ src/location
+ src/imports/location
+ src/imports/locationlabs
+ src/plugins/geoservices
+)
+
+src_configure() {
+ # src/plugins/geoservices requires files that are only generated when
+ # qmake is run in the root directory. Bug 633776.
+ mkdir -p "${QT5_BUILD_DIR}"/src/location || die
+ qt5_qmake "${QT5_BUILD_DIR}"
+ cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 696b51d2b52..1c5315918e2 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1 +1,2 @@
-DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd
+DIST qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz 3828384 BLAKE2B d6b9c892411d25381aa8fbb648f6989808f56cbeebb4df5cbbba87f18694b7d03de741ff65654bcb2ac5e0953c97db4a1d039887cf61e485a2651693a2553518 SHA512 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668
+DIST qtmultimedia-everywhere-opensource-src-5.15.4.tar.xz 3833720 BLAKE2B bd381125280527eee7b5cec117c3d4c64ce2000b459effc1d912e5209d57bd88baf547967d61eefc94adf3f8aa85e3caf010b7ca9f7551b29182a90f483c5cfd SHA512 bb0ada7560093b89751b5b3c0e1a573de215a388d621d356bc3c0e1acfffc2d696230c67b7a7cef037b18c4da900c7eb3d315bd2e73ce12f9aedd0e340399117
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.3.ebuild
index 54ae53fe2ee..a3b1de4be51 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.4.ebuild
new file mode 100644
index 00000000000..b09333980ab
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
+
+RDEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+ =dev-qt/qtnetwork-${QT5_PV}*
+ alsa? ( media-libs/alsa-lib )
+ gstreamer? (
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ pulseaudio? ( media-sound/pulseaudio[glib] )
+ qml? (
+ =dev-qt/qtdeclarative-${QT5_PV}*
+ gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
+ openal? ( media-libs/openal )
+ )
+ widgets? (
+ =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
+ media-libs/libglvnd
+ )
+"
+DEPEND="${RDEPEND}
+ gstreamer? ( x11-base/xorg-proto )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" )
+
+src_prepare() {
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+ src/multimedia/multimedia.pro || die
+
+ qt_use_disable_config openal openal \
+ src/imports/imports.pro
+
+ qt_use_disable_mod qml quick \
+ src/src.pro \
+ src/plugins/plugins.pro
+
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ src/gsttools/gsttools.pro \
+ src/plugins/gstreamer/common.pri
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ $(qt_use alsa)
+ $(qt_use gstreamer)
+ $(qt_use pulseaudio)
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 2487ae322ae..876cb884f82 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,2 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-c9fde86b.tar.gz 67960262 BLAKE2B d1a6a7dac78abce189a753c0a00185fbe03f9de97b226790535af73a9bc009b353fe1edeb754d2098a7beeb7cd1c6e7efb949797658269ef0d0f200f11909820 SHA512 99026537dd4da678bcb04214ebb717907422e373b44fd3b3716798565c330f8d492ec1fc67d936c5125292b30e44f23abe4bf6434b58b9fa76bada3680dfc9f8
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index 5e81d7dc838..8a8481b49e8 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
- <flag name="bindist">Disable EC support via <pkg>dev-libs/openssl</pkg></flag>
<flag name="connman">Enable <pkg>net-misc/connman</pkg>-based bearer plugin</flag>
<flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r12.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r12.ebuild
deleted file mode 100644
index 0577a30d553..00000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r12.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
-
-DEPEND="
- =dev-qt/qtcore-${QT5_PV}*:5=
- sys-libs/zlib:=
- connman? ( =dev-qt/qtdbus-${QT5_PV}* )
- gssapi? ( virtual/krb5 )
- libproxy? ( net-libs/libproxy )
- networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] )
-"
-RDEPEND="${DEPEND}
- connman? ( net-misc/connman )
- networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/network
- src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
- libproxy:libproxy:
- ssl::SSL
- ssl::OPENSSL
- ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :network
-)
-
-pkg_setup() {
- use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
- use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
- local myconf=(
- $(usev connman -dbus-linked)
- $(qt_use gssapi feature-gssapi)
- $(qt_use libproxy)
- $(usev networkmanager -dbus-linked)
- $(qt_use sctp)
- $(usev ssl -openssl-linked)
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- # workaround for bug 652650
- if use ssl; then
- sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
- -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
- fi
-}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild
index babaf742b4c..e34cad6a77e 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
@@ -13,7 +13,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
+IUSE="connman gssapi libproxy networkmanager sctp +ssl"
DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
@@ -23,7 +23,7 @@ DEPEND="
libproxy? ( net-libs/libproxy )
networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* )
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] )
+ ssl? ( >=dev-libs/openssl-1.1.1:0= )
"
RDEPEND="${DEPEND}
connman? ( net-misc/connman )
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild
index 6ca6eb82633..ec7bb665b5a 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index e7e5b552beb..e3a533e1a1e 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1 +1,2 @@
-DIST qtnetworkauth-everywhere-src-5.15.2.tar.xz 141688 BLAKE2B dc850ffb257e2f2c8ece0d8676cf91454df49550883548206d1362946d09bd0ddf74b2a73ea4860c1cbf68f59f0d06312a7d21279f1401bf27c11b66341df95c SHA512 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d
+DIST qtnetworkauth-everywhere-opensource-src-5.15.3.tar.xz 141748 BLAKE2B 71b48d66be1e4ccb731384bb1a7cfcbff964df78d20ebca49bcd89f50a5fe7d65a786d3c6408a897c379129c1fd84c45bf89780f253ed46badc48e2f3303bba8 SHA512 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654
+DIST qtnetworkauth-everywhere-opensource-src-5.15.4.tar.xz 143472 BLAKE2B 661e2e704a4e58697c509b0feced0c27d2dd0b1419cbf128c64683afc6a462763c89f43c51a4e152bd909810b9771381409f8026d7b4365295e713abc85a5db2 SHA512 a36ce21151cb98bcbc99a819e873ef10f68d988aebfbae9aaaa7dc85bd4a693ad7510c47627f0f3841c5ef50173b21cdebe6a602fa429839fd9ad9bcc02d6c3c
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.3.ebuild
index 427cf618df8..7ead57ade6a 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ DESCRIPTION="Network authorization library for the Qt5 framework"
LICENSE="GPL-3"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm64 ~ppc64 x86"
+ KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
fi
IUSE=""
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild
new file mode 100644
index 00000000000..3c8a5d0b22f
--- /dev/null
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Network authorization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtnetwork-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 4b8920365b9..876cb884f82 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild b/dev-qt/qtopengl/qtopengl-5.15.3.ebuild
index e665ed8dace..a250eecca41 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
VIRTUALX_REQUIRED="test"
inherit qt5-build
diff --git a/dev-qt/qtopengl/qtopengl-5.15.4.ebuild b/dev-qt/qtopengl/qtopengl-5.15.4.ebuild
new file mode 100644
index 00000000000..7af53102350
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-5.15.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="gles2-only"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+ =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/opengl
+)
+
+src_configure() {
+ local myconf=(
+ -opengl $(usex gles2-only es2 desktop)
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild b/dev-qt/qtpaths/qtpaths-5.15.3.ebuild
index 1d79d126f61..89d6076a809 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit qt5-build
@@ -23,3 +23,8 @@ RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
src/qtpaths
)
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qtpaths 5
+}
diff --git a/dev-qt/qtpaths/qtpaths-5.15.4.ebuild b/dev-qt/qtpaths/qtpaths-5.15.4.ebuild
new file mode 100644
index 00000000000..6ce80927a5d
--- /dev/null
+++ b/dev-qt/qtpaths/qtpaths-5.15.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Command line client to QStandardPaths"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/qtpaths
+)
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path qtpaths 5
+}
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 96e0c95cdef..6d5271a661d 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1 +1,3 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
+DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
+DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
+DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r10.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.3.ebuild
index c08f8306e50..28b71c5c3d9 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r10.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qttools"
inherit qt5-build
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.4.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.4.ebuild
new file mode 100644
index 00000000000..7d97665f75f
--- /dev/null
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 plugin metadata dumper"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/qtplugininfo
+)
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index d6548eb5847..4e54390fd19 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1 +1,2 @@
-DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f
+DIST qtlocation-everywhere-opensource-src-5.15.3.tar.xz 6556680 BLAKE2B aa187e23ed544e380516d93f3cb83fcff73ee501e7b790eb55b9ca9ddcdbf96d31b8b645b70e003423bf6e8945e2fb06be0ba62785a1ba5680acca2129003d83 SHA512 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886
+DIST qtlocation-everywhere-opensource-src-5.15.4.tar.xz 6559260 BLAKE2B ea43ae7e788f7d117fea9db50660cc2f4e7b6f8cf4ae390b41ed3adfa794d66596d8d7ac184d1edc432d2aa6057727321459a29ddbe399201ad428d290982297 SHA512 6208052d6ac173d19dc77496d8108558e7f31696dc5792fcbbeef2029539db76a60c5a51a7d198f54ea6c0ec23977a57cd8c8f8fa80fe5eac9528d2510c3dbb3
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.3.ebuild
index 6154ad6744a..dba8769378b 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild
new file mode 100644
index 00000000000..88afe75e2aa
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qtlocation"
+inherit qt5-build
+
+DESCRIPTION="Physical position determination library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="geoclue +qml"
+
+RDEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ geoclue? ( =dev-qt/qtdbus-${QT5_PV}* )
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+ geoclue? ( app-misc/geoclue:2.0 )
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/3rdparty/clipper
+ src/3rdparty/poly2tri
+ src/3rdparty/clip2tri
+ src/positioning
+ src/plugins/position/positionpoll
+)
+
+pkg_setup() {
+ use geoclue && QT5_TARGET_SUBDIRS+=( src/plugins/position/geoclue2 )
+ use qml && QT5_TARGET_SUBDIRS+=(
+ src/positioningquick
+ src/imports/positioning
+ )
+}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 4b8920365b9..876cb884f82 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.3.ebuild
index 39e464926b2..16fb8af56cd 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
VIRTUALX_REQUIRED="test"
inherit qt5-build
@@ -20,7 +20,7 @@ RDEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
- cups? ( >=net-print/cups-1.4 )
+ cups? ( net-print/cups )
"
DEPEND="${RDEPEND}
test? ( =dev-qt/qtnetwork-${QT5_PV}* )
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild
new file mode 100644
index 00000000000..2a518d47909
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Printing support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="cups gles2-only"
+
+RDEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+ =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
+ cups? ( net-print/cups )
+"
+DEPEND="${RDEPEND}
+ test? ( =dev-qt/qtnetwork-${QT5_PV}* )
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/printsupport
+ src/plugins/printsupport
+)
+
+QT5_GENTOO_CONFIG=(
+ cups
+)
+
+src_configure() {
+ local myconf=(
+ $(qt_use cups)
+ -opengl $(usex gles2-only es2 desktop)
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 772be7c936e..0c4d7dec3c9 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1 +1,2 @@
-DIST qtquickcontrols-everywhere-src-5.15.2.tar.xz 5982344 BLAKE2B 425bf2841cf12dd636955abeeb520dda580f6b509c01562192d8f2c91d7a9c32349992cbb9f0c1f84a12a98c135656158660ed2d7b21fda204927d0c5255f708 SHA512 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2
+DIST qtquickcontrols-everywhere-opensource-src-5.15.3.tar.xz 5982868 BLAKE2B 62a9f972b744f54d8799587c915312797caf91087b8724081a0e1ce1a32f034b237e02db4a0064734117a4b0fede70f94f0c1399b9c3835250a157706899e7e2 SHA512 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e
+DIST qtquickcontrols-everywhere-opensource-src-5.15.4.tar.xz 5984236 BLAKE2B 0da3a2c3bd86a9fdb1e50627c3de51af3aa057ae76fd2492465d9eb0158384a0381f218df1f0b673934eb94d71aec33325e7fca82bf8a6466a49fb0b5518c78c SHA512 887a8f5fdcd3764575f9068ec8428526a049bb09ae0c214daef3652527d5e448baa53738dccf316b20ccf18f36951ecebd570aee3a27f9c32b9213ef7629de10
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.3.ebuild
index 494d453b030..992584e955a 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild
new file mode 100644
index 00000000000..8ad7d14e6c7
--- /dev/null
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="+widgets"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdeclarative-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+ widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ src/controls/Private/private.pri \
+ tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
+ tests/auto/controls/controls.pro \
+ tests/auto/testplugin/testplugin.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index b992931d43e..c9fbbb8be62 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1 +1,4 @@
-DIST qtquickcontrols2-5.15.2-be66bf9a.tar.gz 9243427 BLAKE2B 7fcb46a69b8ea5a149f489b8ef6302185976fcf2a1afbcc19a05156647e00e037c9b447d763f0e1055464ece9bef0daa12e1b094d91d61c1a20f06727c232ae2 SHA512 7edfacbab302e3e0492d7bdf2b2b761818104452be95e20d52e2bc2649ca684ffb7e6ce709ed47ef6072b965cd63e7943746b193ec3a959dbb9a5540cc5a7567
+DIST qtquickcontrols2-5.15.3-gentoo-kde-1.tar.xz 5628 BLAKE2B 97ac16b23318acea01d3c3a74321bca7d44e9ca84c5c542cc64817e6c21dcf6efe074c6ba0b4b6ad0a74369f2f8a249904ffeb7c977e2d951bbfff42e887470a SHA512 4c29c40a5f5cbb76de7073685eb8289fa046a9c25762146f5e42f262ff3debedd9b891bae45ecf7723921643dbd8418eada836f1409b75dd44b88b5548759016
+DIST qtquickcontrols2-5.15.4-gentoo-kde-1.tar.xz 5636 BLAKE2B 7a1e5b7b00b52389516d133d903543c840cadacdf95911a11218726f190dac61df4bc9d0ca885e9df2284b42238ecb45b243de136d4e403da2fcc19965372a12 SHA512 a1ee7486b7e3dd8cbfcdc72d7fc6c238edae4ce56f7319437ad75310ab25973780065ff6fd7af1b3903645ce3ce6f35c059125e4700b8840587d067bb5888195
+DIST qtquickcontrols2-everywhere-opensource-src-5.15.3.tar.xz 8286960 BLAKE2B 51cc31ead2b8943e59045065da68ab7a9e0785ac0e20947db95286ff41e411821e810cf34bcf1ad418cf847255e9409c3652b48e6a415d3ebcacdb84b8811a40 SHA512 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb
+DIST qtquickcontrols2-everywhere-opensource-src-5.15.4.tar.xz 8289400 BLAKE2B 2976bfd78117c7db4158e828753f0ce0c39582d92f5840967c4eab9a8af61bbd023cd3d3ea3fb3dde8debd340e4e2f4b2717da73de3a2b87a9f9e15985ab87cb SHA512 4ebbb0199db156307140406b6da4fa83c47aee2105e8c46c0da96313ddc4d6d7ea2f1f85691856144eb8c5109c108bb6810ba0693a2d2411b4feaeed1ec9a8f4
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.3.ebuild
index 19bc097b0b4..45db95baf17 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=be66bf9a5618c745d2a6ee2262967af6307b3b07
+QT5_KDEPATCHSET_REV=1
inherit qt5-build
DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild
new file mode 100644
index 00000000000..33542bdda1e
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+inherit qt5-build
+
+DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="widgets"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdeclarative-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+ widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}
+ =dev-qt/qtgraphicaleffects-${QT5_PV}*
+"
+
+src_prepare() {
+ qt_use_disable_mod widgets widgets \
+ src/imports/platform/platform.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 685f69e4d0f..9602d7baeac 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1 +1,2 @@
-DIST qtquicktimeline-everywhere-src-5.15.2.tar.xz 102624 BLAKE2B 65cd3ba114e8da442a32ebe43d36b653b3d9a35b65d4fd0eaf17985545ce918cf45da9484094ee889fe56d935c9b988a1deef1c7c416bcfd3cf153fd458eadbd SHA512 2ea623bf2d74ce4dea8e8639a9a8e4bbc9cfaf7b9ec84eec3da3b41b580962cfa6c443c8c47d7dfe312885f4250ccd6a7c91ca1cbbb0fe8385d0f41ad44c3b92
+DIST qtquicktimeline-everywhere-opensource-src-5.15.3.tar.xz 102668 BLAKE2B 73549b1ca701b67341f552ceec6aff714b132d7b37ece3ac071ee9fed72a0bde8516feff4d48b8eaaf78ad8d45e420f56b5902c2aae4a050d0a571778e004c3e SHA512 4ce49a112a6352b75bbce21bb262d26bb1e073678879ec82547da683a2dc7f2e9940687954bbfcc4c3012d9ebec9d768fa67d2beba941d187d444fc0049782bf
+DIST qtquicktimeline-everywhere-opensource-src-5.15.4.tar.xz 104348 BLAKE2B 0bd3ba5e18df88309418825428f23f1b64fa5e13b48c53b9f79484aa0997dceaf61248727d19479a7cf99ffb30197e95bf085d086dd2ef033dfc62541b26d362 SHA512 8c2f3bb898a56e78ddbf60efa40650e7203ed2cfc5c882619a20d65596c8538191f3ffb438cb38f41117fe07c04791af11ac2505dd521ca40ada33f6dc809e5d
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.3.ebuild
index 3ba1e4d5dce..f0aff5d0626 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.4.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.4.ebuild
new file mode 100644
index 00000000000..f0aff5d0626
--- /dev/null
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Qt module for keyframe-based timeline construction"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdeclarative-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 54fed450c1d..41f4f8be504 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1 +1,2 @@
-DIST qtscript-everywhere-src-5.15.2.tar.xz 2663016 BLAKE2B f3cf09396fbcd9c386de9628042d2b70263343fec3e1fa49e53e705f56802a244373a37e5daafe6d90252ad67a8b1d3e0446aa4520ff8ff4a8bd010951a5d86e SHA512 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32
+DIST qtscript-everywhere-opensource-src-5.15.3.tar.xz 2663512 BLAKE2B 742c35cb037378d3379e0311daea5d051f448832e470a7d1a7ede9e3e685472804c84d2432e7974030d7469023f5f8e7868bb2e24a854d4f41929c2fabddc9b3 SHA512 ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9
+DIST qtscript-everywhere-opensource-src-5.15.4.tar.xz 2665104 BLAKE2B f57661251785d21983871840675c38184b01ae7cc216c9431400fcf2567cc446edca1250e8e1c66a6970dc0da9721368f9baabc362fcfffd1ea3d6e81196587b SHA512 01d3b03eec23f462a7931e268eb8572d85ed560dd8b24f85b420ff8ebb1932d4c18f47c8d5fad7b7c09c147158b02b6cceb9c571b10249ba4008b363e23d7f95
diff --git a/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild b/dev-qt/qtscript/qtscript-5.15.3.ebuild
index b855afed554..579e5614509 100644
--- a/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtscript/qtscript-5.15.4.ebuild b/dev-qt/qtscript/qtscript-5.15.4.ebuild
new file mode 100644
index 00000000000..e41d31f3b5a
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-5.15.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="+jit scripttools"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ scripttools? (
+ =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtwidgets-${QT5_PV}*
+ )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ qt_use_disable_mod scripttools widgets \
+ src/src.pro
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ local myqmakeargs=(
+ JAVASCRIPTCORE_JIT=$(usex jit)
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 8e018db4479..3f62f68daa0 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1 +1,2 @@
-DIST qtscxml-everywhere-src-5.15.2.tar.xz 434204 BLAKE2B 8deaa46eb784690937160470b20dc01ae1b2ee80be89f1f19a22e1e2f2252d3d33427e96bb97b4ec8033b54a78c2a73e3b00fe3bbbe061e9b9bfb299801847fe SHA512 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8
+DIST qtscxml-everywhere-opensource-src-5.15.3.tar.xz 434432 BLAKE2B 4fca0228dfae034b19e8021f717f71ac84f71b54e8245ac06168abd509925c16ed4403f0af2c7d7d20bea2043c4fb22cecc33f9e54972788370b8227050d8c45 SHA512 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1
+DIST qtscxml-everywhere-opensource-src-5.15.4.tar.xz 435952 BLAKE2B 83b599360a3b82fa2e5e203f0a9dcf3ed52c4989f885540a5ffb203fc7d4d70f17c1a21fd1d81ff93b469c91eb3333b5c647c507214175da3c38d14651c7e9b3 SHA512 2664e4e707fd10aa2ef832fdfc133695da3f6f80c2a611dc94b4e22b34c3226d5baa1e5afc77db2115317c654460ebb60896c006aa93b324fe67d6860ae9b431
diff --git a/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild b/dev-qt/qtscxml/qtscxml-5.15.3.ebuild
index 868a3450c83..a778e477a99 100644
--- a/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm64 ~riscv x86"
+ KEYWORDS="amd64 ~arm arm64 ~riscv x86"
fi
IUSE=""
diff --git a/dev-qt/qtscxml/qtscxml-5.15.4.ebuild b/dev-qt/qtscxml/qtscxml-5.15.4.ebuild
new file mode 100644
index 00000000000..0c8a34aec71
--- /dev/null
+++ b/dev-qt/qtscxml/qtscxml-5.15.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdeclarative-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index c6b24fe48db..ffe1e4b3be2 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1 +1,2 @@
-DIST qtsensors-everywhere-src-5.15.2.tar.xz 2056944 BLAKE2B 49f4e91027b122a16d65d953275b8720ecb9c12e9bff3a190df59dba703f6f3f8e8ec8c8fec1084154ec7a03a9a2c5d2fe196ec09ddf8f2282c16edd3873a965 SHA512 d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b
+DIST qtsensors-everywhere-opensource-src-5.15.3.tar.xz 2057388 BLAKE2B d6eb62a51e19ea18d2ea1183e5d74fa8e4b7e7b3a1d3d0a5654d51c287860c3a2537ac74ed1526c56024697840da954a24e0656b0a02f94b7d591ae55678f309 SHA512 c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2
+DIST qtsensors-everywhere-opensource-src-5.15.4.tar.xz 2058828 BLAKE2B 86ff838bf3d02fcd42b280f6027e3d0e3ca93c17475cf85c9cec7d4615398c12d507f79a810f33491d5b2601566fdbfaa0371c2e3cd3349d5e29042846fb22a2 SHA512 b8b9ffedfdcd392bd5c1ab76db3f621d16094f444e14900726378a289c04c08a75b82628cb61f4ca66bba8c1eeba2a56d9f90d9a82adfdc90fc00ac1b579c63e
diff --git a/dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild b/dev-qt/qtsensors/qtsensors-5.15.3.ebuild
index c28fdfe5440..0823e6a19fc 100644
--- a/dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtsensors/qtsensors-5.15.4.ebuild b/dev-qt/qtsensors/qtsensors-5.15.4.ebuild
new file mode 100644
index 00000000000..843c258ce31
--- /dev/null
+++ b/dev-qt/qtsensors/qtsensors-5.15.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Hardware sensor access library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+# TODO: simulator
+IUSE="qml"
+
+RDEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdbus-${QT5_PV}*
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ qt_use_disable_mod qml quick \
+ src/src.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index 7c8d3a7a214..751c1494c98 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1 +1,2 @@
-DIST qtserialbus-everywhere-src-5.15.2.tar.xz 356360 BLAKE2B 491f3a7b9df8f58496cff1c4fea87615335486ec834f859029340c7e34551e1127ce4e2689f16e06e195e40691300475ccace19c1fd43fefe0a56c10961184c2 SHA512 c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b
+DIST qtserialbus-everywhere-opensource-src-5.15.3.tar.xz 356520 BLAKE2B 72ce583891922672d9ee3a62f849846cf2d641847a65262f70020751b64c99b49469eaa7582d851adf020bd6203b1b3fe7c6a797af16be251c4ce32135d9419e SHA512 af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87
+DIST qtserialbus-everywhere-opensource-src-5.15.4.tar.xz 358164 BLAKE2B d757170d7195afc106ff40ef1b24038a340712b3cebd7721373a01f337c4ff055a62b7927c082c5e801dcf2b493e3c88b82d9a257f29580f0a58e30375f41575 SHA512 931362b171799fd8e449d418c3ae80c029c39edffc66b5c3fa054991332950241803d282e1ae1e5f72c8395f88f9d82d6a2d04f00b3907b5e9f7fb5be4f555e7
diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.3.ebuild
index 0d8fd68fa6e..1931b8c79e7 100644
--- a/dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.4.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.4.ebuild
new file mode 100644
index 00000000000..1931b8c79e7
--- /dev/null
+++ b/dev-qt/qtserialbus/qtserialbus-5.15.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtnetwork-${QT5_PV}*
+ =dev-qt/qtserialport-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 4fbf20380e3..ea4134e5961 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1 +1,2 @@
-DIST qtserialport-everywhere-src-5.15.2.tar.xz 321496 BLAKE2B 1a2d1a925a1f8224de6babad131efa9bb2e417574be939be35edf3a3b9f34a7fb12cc282f94ee2d8e52178cec7679caf1402f5a45a14bb15a546023fed494907 SHA512 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b
+DIST qtserialport-everywhere-opensource-src-5.15.3.tar.xz 321572 BLAKE2B 1ddfdb27afda4486b6ffc137076055a20eebae5ab099c22512c94a1a735730b13632961ea27defbda48b333f0867f16b93dfdfea7382f32022c7456e4bb836d0 SHA512 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a
+DIST qtserialport-everywhere-opensource-src-5.15.4.tar.xz 323248 BLAKE2B 3c48bf1a9ad927c69f7e0b6bc425b8aa2182b2dac3e0a5f8cb2a434a815865d24da4237eabf3d3bf6276b3901015da2827063849223a9f845a6a3535eea10131 SHA512 d8bc3d0b89bb4fc05bfe27a4c76bc3732ef5f8ba889400c8116f18c2ed58db7a3b99c4bda1cd60d1e8051121d31a4b55b95d20e89578a6e523d527e6182262ba
diff --git a/dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild b/dev-qt/qtserialport/qtserialport-5.15.3.ebuild
index 26e5eb53bd0..b0dd7a0e806 100644
--- a/dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtserialport/qtserialport-5.15.4.ebuild b/dev-qt/qtserialport/qtserialport-5.15.4.ebuild
new file mode 100644
index 00000000000..c00d3871747
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-5.15.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Serial port abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ virtual/libudev:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # make sure we link against libudev
+ sed -i -e 's/:qtConfig(libudev)//' \
+ src/serialport/serialport-lib.pri || die
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index cb4d6384726..0b04edd4437 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1 +1,4 @@
-DIST qtspeech-everywhere-src-5.15.2.tar.xz 101940 BLAKE2B 0b100fddac7bc880b79914be54a8618e3e31e9a2486e8cd4ab9f65eabaec605d9aba7c66f71569466798b9cc94e97a2e136868a6f8eda3208f9d0a9515e71ac9 SHA512 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05
+DIST qtspeech-5.15.3-gentoo-kde-1.tar.xz 1036 BLAKE2B 8b648b77ed363060aa59bfcb8dcae81af1f9712e347b3f29969bb5a2a0b39087a8f469240c70f3bb9d2e371c70cac5a659f96fd3c34c02814bf619aa55fe8161 SHA512 0c0714b7a603eb7baa45af7fcbcb922750d38d4e5f8bba4426a7b5e5986fdaca4b3538ec4f5fd5f78df1e12892ad77713231cc1553cb875c1903f8ce0f61adc9
+DIST qtspeech-5.15.4-gentoo-kde-1.tar.xz 1036 BLAKE2B b842d09405198fee63d7ef54db26c683ec81319ae5fe48925349bec70e27019852259b80005d33a30b8462c573ab7e34308dc5d36c4ac0b99d273400eb7603f5 SHA512 5604f2c491ff9c33335c1f65fa67d17d0aac37a6dfc6b188053bf338fbabdf00243c6a1f1d4ff07a3344de5241d1fca08d82768874d2888cd02d3a6a4a675ebc
+DIST qtspeech-everywhere-opensource-src-5.15.3.tar.xz 101852 BLAKE2B f6184e0bb28f480c7843aea772fa3bb59219dbff79213671051cf6b7322a14e8ad8f6bffdc190b5d0059695e6d780f6a97abc661a97d64bee55b5a919208eb44 SHA512 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a
+DIST qtspeech-everywhere-opensource-src-5.15.4.tar.xz 103820 BLAKE2B 2c9fabcda61223ead3e3a7d51f4b28c86048fa4e1766b7c43fe5c41470782edfd6a9b1b784a50d69f40efbd5b8aac44ad01427b013f3aa7530c466c393b0433f SHA512 6582fe36950aee8428c72582ff2eda2dae433ad969c323e0c6e8be611be7d81766ceb1cae85a10dcd4d266e33a0cf782fe857e1502d7f3863e0dfb2306af2aed
diff --git a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild b/dev-qt/qtspeech/qtspeech-5.15.3.ebuild
index 996d482b76c..a73f0796dd1 100644
--- a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.15.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+QT5_KDEPATCHSET_REV=1
inherit qt5-build
DESCRIPTION="Text-to-speech library for the Qt5 framework"
diff --git a/dev-qt/qtspeech/qtspeech-5.15.4.ebuild b/dev-qt/qtspeech/qtspeech-5.15.4.ebuild
new file mode 100644
index 00000000000..09fec697612
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-5.15.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+inherit qt5-build
+
+DESCRIPTION="Text-to-speech library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="alsa flite"
+
+RDEPEND="
+ >=app-accessibility/speech-dispatcher-0.8.7
+ =dev-qt/qtcore-${QT5_PV}*
+ flite? (
+ >=app-accessibility/flite-2[alsa?]
+ =dev-qt/qtmultimedia-${QT5_PV}*[alsa?]
+ alsa? ( media-libs/alsa-lib )
+ )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ qt_use_disable_config flite flite \
+ src/plugins/tts/tts.pro
+
+ qt_use_disable_config alsa flite_alsa \
+ src/plugins/tts/flite/flite.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 2487ae322ae..876cb884f82 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,2 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-c9fde86b.tar.gz 67960262 BLAKE2B d1a6a7dac78abce189a753c0a00185fbe03f9de97b226790535af73a9bc009b353fe1edeb754d2098a7beeb7cd1c6e7efb949797658269ef0d0f200f11909820 SHA512 99026537dd4da678bcb04214ebb717907422e373b44fd3b3716798565c330f8d492ec1fc67d936c5125292b30e44f23abe4bf6434b58b9fa76bada3680dfc9f8
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild b/dev-qt/qtsql/qtsql-5.15.3.ebuild
index 7d2229ef073..475735092f6 100644
--- a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
@@ -15,7 +15,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
REQUIRED_USE="
|| ( freetds mysql oci8 odbc postgres sqlite )
"
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild b/dev-qt/qtsql/qtsql-5.15.4.ebuild
index b0ef4887285..ae464f87a8a 100644
--- a/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
@@ -15,7 +15,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
REQUIRED_USE="
|| ( freetds mysql oci8 odbc postgres sqlite )
"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index a5b8f503a5b..b6f31437092 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,2 +1,5 @@
-DIST qtsvg-5.15.2-24128cdf.tar.gz 2779708 BLAKE2B 5e52a0b1c7b3e21ab58b2e6e091c8fc85d5432e247313f74bd8c4d8899cd2634e3242d5d328174d3702544d050504dd3870c1c075a2b7a87c268c371c95b0c76 SHA512 c0840608ff66b0f335f8e5d883a5f8c113de91608ea8b613743c4881a103ff1c9981337c29a0e272ca2bccd4077df9cd8fde320e09eec1e8f6a3eead5cb75198
-DIST qtsvg-5.15.2-cfc61697.tar.gz 2779382 BLAKE2B cd75575741b05cb1ec1b206d1d338c011c718923339d1cb169f0f537f21931e32042f10574e70b5c64d4fc352dfa56adc8b852dafa5131198630afe6bb806580 SHA512 1f8b52c713b4c6d4974af46ebe6519ea597f72ac0c4b80e061f714ff30449e6fdae94eb9705f3c1b857c5ad0647e5875260ee40051cec78321caf7b944fd3d70
+DIST qtsvg-5.15.3-QTBUG-90744.tar.xz 632 BLAKE2B e7f2f52dc546f9520ac2311b417b86d697ab20f8d02318fce76d46b35efcaf3dccdab5377d65c01af3a193df478083733c466e3a778325e73184f84830080686 SHA512 1681a2e0395d97b30b49b981e342b7e647108ba19b1472f34239136e1b946da67afaac3454533139a55a0f5f0a5fd167596a2ca7b26e4c018fa41a91dd94cd7b
+DIST qtsvg-5.15.3-gentoo-kde-1.tar.xz 7384 BLAKE2B 25d0b5216ab6c0fc8758a55138000b641d2ca57a64095c1117c1d5da59cca3dda890fe2b0b8589d5be0ac19e73f3a329af5710dfa163a25609f068d673f830b5 SHA512 4b512bb8ea1ee6e38b28ad52a34a1f2b6a6a7ac72c341b8faacb599f6cd770924ae7a473052c59783653a734e8061d0167633954a6d3d9ae2ed33e0a65adeb44
+DIST qtsvg-5.15.4-gentoo-kde-1.tar.xz 6804 BLAKE2B 30e43ecf736cc2f9067e82fc55d7253531684f256c8182ca14f3a9d211f836e782576d56ee31169951ce03423755c5382e4f865f55694b80ae4a3ec20de08483 SHA512 ee2cd718683a445ea21961b8b79e95132a0ced5ce370aed020c0c55ec4d7bf2b4c465cd0b16c2b0294591e78cc95a5941677f947a08ca8960bafac208ad05514
+DIST qtsvg-everywhere-opensource-src-5.15.3.tar.xz 1886104 BLAKE2B feced6caaa2e2be089ffed77f32d3b0de899b8a97632234ca8aa9d1f34fc0ee94ecd44227bb7c40ec49f0a76b305dc29ad23498bff3c62f45054854ed632b1d1 SHA512 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527
+DIST qtsvg-everywhere-opensource-src-5.15.4.tar.xz 1888900 BLAKE2B ceb055e09f877e826c36569ff41cceab69b8da9eebdb5b7851a582bb4389d16feb939257b8b102aef7229ca8c8777ac0f586d554a88606cb27d287de4a5f5246 SHA512 364400e17cdc659ff1a521f7bd171c5dfe537136f263cd5f64c6b5e27b0398d83ae0b5fe46e77847f3a2feccf0ea75f9591ff4b932d0250e5859272630b5a31c
diff --git a/dev-qt/qtsvg/files/qtsvg-5.15.3-QTBUG-90744-minus-binarypatch.patch b/dev-qt/qtsvg/files/qtsvg-5.15.3-QTBUG-90744-minus-binarypatch.patch
new file mode 100644
index 00000000000..1cdd5fd5ffc
--- /dev/null
+++ b/dev-qt/qtsvg/files/qtsvg-5.15.3-QTBUG-90744-minus-binarypatch.patch
@@ -0,0 +1,142 @@
+From cfc616978b52a396b2ef6900546f7fc086d7cab3 Mon Sep 17 00:00:00 2001
+From: Eirik Aavitsland <eirik.aavitsland@qt.io>
+Date: Thu, 8 Apr 2021 13:19:52 +0200
+Subject: [PATCH 3/9] Make image handler accept UTF-16/UTF-32 encoded SVGs
+
+The canRead() header checks assumed 8 bit encoding.
+
+Pick-to: 6.1 6.0 5.15
+Fixes: QTBUG-90744
+Change-Id: Ibe934fe9ed31b89ee0fbfc4562aa66ab1b359225
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+(cherry picked from commit 45fb1f07eaa984af40fca9f12b8f3d27f7b0e9ac)
+---
+ .../imageformats/svg/qsvgiohandler.cpp | 37 +++++++++++-------
+ tests/auto/qsvgplugin/simple_Utf16BE.svg | Bin 0 -> 228 bytes
+ tests/auto/qsvgplugin/simple_Utf16LE.svg | Bin 0 -> 228 bytes
+ tests/auto/qsvgplugin/simple_Utf32BE.svg | Bin 0 -> 456 bytes
+ tests/auto/qsvgplugin/simple_Utf32LE.svg | Bin 0 -> 456 bytes
+ tests/auto/qsvgplugin/simple_Utf8.svg | 3 ++
+ tests/auto/qsvgplugin/tst_qsvgplugin.cpp | 32 +++++++++++++++
+ 7 files changed, 57 insertions(+), 15 deletions(-)
+ create mode 100644 tests/auto/qsvgplugin/simple_Utf16BE.svg
+ create mode 100644 tests/auto/qsvgplugin/simple_Utf16LE.svg
+ create mode 100644 tests/auto/qsvgplugin/simple_Utf32BE.svg
+ create mode 100644 tests/auto/qsvgplugin/simple_Utf32LE.svg
+ create mode 100644 tests/auto/qsvgplugin/simple_Utf8.svg
+
+diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp
+index bd39b2a..4136aaf 100644
+--- a/src/plugins/imageformats/svg/qsvgiohandler.cpp
++++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp
+@@ -118,6 +118,24 @@ QSvgIOHandler::~QSvgIOHandler()
+ delete d;
+ }
+
++static bool isPossiblySvg(QIODevice *device, bool *isCompressed = nullptr)
++{
++ constexpr int bufSize = 64;
++ char buf[bufSize];
++ const qint64 readLen = device->peek(buf, bufSize);
++ if (readLen < 8)
++ return false;
++# ifndef QT_NO_COMPRESS
++ if (quint8(buf[0]) == 0x1f && quint8(buf[1]) == 0x8b) {
++ if (isCompressed)
++ *isCompressed = true;
++ return true;
++ }
++# endif
++ QTextStream str(QByteArray::fromRawData(buf, readLen));
++ QByteArray ba = str.read(16).trimmed().toLatin1();
++ return ba.startsWith("<?xml") || ba.startsWith("<svg") || ba.startsWith("<!--") || ba.startsWith("<!DOCTYPE svg");
++}
+
+ bool QSvgIOHandler::canRead() const
+ {
+@@ -126,15 +144,9 @@ bool QSvgIOHandler::canRead() const
+ if (d->loaded && !d->readDone)
+ return true; // Will happen if we have been asked for the size
+
+- QByteArray buf = device()->peek(16);
+-#ifndef QT_NO_COMPRESS
+- if (buf.startsWith("\x1f\x8b")) {
+- setFormat("svgz");
+- return true;
+- } else
+-#endif
+- if (buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--") || buf.contains("<!DOCTYPE svg")) {
+- setFormat("svg");
++ bool isCompressed = false;
++ if (isPossiblySvg(device(), &isCompressed)) {
++ setFormat(isCompressed ? "svgz" : "svg");
+ return true;
+ }
+ return false;
+@@ -260,12 +272,7 @@ bool QSvgIOHandler::supportsOption(ImageOption option) const
+
+ bool QSvgIOHandler::canRead(QIODevice *device)
+ {
+- QByteArray buf = device->peek(16);
+- return
+-#ifndef QT_NO_COMPRESS
+- buf.startsWith("\x1f\x8b") ||
+-#endif
+- buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--") || buf.contains("<!DOCTYPE svg");
++ return isPossiblySvg(device);
+ }
+
+ QT_END_NAMESPACE
+diff --git a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
+index e1f84f3..73bbe8b 100644
+--- a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
++++ b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
+@@ -61,6 +61,8 @@ private slots:
+ void checkSize_data();
+ void checkSize();
+ void checkImageInclude();
++ void encodings_data();
++ void encodings();
+ };
+
+
+@@ -145,6 +147,36 @@ void tst_QSvgPlugin::checkImageInclude()
+ logMessages.clear();
+ }
+
++void tst_QSvgPlugin::encodings_data()
++{
++ QTest::addColumn<QString>("filename");
++
++ QTest::newRow("utf-8") << QFINDTESTDATA("simple_Utf8.svg");
++ QTest::newRow("utf-16LE") << QFINDTESTDATA("simple_Utf16LE.svg");
++ QTest::newRow("utf-16BE") << QFINDTESTDATA("simple_Utf16BE.svg");
++ QTest::newRow("utf-32LE") << QFINDTESTDATA("simple_Utf32LE.svg");
++ QTest::newRow("utf-32BE") << QFINDTESTDATA("simple_Utf32BE.svg");
++}
++
++void tst_QSvgPlugin::encodings()
++{
++ QFETCH(QString, filename);
++
++ {
++ QFile file(filename);
++ file.open(QIODevice::ReadOnly);
++ QVERIFY(QSvgIOHandler::canRead(&file));
++ }
++
++ QFile file(filename);
++ file.open(QIODevice::ReadOnly);
++ QSvgIOHandler plugin;
++ plugin.setDevice(&file);
++ QVERIFY(plugin.canRead());
++ QImage img;
++ QVERIFY(plugin.read(&img));
++ QCOMPARE(img.size(), QSize(50, 50));
++}
+
+ QTEST_MAIN(tst_QSvgPlugin)
+ #include "tst_qsvgplugin.moc"
+--
+2.35.1
+
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild b/dev-qt/qtsvg/qtsvg-5.15.3.ebuild
index 63798ecf760..134214df28a 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.3.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=cfc616978b52a396b2ef6900546f7fc086d7cab3
+QT5_KDEPATCHSET_REV=1
inherit qt5-build
DESCRIPTION="SVG rendering library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-QTBUG-90744.tar.xz"
fi
IUSE=""
@@ -23,3 +24,11 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( =dev-qt/qtxml-${QT5_PV}* )
"
+
+PATCHES=( "${FILESDIR}"/${P}-QTBUG-90744-minus-binarypatch.patch )
+
+src_unpack() {
+ default
+ # contains binary patch, so it is applied manually instead
+ rm "${WORKDIR}"/${P}-gentoo-kde-1/0003-Make-image-handler-accept-UTF-16-UTF-32-encoded-SVGs.patch || die
+}
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r11.ebuild b/dev-qt/qtsvg/qtsvg-5.15.4.ebuild
index 720674fb492..e508f12c2e4 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r11.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=24128cdf8bef53eddf31a5709bbbc46293006b1c
+QT5_KDEPATCHSET_REV=1
inherit qt5-build
DESCRIPTION="SVG rendering library for the Qt5 framework"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 4b8920365b9..876cb884f82 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qttest/qttest-5.15.2-r10.ebuild b/dev-qt/qttest/qttest-5.15.3.ebuild
index 8489fbe36c7..9370c7c39e6 100644
--- a/dev-qt/qttest/qttest-5.15.2-r10.ebuild
+++ b/dev-qt/qttest/qttest-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
VIRTUALX_REQUIRED="test"
inherit qt5-build
diff --git a/dev-qt/qttest/qttest-5.15.4.ebuild b/dev-qt/qttest/qttest-5.15.4.ebuild
new file mode 100644
index 00000000000..3bd53794667
--- /dev/null
+++ b/dev-qt/qttest/qttest-5.15.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Unit testing library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+"
+DEPEND="${RDEPEND}
+ test? (
+ =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtxml-${QT5_PV}*
+ )
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/testlib
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :testlib
+)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index c8400f62976..7f6b8061bea 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1 +1,4 @@
-DIST qttranslations-5.15.2-68f420eb.tar.gz 2994506 BLAKE2B a0cdc69f6fc9b455b98658ee386d15346c1c23eeedeb4b7ca9d7cd7b60e7ee06a537a68530d017797683d60485dc38b02144f35f3e3e94c280a00b65a690bf97 SHA512 012e83971a8064d87d0d7ea50e6a9579916974fdaef195f1eea1639673085512bd421ced7abc2550c5b07dad264c861a75cd8ae6d48ac1c5e78f5359ceaa61b4
+DIST qttranslations-5.15.3-gentoo-kde-1.tar.xz 1108 BLAKE2B f3d461f309225001c5c6af038fccb78a2a14902d02018f6f5c0af53a0033328fe9e4809b054982041d1d48f812bf1fbc9aeafe2de1abbdd9406739600c28ebcd SHA512 4e40f15d2477567043feec3d425dd835ac977fb03444043a3806c07e4286dfdab1ffe4d7fd76b3e26ba398bd28e7aad49befdc1b7ce39320621bcc864de19f98
+DIST qttranslations-5.15.4-gentoo-kde-1.tar.xz 1108 BLAKE2B 873e90fb86fc497a36e4154018672b57c6475ee46b834648ce0b0f1236ace237621fe868702b4bf72f49dea46074819f65a0d1c3f325ea6d0bca088dde4ff195 SHA512 ceea094797fa1bab6785f49dde3db225b21e5f7e76459776f0309c1eb073556de9d40c102c7fc3b7a102ef69f021225e71a212417afc1a7052e94ca97e7d1f95
+DIST qttranslations-everywhere-opensource-src-5.15.3.tar.xz 1617284 BLAKE2B 983f3ca42c3d0c896925e9ccdd9036eb9c91152515f5b99227508d96b41ff3a6b10dff33bb5142c2ec141f7757ab2ef10af11ecdc4c31cb43fa2375dd153a926 SHA512 d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc
+DIST qttranslations-everywhere-opensource-src-5.15.4.tar.xz 1618964 BLAKE2B 9377cdaee2839fe0672596e041502037a345bbb52b04a1ce8aedd46e542301c3883e378a9406d0112f615cc46172df062182d6530390dc3ff3bf3b78b6dac644 SHA512 56b20c0174cb68c3e4def85ec6c113576bc8872d1cdac318bc3d9a121645f67ce68e9bd3a73e32fd53617fcef641fb95831b37c40f1250c1c05e109e55b41ee2
diff --git a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild b/dev-qt/qttranslations/qttranslations-5.15.3.ebuild
index 95a06c5982b..b54f7ed8551 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f
+QT5_KDEPATCHSET_REV=1
inherit qt5-build
DESCRIPTION="Translation files for the Qt5 framework"
diff --git a/dev-qt/qttranslations/qttranslations-5.15.4.ebuild b/dev-qt/qttranslations/qttranslations-5.15.4.ebuild
new file mode 100644
index 00000000000..ff9d0e5c053
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-5.15.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+inherit qt5-build
+
+DESCRIPTION="Translation files for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="=dev-qt/qtcore-${QT5_PV}*"
+BDEPEND="=dev-qt/linguist-tools-${QT5_PV}*"
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 79ba5e20230..aff1a5505f8 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1 +1,4 @@
-DIST qtvirtualkeyboard-5.15.2-353b75b2.tar.gz 13693438 BLAKE2B fc803496c2b56967e6b5d192805fa577072561cc55a891957e47985cec6d4971aa055e2d9d9b2e585d182426ec835f604279f7bf9882fd50ead9c65d29f91e5b SHA512 0152ad3848dd856ca4d3551e4296a68ed3bc7cd8d8dd45655232ca64586c1ce936ee819dff0dc3e2f6779a70f1faf5ae3d3fd2183a69f9313d943c506391b167
+DIST qtvirtualkeyboard-5.15.3-gentoo-kde-1.tar.xz 1068 BLAKE2B 963ce43df400ec01f8d483f75d46f50e61b22d33df59f82fc50e4f3bc1d62a39a8556744d5b3f5bc9425aa69f5d30b74abbe6390287c2319824b9b95733c2411 SHA512 373ff84f82e5e8b202dd42c03b446efecab71af110363387ea885cf76eb618bdca02b80935b15cc14e49d613191af11a60aeef723383a5e2b2b9340c430e56b4
+DIST qtvirtualkeyboard-5.15.4-gentoo-kde-1.tar.xz 2968 BLAKE2B c1d8fa4309f1bdaff7240177ee0ea5487ea4d36c591c44ab4144afbd73051fa051376ed071eefdd1e9d85bc0f2fa386770b06c64cdff62b759142d2f5f2dae79 SHA512 b5106085b9e40071fdc1776afede0065218e8585e73c1367a7ae428641b4be0664146577f8de41e83707db5a3b74347821d5f485458fdd4642090c9c2351aa98
+DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.3.tar.xz 10959776 BLAKE2B 1147b74d148398736dbdadd3e6513d23816be889a0995fcd375d36b41ad4624ac295afc89a9dd089b4b7587a8e1d09c654d081adfd26d5847d6e6b10a892d794 SHA512 f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2
+DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.4.tar.xz 10964124 BLAKE2B c688273a37243b68fd228de559baa8fd6def9f772bc8d032f9947a19541ac27e748cea6b1c33777e8a79791df75da6164706aa9631106f562965bb4e14eb8b5e SHA512 870279299a5e166badea0746a2d4badc758c66f8404e36d1df05997dcfeb66733154fc2a9830c433fbacf885b7afb44bc8dc8a5aacc02713966630ce98231ba3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.3.ebuild
index 0ed8265c7dd..9ee74099b8c 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=353b75b2e34bdae901625bbddf5c5e3f3e6c0de5
+QT5_KDEPATCHSET_REV=1
inherit qt5-build
DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild
new file mode 100644
index 00000000000..672181fecc1
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+inherit qt5-build
+
+DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+# TODO: unbundle libraries for more layouts
+IUSE="handwriting +spell +X"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdeclarative-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtsvg-${QT5_PV}*
+ spell? ( app-text/hunspell:= )
+ X? ( x11-libs/libxcb:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local myqmakeargs=(
+ $(usev handwriting CONFIG+=lipi-toolkit)
+ $(usev !spell CONFIG+=disable-hunspell)
+ $(usev !X CONFIG+=disable-desktop)
+ CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
+ lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
+ lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
+ lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
+ lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
+ lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
+ lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
+ lang-uk_UA lang-vi_VN"
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 8fcb0883fb4..1a095cd4bc2 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,2 +1,4 @@
-DIST qtwayland-5.15.2-992833ca.tar.gz 829101 BLAKE2B a00cce48b06b9537561e51598dceb3b2cf2f77ccba869b726b7ac473764dd64024ef759a8d46dd3f3e1161c27fcb1c70ce20a5c3d6f2e9938950cd38f84bc2c2 SHA512 3520a7b8b27703b3306a5e852498c1805f359e09d2622ed53b5ee2038e6e99d3d0132f47d78167cdf4a1d1f0d4955f8440cec897fcc4dc24f7d3a3a7a493c584
-DIST qtwayland-5.15.2-efe6edca.tar.gz 829293 BLAKE2B 6ccc5a4e111818cc65855eb4570727f30932bec9a749069550d07332df719eaeec0baf472c025150a32c9c380294f5e9496ad3babd181887a02fc37d1bfd5f2a SHA512 87190cd1ade57c98da972a2f5d48aa0376ccc4bfa589f5832b8a62a63b3eafa6acf88d812ae98c484d4b02878ae2c1986c3759c0ba3f46894c76af713d7b8346
+DIST qtwayland-5.15.3-gentoo-kde-2.tar.xz 35460 BLAKE2B ea229ae3007405dcb431c90c3a8411d11d2d5715e917f5a57cc2881da4274938d6466f1562dc5f750b8d27ee60a459d6251ca1ab2563f6ee4b9f89e17a956b59 SHA512 63041bcf68869eb5bd1449bfeecd9847c6890378743eaf1f6cedd95b01f54448be804de6bb5649d70240d4fe98d39fd58db2ba5a5234269c17b5127dd1d76dd3
+DIST qtwayland-5.15.4-gentoo-kde-1.tar.xz 32156 BLAKE2B b18c35f07bc20ab778d925961486511e90dea3e04bd83730f54fcc94d7a8680d86f33b7087e84cf77e283a20514472caeadb7409fe59117f3c066dcfad4ba46d SHA512 a86fd28cbaec35a9c616584ea7b65d4acac0b98f58f58bd32a11a586d8b2c8cc6f8f95e70d1f9deb9136515328ee03af57479ce68b34ddccdb6e8e3110a0707f
+DIST qtwayland-everywhere-opensource-src-5.15.3.tar.xz 565004 BLAKE2B bc146caf77d42436dcb599df8d2aea422ac8717151dee91b9be129b97902d5af274dec90bd5ffceef62512515e5cf57a61ab773cfc6c13742a6cc5d9b6f72726 SHA512 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89
+DIST qtwayland-everywhere-opensource-src-5.15.4.tar.xz 567300 BLAKE2B e2f77a8e6a81ef105d218db6f40164b95beee2d3f34253b4208170a1a25f52ba2574d231979ec05d2bfa7d41a1949b01bd3f6bfcab75487e88d11b6fd1e32455 SHA512 58ae262f7aa0455fb577a36fe9413a969398a2043160642501bac064d6fbc3280f76aa566e62b9d73c67a8c3606849b1b97bcb9b0250d26c269ec921112f40e4
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch
new file mode 100644
index 00000000000..8bffa3e08b3
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch
@@ -0,0 +1,131 @@
+From d7b34dbf072236cdfb3b64e5ad26d1ff29dfec5f Mon Sep 17 00:00:00 2001
+From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
+Date: Thu, 22 Apr 2021 08:42:33 +0200
+Subject: client: Gracefully handle shutdown and window hiding
+
+When a window is hidden or destroyed, the render thread may already
+be rendering. We need to properly read-lock the surface pointer
+when it is in use and exit when it becomes null.
+
+Note that there is also a potential crash in the Mesa GL driver
+where it keeps a proxy to the wl_surface, so if we delete this
+while we are still rendering, it can crash inside the driver.
+This is not addressed by this patch, and has not been reproduced
+on any other drivers so far.
+
+[ChangeLog][Client] Fixed a crash that could happen when hiding
+or closing windows while Qt Quick was actively rendering on
+a different thread.
+
+Pick-to: 6.0 6.1 5.15
+Fixes: QTBUG-91264
+Fixes: QTBUG-90037
+Task-number: QTBUG-92249
+Change-Id: I029b123b83c58740321e8b90a463ced748d8bcf4
+Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
+Reviewed-by: David Edmundson <davidedmundson@kde.org>
+(cherry picked from commit b19b0fbaf775e8b8eda1e03c265a5393d618c6c0)
+---
+ src/client/qwaylandwindow.cpp | 17 ++++++++++++++++-
+ src/client/qwaylandwindow_p.h | 2 +-
+ .../client/wayland-egl/qwaylandglcontext.cpp | 1 -
+ 3 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index 494911b3..0d849b57 100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -414,6 +414,7 @@ void QWaylandWindow::closePopups(QWaylandWindow *parent)
+
+ QPlatformScreen *QWaylandWindow::calculateScreenFromSurfaceEvents() const
+ {
++ QReadLocker lock(&mSurfaceLock);
+ if (mSurface) {
+ if (auto *screen = mSurface->oldestEnteredScreen())
+ return screen;
+@@ -552,6 +553,10 @@ void QWaylandWindow::sendRecursiveExposeEvent()
+
+ void QWaylandWindow::attach(QWaylandBuffer *buffer, int x, int y)
+ {
++ QReadLocker locker(&mSurfaceLock);
++ if (mSurface == nullptr)
++ return;
++
+ if (buffer) {
+ Q_ASSERT(!buffer->committed());
+ handleUpdate();
+@@ -571,6 +576,10 @@ void QWaylandWindow::attachOffset(QWaylandBuffer *buffer)
+
+ void QWaylandWindow::damage(const QRect &rect)
+ {
++ QReadLocker locker(&mSurfaceLock);
++ if (mSurface == nullptr)
++ return;
++
+ const int s = scale();
+ if (mDisplay->compositorVersion() >= 4)
+ mSurface->damage_buffer(s * rect.x(), s * rect.y(), s * rect.width(), s * rect.height());
+@@ -605,6 +614,8 @@ void QWaylandWindow::commit(QWaylandBuffer *buffer, const QRegion &damage)
+ qCDebug(lcWaylandBackingstore) << "Buffer already committed, ignoring.";
+ return;
+ }
++
++ QReadLocker locker(&mSurfaceLock);
+ if (!mSurface)
+ return;
+
+@@ -624,7 +635,9 @@ void QWaylandWindow::commit(QWaylandBuffer *buffer, const QRegion &damage)
+
+ void QWaylandWindow::commit()
+ {
+- mSurface->commit();
++ QReadLocker locker(&mSurfaceLock);
++ if (mSurface != nullptr)
++ mSurface->commit();
+ }
+
+ const wl_callback_listener QWaylandWindow::callbackListener = {
+@@ -725,6 +738,7 @@ QPointF QWaylandWindow::mapFromWlSurface(const QPointF &surfacePosition) const
+
+ wl_surface *QWaylandWindow::wlSurface()
+ {
++ QReadLocker locker(&mSurfaceLock);
+ return mSurface ? mSurface->object() : nullptr;
+ }
+
+@@ -749,6 +763,7 @@ QWaylandScreen *QWaylandWindow::waylandScreen() const
+
+ void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation)
+ {
++ QReadLocker locker(&mSurfaceLock);
+ if (mDisplay->compositorVersion() < 2)
+ return;
+
+diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
+index d45980a8..54ac67a9 100644
+--- a/src/client/qwaylandwindow_p.h
++++ b/src/client/qwaylandwindow_p.h
+@@ -288,7 +288,7 @@ private:
+
+ static QWaylandWindow *mMouseGrab;
+
+- QReadWriteLock mSurfaceLock;
++ mutable QReadWriteLock mSurfaceLock;
+
+ friend class QWaylandSubSurface;
+ };
+diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+index 683fe123..8f12736d 100644
+--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
++++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+@@ -192,7 +192,6 @@ public:
+ }
+ void blit(QWaylandEglWindow *window)
+ {
+- Q_ASSERT(window->wlSurface());
+ QOpenGLTextureCache *cache = QOpenGLTextureCache::cacheForContext(m_context->context());
+
+ QSize surfaceSize = window->surfaceSize();
+--
+2.35.0
+
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch b/dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch
new file mode 100644
index 00000000000..4ad80127f51
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/833488
+--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
++++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+@@ -44,6 +44,8 @@
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
+
++#include <array>
++
+ // compatibility with libdrm <= 2.4.74
+ #ifndef DRM_FORMAT_RESERVED
+ #define DRM_FORMAT_RESERVED ((1ULL << 56) - 1)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild b/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
index 3fa36666cf6..02f088b94a6 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=efe6edcaf8eba601dff99ec6ad4457c8a4442f86
+QT5_KDEPATCHSET_REV=2
inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
@@ -21,7 +21,6 @@ DEPEND="
=dev-qt/qtdeclarative-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
media-libs/libglvnd
- >=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
X? (
=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
@@ -30,6 +29,14 @@ DEPEND="
)
"
RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-util/wayland-scanner
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.15.2-QTBUG-90037-QTBUG-91264.patch" # upstream pending
+ "${FILESDIR}/${PN}-5.15.3-clang.patch"
+)
src_configure() {
local myqmakeargs=(
@@ -40,3 +47,8 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+ rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r15.ebuild b/dev-qt/qtwayland/qtwayland-5.15.4.ebuild
index ea619cd58e7..7b70190c554 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r15.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=992833ca741efe8f533c61abfaf129a1d8bfcfee
+QT5_KDEPATCHSET_REV=1
inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
@@ -33,6 +33,11 @@ BDEPEND="
dev-util/wayland-scanner
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.15.2-QTBUG-90037-QTBUG-91264.patch" # upstream pending
+ "${FILESDIR}/${PN}-5.15.3-clang.patch"
+)
+
src_configure() {
local myqmakeargs=(
--
@@ -42,3 +47,8 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+ rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}
diff --git a/dev-qt/qtwaylandscanner/Manifest b/dev-qt/qtwaylandscanner/Manifest
new file mode 100644
index 00000000000..6eb6537b227
--- /dev/null
+++ b/dev-qt/qtwaylandscanner/Manifest
@@ -0,0 +1,2 @@
+DIST qtwayland-everywhere-opensource-src-5.15.3.tar.xz 565004 BLAKE2B bc146caf77d42436dcb599df8d2aea422ac8717151dee91b9be129b97902d5af274dec90bd5ffceef62512515e5cf57a61ab773cfc6c13742a6cc5d9b6f72726 SHA512 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89
+DIST qtwayland-everywhere-opensource-src-5.15.4.tar.xz 567300 BLAKE2B e2f77a8e6a81ef105d218db6f40164b95beee2d3f34253b4208170a1a25f52ba2574d231979ec05d2bfa7d41a1949b01bd3f6bfcab75487e88d11b6fd1e32455 SHA512 58ae262f7aa0455fb577a36fe9413a969398a2043160642501bac064d6fbc3280f76aa566e62b9d73c67a8c3606849b1b97bcb9b0250d26c269ec921112f40e4
diff --git a/dev-qt/qtwaylandscanner/metadata.xml b/dev-qt/qtwaylandscanner/metadata.xml
new file mode 100644
index 00000000000..a1a4e61d01d
--- /dev/null
+++ b/dev-qt/qtwaylandscanner/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://bugreports.qt.io/</bugs-to>
+ <doc>https://doc.qt.io/</doc>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.3.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.3.ebuild
new file mode 100644
index 00000000000..99a2c9235d0
--- /dev/null
+++ b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qtwayland"
+inherit qt5-build
+
+DESCRIPTION="Tool that generates certain boilerplate C++ code from Wayland protocol xml spec"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+fi
+
+DEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
+RDEPEND="${DEPEND}
+ !<dev-qt/qtwayland-5.15.3:5
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/qtwaylandscanner
+)
diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild
new file mode 100644
index 00000000000..1d586e6847c
--- /dev/null
+++ b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qtwayland"
+inherit qt5-build
+
+DESCRIPTION="Tool that generates certain boilerplate C++ code from Wayland protocol xml spec"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
+RDEPEND="${DEPEND}
+ !<dev-qt/qtwayland-5.15.3:5
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/qtwaylandscanner
+)
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index b1f08ab2570..523a7be998e 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1 +1,4 @@
-DIST qtwebchannel-everywhere-src-5.15.2.tar.xz 209208 BLAKE2B 486da1fb4dc8106343716536c69f9fe3251119ab844b36eace21ad1921840be3e0bb97db58d29738bb54a28d2ad85839bfa71a8832a9d84a40c32b0f285fc2e7 SHA512 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b
+DIST qtwebchannel-5.15.3-gentoo-kde-1.tar.xz 5780 BLAKE2B 427f26490410eeff0a2c8fe161724dbefb185188db18aa929a86c54634c589101db8718e7bf7f71d858e068da8d25dc7f9e029961c0c92d26ad894e6eedfc262 SHA512 a041f4f451e5522676d6b4b8a5600faab2dfa81f5d413b6bd94801f11e26a25a36332c317471be99658a7c075ea2d53e0ceaae9a7249524668bb7c09e34bbb05
+DIST qtwebchannel-5.15.4-gentoo-kde-1.tar.xz 5780 BLAKE2B ce4325efd23f9b207c5bf62a8f2740fbe05c706768f8bd227c0fc8a99279a93363123decde4fa1ec696e5b86e258c13c0ab98a53903634252b7ed2fae5d6fc0b SHA512 63f8840ff8811f2c671ff8b863682775569cf752965c4c1a381a249a641926990aa31e6e73f94776bdd71b5db80e4a3c62b479a770249b55231790df41997756
+DIST qtwebchannel-everywhere-opensource-src-5.15.3.tar.xz 209116 BLAKE2B 08edc7a3fdb5556274bc7b746dfcd1e46c64c019c30c171f6c25202aee22335a8fdec8cb1e94dd60ffcf70b245bba67714374bd2d3b55b7ede7ee7fbf2e6824e SHA512 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415
+DIST qtwebchannel-everywhere-opensource-src-5.15.4.tar.xz 210728 BLAKE2B 276792545d413cb5522fbfd5602224e1a8c085919f89830892d2fecda88e09519bdc8d3b2b2e846ce2d16b6a6f20cd250c09c61e65ffd489b334cfebbc28488e SHA512 18d5e6f44b780c7dfc94e1620ba76d7b0731d671df537b2e29fef062a0775e8dc973deb6c949b37000f5e8a49bdd31a723aa069bafcb9ecdc3259d0bf97e5a26
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.3.ebuild
index 1f5019a95f5..648e932a01a 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+QT5_KDEPATCHSET_REV=1
inherit qt5-build
DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild
new file mode 100644
index 00000000000..0212d5c60e1
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ qt_use_disable_mod qml quick src/src.pro
+ qt_use_disable_mod qml qml src/webchannel/webchannel.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 6b501423215..4b7a113801f 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,5 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
-DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee
+DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
+DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8 SHA512 80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6
+DIST qtwebengine-5.15.3_p20220505.tar.xz 318923536 BLAKE2B 18798ee82864bf513525be30aba58636518b5f13061826a5f80a791baeb3a7695f2626a3eec8b8be88ef6ae4a4caa989f9a35b8b9d8d6f85f727ce3e3a18e110 SHA512 c5f0688aa782f1e8f6a076b0bc4ba0c5bb0518a784399d915da924f1a4e798dff1d23158b3bc73e46629020f5490a15823d6d5b36463dc7ebdec14331fe4323e
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch
new file mode 100644
index 00000000000..fdcc787971c
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch
@@ -0,0 +1,10 @@
+--- a/src/buildtools/gn.pro
++++ b/src/buildtools/gn.pro
+@@ -25,6 +25,7 @@
+ msvc:!clang_cl: gn_gen_args += --use-lto
+
+ gn_configure = $$system_quote($$gn_bootstrap) $$gn_gen_args
++ gn_configure += --no-static-libstdc++
+ macos {
+ gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\"
+ }
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch
deleted file mode 100644
index dfaa634bdb1..00000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 78b1bcff4d9b977313e9ea15068168e1b11f5ba1 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 4 Aug 2021 19:08:03 +0200
-Subject: [PATCH] chromium: abseil-cpp: fix build with glibc-2.34
-
-* backport a fix from upstream abseil-cpp:
- https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9
-
- to fix:
-
-[97/24505] CXX obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
-FAILED: obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
-/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DABSL_ALLOCATOR_NOTHROW=1 -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/abseil-cpp -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc -o obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc: In function 'bool absl::SetupAlternateStackOnce()':
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: error: no matching function for call to 'max(long int, int)'
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61,
- from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)'
- 254 | max(const _Tp& __a, const _Tp& __b)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: deduced conflicting types for parameter 'const _Tp' ('long int' and 'int')
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61,
- from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)'
- 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: deduced conflicting types for parameter 'const _Tp' ('long int' and 'int')
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)'
- 3461 | max(initializer_list<_Tp> __l)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: mismatched types 'std::initializer_list<_Tp>' and 'long int'
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)'
- 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: mismatched types 'std::initializer_list<_Tp>' and 'long int'
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../abseil-cpp/absl/debugging/failure_signal_handler.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc b/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
-index 5d13bdbbbd1..150a43f2660 100644
---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
-+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
-@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
- #else
- const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
- #endif
-- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
-+ size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
- defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
- // Account for sanitizer instrumentation requiring additional stack space.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch
deleted file mode 100644
index b91c239ac2b..00000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 4 Aug 2021 19:11:06 +0200
-Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34
-
-* fixes:
-[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o
-FAILED: obj/third_party/breakpad/client/exception_handler.o
-/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()':
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)'
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
- from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)'
- 254 | max(const _Tp& __a, const _Tp& __b)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
- from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)'
- 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)'
- 3461 | max(initializer_list<_Tp> __l)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int'
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)'
- 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int'
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index ca353c40997..2e43ba6fc04 100644
---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
- // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
- // the alternative stack. Ensure that the size of the alternative stack is
- // large enough.
-- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
-+ static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ);
-
- // Only set an alternative stack if there isn't already one, or if the current
- // one is too small.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
new file mode 100644
index 00000000000..c1a98d0934f
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
@@ -0,0 +1,42 @@
+From 0825e7bc64e47d87e1f1026cc80c933550f114f5 Mon Sep 17 00:00:00 2001
+From: Dimitry Andric <dim@FreeBSD.org>
+Date: Mon, 14 Feb 2022 13:55:25 +0100
+Subject: www/qt5-webengine: fix build with clang 14
+
+Fixes compile error:
+
+In file included from gen/third_party/blink/renderer/platform/platform_jumbo_63.cc:8:
+src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:122:15: error: anonymous non-C-compatible type given name for linkage purposes by typedef declaration after its linkage was computed; add a tag name here to establish linkage prior to definition
+typedef struct {
+ ^
+ UTextWithBuffer
+src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:123:3: note: type is not C-compatible due to this member declaration
+ DISALLOW_NEW();
+ ^~~~~~~~~~~~~~
+src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h:40:2: note: expanded from macro 'DISALLOW_NEW'
+ public: \
+ ^~~~~~~
+src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:126:3: note: type is given name 'UTextWithBuffer' for linkage purposes by this typedef declaration
+} UTextWithBuffer;
+ ^
+
+PR: 261949
+Approved by: adridg (maintainer)
+MFH: 2022Q1
+
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
+@@ -119,11 +119,11 @@ enum TextContext { kNoContext, kPriorContext, kPrimary
+
+ const int kTextBufferCapacity = 16;
+
+-typedef struct {
++struct UTextWithBuffer {
+ DISALLOW_NEW();
+ UText text;
+ UChar buffer[kTextBufferCapacity];
+-} UTextWithBuffer;
++};
+
+ static inline int64_t TextPinIndex(int64_t& index, int64_t limit) {
+ if (index < 0)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
new file mode 100644
index 00000000000..15c192667f2
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
@@ -0,0 +1,169 @@
+From 05f6ffbbce0a2aad01dc05d682cbe4a1ec44fad5 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Tue, 25 Jan 2022 10:51:58 +0000
+Subject: [PATCH] Fix build with ffmpeg 5
+
+---
+ chromium/media/ffmpeg/ffmpeg_common.h | 1 +
+ chromium/media/filters/audio_file_reader.cc | 2 +-
+ chromium/media/filters/ffmpeg_audio_decoder.cc | 2 +-
+ chromium/media/filters/ffmpeg_demuxer.cc | 12 ++++++------
+ chromium/media/filters/ffmpeg_glue.cc | 4 ----
+ chromium/media/filters/ffmpeg_video_decoder.cc | 2 +-
+ chromium/media/filters/media_file_checker.cc | 2 +-
+ .../video_coding/codecs/h264/h264_decoder_impl.cc | 2 +-
+ 8 files changed, 12 insertions(+), 15 deletions(-)
+
+diff --git a/chromium/media/ffmpeg/ffmpeg_common.h b/chromium/media/ffmpeg/ffmpeg_common.h
+index 2734a485cbd..70b1877a43c 100644
+--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
++++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
++#include <libavutil/channel_layout.h>
+ #include <libavutil/imgutils.h>
+ #include <libavutil/log.h>
+ #include <libavutil/mastering_display_metadata.h>
+diff --git a/chromium/media/filters/audio_file_reader.cc b/chromium/media/filters/audio_file_reader.cc
+index cb81d920def..bd73908d0ca 100644
+--- a/src/3rdparty/chromium/media/filters/audio_file_reader.cc
++++ b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
+@@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() {
+ }
+
+ bool AudioFileReader::OpenDecoder() {
+- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
+ if (codec) {
+ // MP3 decodes to S16P which we don't support, tell it to use S16 instead.
+ if (codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P)
+diff --git a/chromium/media/filters/ffmpeg_audio_decoder.cc b/chromium/media/filters/ffmpeg_audio_decoder.cc
+index 0d825ed791b..72fac6167ef 100644
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
+@@ -329,7 +329,7 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) {
+ }
+ }
+
+- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
+ if (!codec ||
+ avcodec_open2(codec_context_.get(), codec, &codec_options) < 0) {
+ DLOG(ERROR) << "Could not initialize audio decoder: "
+diff --git a/chromium/media/filters/ffmpeg_demuxer.cc b/chromium/media/filters/ffmpeg_demuxer.cc
+index d34db63f3ef..427565b00c1 100644
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
+@@ -98,12 +98,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
+
+ // Next try to use the first DTS value, for codecs where we know PTS == DTS
+ // (excludes all H26x codecs). The start time must be returned in PTS.
+- if (stream->first_dts != kNoFFmpegTimestamp &&
++ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
+ stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
+ stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
+ stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
+ const base::TimeDelta first_pts =
+- ConvertFromTimeBase(stream->time_base, stream->first_dts);
++ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
+ if (first_pts < start_time)
+ start_time = first_pts;
+ }
+@@ -408,11 +408,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
+ scoped_refptr<DecoderBuffer> buffer;
+
+ if (type() == DemuxerStream::TEXT) {
+- int id_size = 0;
++ size_t id_size = 0;
+ uint8_t* id_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
+
+- int settings_size = 0;
++ size_t settings_size = 0;
+ uint8_t* settings_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
+
+@@ -424,7 +424,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
+ buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
+ side_data.data(), side_data.size());
+ } else {
+- int side_data_size = 0;
++ size_t side_data_size = 0;
+ uint8_t* side_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
+
+@@ -485,7 +485,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
+ packet->size - data_offset);
+ }
+
+- int skip_samples_size = 0;
++ size_t skip_samples_size = 0;
+ const uint32_t* skip_samples_ptr =
+ reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
+diff --git a/chromium/media/filters/ffmpeg_glue.cc b/chromium/media/filters/ffmpeg_glue.cc
+index 0ef3521473d..8483ecc348f 100644
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
+@@ -59,7 +59,6 @@ static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) {
+ }
+
+ void FFmpegGlue::InitializeFFmpeg() {
+- av_register_all();
+ }
+
+ static void LogContainer(bool is_local_file,
+@@ -95,9 +94,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
+ // Enable fast, but inaccurate seeks for MP3.
+ format_context_->flags |= AVFMT_FLAG_FAST_SEEK;
+
+- // Ensures we can read out various metadata bits like vp8 alpha.
+- format_context_->flags |= AVFMT_FLAG_KEEP_SIDE_DATA;
+-
+ // Ensures format parsing errors will bail out. From an audit on 11/2017, all
+ // instances were real failures. Solves bugs like http://crbug.com/710791.
+ format_context_->error_recognition |= AV_EF_EXPLODE;
+diff --git a/chromium/media/filters/ffmpeg_video_decoder.cc b/chromium/media/filters/ffmpeg_video_decoder.cc
+index ef12477ee89..7996606f5f9 100644
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
+@@ -391,7 +391,7 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config,
+ if (decode_nalus_)
+ codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
+
+- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
+ if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
+ ReleaseFFmpegResources();
+ return false;
+diff --git a/chromium/media/filters/media_file_checker.cc b/chromium/media/filters/media_file_checker.cc
+index 59c2a2fc618..1a9872c7acb 100644
+--- a/src/3rdparty/chromium/media/filters/media_file_checker.cc
++++ b/src/3rdparty/chromium/media/filters/media_file_checker.cc
+@@ -68,7 +68,7 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) {
+ auto context = AVStreamToAVCodecContext(format_context->streams[i]);
+ if (!context)
+ continue;
+- AVCodec* codec = avcodec_find_decoder(cp->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(cp->codec_id);
+ if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) {
+ auto loop = std::make_unique<FFmpegDecodingLoop>(context.get());
+ stream_contexts[i] = {std::move(context), std::move(loop)};
+diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+index 9002b874611..d12fade8b63 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+@@ -203,7 +203,7 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* codec_settings,
+ // a pointer |this|.
+ av_context_->opaque = this;
+
+- AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
+ if (!codec) {
+ // This is an indication that FFmpeg has not been initialized or it has not
+ // been compiled/initialized with the correct set of codecs.
+--
+2.35.1
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
new file mode 100644
index 00000000000..cd476564037
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
@@ -0,0 +1,32 @@
+https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtwebengine/0001-skia-Some-includes-to-fix-build-with-GCC-12.patch?expand=1
+https://bugs.gentoo.org/840326
+
+From 68799a1e0815b20ca59ce354a55280399257a201 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Fri, 25 Mar 2022 15:29:28 +0100
+Subject: [PATCH] skia: Some includes to fix build with GCC 12
+
+Those includes got introduced upstream for other reasons and fixed building
+with GCC 12 as a side effect.
+--- a/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
++++ b/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
+@@ -12,6 +12,8 @@
+ #include "include/core/SkScalar.h"
+ #include "include/core/SkTypes.h"
+
++#include <array>
++
+ /** \file SkColor.h
+
+ Types, consts, functions, and macros for colors.
+--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
+@@ -8,6 +8,8 @@
+
+ #include "include/utils/SkParse.h"
+
++#include <algorithm> // std::lower_bound
++
+ static constexpr const char* gColorNames[] = {
+ "aliceblue",
+ "antiquewhite",
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
new file mode 100644
index 00000000000..a319f521ca6
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
@@ -0,0 +1,10 @@
+--- a/src/core/gn_run.pro
++++ b/src/core/gn_run.pro
+@@ -64,6 +64,7 @@
+ }
+ } else {
+ gn_args+= "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\""
++ gn_args += $$(EXTRA_GN)
+ gn_args = $$system_quote($$gn_args)
+ gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
+ gn_run = $$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args --root=$$gn_src_root
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index fe0b26ec2aa..cbcf0f7a01d 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -11,15 +11,12 @@
<name>Georgy Yakovlev</name>
</maintainer>
<use>
- <flag name="designer">Install the QWebEngineView plugin used to add widgets in
- <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
- <flag name="geolocation">Enable physical position determination
- via <pkg>dev-qt/qtpositioning</pkg></flag>
+ <flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
+ <flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="jumbo-build">Combine source files to speed up build process.</flag>
- <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
- instead of bundled.</flag>
- <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
- instead of bundled.</flag>
+ <flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
+ <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
+ <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
</use>
<upstream>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
index 1f1725cb3e3..db0d242c1aa 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
HOMEPAGE="https://www.qt.io/"
@@ -14,7 +14,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
- SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2"
S="${WORKDIR}/${P}"
QT5_BUILD_DIR="${S}_build"
fi
@@ -27,10 +26,12 @@ else
inherit git-r3
fi
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
+# ppc64 patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
+ ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -80,6 +81,7 @@ RDEPEND="
geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
+ screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
@@ -106,34 +108,57 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
- "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
+ "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
+ "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+ "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
)
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
- elog "additional security fixes from newer versions. Extensive as it is, the"
- elog "list of backports is impossible to evaluate, but always bound to be behind"
- elog "Chromium's release schedule."
- elog "In addition, various online services may deny service based on an outdated"
- elog "user agent version (and/or other checks). Google is already known to do so."
- elog
- elog "tldr: Your web browsing experience will be compromised."
-}
-
-src_unpack() {
- # bug 307861
+qtwebengine_check-reqs() {
+ # bug #307861
eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
ewarn "You may experience really long compilation times and/or increased memory usage."
ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- ewarn
fi
eshopts_pop
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ # (check-reqs added for bug #570534)
+ #
+ # Estimate the amount of RAM required
+ # Multiplier is *10 because Bash doesn't do floating point maths.
+ # Let's crudely assume ~2GB per compiler job for GCC.
+ local multiplier=20
+
+ # And call it ~1.5GB for Clang.
+ if tc-is-clang ; then
+ multiplier=15
+ fi
+
+ local CHECKREQS_DISK_BUILD="7G"
+ local CHECKREQS_DISK_USR="150M"
+ if ! has "distcc" ${FEATURES} ; then
+ # bug #830661
+ # Not super realistic to come up with good estimates for distcc right now
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
case ${QT5_BUILD_TYPE} in
live) git-r3_src_unpack ;&
release) default ;;
@@ -145,10 +170,10 @@ src_prepare() {
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die
fi
- # We need to make sure this integrates well into Qt 5.15.2 installation.
+ # We need to make sure this integrates well into Qt 5.15.3 installation.
# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
- sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
+ sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
# QTBUG-88657 - jumbo-build could still make trouble
if ! use jumbo-build; then
@@ -173,6 +198,15 @@ src_prepare() {
done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
fi
+ # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
+ if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ fi
+
+ if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
+ eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
+ fi
+
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
@@ -200,7 +234,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
--
@@ -213,6 +247,7 @@ src_configure() {
$(qt_use geolocation webengine-geolocation)
$(qt_use kerberos webengine-kerberos)
$(qt_use pulseaudio)
+ $(usex screencast -webengine-webrtc-pipewire '')
$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
$(qt_use system-icu webengine-icu)
)
@@ -227,3 +262,14 @@ src_install() {
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
fi
}
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
+ elog "additional security fixes from newer versions. Extensive as it is, the"
+ elog "list of backports is impossible to evaluate, but always bound to be behind"
+ elog "Chromium's release schedule."
+ elog "In addition, various online services may deny service based on an outdated"
+ elog "user agent version (and/or other checks). Google is already known to do so."
+ elog
+ elog "tldr: Your web browsing experience will be compromised."
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
new file mode 100644
index 00000000000..c213bc2c4a1
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+HOMEPAGE="https://www.qt.io/"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ if [[ ${PV} == ${QT5_PV}_p* ]]; then
+ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220505.tar.xz"
+ S="${WORKDIR}/${PN}-5.15.3_p20220505"
+ QT5_BUILD_DIR="${S}_build"
+ fi
+else
+ EGIT_BRANCH="5.15"
+ EGIT_REPO_URI=(
+ "https://code.qt.io/qt/${QT5_MODULE}.git"
+ "https://github.com/qt/${QT5_MODULE}.git"
+ )
+ inherit git-r3
+fi
+
+# ppc64 patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
+ ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
+
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
+
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/re2:=
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdeclarative-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtnetwork-${QT5_PV}*
+ =dev-qt/qtprintsupport-${QT5_PV}*
+ =dev-qt/qtwebchannel-${QT5_PV}*[qml]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:0=
+ >=media-libs/libvpx-1.5:=[svc(+)]
+ media-libs/libwebp:=
+ media-libs/opus
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib[minizip]
+ virtual/libudev
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ designer? ( =dev-qt/designer-${QT5_PV}* )
+ geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-sound/pulseaudio:= )
+ screencast? ( media-video/pipewire:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-icu? ( >=dev-libs/icu-69.1:= )
+ widgets? (
+ =dev-qt/qtdeclarative-${QT5_PV}*[widgets]
+ =dev-qt/qtwidgets-${QT5_PV}*
+ )
+"
+DEPEND="${RDEPEND}
+ media-libs/libglvnd
+"
+BDEPEND="${PYTHON_DEPS}
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+ ppc64? ( >=dev-util/gn-0.1807 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
+ "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
+ "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
+ "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+ "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
+)
+
+qtwebengine_check-reqs() {
+ # bug #307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+ ewarn "You may experience really long compilation times and/or increased memory usage."
+ ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+ fi
+ eshopts_pop
+
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ # (check-reqs added for bug #570534)
+ #
+ # Estimate the amount of RAM required
+ # Multiplier is *10 because Bash doesn't do floating point maths.
+ # Let's crudely assume ~2GB per compiler job for GCC.
+ local multiplier=20
+
+ # And call it ~1.5GB for Clang.
+ if tc-is-clang ; then
+ multiplier=15
+ fi
+
+ local CHECKREQS_DISK_BUILD="7G"
+ local CHECKREQS_DISK_USR="150M"
+ if ! has "distcc" ${FEATURES} ; then
+ # bug #830661
+ # Not super realistic to come up with good estimates for distcc right now
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ case ${QT5_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
+src_prepare() {
+ if [[ ${PV} == ${QT5_PV}_p* ]]; then
+ # This is made from git, and for some reason will fail w/o .git directories.
+ mkdir -p .git src/3rdparty/chromium/.git || die
+ fi
+ # We need to make sure this integrates well into Qt 5.15.3 installation.
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+ # See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
+ sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
+
+ # QTBUG-88657 - jumbo-build could still make trouble
+ if ! use jumbo-build; then
+ sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+ src/buildtools/config/common.pri || die
+ fi
+
+ # bug 620444 - ensure local headers are used
+ find "${S}" -type f -name "*.pr[fio]" | \
+ xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
+
+ if use system-icu; then
+ # Sanity check to ensure that bundled copy of ICU is not used.
+ # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+ # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+ # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+ local file
+ while read file; do
+ echo "#error This file should not be used!" > "${file}" || die
+ done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+ fi
+
+ # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
+ if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ fi
+
+ if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
+ eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
+ fi
+
+ qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
+ qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
+
+ qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
+ qt_use_disable_mod widgets widgets src/src.pro
+
+ qt5-build_src_prepare
+
+ # we need to generate ppc64 stuff because upstream does not ship it yet
+ if use ppc64; then
+ einfo "Patching for ppc64le and generating build files"
+ eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
+ pushd src/3rdparty/chromium > /dev/null || die
+ eapply -p0 "${WORKDIR}/${PN}-ppc64le"
+ popd > /dev/null || die
+ pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
+ mkdir -vp source/config/linux/ppc64 || die
+ mkdir -p source/libvpx/test || die
+ touch source/libvpx/test/test.mk || die
+ ./generate_gni.sh || die
+ popd >/dev/null || die
+ fi
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local myqmakeargs=(
+ --
+ -no-build-qtpdf
+ -printing-and-pdf
+ -system-opus
+ -system-webp
+ $(qt_use alsa)
+ $(qt_use !bindist proprietary-codecs)
+ $(qt_use geolocation webengine-geolocation)
+ $(qt_use kerberos webengine-kerberos)
+ $(qt_use pulseaudio)
+ $(usex screencast -webengine-webrtc-pipewire '')
+ $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ $(qt_use system-icu webengine-icu)
+ )
+ qt5-build_src_configure
+}
+
+src_install() {
+ qt5-build_src_install
+
+ # bug 601472
+ if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+ fi
+}
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
+ elog "with additional security fixes from newer versions. Extensive as it is, the"
+ elog "list of backports is impossible to evaluate, but always bound to be behind"
+ elog "Chromium's release schedule."
+ elog "In addition, various online services may deny service based on an outdated"
+ elog "user agent version (and/or other checks). Google is already known to do so."
+ elog
+ elog "tldr: Your web browsing experience will be compromised."
+}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index b174321d9fb..1a541d18c80 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1 +1,4 @@
-DIST qtwebsockets-5.15.2-e7883bc6.tar.gz 434705 BLAKE2B f8c8fbb0e369ad5ceed40ca62c2a7d6d2cdb3cb74037e9ecb487b0ec31757aae10ed6f61790c566e4431b59585fee423047c4687b41cdfc08e96dd46c2f964b6 SHA512 35b1caed6462083014bbb83c6aa81b441f67da7f0e3813fc47997ca4fecfe5423eaef5dd4ed3c37f42dd311eded0e6b36cce6725c7028047ca21b454ded9257f
+DIST qtwebsockets-5.15.3-gentoo-kde-1.tar.xz 2044 BLAKE2B 7f7b0ab24f0347d838d66cbb46968c8ed11016b6b27394c7eb13c5499fb089a744cfd806099414710feb28b7ce985bbb646f6e8374e37d048fe633e63bb55bde SHA512 05551f72e5a887ac771f9d5d8048e5d71a5740a03c676c864379a230baf51994cfa91008ad4d7b4d347afafbec12a9aeedd1f51bcfb4f30847a2fcd08ef85a05
+DIST qtwebsockets-5.15.4-gentoo-kde-1.tar.xz 2036 BLAKE2B 563c0baaa8ad1b9c786f354907a711ca79e037db2c6945ab2a385399f882a80e394857bf557eeaf1af6db6d01aefd0cd25ce13ccf58c2505b2f57a318a6f59fc SHA512 6191ce1b5d006a6b279c30f4bc7f78d544dabc57ec353cc24da35275ad4f87b6f138f0169e76b5a9c1db3d07c91c57ba20cde9979a85670e585bd1b6215e9cd1
+DIST qtwebsockets-everywhere-opensource-src-5.15.3.tar.xz 259184 BLAKE2B d37056edef6a8618f773c5b51d3e3d3d48e996ddf27b04129a9b2ef4e313405018ec0325482d2157245f31fc25e3938a03d2aab773735269930c4cb175593ef0 SHA512 a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea
+DIST qtwebsockets-everywhere-opensource-src-5.15.4.tar.xz 260792 BLAKE2B 5e494c712e859bac610547ab3c4fe7552b2a4fe6d0c120bd445937903b120395da21c0ebee5c1de97c02e60ce48e53551d6b509fecc5ca38e142677857130adc SHA512 01714b9927c3a234fac9386a596aa3dc3833d9cfe8cc152892fec969e51b428bed00f501c16b8e4f810452739ff8491e5c64f9b936aa10e1a839c09c8f2832ce
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.3.ebuild
index 3430a52d80f..a8691a3b4e7 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=e7883bc64440b1ff4666272ac6eb710ee4bc221b
+QT5_KDEPATCHSET_REV=1
inherit qt5-build
DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild
new file mode 100644
index 00000000000..db65f8a602b
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+inherit qt5-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="qml +ssl"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtnetwork-${QT5_PV}*[ssl=]
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ qt_use_disable_mod qml quick src/src.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 9cf04c9ed78..0cc80d3d1f5 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1 +1,2 @@
-DIST qtwebview-everywhere-src-5.15.2.tar.xz 133428 BLAKE2B 64cc9ff6a14c9107eb1607cbf244d179fd78ab5fdc879cce85c5f8b85dd738452b681faf864bf0013d3c8614ab2bd593fbf5ddb603ee2d2a0e0f684f9a46a0e2 SHA512 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85
+DIST qtwebview-everywhere-opensource-src-5.15.3.tar.xz 133700 BLAKE2B 7ca5b2e18f08a7a7dd08ff7c835e796dbba5dfd77deaed0e5909d1622d478de69e190b68b3f02e4c48ba04fd37196ea63297ffea4f6e999966b3938944491614 SHA512 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030
+DIST qtwebview-everywhere-opensource-src-5.15.4.tar.xz 135316 BLAKE2B 7c8554abeb07014f51b9e61e352cb5b473973ae52c675a7027e95cfca2bf8bfecfac2bd2b5d1b1f6170420bd9a3c4280ee9de7604834cc42841ea0db51cc3dd9 SHA512 fb5177f0e8f79490598120f01b6cdd78ce5cbac8f313c0e088ded7b4daada290d2c058ecd6eebdba76fd15efd2e198bc03cbaf544fba664d49efb55709703be6
diff --git a/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild b/dev-qt/qtwebview/qtwebview-5.15.3.ebuild
index 29f8f003612..288f86cec68 100644
--- a/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
+++ b/dev-qt/qtwebview/qtwebview-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtwebview/qtwebview-5.15.4.ebuild b/dev-qt/qtwebview/qtwebview-5.15.4.ebuild
new file mode 100644
index 00000000000..288f86cec68
--- /dev/null
+++ b/dev-qt/qtwebview/qtwebview-5.15.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdeclarative-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtwebengine-${QT5_PV}*:5
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 2487ae322ae..876cb884f82 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,2 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-c9fde86b.tar.gz 67960262 BLAKE2B d1a6a7dac78abce189a753c0a00185fbe03f9de97b226790535af73a9bc009b353fe1edeb754d2098a7beeb7cd1c6e7efb949797658269ef0d0f200f11909820 SHA512 99026537dd4da678bcb04214ebb717907422e373b44fd3b3716798565c330f8d492ec1fc67d936c5125292b30e44f23abe4bf6434b58b9fa76bada3680dfc9f8
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.3.ebuild
index 90eb44f6124..6c6b044b5b8 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.4.ebuild
index 1ad9cc0c3ae..5eacab03514 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 77d3a22a456..5c4a2718032 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1 +1,2 @@
-DIST qtx11extras-everywhere-src-5.15.2.tar.xz 143972 BLAKE2B 7dfa2fcdad254280bb00f40722e5ba4736ed89a1dc6b3542738a0492fe74a5f0823aefc141938bd7b0e839c7ee0b72914030b368cf4e33101e1e056e4a8d2ca3 SHA512 beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9
+DIST qtx11extras-everywhere-opensource-src-5.15.3.tar.xz 143996 BLAKE2B 5e6fa4d15c6fd16d81d4923cdace8e90baaa2b6484667a516890b4c6da5befa61205809bf4f52273bc25747b1d7a6355b8f85ecbf891a0d97548362a01e0acb2 SHA512 eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133
+DIST qtx11extras-everywhere-opensource-src-5.15.4.tar.xz 145612 BLAKE2B 4c67f50d8a1cf152a5e46d208f4cd4faaa100d8b0a178bd610c825dcdf7cbbc0ec2b8ac904856ebc7b08aebbb9b6c4b6d0503fdc5af21d32ed3d4c2d7bdf170f SHA512 79c718eff9daba9ff3f361d38f828f8f3c447b87486d652d4ed1f964ec686259ae4d0a1a50b7b6b9349453ba3f8b56b3c20c8a5f26971d5cc3c8f99d668744d6
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.3.ebuild
index 0174763a58f..d72499e0a52 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild
new file mode 100644
index 00000000000..41f0323f3ce
--- /dev/null
+++ b/dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*[X]
+"
+DEPEND="${RDEPEND}
+ test? ( =dev-qt/qtwidgets-${QT5_PV}* )
+"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 4b8920365b9..876cb884f82 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
+DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
+DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild b/dev-qt/qtxml/qtxml-5.15.3.ebuild
index 23f2c1e9e28..cde4aacd89a 100644
--- a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.15.4.ebuild b/dev-qt/qtxml/qtxml-5.15.4.ebuild
new file mode 100644
index 00000000000..6ce2492b78c
--- /dev/null
+++ b/dev-qt/qtxml/qtxml-5.15.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+ =dev-qt/qtcore-${QT5_PV}*:5=
+"
+DEPEND="${RDEPEND}
+ test? ( =dev-qt/qtnetwork-${QT5_PV}* )
+"
+
+QT5_TARGET_SUBDIRS=(
+ src/xml
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :xml
+)
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index a0b8d8e7cdf..0a699d2920c 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1 +1,2 @@
-DIST qtxmlpatterns-everywhere-src-5.15.2.tar.xz 5209380 BLAKE2B 35933ecc0b7eb6b7355e660aafc616e47a1358857f8f2b161454dcaf1f05cd0d536e27859e3380a8ac46da3b228c805ef25d267931eb71585e5f9974d3e5640f SHA512 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348
+DIST qtxmlpatterns-everywhere-opensource-src-5.15.3.tar.xz 5211100 BLAKE2B 808b3f047603e31a973c1455632c2b4425f2daffbe977572682155c6421062285481b7847fe21ea796991bc21aebb4be65f6a17d1d2bfeb3b0ff722b6785f234 SHA512 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4
+DIST qtxmlpatterns-everywhere-opensource-src-5.15.4.tar.xz 5211620 BLAKE2B 2255ad1fe12a356b6b7aae515fa469df89a0d54e841062d68fa1f9b69d4fc88eab9f4a71510c6d8261bd146172b16a2fcb5b23127870a8a249573d1bca66cb63 SHA512 fc4b4723407f6a1e765933d9d76ec4ffe874cb4a70e47bc4110def2c4a491b86fa753c33ef31ef95ad1a6eaa3de1fadbc49deb7783d32d8fc2f51672670d5a87
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2-r1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.3.ebuild
index 20f6cb72b15..5d155fc8c5c 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2-r1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,9 @@ DEPEND="
=dev-qt/qtnetwork-${QT5_PV}*
qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !<dev-qt/qtchooser-66-r2
+"
src_prepare() {
qt_use_disable_mod qml qml \
@@ -29,3 +31,9 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path xmlpatterns
+ qt5_symlink_binary_to_path xmlpatternsvalidator
+}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild
new file mode 100644
index 00000000000..83dd028bd88
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtnetwork-${QT5_PV}*
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}
+ !<dev-qt/qtchooser-66-r2
+"
+
+src_prepare() {
+ qt_use_disable_mod qml qml \
+ src/src.pro \
+ src/imports/imports.pro
+
+ qt_use_disable_mod qml quick tests/auto/auto.pro
+
+ qt5-build_src_prepare
+}
+
+src_install() {
+ qt5-build_src_install
+ qt5_symlink_binary_to_path xmlpatterns
+ qt5_symlink_binary_to_path xmlpatternsvalidator
+}