diff options
Diffstat (limited to 'dev-qt')
143 files changed, 4528 insertions, 633 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 5c02554c7d9c..d239dc0e8752 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest index f575f373dd95..cfe4106b3cc4 100644 --- a/dev-qt/qt3d/Manifest +++ b/dev-qt/qt3d/Manifest @@ -1,5 +1,7 @@ DIST qt3d-everywhere-opensource-src-5.15.10.tar.xz 118262456 BLAKE2B eff3ffd0b305e005019ae59c7214f2df12509ce3fe6cde38dc315b8a3062364c714e5b7e3d33fbaa2c7a71ae19077149bbd7e13d49757044c497337ff2c16035 SHA512 6c3d94b02188493567921552e104f407fd92bf2b95acd6c933a9dd214ba7ebc0c1983ffcaefeae63d60131d02651df1da834522628711d36514dc697e7bb885f DIST qt3d-everywhere-src-6.5.2.tar.xz 161691776 BLAKE2B 0bae744dda45b5af9a0c2dca98d43a2f0376cca018671cd91ffa6add8e7045c2fbcdb08f5a9966e93c70e1976f6e2b1a3670b1de6362fbe4eb7bb7c03d53a22e SHA512 f7bcc09b5c6c01e58b68cb7af67cef5f0477ec3cdcd924fd365b7411b2e5d89c307f29d099289055fb1b04b8237cc87dc071734433fa4d0bbb21eec698ed731a EBUILD qt3d-5.15.10.ebuild 948 BLAKE2B aefde923b2946495d82760f4a446bb53d21bde558cd2ae500afeb92b7435aa24ebcdb0fdadb4e54bf198e679bdc72bf5303417c77c9bbec99c68eea1d387b56b SHA512 3750f03d8d4937fdc1407325016835ba8885679e8cc3100b537102091fcd6c59cd0db120f7b4db8199c8ce00ad65107634539f41d11d9edc25be9728be2111be -EBUILD qt3d-6.5.2.ebuild 958 BLAKE2B e00d4c63841c4f72bcf862f7dd5a68e17b565f0fdfe8acf774942de897c2c2bb857d5de67809d81db013f74d01dcbc2a0dba67b8d7ec8c247400de6529228761 SHA512 e9381edca0e4ea61c424704b2a2fa4f16a8c31d71c40e6d302176159e180125f65702237ef440cb571ec8a12424eaf8e09ca7bd491e98d3e81596bc44fad4b5d -MISC metadata.xml 645 BLAKE2B 6534d1e6a8b8a5d8d41683988ce5001a1c92fe5eecae9fe1942c8a28985ff8a0c60318621f839ab4baa9c6738ce3dd0c4128280c6e1c5b3a8dcd86251a1e08eb SHA512 5f2b1e19665e5f9bda13f708f6f35321fbe6b8451e590a6e29275e23d6df4080d2ddb5bace49cdaeb1352117369b7e01404a64539e3d2edbda41420c95792a61 +EBUILD qt3d-6.5.2-r1.ebuild 776 BLAKE2B 2bc748584515aad7c7181a129b247d4a001b30e607384c5208b0f90eea9a5c72877839ed2de01f34f0d38d06c8319248e57c59059fccc91bcc586fe2427f35c2 SHA512 d0bdf4024d0de21f5c3b6c158e60a825ac45d0039fbab4ff867915aec3ff10a9508f1b427e002655964e8ce0ceca112193bb9a26c22b410044b6412507fe4556 +EBUILD qt3d-6.5.9999.ebuild 776 BLAKE2B 2bc748584515aad7c7181a129b247d4a001b30e607384c5208b0f90eea9a5c72877839ed2de01f34f0d38d06c8319248e57c59059fccc91bcc586fe2427f35c2 SHA512 d0bdf4024d0de21f5c3b6c158e60a825ac45d0039fbab4ff867915aec3ff10a9508f1b427e002655964e8ce0ceca112193bb9a26c22b410044b6412507fe4556 +EBUILD qt3d-6.9999.ebuild 776 BLAKE2B 2bc748584515aad7c7181a129b247d4a001b30e607384c5208b0f90eea9a5c72877839ed2de01f34f0d38d06c8319248e57c59059fccc91bcc586fe2427f35c2 SHA512 d0bdf4024d0de21f5c3b6c158e60a825ac45d0039fbab4ff867915aec3ff10a9508f1b427e002655964e8ce0ceca112193bb9a26c22b410044b6412507fe4556 +MISC metadata.xml 692 BLAKE2B 807ac52bd34ad8ea6471eb7b03703f20951c941a2b5841fa173796b4d9b3bdee1afc79fb83057a5bd6329db5cf656c0c5afdc6ece087684c14e0a581c91eed69 SHA512 5894daabb0fbee32e8fbcdc35f720f2f3225bd78ac632491d4603650db49c79c41fbe84d1cfde15870ed7a17c39c98cb5572ca5ed1da7fe5311faa7b2b750aec diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index b81d5a37bc53..12e16d119066 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -12,6 +12,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qt3d</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild b/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild new file mode 100644 index 000000000000..2a4dec0336da --- /dev/null +++ b/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="3D rendering module for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +elif [[ ${QT6_BUILD_TYPE} == live ]]; then + EGIT_SUBMODULES=() # skip qtquick3d-assimp +fi + +IUSE="gles2-only qml vulkan" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets] + ~dev-qt/qtshadertools-${PV}:6 + media-libs/assimp:= + qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + -DQT_FEATURE_qt3d_system_assimp=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qt3d/qt3d-6.5.2.ebuild b/dev-qt/qt3d/qt3d-6.5.2.ebuild deleted file mode 100644 index d62b749fbe0a..000000000000 --- a/dev-qt/qt3d/qt3d-6.5.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="3D rendering module for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE="" - -RDEPEND=" - =dev-qt/qtbase-${PV}*[concurrent,gui,network,opengl,vulkan,widgets] - =dev-qt/qtdeclarative-${PV}*[widgets] - =dev-qt/qtmultimedia-${PV}* - =dev-qt/qtshadertools-${PV}* - media-libs/assimp:= -" -DEPEND="${RDEPEND} - dev-util/vulkan-headers -" - -# No qtgamepad branching since 6.3. -src_configure() { - local mycmakeargs=( - -DQT_FEATURE_opengl=ON - -DQT_FEATURE_qt3d_animation=ON - -DQT_FEATURE_qt3d_extras=ON - -DQT_FEATURE_qt3d_input=ON - -DQT_FEATURE_qt3d_logic=ON - -DQT_FEATURE_qt3d_render=ON - -DQT_FEATURE_qt3d_rhi_renderer=ON - -DQT_FEATURE_qt3d_system_assimp=ON - -DQT_FEATURE_regularexpression=ON - -DQT_FEATURE_system_zlib=ON - -DQT_FEATURE_vulkan=ON - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qt3d/qt3d-6.5.9999.ebuild b/dev-qt/qt3d/qt3d-6.5.9999.ebuild new file mode 100644 index 000000000000..2a4dec0336da --- /dev/null +++ b/dev-qt/qt3d/qt3d-6.5.9999.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="3D rendering module for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +elif [[ ${QT6_BUILD_TYPE} == live ]]; then + EGIT_SUBMODULES=() # skip qtquick3d-assimp +fi + +IUSE="gles2-only qml vulkan" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets] + ~dev-qt/qtshadertools-${PV}:6 + media-libs/assimp:= + qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + -DQT_FEATURE_qt3d_system_assimp=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qt3d/qt3d-6.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild new file mode 100644 index 000000000000..2a4dec0336da --- /dev/null +++ b/dev-qt/qt3d/qt3d-6.9999.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="3D rendering module for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +elif [[ ${QT6_BUILD_TYPE} == live ]]; then + EGIT_SUBMODULES=() # skip qtquick3d-assimp +fi + +IUSE="gles2-only qml vulkan" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets] + ~dev-qt/qtshadertools-${PV}:6 + media-libs/assimp:= + qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + -DQT_FEATURE_qt3d_system_assimp=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest index 39acf64cf050..b397473777d8 100644 --- a/dev-qt/qt5compat/Manifest +++ b/dev-qt/qt5compat/Manifest @@ -1,3 +1,5 @@ DIST qt5compat-everywhere-src-6.5.2.tar.xz 14638008 BLAKE2B ab16da4c4cdbbfde615e083ebce57352bbee6e37ddd6a9a764a9f93824edb0a230324c989808c859b8142f16cec2f57cfffe33fe20fd1d7b72ec8a1967c87e99 SHA512 c646231f4bece460bfa6b654cba63a91c938c98b4fca8198e63a3fc15a2c7424ef43a765f612d6555b341a8b46f89293d4567257e489569e4669d9beaee6ed66 -EBUILD qt5compat-6.5.2.ebuild 353 BLAKE2B b57d7addff3b54eaabae28b20745dace7ecb2c01f2de0117eb83a58ddaa5a2d26c527470953249cae2797d34f81562bb60ea68b2ef05f2350d2546c81dd805eb SHA512 7f3c3a60723674ebeea149c3317d6ce689630fd638a28fb1bd937667d63fb1b20cfa760c848d3dfe54e35a73d572aa00ff7dba2436bd40709b00ff18b66f8c81 -MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e +EBUILD qt5compat-6.5.2-r1.ebuild 650 BLAKE2B d99a24afd58139ec14d2bd87afecfa7f7f851121f9e9adbbd93f06fde847564e3612b13418e519a7dcdc5f88d38aee4b5ecace6424e6fd5e9f489d10fdeb3e59 SHA512 9f45bd5fbe735237161de6b64fdd68e9810790a537b9084642772f04be7be574e94df3bdbbe2ec57dc0ead555e3d3e4fc528f12f07e9a0782cda9613ad9576d0 +EBUILD qt5compat-6.5.9999.ebuild 650 BLAKE2B d99a24afd58139ec14d2bd87afecfa7f7f851121f9e9adbbd93f06fde847564e3612b13418e519a7dcdc5f88d38aee4b5ecace6424e6fd5e9f489d10fdeb3e59 SHA512 9f45bd5fbe735237161de6b64fdd68e9810790a537b9084642772f04be7be574e94df3bdbbe2ec57dc0ead555e3d3e4fc528f12f07e9a0782cda9613ad9576d0 +EBUILD qt5compat-6.9999.ebuild 650 BLAKE2B d99a24afd58139ec14d2bd87afecfa7f7f851121f9e9adbbd93f06fde847564e3612b13418e519a7dcdc5f88d38aee4b5ecace6424e6fd5e9f489d10fdeb3e59 SHA512 9f45bd5fbe735237161de6b64fdd68e9810790a537b9084642772f04be7be574e94df3bdbbe2ec57dc0ead555e3d3e4fc528f12f07e9a0782cda9613ad9576d0 +MISC metadata.xml 614 BLAKE2B 0398cf879d68d52becdfe5098503b6c40b9e84f6a0d05f961d068235a0caff829fd930027c0bd736dbae76aa5b00ee3f99c6e303120fe14b6da3789ee7781e7f SHA512 ebf0f12d0a42356a915c06626046498273659cba209a0537b69cc27da2b5dc721c49cf4180d1a7137a34b89ac1ee39d95295cbebb83848c1f63b786b1eaaad7c diff --git a/dev-qt/qt5compat/metadata.xml b/dev-qt/qt5compat/metadata.xml index ae8aa9597f20..00a322d647f6 100644 --- a/dev-qt/qt5compat/metadata.xml +++ b/dev-qt/qt5compat/metadata.xml @@ -5,9 +5,13 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> + <use> + <flag name="qml">Build QML/QtQuick bindings and imports</flag> + </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qt5compat</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild new file mode 100644 index 000000000000..46743a4d8f24 --- /dev/null +++ b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module containing the unsupported Qt 5 APIs" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="icu qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml] + icu? ( dev-libs/icu:= ) + qml? ( + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtshadertools-${PV}:6 + ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} + +src_test() { + # tst_qxmlinputsource sometimes hang without -j1 + qt6-build_src_test -j1 +} diff --git a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild b/dev-qt/qt5compat/qt5compat-6.5.2.ebuild deleted file mode 100644 index 54dca83e10d2..000000000000 --- a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt module containing the unsupported Qt 5 APIs" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network] - =dev-qt/qtdeclarative-${PV}* -" -RDEPEND="${DEPEND}" diff --git a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild new file mode 100644 index 000000000000..46743a4d8f24 --- /dev/null +++ b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module containing the unsupported Qt 5 APIs" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="icu qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml] + icu? ( dev-libs/icu:= ) + qml? ( + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtshadertools-${PV}:6 + ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} + +src_test() { + # tst_qxmlinputsource sometimes hang without -j1 + qt6-build_src_test -j1 +} diff --git a/dev-qt/qt5compat/qt5compat-6.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.9999.ebuild new file mode 100644 index 000000000000..46743a4d8f24 --- /dev/null +++ b/dev-qt/qt5compat/qt5compat-6.9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module containing the unsupported Qt 5 APIs" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="icu qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml] + icu? ( dev-libs/icu:= ) + qml? ( + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtshadertools-${PV}:6 + ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} + +src_test() { + # tst_qxmlinputsource sometimes hang without -j1 + qt6-build_src_test -j1 +} diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 26d67d0b0ebf..d13b48166836 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1,4 +1,7 @@ AUX qtbase-6.5.2-CVE-2023-38197.patch 14691 BLAKE2B 68de2edb047871de9608a0a570773c9987474f9977f1dad9a849b8ed18dad6ef966997c0293adaee92fd2fcdb24a79a6bd05a71874c548722bfca64d960f12e3 SHA512 0ee7d66a0894879816454fdfd4c9feb958d82e87f4287935704216330e74135709b23cba7a5c084a6b2617b16c54a96eb6eff785d85f0d79b15ef6ccd9da51c6 +AUX qtbase-6.5.2-tests-gcc13.patch 1491 BLAKE2B 72417e910bb35df59c10d18e093bf4d17952d0a39ead552a342020004bbf7c9e0f903140c014509ab806915ff380ad3732e3cd119b9b1ce3bec550b9c247a077 SHA512 10e05e135e4997cc71c0d2f1a0b40131babe88801d87bb11f69aa1ae93cdcdef9e1e510dbfe337b5bd101e4831a401a63a5e49d84f9f865d6db986e3e60277ba DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20 -EBUILD qtbase-6.5.2.ebuild 5080 BLAKE2B 025013b416fead6bbe9423f06ad38a9b3750e12ffe70756183af361e825f499cb1356678098c709bc33c72fdddb91972e91116c44bcbf2bf6c8fd796440add5a SHA512 cecb0846a9a3266f98c12423b861930fb050bc4116dc4d2f595678e10a2b6020f7dd4869951f4e4ff458bc25d5c73fe737834587c03f40d9ad59abfe7c684f5b -MISC metadata.xml 1762 BLAKE2B fd53799e4a3668fb8d32798f1d128df86aaa7181563655ffb71d6c15a7bab33e5fb08f3c5b41695e8fee4a46f5a5216030d0aeb0927eaeec387136ec66964a8f SHA512 6e05599e981d07f7a6d79eda9e1ef9e41383e05aec5442fed8a46be87245b6e9a77fb9b469fe656f9fdd29ffb69767136c0922baed3c5448ca8c58ee70ad713d +EBUILD qtbase-6.5.2-r1.ebuild 8953 BLAKE2B 579df068d067a9713003bdaf25a74191d3ec4a5694ad24f859ea53c289570a34aa8eaa9dcc897692f76b7f41f2e13410d9e69f81480f2cc0b22745ed8a5fdc07 SHA512 831305547ceffe924987a969820f807e482564c2fe11fe2cbc284540b2a57046c55567737e216baabbb3c4b9a3e74ccaf3157a5f2cbcc85491bc69f7638e3744 +EBUILD qtbase-6.5.9999.ebuild 8861 BLAKE2B c862b8e672aa1270aaca95d00160ba4ea8032669a3973b63275c68baa134b7ea338159a1ab9d1ea77d5d07faade42921ccc2997734cab34b0ed70f86998e0dd5 SHA512 dc225ed604ca729faf934961496bb3664062acddfd44eb37f9e166616c23f4c34248688fe657601cf047ac4e2385c52a35850a128d53ac9ca2cf9aff2993c50e +EBUILD qtbase-6.9999.ebuild 8861 BLAKE2B 86ceb8af158569506c159ff03e62523b7e4e5ca13b9a31d90ac0ef9144589849bba7ece4eb3183dee435c5b1737c8bfda82f083452bd8fab0b530940de0190dc SHA512 a9f74828f56c3ccb1699e1e911284560cf780989ab5ff0a740c87ede1d107558c4e8d9b3b9f15cdf119cffae2e64539fbc163f655ae20c8e7fa933d39ae9ec3e +MISC metadata.xml 1675 BLAKE2B 2ebcdba30a9090ca67955496f9e88c33756df5ff409821525fff1e3267198c5eb55d5d486fc103b471b6374a169d2cf9b7c3af11628e860a2fdc412100249f96 SHA512 ce269f77e47f082145f42db9b7bf4e4d4ed21c95ec28670b2957f7ae9f6c716a15e67feea88cb15974f59a5d03afa7b70b875674f0c2f4ba5e9fc90d1cb39bd3 diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-tests-gcc13.patch b/dev-qt/qtbase/files/qtbase-6.5.2-tests-gcc13.patch new file mode 100644 index 000000000000..431d89a387f6 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.5.2-tests-gcc13.patch @@ -0,0 +1,25 @@ +https://bugreports.qt.io/browse/QTBUG-114785 +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=3e801b5477a7abfe4b87f20639e345bf3dc7eca8 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sat, 29 Apr 2023 13:01:56 +0200 +Subject: [PATCH] tinycbor: fix build with gcc-13 + +Fixes: QTBUG-114785 +Pick-to: 6.6 6.5 +Change-Id: I4876ebd8890eee883a0d1a2bef8cb7aec4fd0f2f +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- a/src/3rdparty/tinycbor/tests/encoder/data.cpp ++++ b/src/3rdparty/tinycbor/tests/encoder/data.cpp +@@ -239,9 +239,9 @@ + QTest::newRow("0.f16") << raw("\xf9\0\0") << QVariant::fromValue(qfloat16(0)); + QTest::newRow("-1.f16") << raw("\xf9\xbc\0") << QVariant::fromValue(qfloat16(-1)); + QTest::newRow("1.5f16") << raw("\xf9\x3e\0") << QVariant::fromValue(qfloat16(1.5)); +- QTest::newRow("nan_f16") << raw("\xf9\x7e\0") << QVariant::fromValue<qfloat16>(myNaNf()); +- QTest::newRow("-inf_f16") << raw("\xf9\xfc\0") << QVariant::fromValue<qfloat16>(myNInff()); +- QTest::newRow("+inf_f16") << raw("\xf9\x7c\0") << QVariant::fromValue<qfloat16>(myInff()); ++ QTest::newRow("nan_f16") << raw("\xf9\x7e\0") << QVariant::fromValue<qfloat16>(qfloat16(myNaNf())); ++ QTest::newRow("-inf_f16") << raw("\xf9\xfc\0") << QVariant::fromValue<qfloat16>(qfloat16(myNInff())); ++ QTest::newRow("+inf_f16") << raw("\xf9\x7c\0") << QVariant::fromValue<qfloat16>(qfloat16(myInff())); + #endif + + QTest::newRow("0.f") << raw("\xfa\0\0\0\0") << QVariant::fromValue(0.f); diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml index d828e06391c0..573775d954fd 100644 --- a/dev-qt/qtbase/metadata.xml +++ b/dev-qt/qtbase/metadata.xml @@ -9,7 +9,6 @@ <flag name="brotli">Enable support for Brotli decompression</flag> <flag name="concurrent">Build Qt6Concurrent module</flag> <flag name="dbus">Build Qt6DBus module</flag> - <flag name="egl">Enable EGL integration</flag> <flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag> <flag name="evdev">Enable support for input devices via evdev</flag> <flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag> @@ -21,13 +20,13 @@ <flag name="sql">Build Qt6Sql module</flag> <flag name="systemd">Enable native journald logging support</flag> <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> - <flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag> <flag name="widgets">Build Qt6Widgets module</flag> <flag name="X">Build the XCB platform plugin and enable X11 integration</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtbase</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild new file mode 100644 index 000000000000..3c566fb935d8 --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild @@ -0,0 +1,331 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic qt6-build toolchain-funcs + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +declare -A QT6_IUSE=( + [global]="+ssl +udev zstd" + [core]="icu systemd" + [modules]="+concurrent +dbus +gui +network +sql +xml" + + [gui]=" + +X accessibility eglfs evdev gles2-only +libinput + opengl tslib vulkan +widgets + " + [network]="brotli gssapi libproxy sctp" + [sql]="mysql oci8 odbc postgres +sqlite" + [widgets]="cups gtk" + + [optfeature]="wayland" #864509 +) +IUSE="${QT6_IUSE[*]}" +REQUIRED_USE=" + $( + printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} + printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} + printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/} + printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/} + ) + accessibility? ( X dbus ) + eglfs? ( opengl ) + gui? ( || ( X eglfs wayland ) ) + libinput? ( udev ) + sql? ( || ( ${QT6_IUSE[sql]//+/} ) ) + test? ( icu sql? ( sqlite ) ) +" + +# groups: +# - global (configure.cmake) +# - qtcore (src/corelib/configure.cmake) +# - qtgui (src/gui/configure.cmake) +# - qtnetwork (src/network/configure.cmake) +# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] +# - qtsql (src/plugins/sqldrivers/configure.cmake) +RDEPEND=" + sys-libs/zlib:= + ssl? ( dev-libs/openssl:= ) + udev? ( virtual/libudev:= ) + zstd? ( app-arch/zstd:= ) + + app-crypt/libb2 + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2:=[pcre16,unicode(+)] + icu? ( dev-libs/icu:= ) + systemd? ( sys-apps/systemd:= ) + + dbus? ( sys-apps/dbus ) + gui? ( + media-libs/fontconfig + media-libs/freetype:2 + media-libs/harfbuzz:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + x11-libs/libdrm + x11-libs/libxkbcommon[X?] + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + accessibility? ( app-accessibility/at-spi2-core:2 ) + eglfs? ( media-libs/mesa[gbm(+)] ) + evdev? ( sys-libs/mtdev ) + libinput? ( dev-libs/libinput:= ) + opengl? ( media-libs/libglvnd[X?] ) + tslib? ( x11-libs/tslib ) + widgets? ( + cups? ( net-print/cups ) + gtk? ( + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + ) + ) + ) + network? ( + brotli? ( app-arch/brotli:= ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + ) + sql? ( + mysql? ( dev-db/mysql-connector-c:= ) + oci8? ( dev-db/oracle-instantclient:=[sdk] ) + odbc? ( dev-db/unixODBC ) + postgres? ( dev-db/postgresql:* ) + sqlite? ( dev-db/sqlite:3 ) + ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + gui? ( + vulkan? ( dev-util/vulkan-headers ) + ) + network? ( + sctp? ( net-misc/lksctp-tools ) + ) + test? ( + elibc_musl? ( sys-libs/timezone-data ) + ) +" +BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392 +PDEPEND="wayland? ( ~dev-qt/qtwayland-${PV}:6 )" + +PATCHES=( + "${FILESDIR}"/${P}-CVE-2023-38197.patch + "${FILESDIR}"/${P}-tests-gcc13.patch +) + +src_prepare() { + qt6-build_src_prepare + + if use test; then + # test itself has -Werror=strict-aliasing issues, drop for simplicity + sed -e '/add_subdirectory(qsharedpointer)/d' \ + -i tests/auto/corelib/tools/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" + -DINSTALL_BINDIR="${QT6_BINDIR}" + -DINSTALL_DATADIR="${QT6_DATADIR}" + -DINSTALL_DOCDIR="${QT6_DOCDIR}" + -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" + -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" + -DINSTALL_LIBDIR="${QT6_LIBDIR}" + -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" + -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}" + -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" + -DINSTALL_QMLDIR="${QT6_QMLDIR}" + -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" + -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" + + -DQT_FEATURE_precompile_header=OFF + $(qt_feature ssl openssl) + $(qt_feature ssl openssl_linked) + $(qt_feature udev libudev) + $(qt_feature zstd) + + # qtcore + $(qt_feature icu) + $(qt_feature systemd journald) + + # tools + -DQT_FEATURE_androiddeployqt=OFF + + # modules + $(qt_feature concurrent) + $(qt_feature dbus) + $(qt_feature gui) + $(qt_feature network) + $(qt_feature sql) + -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps + $(qt_feature xml) + ) + + use gui && mycmakeargs+=( + $(qt_feature X xcb) + $(qt_feature X system_xcb_xinput) + $(qt_feature X xkbcommon_x11) + $(cmake_use_find_package X X11) # needed for truly no automagic + $(qt_feature accessibility accessibility_atspi_bridge) + $(qt_feature eglfs) + $(qt_feature evdev) + $(qt_feature evdev mtdev) + $(qt_feature gles2-only opengles2) + $(qt_feature libinput) + $(qt_feature opengl) + $(usev !opengl -DINPUT_opengl=no) #913691 + $(qt_feature tslib) + $(qt_feature vulkan) + $(qt_feature widgets) + -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c + ) && use widgets && mycmakeargs+=( + $(qt_feature cups) # qtprintsupport is enabled w/ gui+widgets + $(qt_feature gtk gtk3) + ) + + use network && mycmakeargs+=( + $(qt_feature brotli) + $(qt_feature gssapi) + $(qt_feature libproxy) + $(qt_feature sctp) + $(usev test -DQT_SKIP_DOCKER_COMPOSE=ON) + ) + + use sql && mycmakeargs+=( + -DQT_FEATURE_sql_db2=OFF # unpackaged + -DQT_FEATURE_sql_ibase=OFF # unpackaged + $(qt_feature mysql sql_mysql) + $(qt_feature oci8 sql_oci) + $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client) + $(qt_feature odbc sql_odbc) + $(qt_feature postgres sql_psql) + $(qt_feature sqlite sql_sqlite) + $(qt_feature sqlite system_sqlite) + -DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt + ) + + if use amd64 || use x86; then + # see bug #913400 for explanations + local cpufeats=( + # list of checked cpu features in configure.cmake + avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl} + f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes + ) + # handle odd ones out not matching -m* and macros (keep same order) + local cpuflags=( "${cpufeats[@]}" aes sha ) + local cpufeats+=( aesni shani ) + + local -a intrins + IFS=' ' read -ra intrins < <( + : "$(test-flags-CXX "${cpuflags[@]/#/-m}")" + $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1 + #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) + #include <x86intrin.h> + #endif + $(printf '__%s__ ' "${cpuflags[@]^^}") + EOF + assert + ) + + # do nothing and leave to qtbase if no macros expanded (test failed?) + if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then + local -i i + for ((i=0; i<${#cpufeats[@]}; i++)); do + [[ ${intrins[i]} == __* ]] && + mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF ) + done + mycmakeargs+=( -DTEST_x86intrin=ON ) + fi + fi + + qt6-build_src_configure +} + +src_test() { + local -x TZ=UTC + local -x LC_TIME=C + + local CMAKE_SKIP_TESTS=( + # broken with out-of-source + if qtbase is not already installed + tst_moc + tst_qmake + # needs x11/opengl, we *could* run these but tend to be flaky + # when opengl rendering is involved (even if software-only) + tst_qopengl{,config,widget,window} + tst_qgraphicsview + tst_qx11info + # fails with network sandbox + tst_qdnslookup + # typical to lack SCTP support on non-generic kernels + tst_qsctpsocket + # these can be flaky depending on the environment/toolchain + tst_qlogging # backtrace log test can easily vary + tst_qrawfont # can be affected by available fonts + tst_qstorageinfo # checks mounted filesystems + # flaky due to using different test framework and fails with USE=-gui + tst_selftests + # known failing when using clang+glibc+stdc++, needs looking into + tst_qthread + # partially failing on x86 chroots and seemingly(?) harmless (dev-qt + # revdeps tests pass), skip globally to avoid keywording flakiness + tst_json + tst_qcolorspace + tst_qdoublevalidator + tst_qglobal + tst_qglyphrun + tst_qvectornd + tst_rcc + # partially broken on llvm-musl, needs looking into but skip to have + # a baseline for regressions (like above, rest of dev-qt is fine) + $(usev elibc_musl ' + tst_qfiledialog2 + tst_qicoimageformat + tst_qimagereader + tst_qpainter + tst_qimage + ') + # note: for linux, upstream only really runs+maintains tests for amd64 + # https://doc.qt.io/qt-6/supported-platforms.html + ) + + qt6-build_src_test +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete_bins=( # need a better way to handle this + clientserver copier crashingServer desktopsettingsaware_helper + echo fileWriterProcess modal_helper nospace 'one space' + paster qcommandlineparser_test_helper qfileopeneventexternal + socketprocess syslocaleapp tst_qhashseed_helper 'two space s' + write-read-write + ) + local delete=( # sigh + "${D}${QT6_BINDIR}"/test* + "${delete_bins[@]/#/${D}${QT6_BINDIR}/}" + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtbase/qtbase-6.5.2.ebuild b/dev-qt/qtbase/qtbase-6.5.2.ebuild deleted file mode 100644 index 5e1b328fd988..000000000000 --- a/dev-qt/qtbase/qtbase-6.5.2.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -# Qt Modules -IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd" -REQUIRED_USE=" - opengl? ( gui ) - widgets? ( gui ) - X? ( || ( evdev libinput ) ) -" - -QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X" -QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc" -QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite" -IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev wayland" -# QtPrintSupport = QtGui + QtWidgets enabled. -# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X -REQUIRED_USE+=" - $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/}) - $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/}) - $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/}) - accessibility? ( dbus X ) - cups? ( gui widgets ) - eglfs? ( egl ) - gtk? ( widgets ) - gui? ( || ( eglfs X ) || ( libinput X ) ) - libinput? ( udev ) - sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) ) - vnc? ( gui ) - X? ( gles2-only? ( egl ) ) -" - -# TODO: -# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c -# qtnetwork: connman, networkmanager -DEPEND=" - app-crypt/libb2 - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2:=[pcre16,unicode] - dev-util/gtk-update-icon-cache - media-libs/fontconfig - >=media-libs/freetype-2.6.1:2 - >=media-libs/harfbuzz-1.6.0:= - media-libs/tiff:= - >=sys-apps/dbus-1.4.20 - sys-libs/zlib:= - brotli? ( app-arch/brotli:= ) - evdev? ( sys-libs/mtdev ) - freetds? ( dev-db/freetds ) - gles2-only? ( media-libs/libglvnd ) - !gles2-only? ( media-libs/libglvnd[X] ) - gssapi? ( virtual/krb5 ) - gtk? ( - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) - gui? ( media-libs/libpng:= ) - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) - jpeg? ( media-libs/libjpeg-turbo:= ) - libinput? ( - dev-libs/libinput:= - >=x11-libs/libxkbcommon-0.5.0 - ) - libproxy? ( net-libs/libproxy ) - mysql? ( dev-db/mysql-connector-c:= ) - oci8? ( dev-db/oracle-instantclient:=[sdk] ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:* ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl:= ) - systemd? ( sys-apps/systemd:= ) - tslib? ( >=x11-libs/tslib-1.21 ) - udev? ( virtual/libudev:= ) - vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libdrm - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libxcb-1.12:= - >=x11-libs/libxkbcommon-0.5.0[X] - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND="${DEPEND}" -PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}* )" - -PATCHES=( "${FILESDIR}/${PN}-6.5.2-CVE-2023-38197.patch" ) - -src_configure() { - local mycmakeargs=( - -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} - -DINSTALL_BINDIR=${QT6_BINDIR} - -DINSTALL_DATADIR=${QT6_DATADIR} - -DINSTALL_DOCDIR=${QT6_DOCDIR} - -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} - -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR} - -DINSTALL_LIBDIR=${QT6_LIBDIR} - -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR} - -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs - -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} - -DINSTALL_QMLDIR=${QT6_QMLDIR} - -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR} - -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} - -DQT_FEATURE_androiddeployqt=OFF - $(qt_feature concurrent) - $(qt_feature dbus) - $(qt_feature gui) - $(qt_feature gui testlib) - $(qt_feature icu) - $(qt_feature network) - $(qt_feature sql) - $(qt_feature systemd journald) - $(qt_feature udev libudev) - $(qt_feature xml) - $(qt_feature zstd) - ) - use gui && mycmakeargs+=( - $(qt_feature accessibility accessibility_atspi_bridge) - $(qt_feature egl) - $(qt_feature egl xcb_egl_plugin) - $(qt_feature eglfs eglfs_egldevice) - $(qt_feature eglfs eglfs_gbm) - $(qt_feature evdev) - $(qt_feature evdev mtdev) - -DQT_FEATURE_gif=ON - $(qt_feature jpeg) - $(qt_feature opengl) - $(qt_feature gles2-only opengles2) - $(qt_feature libinput) - $(qt_feature tslib) - $(qt_feature tuio tuiotouch) - $(qt_feature vulkan) - $(qt_feature widgets) - $(qt_feature X xcb) - $(qt_feature X xcb_xlib) - ) - use widgets && mycmakeargs+=( - $(qt_feature cups) - $(qt_feature gtk gtk3) - ) - if use libinput || use X; then - mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON ) - fi - use network && mycmakeargs+=( - $(qt_feature brotli) - $(qt_feature gssapi) - $(qt_feature libproxy) - $(qt_feature sctp) - $(qt_feature ssl openssl) - $(qt_feature vnc) - ) - use sql && mycmakeargs+=( - $(qt_feature freetds sql_tds) - $(qt_feature mysql sql_mysql) - $(qt_feature oci8 sql_oci) - $(qt_feature odbc sql_odbc) - $(qt_feature postgres sql_psql) - $(qt_feature sqlite sql_sqlite) - $(qt_feature sqlite system_sqlite) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - # https://bugs.gentoo.org/863395 - qt6_symlink_binary_to_path qmake 6 -} diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild new file mode 100644 index 000000000000..714ed0db12c8 --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild @@ -0,0 +1,326 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic qt6-build toolchain-funcs + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +declare -A QT6_IUSE=( + [global]="+ssl +udev zstd" + [core]="icu systemd" + [modules]="+concurrent +dbus +gui +network +sql +xml" + + [gui]=" + +X accessibility eglfs evdev gles2-only +libinput + opengl tslib vulkan +widgets + " + [network]="brotli gssapi libproxy sctp" + [sql]="mysql oci8 odbc postgres +sqlite" + [widgets]="cups gtk" + + [optfeature]="wayland" #864509 +) +IUSE="${QT6_IUSE[*]}" +REQUIRED_USE=" + $( + printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} + printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} + printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/} + printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/} + ) + accessibility? ( X dbus ) + eglfs? ( opengl ) + gui? ( || ( X eglfs wayland ) ) + libinput? ( udev ) + sql? ( || ( ${QT6_IUSE[sql]//+/} ) ) + test? ( icu sql? ( sqlite ) ) +" + +# groups: +# - global (configure.cmake) +# - qtcore (src/corelib/configure.cmake) +# - qtgui (src/gui/configure.cmake) +# - qtnetwork (src/network/configure.cmake) +# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] +# - qtsql (src/plugins/sqldrivers/configure.cmake) +RDEPEND=" + sys-libs/zlib:= + ssl? ( dev-libs/openssl:= ) + udev? ( virtual/libudev:= ) + zstd? ( app-arch/zstd:= ) + + app-crypt/libb2 + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2:=[pcre16,unicode(+)] + icu? ( dev-libs/icu:= ) + systemd? ( sys-apps/systemd:= ) + + dbus? ( sys-apps/dbus ) + gui? ( + media-libs/fontconfig + media-libs/freetype:2 + media-libs/harfbuzz:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + x11-libs/libdrm + x11-libs/libxkbcommon[X?] + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + accessibility? ( app-accessibility/at-spi2-core:2 ) + eglfs? ( media-libs/mesa[gbm(+)] ) + evdev? ( sys-libs/mtdev ) + libinput? ( dev-libs/libinput:= ) + opengl? ( media-libs/libglvnd[X?] ) + tslib? ( x11-libs/tslib ) + widgets? ( + cups? ( net-print/cups ) + gtk? ( + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + ) + ) + ) + network? ( + brotli? ( app-arch/brotli:= ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + ) + sql? ( + mysql? ( dev-db/mysql-connector-c:= ) + oci8? ( dev-db/oracle-instantclient:=[sdk] ) + odbc? ( dev-db/unixODBC ) + postgres? ( dev-db/postgresql:* ) + sqlite? ( dev-db/sqlite:3 ) + ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + gui? ( + vulkan? ( dev-util/vulkan-headers ) + ) + network? ( + sctp? ( net-misc/lksctp-tools ) + ) + test? ( + elibc_musl? ( sys-libs/timezone-data ) + ) +" +BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392 +PDEPEND="wayland? ( ~dev-qt/qtwayland-${PV}:6 )" + +src_prepare() { + qt6-build_src_prepare + + if use test; then + # test itself has -Werror=strict-aliasing issues, drop for simplicity + sed -e '/add_subdirectory(qsharedpointer)/d' \ + -i tests/auto/corelib/tools/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" + -DINSTALL_BINDIR="${QT6_BINDIR}" + -DINSTALL_DATADIR="${QT6_DATADIR}" + -DINSTALL_DOCDIR="${QT6_DOCDIR}" + -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" + -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" + -DINSTALL_LIBDIR="${QT6_LIBDIR}" + -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" + -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}" + -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" + -DINSTALL_QMLDIR="${QT6_QMLDIR}" + -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" + -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" + + -DQT_FEATURE_precompile_header=OFF + $(qt_feature ssl openssl) + $(qt_feature ssl openssl_linked) + $(qt_feature udev libudev) + $(qt_feature zstd) + + # qtcore + $(qt_feature icu) + $(qt_feature systemd journald) + + # tools + -DQT_FEATURE_androiddeployqt=OFF + + # modules + $(qt_feature concurrent) + $(qt_feature dbus) + $(qt_feature gui) + $(qt_feature network) + $(qt_feature sql) + -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps + $(qt_feature xml) + ) + + use gui && mycmakeargs+=( + $(qt_feature X xcb) + $(qt_feature X system_xcb_xinput) + $(qt_feature X xkbcommon_x11) + $(cmake_use_find_package X X11) # needed for truly no automagic + $(qt_feature accessibility accessibility_atspi_bridge) + $(qt_feature eglfs) + $(qt_feature evdev) + $(qt_feature evdev mtdev) + $(qt_feature gles2-only opengles2) + $(usev !opengl -DINPUT_opengl=no) #913691 + $(qt_feature libinput) + $(qt_feature opengl) + $(qt_feature tslib) + $(qt_feature vulkan) + $(qt_feature widgets) + -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c + ) && use widgets && mycmakeargs+=( + $(qt_feature cups) # qtprintsupport is enabled w/ gui+widgets + $(qt_feature gtk gtk3) + ) + + use network && mycmakeargs+=( + $(qt_feature brotli) + $(qt_feature gssapi) + $(qt_feature libproxy) + $(qt_feature sctp) + $(usev test -DQT_SKIP_DOCKER_COMPOSE=ON) + ) + + use sql && mycmakeargs+=( + -DQT_FEATURE_sql_db2=OFF # unpackaged + -DQT_FEATURE_sql_ibase=OFF # unpackaged + $(qt_feature mysql sql_mysql) + $(qt_feature oci8 sql_oci) + $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client) + $(qt_feature odbc sql_odbc) + $(qt_feature postgres sql_psql) + $(qt_feature sqlite sql_sqlite) + $(qt_feature sqlite system_sqlite) + -DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt + ) + + if use amd64 || use x86; then + # see bug #913400 for explanations + local cpufeats=( + # list of checked cpu features in configure.cmake + avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl} + f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes + ) + # handle odd ones out not matching -m* and macros (keep same order) + local cpuflags=( "${cpufeats[@]}" aes sha ) + local cpufeats+=( aesni shani ) + + local -a intrins + IFS=' ' read -ra intrins < <( + : "$(test-flags-CXX "${cpuflags[@]/#/-m}")" + $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1 + #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) + #include <x86intrin.h> + #endif + $(printf '__%s__ ' "${cpuflags[@]^^}") + EOF + assert + ) + + # do nothing and leave to qtbase if no macros expanded (test failed?) + if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then + local -i i + for ((i=0; i<${#cpufeats[@]}; i++)); do + [[ ${intrins[i]} == __* ]] && + mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF ) + done + mycmakeargs+=( -DTEST_x86intrin=ON ) + fi + fi + + qt6-build_src_configure +} + +src_test() { + local -x TZ=UTC + local -x LC_TIME=C + + local CMAKE_SKIP_TESTS=( + # broken with out-of-source + if qtbase is not already installed + tst_moc + tst_qmake + # needs x11/opengl, we *could* run these but tend to be flaky + # when opengl rendering is involved (even if software-only) + tst_qopengl{,config,widget,window} + tst_qgraphicsview + tst_qx11info + # fails with network sandbox + tst_qdnslookup + # typical to lack SCTP support on non-generic kernels + tst_qsctpsocket + # these can be flaky depending on the environment/toolchain + tst_qlogging # backtrace log test can easily vary + tst_qrawfont # can be affected by available fonts + tst_qstorageinfo # checks mounted filesystems + # flaky due to using different test framework and fails with USE=-gui + tst_selftests + # known failing when using clang+glibc+stdc++, needs looking into + tst_qthread + # partially failing on x86 chroots and seemingly(?) harmless (dev-qt + # revdeps tests pass), skip globally to avoid keywording flakiness + tst_json + tst_qcolorspace + tst_qdoublevalidator + tst_qglobal + tst_qglyphrun + tst_qvectornd + tst_rcc + # partially broken on llvm-musl, needs looking into but skip to have + # a baseline for regressions (like above, rest of dev-qt is fine) + $(usev elibc_musl ' + tst_qfiledialog2 + tst_qicoimageformat + tst_qimagereader + tst_qpainter + tst_qimage + ') + # note: for linux, upstream only really runs+maintains tests for amd64 + # https://doc.qt.io/qt-6/supported-platforms.html + ) + + qt6-build_src_test +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete_bins=( # need a better way to handle this + clientserver copier crashingServer desktopsettingsaware_helper + echo fileWriterProcess modal_helper nospace 'one space' + paster qcommandlineparser_test_helper qfileopeneventexternal + socketprocess syslocaleapp tst_qhashseed_helper 'two space s' + write-read-write + ) + local delete=( # sigh + "${D}${QT6_BINDIR}"/test* + "${delete_bins[@]/#/${D}${QT6_BINDIR}/}" + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild new file mode 100644 index 000000000000..15a3ab244492 --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -0,0 +1,326 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic qt6-build toolchain-funcs + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +declare -A QT6_IUSE=( + [global]="+ssl +udev zstd" + [core]="icu systemd" + [modules]="+concurrent +dbus +gui +network +sql +xml" + + [gui]=" + +X accessibility eglfs evdev gles2-only +libinput + opengl tslib vulkan +widgets + " + [network]="brotli gssapi libproxy sctp" + [sql]="mysql oci8 odbc postgres +sqlite" + [widgets]="cups gtk" + + [optfeature]="wayland" #864509 +) +IUSE="${QT6_IUSE[*]}" +REQUIRED_USE=" + $( + printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} + printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} + printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/} + printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/} + ) + accessibility? ( X dbus ) + eglfs? ( opengl ) + gui? ( || ( X eglfs wayland ) ) + libinput? ( udev ) + sql? ( || ( ${QT6_IUSE[sql]//+/} ) ) + test? ( icu sql? ( sqlite ) ) +" + +# groups: +# - global (configure.cmake) +# - qtcore (src/corelib/configure.cmake) +# - qtgui (src/gui/configure.cmake) +# - qtnetwork (src/network/configure.cmake) +# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] +# - qtsql (src/plugins/sqldrivers/configure.cmake) +RDEPEND=" + sys-libs/zlib:= + ssl? ( dev-libs/openssl:= ) + udev? ( virtual/libudev:= ) + zstd? ( app-arch/zstd:= ) + + app-crypt/libb2 + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2:=[pcre16,unicode(+)] + icu? ( dev-libs/icu:= ) + systemd? ( sys-apps/systemd:= ) + + dbus? ( sys-apps/dbus ) + gui? ( + media-libs/fontconfig + media-libs/freetype:2 + media-libs/harfbuzz:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + x11-libs/libdrm + x11-libs/libxkbcommon[X?] + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + accessibility? ( app-accessibility/at-spi2-core:2 ) + eglfs? ( media-libs/mesa[gbm(+)] ) + evdev? ( sys-libs/mtdev ) + libinput? ( dev-libs/libinput:= ) + opengl? ( media-libs/libglvnd[X?] ) + tslib? ( x11-libs/tslib ) + widgets? ( + cups? ( net-print/cups ) + gtk? ( + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + ) + ) + ) + network? ( + brotli? ( app-arch/brotli:= ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + ) + sql? ( + mysql? ( dev-db/mysql-connector-c:= ) + oci8? ( dev-db/oracle-instantclient:=[sdk] ) + odbc? ( dev-db/unixODBC ) + postgres? ( dev-db/postgresql:* ) + sqlite? ( dev-db/sqlite:3 ) + ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + gui? ( + vulkan? ( dev-util/vulkan-headers ) + ) + network? ( + sctp? ( net-misc/lksctp-tools ) + ) + test? ( + elibc_musl? ( sys-libs/timezone-data ) + ) +" +BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392 +PDEPEND="wayland? ( ~dev-qt/qtwayland-${PV}:6 )" + +src_prepare() { + qt6-build_src_prepare + + if use test; then + # test itself has -Werror=strict-aliasing issues, drop for simplicity + sed -e '/add_subdirectory(qsharedpointer)/d' \ + -i tests/auto/corelib/tools/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" + -DINSTALL_BINDIR="${QT6_BINDIR}" + -DINSTALL_DATADIR="${QT6_DATADIR}" + -DINSTALL_DOCDIR="${QT6_DOCDIR}" + -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" + -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" + -DINSTALL_LIBDIR="${QT6_LIBDIR}" + -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" + -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}" + -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" + -DINSTALL_QMLDIR="${QT6_QMLDIR}" + -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" + -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" + + -DQT_FEATURE_precompile_header=OFF + $(qt_feature ssl openssl) + $(qt_feature ssl openssl_linked) + $(qt_feature udev libudev) + $(qt_feature zstd) + + # qtcore + $(qt_feature icu) + $(qt_feature systemd journald) + + # tools + -DQT_FEATURE_androiddeployqt=OFF + + # modules + $(qt_feature concurrent) + $(qt_feature dbus) + $(qt_feature gui) + $(qt_feature network) + $(qt_feature sql) + -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps + $(qt_feature xml) + ) + + use gui && mycmakeargs+=( + $(qt_feature X xcb) + $(qt_feature X system_xcb_xinput) + $(qt_feature X xkbcommon_x11) + $(cmake_use_find_package X X11) # needed for truly no automagic + $(qt_feature accessibility accessibility_atspi_bridge) + $(qt_feature eglfs) + $(qt_feature evdev) + $(qt_feature evdev mtdev) + $(qt_feature gles2-only opengles2) + $(qt_feature libinput) + $(qt_feature opengl) + $(usev !opengl -DINPUT_opengl=no) #913691 + $(qt_feature tslib) + $(qt_feature vulkan) + $(qt_feature widgets) + -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c + ) && use widgets && mycmakeargs+=( + $(qt_feature cups) # qtprintsupport is enabled w/ gui+widgets + $(qt_feature gtk gtk3) + ) + + use network && mycmakeargs+=( + $(qt_feature brotli) + $(qt_feature gssapi) + $(qt_feature libproxy) + $(qt_feature sctp) + $(usev test -DQT_SKIP_DOCKER_COMPOSE=ON) + ) + + use sql && mycmakeargs+=( + -DQT_FEATURE_sql_db2=OFF # unpackaged + -DQT_FEATURE_sql_ibase=OFF # unpackaged + $(qt_feature mysql sql_mysql) + $(qt_feature oci8 sql_oci) + $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client) + $(qt_feature odbc sql_odbc) + $(qt_feature postgres sql_psql) + $(qt_feature sqlite sql_sqlite) + $(qt_feature sqlite system_sqlite) + -DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt + ) + + if use amd64 || use x86; then + # see bug #913400 for explanations + local cpufeats=( + # list of checked cpu features in configure.cmake + avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl} + f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes + ) + # handle odd ones out not matching -m* and macros (keep same order) + local cpuflags=( "${cpufeats[@]}" aes sha ) + local cpufeats+=( aesni shani ) + + local -a intrins + IFS=' ' read -ra intrins < <( + : "$(test-flags-CXX "${cpuflags[@]/#/-m}")" + $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1 + #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) + #include <x86intrin.h> + #endif + $(printf '__%s__ ' "${cpuflags[@]^^}") + EOF + assert + ) + + # do nothing and leave to qtbase if no macros expanded (test failed?) + if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then + local -i i + for ((i=0; i<${#cpufeats[@]}; i++)); do + [[ ${intrins[i]} == __* ]] && + mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF ) + done + mycmakeargs+=( -DTEST_x86intrin=ON ) + fi + fi + + qt6-build_src_configure +} + +src_test() { + local -x TZ=UTC + local -x LC_TIME=C + + local CMAKE_SKIP_TESTS=( + # broken with out-of-source + if qtbase is not already installed + tst_moc + tst_qmake + # needs x11/opengl, we *could* run these but tend to be flaky + # when opengl rendering is involved (even if software-only) + tst_qopengl{,config,widget,window} + tst_qgraphicsview + tst_qx11info + # fails with network sandbox + tst_qdnslookup + # typical to lack SCTP support on non-generic kernels + tst_qsctpsocket + # these can be flaky depending on the environment/toolchain + tst_qlogging # backtrace log test can easily vary + tst_qrawfont # can be affected by available fonts + tst_qstorageinfo # checks mounted filesystems + # flaky due to using different test framework and fails with USE=-gui + tst_selftests + # known failing when using clang+glibc+stdc++, needs looking into + tst_qthread + # partially failing on x86 chroots and seemingly(?) harmless (dev-qt + # revdeps tests pass), skip globally to avoid keywording flakiness + tst_json + tst_qcolorspace + tst_qdoublevalidator + tst_qglobal + tst_qglyphrun + tst_qvectornd + tst_rcc + # partially broken on llvm-musl, needs looking into but skip to have + # a baseline for regressions (like above, rest of dev-qt is fine) + $(usev elibc_musl ' + tst_qfiledialog2 + tst_qicoimageformat + tst_qimagereader + tst_qpainter + tst_qimage + ') + # note: for linux, upstream only really runs+maintains tests for amd64 + # https://doc.qt.io/qt-6/supported-platforms.html + ) + + qt6-build_src_test +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete_bins=( # need a better way to handle this + clientserver copier crashingServer desktopsettingsaware_helper + echo fileWriterProcess modal_helper nospace 'one space' + paster qcommandlineparser_test_helper qfileopeneventexternal + socketprocess syslocaleapp tst_qhashseed_helper 'two space s' + write-read-write + ) + local delete=( # sigh + "${D}${QT6_BINDIR}"/test* + "${delete_bins[@]/#/${D}${QT6_BINDIR}/}" + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest index 82fa2e9b44f5..e48c31318689 100644 --- a/dev-qt/qtcharts/Manifest +++ b/dev-qt/qtcharts/Manifest @@ -1,5 +1,7 @@ DIST qtcharts-everywhere-opensource-src-5.15.10.tar.xz 4254496 BLAKE2B 9a163371a6360fb39f57d08e282f4bca79c4839ebbb105ebb37f32797d72faac73cdf832eb64cb4d76196447f5feb3089287e98f6979e0bd6b2fba5f7e0d28a7 SHA512 15c76bc6b987b2d89473972df9cd4826913bb0dd2dffdb06fc6dfdbdd1a5676508584d5f0982b06ab513e46cee12871f3eb0ed00f94fccf23ef807079be96961 DIST qtcharts-everywhere-src-6.5.2.tar.xz 4667940 BLAKE2B 36a24659e09e8f6d19c14683e86781ceb04efa80c9dc44e666202507b5d1a0586c1265ed6d5deecbdd18b4d7c0f0d539d9e829f90419ddb05a323ce389bb455c SHA512 913362f21668a81b82eff5125991b0b53ff9eeaf93dc6bf17539d4cffdc60e639a4e3490edec793d02ff942174ea3036854cdc8801382f4b8af341f8cbc3a1f1 EBUILD qtcharts-5.15.10.ebuild 572 BLAKE2B 8b157c6f720fd9befa6b1cd25fbe018b72936c88b3b47b3744e9080bb48c78f46538df11f52498237b01967fc7c26ffaf172f24a7a1ca1e8107269aa61951bd3 SHA512 42a14766f3898d45ce51b03680f7751dad7c0cf250e7b7de7af3ab012f5168bf2aa1969d701243af5038049042e4d57d7eb66b79899048c917b4358ab9ceb4d2 -EBUILD qtcharts-6.5.2.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716 -MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30 +EBUILD qtcharts-6.5.2-r1.ebuild 521 BLAKE2B 79384c43fefef5c84f76547ec6e683e835cb69c734efa01030aae57c67feb2c446cf8b1c69d2b6806ca265f220ae2a30341652d4728fe3a1791cd8eaa92b8c3c SHA512 aff7decf450409a48238e35851b6088131dcbdd6a8c49307c3b0c750da46e0ce702f4287c26678c942a3fa9eb66d6e752266ba1a4f39f6bd81b2344f43bda07a +EBUILD qtcharts-6.5.9999.ebuild 521 BLAKE2B 79384c43fefef5c84f76547ec6e683e835cb69c734efa01030aae57c67feb2c446cf8b1c69d2b6806ca265f220ae2a30341652d4728fe3a1791cd8eaa92b8c3c SHA512 aff7decf450409a48238e35851b6088131dcbdd6a8c49307c3b0c750da46e0ce702f4287c26678c942a3fa9eb66d6e752266ba1a4f39f6bd81b2344f43bda07a +EBUILD qtcharts-6.9999.ebuild 521 BLAKE2B 79384c43fefef5c84f76547ec6e683e835cb69c734efa01030aae57c67feb2c446cf8b1c69d2b6806ca265f220ae2a30341652d4728fe3a1791cd8eaa92b8c3c SHA512 aff7decf450409a48238e35851b6088131dcbdd6a8c49307c3b0c750da46e0ce702f4287c26678c942a3fa9eb66d6e752266ba1a4f39f6bd81b2344f43bda07a +MISC metadata.xml 613 BLAKE2B 693aba98343908132ab23149d09ca0e9a99c3af498ac177469d63fb87a5f782b31f92a70941c33bd9f5d82cd0dccb2a2fe7ddf9321f9644401b0603cd99fd21e SHA512 33ee8e1edf4e713a4081af40e7d1b17ae1dcfa390bb6b2dc908d4c1e0ad010b588f65ce1f592bbccaeda21fbab70aaa777d6809ad75e15238c27f40421a78e77 diff --git a/dev-qt/qtcharts/metadata.xml b/dev-qt/qtcharts/metadata.xml index 5ca993705e2e..0833bb7edb1a 100644 --- a/dev-qt/qtcharts/metadata.xml +++ b/dev-qt/qtcharts/metadata.xml @@ -11,6 +11,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtcharts</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild b/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild new file mode 100644 index 000000000000..9f2d54c39e93 --- /dev/null +++ b/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Chart component library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="gles2-only qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtcharts/qtcharts-6.5.2.ebuild b/dev-qt/qtcharts/qtcharts-6.5.2.ebuild deleted file mode 100644 index 92c6cf414b07..000000000000 --- a/dev-qt/qtcharts/qtcharts-6.5.2.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Chart component library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,opengl,widgets] - =dev-qt/qtdeclarative-${PV}* -" -RDEPEND="${DEPEND}" diff --git a/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild new file mode 100644 index 000000000000..9f2d54c39e93 --- /dev/null +++ b/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Chart component library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="gles2-only qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtcharts/qtcharts-6.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.9999.ebuild new file mode 100644 index 000000000000..9f2d54c39e93 --- /dev/null +++ b/dev-qt/qtcharts/qtcharts-6.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Chart component library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="gles2-only qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest new file mode 100644 index 000000000000..89c70f1a3a58 --- /dev/null +++ b/dev-qt/qtconnectivity/Manifest @@ -0,0 +1,5 @@ +DIST qtconnectivity-everywhere-src-6.5.2.tar.xz 985972 BLAKE2B e7f3d8ad3580336d7eaff50e8ac2af3b291462544ebc5ca3d049d045a8388668d5e54a075375aaa9c99b3232ec07063dc4b7288bdc9fee83843fe57909e5e35b SHA512 76d9569ecfbbb4355587779a9aa0abf20f7d08484a2634e6c3b49a71b057451c54fd5fd344b4c376206384e5f1e9264a6bbbcd85ee44f15637c116f411d4aa30 +EBUILD qtconnectivity-6.5.2.ebuild 1411 BLAKE2B 147fd7843a6566d3f80018c04130a9018736482f38f7269cedb3eb4bb2201cd204621e9f5cb456db6d1838374aca8a66033181ff04b23c5ebe056b37d2dc4347 SHA512 46220e5e4349a18d494923b6550ba088b63c69b962c62afdae9eb60cf97c2cd48aec73b3b0d29667581d00143332ab2ec51059474ac2f4a1a1fd71e160727199 +EBUILD qtconnectivity-6.5.9999.ebuild 1411 BLAKE2B 147fd7843a6566d3f80018c04130a9018736482f38f7269cedb3eb4bb2201cd204621e9f5cb456db6d1838374aca8a66033181ff04b23c5ebe056b37d2dc4347 SHA512 46220e5e4349a18d494923b6550ba088b63c69b962c62afdae9eb60cf97c2cd48aec73b3b0d29667581d00143332ab2ec51059474ac2f4a1a1fd71e160727199 +EBUILD qtconnectivity-6.9999.ebuild 1411 BLAKE2B 147fd7843a6566d3f80018c04130a9018736482f38f7269cedb3eb4bb2201cd204621e9f5cb456db6d1838374aca8a66033181ff04b23c5ebe056b37d2dc4347 SHA512 46220e5e4349a18d494923b6550ba088b63c69b962c62afdae9eb60cf97c2cd48aec73b3b0d29667581d00143332ab2ec51059474ac2f4a1a1fd71e160727199 +MISC metadata.xml 637 BLAKE2B 5e9bcc7a56c93b58d09022effcbef407532e6248bda88bd0eb6a2d1c0094b9715b867025e464870bf9c6ee644c020538d8210ae742fcb55be1b795f50bfadbce SHA512 f9a9ebe77ba29217437d2afa9b05a13d421683feef94f1c64d861d9a1e081ed2ab1716453ddd66a0b93c6fecccfd11642ab69f297efbfe23baf3ad8f232197d5 diff --git a/dev-qt/qtconnectivity/metadata.xml b/dev-qt/qtconnectivity/metadata.xml new file mode 100644 index 000000000000..84c08090ba58 --- /dev/null +++ b/dev-qt/qtconnectivity/metadata.xml @@ -0,0 +1,21 @@ +<?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> + <use> + <flag name="nfc">Enable support for the Near Field Communication protocol</flag> + </use> + <upstream> + <bugs-to>https://bugreports.qt.io/</bugs-to> + <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtconnectivity</remote-id> + </upstream> + <slots> + <subslots> + Must only be used by packages that are known to use private parts of the Qt API. + </subslots> + </slots> +</pkgmetadata> diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild new file mode 100644 index 000000000000..ed231522887f --- /dev/null +++ b/dev-qt/qtconnectivity/qtconnectivity-6.5.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+bluetooth nfc smartcard" +REQUIRED_USE="|| ( bluetooth nfc )" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network] + bluetooth? ( + ~dev-qt/qtbase-${PV}:6[dbus] + net-wireless/bluez:= + ) + nfc? ( + smartcard? ( sys-apps/pcsc-lite ) + ) +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # most hardware tests are skipped, but seems(?) this one detects and fails + tst_qlowenergycontroller +) + +src_prepare() { + qt6-build_src_prepare + + use bluetooth || + sed -i '/add_subdirectory(bluetooth)/d' src/CMakeLists.txt || die + use nfc || + sed -i '/add_subdirectory(nfc)/d' src/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + $(usev nfc $(qt_feature smartcard pcsclite)) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + # broken (unnecessary) symlink due to add_app() being used over add_tool() + use !bluetooth || rm -- "${ED}"/usr/bin/sdpscanner6 || die + + if use test; then + local delete=( # sigh + "${D}${QT6_BINDIR}"/bluetoothtestdevice + "${D}${QT6_BINDIR}"/bttestui + "${D}${QT6_BINDIR}"/qlecontroller-server + ) + # using -f given not tracking which tests may be skipped or not + rm -f -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.5.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.5.9999.ebuild new file mode 100644 index 000000000000..ed231522887f --- /dev/null +++ b/dev-qt/qtconnectivity/qtconnectivity-6.5.9999.ebuild @@ -0,0 +1,66 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+bluetooth nfc smartcard" +REQUIRED_USE="|| ( bluetooth nfc )" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network] + bluetooth? ( + ~dev-qt/qtbase-${PV}:6[dbus] + net-wireless/bluez:= + ) + nfc? ( + smartcard? ( sys-apps/pcsc-lite ) + ) +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # most hardware tests are skipped, but seems(?) this one detects and fails + tst_qlowenergycontroller +) + +src_prepare() { + qt6-build_src_prepare + + use bluetooth || + sed -i '/add_subdirectory(bluetooth)/d' src/CMakeLists.txt || die + use nfc || + sed -i '/add_subdirectory(nfc)/d' src/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + $(usev nfc $(qt_feature smartcard pcsclite)) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + # broken (unnecessary) symlink due to add_app() being used over add_tool() + use !bluetooth || rm -- "${ED}"/usr/bin/sdpscanner6 || die + + if use test; then + local delete=( # sigh + "${D}${QT6_BINDIR}"/bluetoothtestdevice + "${D}${QT6_BINDIR}"/bttestui + "${D}${QT6_BINDIR}"/qlecontroller-server + ) + # using -f given not tracking which tests may be skipped or not + rm -f -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild new file mode 100644 index 000000000000..ed231522887f --- /dev/null +++ b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild @@ -0,0 +1,66 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+bluetooth nfc smartcard" +REQUIRED_USE="|| ( bluetooth nfc )" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network] + bluetooth? ( + ~dev-qt/qtbase-${PV}:6[dbus] + net-wireless/bluez:= + ) + nfc? ( + smartcard? ( sys-apps/pcsc-lite ) + ) +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # most hardware tests are skipped, but seems(?) this one detects and fails + tst_qlowenergycontroller +) + +src_prepare() { + qt6-build_src_prepare + + use bluetooth || + sed -i '/add_subdirectory(bluetooth)/d' src/CMakeLists.txt || die + use nfc || + sed -i '/add_subdirectory(nfc)/d' src/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + $(usev nfc $(qt_feature smartcard pcsclite)) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + # broken (unnecessary) symlink due to add_app() being used over add_tool() + use !bluetooth || rm -- "${ED}"/usr/bin/sdpscanner6 || die + + if use test; then + local delete=( # sigh + "${D}${QT6_BINDIR}"/bluetoothtestdevice + "${D}${QT6_BINDIR}"/bttestui + "${D}${QT6_BINDIR}"/qlecontroller-server + ) + # using -f given not tracking which tests may be skipped or not + rm -f -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index dcd2f03862d0..91d0e4857b3e 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -3,5 +3,7 @@ DIST qtdeclarative-5.15.10-gentoo-kde-3.tar.xz 26396 BLAKE2B 07ad0b115316e8eeaa1 DIST qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz 21596352 BLAKE2B 4259b55b1406694cf10d5ff1c4bc2501b47a7a7ea4a09eeb77c08fa1417d5f8d028df1a0753af0d1ef52d7aa1331343c56b6c72adf462a6d1a1d5097c288ad8f SHA512 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8 DIST qtdeclarative-everywhere-src-6.5.2.tar.xz 35552840 BLAKE2B 048da9ab9433034ede21b51458cd3c7bd09d5364c8e2e65a02905bdc107d456ba0cbf2f9ea459324462c455fb33ef5f9b7bbbbe79e669100c82274476c10b34c SHA512 e6fd9dddbab72ee2e323d8ae0f4ac438b935477ad50b3e069a307993e94b289648d29ee265ac535e1396e4c1ba4bdf7e16b0cdf89a17df8d0a43bbe94f7316ef EBUILD qtdeclarative-5.15.10-r2.ebuild 1537 BLAKE2B ea417da488314eed547e9637796d153a358c8cec1645242338f6fa67605b45a886b9f91de62db4483f1a69b704ce852879948c097c66cdeb4f6e777a81c264f6 SHA512 a34ae5b04825f751715975dc927824b6ba4726564647e50d84f27bc1dc1d8c8a6dde27b02e568b01ee21f6a8476ac27d9db9b72fd3b3a4175be7043e89d7435c -EBUILD qtdeclarative-6.5.2.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8 -MISC metadata.xml 744 BLAKE2B ef479ad28d7560fc3abd2e743e8994a6a843bc1a4d0644ac037a4fa481f71a6ee73fbf99073769d20fcb245e6432556bc00707d3ecec1fb709ae2622fc9c5e31 SHA512 27d3e595647800c62e1275f2b5bfae0f2644fce547175cd5f63c4907c2313298b988f5378761868d2761c3edf396cfcf4d0c733032026e7ea0a9bf7ba367ecda +EBUILD qtdeclarative-6.5.2-r1.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124 +EBUILD qtdeclarative-6.5.9999.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124 +EBUILD qtdeclarative-6.9999.ebuild 701 BLAKE2B 4430d15f8361f70d6207f04903285e05b634ea2fa1e25a0431514a4e941cf4c4726417462d6716dc59a86d34c02584535ce528ac7fd6510a66a126f18cf39cd3 SHA512 96f79b461851f32831a1e9f4dfb1fc02f08041b8b64cb2259015fa0e2be48622e506a0f918737ecee0490bd6ab7e2f159ad51d518cd454ce149c8c26aeb57124 +MISC metadata.xml 800 BLAKE2B ac64df7acf6a3fff34fe396b981c4babb145590b2e8d8d656ea6287d2a251c799866748f184a4b1876fe3195120a6192fe9ea7d787f49978a3c8d47159c01031 SHA512 30e9c9c8c3719791e927574a08a0a5667c327ca3d6c614df1b372ae1390074ae5ba16d0363cc81c625fa9ce585f93cb4bcba78ad9f0b36470d63c614c195c5c2 diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index b1f5174a5c63..62a0a2de1bd8 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -14,6 +14,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtdeclarative</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild index 8c9a771cc98e..90ce21a2e8ec 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild @@ -11,13 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="opengl +sql +widgets" +IUSE="opengl +sql vulkan +widgets" -DEPEND=" - =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] - =dev-qt/qtshadertools-${PV}* -" -RDEPEND="${DEPEND}" +# behaves very badly when qtdeclarative is not already installed, also +# other more minor issues (installs junk, sandbox/offscreen issues) +RESTRICT="test" + +RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" +DEPEND="${RDEPEND}" +BDEPEND="~dev-qt/qtshadertools-${PV}:6" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild new file mode 100644 index 000000000000..90ce21a2e8ec --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt Declarative (Quick 2)" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="opengl +sql vulkan +widgets" + +# behaves very badly when qtdeclarative is not already installed, also +# other more minor issues (installs junk, sandbox/offscreen issues) +RESTRICT="test" + +RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" +DEPEND="${RDEPEND}" +BDEPEND="~dev-qt/qtshadertools-${PV}:6" + +src_configure() { + local mycmakeargs=( + $(qt_feature opengl) + $(qt_feature sql) + $(qt_feature widgets) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild new file mode 100644 index 000000000000..90ce21a2e8ec --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt Declarative (Quick 2)" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="opengl +sql vulkan +widgets" + +# behaves very badly when qtdeclarative is not already installed, also +# other more minor issues (installs junk, sandbox/offscreen issues) +RESTRICT="test" + +RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" +DEPEND="${RDEPEND}" +BDEPEND="~dev-qt/qtshadertools-${PV}:6" + +src_configure() { + local mycmakeargs=( + $(qt_feature opengl) + $(qt_feature sql) + $(qt_feature widgets) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest index 6ca2aa847d69..8d100a1052eb 100644 --- a/dev-qt/qtimageformats/Manifest +++ b/dev-qt/qtimageformats/Manifest @@ -2,5 +2,7 @@ DIST qtimageformats-5.15.10-gentoo-kde-1.tar.xz 6944 BLAKE2B a9e43d63cc2db043723 DIST qtimageformats-everywhere-opensource-src-5.15.10.tar.xz 1845088 BLAKE2B ff704a5ea07173f2e6e9fe72f4e9ab11093a6cd80bedc56efeddc68ff4a53ac46bcd6d6871697f5dcaab537a6b3238aa5a61120090670a4ef529bc5173a44b81 SHA512 7373884e5f01da0aae6f7d4575ca953de3be6cd41d3d19aa29bb2a2e5998486407525f23122e8b13c26143e64aa95d4756c5381643e93f930472c9890e6561de DIST qtimageformats-everywhere-src-6.5.2.tar.xz 1966744 BLAKE2B 953b0ff7a9f79860c60651645441ebd853b355140a30b34fc0c8dec2d50e532733f3cce11de8315e756abea9f45d8b595aaa6b3a5e1a8cf751ee202f45fe5d67 SHA512 c7262b773642f216b5f6ca3496cce294f1acf7bbf55aa61db1b60ad24ec0c332b83aa9b43e8baa5ce33a54826364385b4de00426e5556fe821c3b5e770d53819 EBUILD qtimageformats-5.15.10.ebuild 705 BLAKE2B 4222a57660cc0730f376db02db94e3d82d36cf06566add5caf1ef5569ac92a023273e1374ee901e0010d1b8dde5ef1670400ac6d18cdcc2f9aaf71d60e277a1d SHA512 c735cb6de2811e5c2c8a7f8c97e6430263779025d7d5809ba665dc25fa66297c9cbca07aea2483e170d266876aa023a95ce045cb02b83f1c04ba47f5d7434e63 -EBUILD qtimageformats-6.5.2.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2 -MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e +EBUILD qtimageformats-6.5.2.ebuild 635 BLAKE2B df95273018d1db06a2b72408fe4d411d0885fad219b8f995a4d7ad2e5e5289eb5a3962d7bed9ce770707552c015cdfa1d1d433527035cb6557660673a9e486fd SHA512 5e4b301d055ccf0966359f5c4d69eacd964ef22463ca4e9b1b1bc7d75295ae136a851f0b6897f288448f94900b1adb776e5c4a8879d103ee0982866559239a5a +EBUILD qtimageformats-6.5.9999.ebuild 635 BLAKE2B df95273018d1db06a2b72408fe4d411d0885fad219b8f995a4d7ad2e5e5289eb5a3962d7bed9ce770707552c015cdfa1d1d433527035cb6557660673a9e486fd SHA512 5e4b301d055ccf0966359f5c4d69eacd964ef22463ca4e9b1b1bc7d75295ae136a851f0b6897f288448f94900b1adb776e5c4a8879d103ee0982866559239a5a +EBUILD qtimageformats-6.9999.ebuild 635 BLAKE2B df95273018d1db06a2b72408fe4d411d0885fad219b8f995a4d7ad2e5e5289eb5a3962d7bed9ce770707552c015cdfa1d1d433527035cb6557660673a9e486fd SHA512 5e4b301d055ccf0966359f5c4d69eacd964ef22463ca4e9b1b1bc7d75295ae136a851f0b6897f288448f94900b1adb776e5c4a8879d103ee0982866559239a5a +MISC metadata.xml 539 BLAKE2B f82d2242ecd287674a2be5eae280a70ddca0e7c913ee5c86c7bf95c9a122c5d0d57006d5bd236afb5ef55b51d1bed6be5110c51e732fbe94ebe5b6e10fee89db SHA512 22e5e3417dc154092e816cdfe391fb7c6595532f506766da0d2ae44f8254453f57a00d0fb1b12f9d2fb10c8cec5561d85f3891991aeb2aedcd3696f2c3b31d4a diff --git a/dev-qt/qtimageformats/metadata.xml b/dev-qt/qtimageformats/metadata.xml index ae8aa9597f20..120e744af9b3 100644 --- a/dev-qt/qtimageformats/metadata.xml +++ b/dev-qt/qtimageformats/metadata.xml @@ -8,6 +8,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtimageformats</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild index ffa831e51aa5..044867e78e37 100644 --- a/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,13 +13,13 @@ fi IUSE="mng" -DEPEND=" - =dev-qt/qtbase-${PV}*[gui] +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild new file mode 100644 index 000000000000..044867e78e37 --- /dev/null +++ b/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild @@ -0,0 +1,35 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Additional format plugins for the Qt image I/O system" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="mng" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + media-libs/libwebp:= + media-libs/tiff:= + mng? ( media-libs/libmng:= ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_jasper=OFF + $(qt_feature mng) + -DQT_FEATURE_tiff=ON + -DQT_FEATURE_webp=ON + -DQT_FEATURE_system_tiff=ON + -DQT_FEATURE_system_webp=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild new file mode 100644 index 000000000000..044867e78e37 --- /dev/null +++ b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild @@ -0,0 +1,35 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Additional format plugins for the Qt image I/O system" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="mng" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + media-libs/libwebp:= + media-libs/tiff:= + mng? ( media-libs/libmng:= ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_jasper=OFF + $(qt_feature mng) + -DQT_FEATURE_tiff=ON + -DQT_FEATURE_webp=ON + -DQT_FEATURE_system_tiff=ON + -DQT_FEATURE_system_webp=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index 6f7c6026d554..b75e941cdfc7 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -1,7 +1,10 @@ +AUX qtlocation-6.5.2-missing-memory.patch 607 BLAKE2B d097d0d39f32cf3ebd616fed9ed7772a5f68a786b95b2c66068aad395faa8746e4d7784826badd77ade8e2b47810779b956e16eb07b88a9b50556a0d90753ef2 SHA512 7018315e77fd478bb82aae0ead7019ae4fffe1063850436c8c9025529b2feb52042bfe917e2d31a914e7e6e7c9adad15ccdcac1f4a6d54bcfb9e9467a0c4f6a2 DIST qtlocation-5.15.10-gentoo-kde-1.tar.xz 3664 BLAKE2B e2d694772a43ca4bc27c819d8fadf5bab3ddb40644d5a08315faa5af63a7aace6475c2dd2b6d612dcb7705113211cd50e6e83ce79773ec6033767be0fb761346 SHA512 c3917fa4db6316c9e173c475d8606b7fd9dc3cfed29487fa23c9b6df68887d799e6260abc3f5cd144e9d8c1e95e66b0de429bf59f15526639aab4d430c3d439a DIST qtlocation-everywhere-opensource-src-5.15.10.tar.xz 6552240 BLAKE2B 1e44bdafcde01294424cef1963924b85fc4f3cc8ab19b1ae37d79d10cb0bbb1a482f592725fa28e0f039fc84cb2167df4d15e23e4060bd7c49df013c54322665 SHA512 e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4 DIST qtlocation-everywhere-src-6.5.2.tar.xz 3032488 BLAKE2B c8cd34980b0f78326fb70bf76a04094cf3e27afbd6aed6d982ce30abfa9dc4250d164dbe11c1027bedcdeee3b7c907c3716e88f16eeae173b846ccdf2c38d458 SHA512 b1e5c1813deb8a4eb9f8548afa935f1a2145ed3168f0276493ea501057fd4f70b8980ae387248a59e50f0e450ae245a04cd8636fb61d37af9c3634ff1cdd24f3 DIST qtlocation-mapboxgl-5.15.10-5a07e196.tar.gz 3726230 BLAKE2B 9dbe08088a55bc1da4952a628af987b3b056615e883983d3a5e2eb392ce4aff16bfd753f84bbad07f9a415fbd275ec9933a64b6bcfd27ea6d8adced6d2adcac7 SHA512 ec3de81f643388690eda45d073a9c6f908d8efeff30cd062d9afcd1f94c6b45b301327747928d45b4047ce04b7df5b0afaf9e8942e22660711a5ac49787829eb EBUILD qtlocation-5.15.10.ebuild 1544 BLAKE2B 2943df2242ee45db0180334464d327614bcfb6ad93cd8117e4f6c81c3ef2384199dc547743f5784a0b88e976ea5296a833fbad986eb30eb947d6004283b69dd3 SHA512 453d7c2b6ab694e98c1ec9d08af70994910e8537f75d02aca8117b9887b3e7d98ac27f391b76327668a57d5a0186ebffb4b13f727d87feaaac4f0a0e1d5a2acd -EBUILD qtlocation-6.5.2.ebuild 433 BLAKE2B b70a66d0ad3fd02696537c32677077786d0f528a7676af4a3e68afca659c64436b398f046d2a88ab513bb1ef4eecde08beb26a6f2cd3a5063f72b0f8fda26489 SHA512 f742f4ee5f73d0a5fcde8bf993c7e09495f852b0b62f2f5fa0925df31a69088c2712518542a06374373a5c3e91098c5f44ec2d0585354effddd44d736a81cdea -MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e +EBUILD qtlocation-6.5.2-r1.ebuild 1468 BLAKE2B ed0d13151b41de0a0f86fca85dabf14b4893a939d4e6cde9ce4de4c844aef9e54e4ff2119566d48d2ce2ca1a307b6171592a658f7446ecd23d5de12aefe721c2 SHA512 e5a83f5e17b9db8ebc5dd92ab2024be8b96f0d2edc6994c58c9d260fc0c59dafb9852db3c402e6b47022587d2807c39292d84ec2b58bdda4fca8577f948ac74b +EBUILD qtlocation-6.5.9999.ebuild 1411 BLAKE2B 843b87346b18a733fe8835e57990aef80aa48b762f7a1c0bad5ce65aad08932bdd8d92f8833953fcb2526342fea2403ed46a0fdaa52951083b5bf38cdf56cf79 SHA512 8a388a2303a712230d293ece7b6d23d7b0b31aa3776b28011327bc3400d80edfe88f66af4acb3c1079adc1e040778c5e5c8bb4c797e03f2461e9c4cbf9467947 +EBUILD qtlocation-6.9999.ebuild 1411 BLAKE2B 843b87346b18a733fe8835e57990aef80aa48b762f7a1c0bad5ce65aad08932bdd8d92f8833953fcb2526342fea2403ed46a0fdaa52951083b5bf38cdf56cf79 SHA512 8a388a2303a712230d293ece7b6d23d7b0b31aa3776b28011327bc3400d80edfe88f66af4acb3c1079adc1e040778c5e5c8bb4c797e03f2461e9c4cbf9467947 +MISC metadata.xml 535 BLAKE2B 061ed9abebe579a38a262451a5e72d112adbcf4693078042f3b55be8d16b7bd430198edb732cd127deccf8c67d444b9951dd7ac8e2d0fef7de02913a3a8ba644 SHA512 823b03655b8bbb923d38d4f8358898beb2e2fa34d36e2d8d843e164027d58eb044a3e661b8dfc12cda123f15fd07d0987874b81543c47e46c670c25fa35dde87 diff --git a/dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch b/dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch new file mode 100644 index 000000000000..e57681c7ba97 --- /dev/null +++ b/dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch @@ -0,0 +1,22 @@ +Manifests itself as an issue only with clang+glibc +(gcc+glibc, or clang+musl are fine). + +https://github.com/qt/qtlocation/commit/3a1b28126a0a182bef9fe0ccb85409fceb39d1f3 +From: Tim Blechmann <tim@klingt.org> +Date: Thu, 20 Jul 2023 17:04:39 +0800 +Subject: [PATCH] location: include missing header + +std::unique_ptr requires <memory> + +Pick-to: 6.5 6.6 +--- a/src/location/maps/qgeocameratiles_p.h ++++ b/src/location/maps/qgeocameratiles_p.h +@@ -17,6 +17,8 @@ + #include <QtLocation/private/qlocationglobal_p.h> + #include <QtCore/QScopedPointer> + ++#include <memory> ++ + QT_BEGIN_NAMESPACE + + class QGeoCameraData; diff --git a/dev-qt/qtlocation/metadata.xml b/dev-qt/qtlocation/metadata.xml index ae8aa9597f20..4e925ad20fd6 100644 --- a/dev-qt/qtlocation/metadata.xml +++ b/dev-qt/qtlocation/metadata.xml @@ -8,6 +8,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtlocation</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild b/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild new file mode 100644 index 000000000000..227c0e646e5b --- /dev/null +++ b/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtpositioning-${PV}:6[qml(+)] +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # ignores QML_IMPORT_PATH (unlike other tests) and looks in + # the missing builddir/qml, skip rather than work around + tst_declarative_ui +) + +PATCHES=( + "${FILESDIR}"/${P}-missing-memory.patch +) + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so + "${D}${QT6_QMLDIR}"/QtLocation/Test + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtlocation/qtlocation-6.5.2.ebuild b/dev-qt/qtlocation/qtlocation-6.5.2.ebuild deleted file mode 100644 index 0862902e101f..000000000000 --- a/dev-qt/qtlocation/qtlocation-6.5.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtpositioning-${PV}* - =dev-qt/qtshadertools-${PV}* -" -RDEPEND="${DEPEND}" diff --git a/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild new file mode 100644 index 000000000000..1183318657ba --- /dev/null +++ b/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild @@ -0,0 +1,45 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtpositioning-${PV}:6[qml] +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # ignores QML_IMPORT_PATH (unlike other tests) and looks in + # the missing builddir/qml, skip rather than work around + tst_declarative_ui +) + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so + "${D}${QT6_QMLDIR}"/QtLocation/Test + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtlocation/qtlocation-6.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.9999.ebuild new file mode 100644 index 000000000000..1183318657ba --- /dev/null +++ b/dev-qt/qtlocation/qtlocation-6.9999.ebuild @@ -0,0 +1,45 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtpositioning-${PV}:6[qml] +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # ignores QML_IMPORT_PATH (unlike other tests) and looks in + # the missing builddir/qml, skip rather than work around + tst_declarative_ui +) + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so + "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so + "${D}${QT6_QMLDIR}"/QtLocation/Test + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 8c68fc39b3a6..855b4caf14db 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -2,5 +2,7 @@ DIST qtmultimedia-5.15.10-gentoo-kde-1.tar.xz 2420 BLAKE2B 9062d863dc7e47a5690c7 DIST qtmultimedia-everywhere-opensource-src-5.15.10.tar.xz 3832156 BLAKE2B 88c01c685294085fdde9f00e2e2ea0952311cef910ee037bd6ee204cf7e00bc25a6aeecbdd70e4822bfe4de40cb6b991a8f4a72bfd74872110d43154aefce0b3 SHA512 a322dba0daced00cf0a7fcd21b7f55c281dec107b7976792406ecc7658c94ea1a40c81c7cbdc0987f1be32cafd2458993c92db87fcbfdc7ba1243d2e0047896e DIST qtmultimedia-everywhere-src-6.5.2.tar.xz 6415576 BLAKE2B c0032c405315e6884de6bb851de3aed0b60827a932c15b1022dca70ebfaa5dffb258b2b22f9ab40f57586490db6ec50ea862152fca8429e600f9c6bffe2f42a2 SHA512 e12a2406e78eda8f3f4674b8fe01b06bc2c7b8fcbe5342e25e28340e13c0ab0db44a78c91a8a1f268664e5bb11c3bc7116248700f0c67faa618e058af0dfb1e0 EBUILD qtmultimedia-5.15.10.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21 -EBUILD qtmultimedia-6.5.2.ebuild 1304 BLAKE2B 8d4ebb427a8c00d86b49d6d93f07ef0f0e0431540e471c50e9e741d4f5d8cff40daf4c0a5234b0deb2401a19dc272bbe9e3816a7f964046a5ec2851ae8d6bf0f SHA512 c999d2bef01cf7f01d720128eec4d73366d92c157fbcf365f07f975f633b90fc61e4ac5dfd3e3ac1d568e8736e565fc92d7b8921a15d29cc95dd4ef8e0f21716 -MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db +EBUILD qtmultimedia-6.5.2-r1.ebuild 1949 BLAKE2B b9dd4a9d8bf7916e2a31e658ca5d1231342df6d2ac70925a0511f528eef3aad030000ae3eb09c3e440c06aa9cc39ed71ad18655a6ea078431171049bb6fc3cc7 SHA512 dd805568e002ebb3d46222e255a4fa22b09658e6121e09b2b95f48db62ad0b3eedfe9eb2ec9a7af4058595a51909750d46acbcf54e05011e491278bc5545cecb +EBUILD qtmultimedia-6.5.9999.ebuild 1949 BLAKE2B b9dd4a9d8bf7916e2a31e658ca5d1231342df6d2ac70925a0511f528eef3aad030000ae3eb09c3e440c06aa9cc39ed71ad18655a6ea078431171049bb6fc3cc7 SHA512 dd805568e002ebb3d46222e255a4fa22b09658e6121e09b2b95f48db62ad0b3eedfe9eb2ec9a7af4058595a51909750d46acbcf54e05011e491278bc5545cecb +EBUILD qtmultimedia-6.9999.ebuild 1949 BLAKE2B b9dd4a9d8bf7916e2a31e658ca5d1231342df6d2ac70925a0511f528eef3aad030000ae3eb09c3e440c06aa9cc39ed71ad18655a6ea078431171049bb6fc3cc7 SHA512 dd805568e002ebb3d46222e255a4fa22b09658e6121e09b2b95f48db62ad0b3eedfe9eb2ec9a7af4058595a51909750d46acbcf54e05011e491278bc5545cecb +MISC metadata.xml 773 BLAKE2B e4b291f7b0f103011af120ad0cb9766cc03341c44f751127997958d704803cbc278094050693f4cc7ba17fb3c2f311252c2304e5a93cf17363ebbbc4e6c2cce0 SHA512 d5c729736723cf7296234acc39d55cd28924449b4bca425c37b8fa7582dbab9c649b501ac88ffcd3c5a5cc696390d18cf9912a4fb6e2520768ff704533d7f909 diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index 72fd89719ada..49778c48acf6 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -13,6 +13,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtmultimedia</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild new file mode 100644 index 000000000000..8e203f8eaec1 --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic qt6-build + +DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" +# tst_qmediaplayerbackend hard requires qml, review in case becomes optional +REQUIRED_USE=" + || ( ffmpeg gstreamer ) + vaapi? ( ffmpeg ) + test? ( qml ) +" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] + alsa? ( media-libs/alsa-lib ) + ffmpeg? ( + ~dev-qt/qtbase-${PV}:6[X=] + media-video/ffmpeg:=[vaapi?] + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + ) + vaapi? ( + media-libs/libglvnd + media-libs/libva:= + ) + ) + gstreamer? ( + dev-libs/glib:2 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0[X=,opengl?] + media-libs/gstreamer:1.0 + opengl? ( media-libs/libglvnd ) + ) + pulseaudio? ( media-libs/libpulse ) + qml? ( + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtquick3d-${PV}:6 + ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + v4l? ( sys-kernel/linux-headers ) +" +BDEPEND="~dev-qt/qtshadertools-${PV}:6" + +CMAKE_SKIP_TESTS=( + # tries to use real alsa or pulseaudio and fails in sandbox + tst_qaudiosink + tst_qaudiosource + tst_qmediacapturesession + tst_qmediaplayerbackend + tst_qsoundeffect + # may try to use hardware acceleration for encoding + tst_qscreencapture_integration +) + +src_configure() { + # normally passed by the build system, but needed for 32-on-64 chroots + use x86 && append-cppflags -DPFFFT_SIMD_DISABLE + + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + $(qt_feature alsa) + $(qt_feature ffmpeg) + $(qt_feature gstreamer) + $(usev gstreamer $(qt_feature opengl gstreamer_gl)) + $(qt_feature pulseaudio) + $(qt_feature v4l linux_v4l) + $(qt_feature vaapi) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild deleted file mode 100644 index 1091cf2d5cf6..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE="alsa +ffmpeg gstreamer pulseaudio v4l vaapi" - -REQUIRED_USE=" - || ( ffmpeg gstreamer ) - vaapi? ( ffmpeg ) -" - -RDEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtquick3d-${PV}* - =dev-qt/qtshadertools-${PV}* - =dev-qt/qtsvg-${PV}* - alsa? ( media-libs/alsa-lib ) - ffmpeg? ( - media-libs/libva:= - media-video/ffmpeg:= - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/libglvnd - ) - pulseaudio? ( media-libs/libpulse[glib] ) - vaapi? ( - =dev-qt/qtbase-${PV}*[opengl] - media-libs/libglvnd - media-libs/libva:= - ) -" -DEPEND="${RDEPEND} - gstreamer? ( x11-base/xorg-proto ) - v4l? ( sys-kernel/linux-headers ) -" - -src_configure() { - local mycmakeargs=( - $(qt_feature alsa) - $(qt_feature ffmpeg) - $(qt_feature gstreamer) - $(qt_feature v4l linux_v4l) - $(qt_feature pulseaudio) - $(qt_feature vaapi) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild new file mode 100644 index 000000000000..8e203f8eaec1 --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild @@ -0,0 +1,85 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic qt6-build + +DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" +# tst_qmediaplayerbackend hard requires qml, review in case becomes optional +REQUIRED_USE=" + || ( ffmpeg gstreamer ) + vaapi? ( ffmpeg ) + test? ( qml ) +" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] + alsa? ( media-libs/alsa-lib ) + ffmpeg? ( + ~dev-qt/qtbase-${PV}:6[X=] + media-video/ffmpeg:=[vaapi?] + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + ) + vaapi? ( + media-libs/libglvnd + media-libs/libva:= + ) + ) + gstreamer? ( + dev-libs/glib:2 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0[X=,opengl?] + media-libs/gstreamer:1.0 + opengl? ( media-libs/libglvnd ) + ) + pulseaudio? ( media-libs/libpulse ) + qml? ( + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtquick3d-${PV}:6 + ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + v4l? ( sys-kernel/linux-headers ) +" +BDEPEND="~dev-qt/qtshadertools-${PV}:6" + +CMAKE_SKIP_TESTS=( + # tries to use real alsa or pulseaudio and fails in sandbox + tst_qaudiosink + tst_qaudiosource + tst_qmediacapturesession + tst_qmediaplayerbackend + tst_qsoundeffect + # may try to use hardware acceleration for encoding + tst_qscreencapture_integration +) + +src_configure() { + # normally passed by the build system, but needed for 32-on-64 chroots + use x86 && append-cppflags -DPFFFT_SIMD_DISABLE + + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + $(qt_feature alsa) + $(qt_feature ffmpeg) + $(qt_feature gstreamer) + $(usev gstreamer $(qt_feature opengl gstreamer_gl)) + $(qt_feature pulseaudio) + $(qt_feature v4l linux_v4l) + $(qt_feature vaapi) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild new file mode 100644 index 000000000000..8e203f8eaec1 --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -0,0 +1,85 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic qt6-build + +DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" +# tst_qmediaplayerbackend hard requires qml, review in case becomes optional +REQUIRED_USE=" + || ( ffmpeg gstreamer ) + vaapi? ( ffmpeg ) + test? ( qml ) +" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] + alsa? ( media-libs/alsa-lib ) + ffmpeg? ( + ~dev-qt/qtbase-${PV}:6[X=] + media-video/ffmpeg:=[vaapi?] + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + ) + vaapi? ( + media-libs/libglvnd + media-libs/libva:= + ) + ) + gstreamer? ( + dev-libs/glib:2 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0[X=,opengl?] + media-libs/gstreamer:1.0 + opengl? ( media-libs/libglvnd ) + ) + pulseaudio? ( media-libs/libpulse ) + qml? ( + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtquick3d-${PV}:6 + ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + v4l? ( sys-kernel/linux-headers ) +" +BDEPEND="~dev-qt/qtshadertools-${PV}:6" + +CMAKE_SKIP_TESTS=( + # tries to use real alsa or pulseaudio and fails in sandbox + tst_qaudiosink + tst_qaudiosource + tst_qmediacapturesession + tst_qmediaplayerbackend + tst_qsoundeffect + # may try to use hardware acceleration for encoding + tst_qscreencapture_integration +) + +src_configure() { + # normally passed by the build system, but needed for 32-on-64 chroots + use x86 && append-cppflags -DPFFFT_SIMD_DISABLE + + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + $(qt_feature alsa) + $(qt_feature ffmpeg) + $(qt_feature gstreamer) + $(usev gstreamer $(qt_feature opengl gstreamer_gl)) + $(qt_feature pulseaudio) + $(qt_feature v4l linux_v4l) + $(qt_feature vaapi) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest index acf306557c6c..9a24ed122f97 100644 --- a/dev-qt/qtnetworkauth/Manifest +++ b/dev-qt/qtnetworkauth/Manifest @@ -1,5 +1,7 @@ DIST qtnetworkauth-everywhere-opensource-src-5.15.10.tar.xz 144780 BLAKE2B 81a26919bef970538dbaa4f8bb219b694e190cae2cb2e156fdd0af3997fd5b86facb0d4841a92161703c78deb675f76a8950889c9a2c08156f2ce34b4ec88bef SHA512 bfdda139223d183767e50fb95309dee7cd85c42fa09a00246a38987bf1570d84a137fb3fc71119416cc45126f21f6964f430b031e5acd4447caf30d0aac3bc2a DIST qtnetworkauth-everywhere-src-6.5.2.tar.xz 150416 BLAKE2B 68ed2266051fb3caa0ddb59c1d1591e35b39aea1432da488f563ede86b9e2ecaa1d556b42c9b828910bb30eca5e413f5aa0a81f2196f02456aea303ebe55b084 SHA512 f9374c2729f584532e90114a3bf8939eb27e90e31a2c76c414e8e5fb23a1feac96b23ec31ebfc59122f7d8431ef2ab285a8e840ffba143752e586a0a527d3436 EBUILD qtnetworkauth-5.15.10.ebuild 402 BLAKE2B f6aada3fab2a9a22353930bcc8c96fd46806ccc46792a9bf770a812245a9b246722101f40c0ac9a8b3fe115a94f38c4d32e988cd23f0f28133ea08e858b95414 SHA512 63a5ddf86500089e2f7fa44ebb585a11bf257222a9a9b96fa8985b5acb56301a8680f04ec0ee4cee0bd9dcd3761031da704f71bd18dfe7c88aeb9fcc308d222b -EBUILD qtnetworkauth-6.5.2.ebuild 337 BLAKE2B b9d2380c3f88cd04c9ae3c64e799fe978be6d05d6debd960d31018aca0bf67fd7831b17bbb4ed9a917477817b2eb011bbd9141e6b8f4d649179019146de03105 SHA512 11f4aa6fb4fdb30132c344e9fbab81006cba7cc8cf8b5c81339c837940f928a3752ad05d367500811f87f3a606ee432b717cce1dfdf801e6c293e112158cc514 -MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e +EBUILD qtnetworkauth-6.5.2-r1.ebuild 328 BLAKE2B de758ef39149207fd3eee8a0d4a9c9987ecba375fec97d2ab73da285b8eb7051186d3886a74cbd7eb07cfa654e7a9ec4d45170136cf8d9e3aa0ace7a3e0bb3c1 SHA512 5bd7f25402133d0555646cb01b035515d7387827d7ff7140666a1f980f00309bca8ea4fe91fdf57924c0303702e06b9e3885a24aa77a16a4e9434b8807de6c73 +EBUILD qtnetworkauth-6.5.9999.ebuild 328 BLAKE2B de758ef39149207fd3eee8a0d4a9c9987ecba375fec97d2ab73da285b8eb7051186d3886a74cbd7eb07cfa654e7a9ec4d45170136cf8d9e3aa0ace7a3e0bb3c1 SHA512 5bd7f25402133d0555646cb01b035515d7387827d7ff7140666a1f980f00309bca8ea4fe91fdf57924c0303702e06b9e3885a24aa77a16a4e9434b8807de6c73 +EBUILD qtnetworkauth-6.9999.ebuild 328 BLAKE2B de758ef39149207fd3eee8a0d4a9c9987ecba375fec97d2ab73da285b8eb7051186d3886a74cbd7eb07cfa654e7a9ec4d45170136cf8d9e3aa0ace7a3e0bb3c1 SHA512 5bd7f25402133d0555646cb01b035515d7387827d7ff7140666a1f980f00309bca8ea4fe91fdf57924c0303702e06b9e3885a24aa77a16a4e9434b8807de6c73 +MISC metadata.xml 538 BLAKE2B 0bf6259826c916b9b8f57a05397c87e9d013d69739c93f1ca3eb030c7bb6e7630021b8dfcc7497cff90aa5e5cc570a5e73285001edeb40a50839d10955e230aa SHA512 5c25a747fb6f9054d5c30b4ec08b4e02435676085f5dccc1d05bc68222230f3bbf426667f7cadf1a97d7a423aa8d1d8cb55e00d9212e333646300439c81ee2f8 diff --git a/dev-qt/qtnetworkauth/metadata.xml b/dev-qt/qtnetworkauth/metadata.xml index ae8aa9597f20..f57c41c38251 100644 --- a/dev-qt/qtnetworkauth/metadata.xml +++ b/dev-qt/qtnetworkauth/metadata.xml @@ -8,6 +8,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtnetworkauth</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2-r1.ebuild index 90c313132402..c0c8c0b51bf7 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,5 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network,widgets] -" -RDEPEND="${DEPEND}" +RDEPEND="~dev-qt/qtbase-${PV}:6[network]" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.9999.ebuild index e82c78f55aca..c0c8c0b51bf7 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.5.2.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.9999.ebuild @@ -5,15 +5,11 @@ EAPI=8 inherit qt6-build -DESCRIPTION="Qt WebChannel" +DESCRIPTION="Network authorization library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[concurrent] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtwebsockets-${PV}* -" -RDEPEND="${DEPEND}" +RDEPEND="~dev-qt/qtbase-${PV}:6[network]" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild new file mode 100644 index 000000000000..c0c8c0b51bf7 --- /dev/null +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild @@ -0,0 +1,15 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Network authorization library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND="~dev-qt/qtbase-${PV}:6[network]" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest index 5dacbfa1c6d5..2f9ceff368c4 100644 --- a/dev-qt/qtpositioning/Manifest +++ b/dev-qt/qtpositioning/Manifest @@ -1,5 +1,7 @@ DIST qtlocation-everywhere-opensource-src-5.15.10.tar.xz 6552240 BLAKE2B 1e44bdafcde01294424cef1963924b85fc4f3cc8ab19b1ae37d79d10cb0bbb1a482f592725fa28e0f039fc84cb2167df4d15e23e4060bd7c49df013c54322665 SHA512 e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4 DIST qtpositioning-everywhere-src-6.5.2.tar.xz 1456284 BLAKE2B 15ec5202f72ccec5b5cd5e887eacd34718e47e150fd290e8ef3e03e6566b647ca4e2995c87bc54fad598b0225a390eaa93fe7685419006ff39db93fd3803488d SHA512 8319e999de227d6ee999a4e7f84e3a12e2a8b070375fd7b86cef7a7962cce1d4d45f17a846df779561e1cedde80a80240bd2a03259c8a2ed5ebda6e209bdd991 EBUILD qtpositioning-5.15.10.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6 -EBUILD qtpositioning-6.5.2.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148 -MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10 +EBUILD qtpositioning-6.5.2-r1.ebuild 1350 BLAKE2B 1ef2f37d2998877ea48cad3309f2105f3853857e6f349e5084560a54dbcf4536d752b66c11cd0c3d82ba6ffefa13c2444958469d9137878607f64baf3ac2bb58 SHA512 8586ec27f68b4307ec81ee902e59120e740a5e0ce7d6a77f003e4a0777a3228550df3ea7bf079da93b520f32da9bb8229d95877b175710494d3be9956a6c485a +EBUILD qtpositioning-6.5.9999.ebuild 1350 BLAKE2B 1ef2f37d2998877ea48cad3309f2105f3853857e6f349e5084560a54dbcf4536d752b66c11cd0c3d82ba6ffefa13c2444958469d9137878607f64baf3ac2bb58 SHA512 8586ec27f68b4307ec81ee902e59120e740a5e0ce7d6a77f003e4a0777a3228550df3ea7bf079da93b520f32da9bb8229d95877b175710494d3be9956a6c485a +EBUILD qtpositioning-6.9999.ebuild 1350 BLAKE2B 1ef2f37d2998877ea48cad3309f2105f3853857e6f349e5084560a54dbcf4536d752b66c11cd0c3d82ba6ffefa13c2444958469d9137878607f64baf3ac2bb58 SHA512 8586ec27f68b4307ec81ee902e59120e740a5e0ce7d6a77f003e4a0777a3228550df3ea7bf079da93b520f32da9bb8229d95877b175710494d3be9956a6c485a +MISC metadata.xml 695 BLAKE2B 13fe75d106b1e2067eaf8113a9f613a3fc575c46c0e92288155d9d799a8337557b8c0e59bc2e77d28e1ab1c358d50d14904d135415ee32f1003901ee18b094ab SHA512 f3310f84aa4fa176bbcde51d8e451a2ad34a502ec9a1f0943381bdfd099b8137df68ba18547320ced87bc68b2ef77307b7b5cf2a10bb42f100adfbd4be871474 diff --git a/dev-qt/qtpositioning/metadata.xml b/dev-qt/qtpositioning/metadata.xml index f04124b945e5..307f4190be2e 100644 --- a/dev-qt/qtpositioning/metadata.xml +++ b/dev-qt/qtpositioning/metadata.xml @@ -12,6 +12,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtpositioning</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild new file mode 100644 index 000000000000..1a70305f545f --- /dev/null +++ b/dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Physical position determination library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="geoclue +qml" + +DEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] + ~dev-qt/qtserialport-${PV}:6 + geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +RDEPEND=" + ${DEPEND} + geoclue? ( app-misc/geoclue:2.0 ) +" + +src_prepare() { + qt6-build_src_prepare + + # would use $(cmake_use_find_package geoclue Qt6DBus) but doing + # this side-disables gui+qml if do have qtbase[dbus] + use geoclue || + sed -e 's/TARGET Qt::DBus/FALSE/' \ + -i src/plugins/position/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake + "${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so + "${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so + ) + # using -f given not tracking which tests may be skipped or not + rm -f -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild deleted file mode 100644 index 60873b452acc..000000000000 --- a/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Physical position determination library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -DEPEND=" - =dev-qt/qtbase-${PV}*[dbus,gui,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtserialport-${PV}* -" -RDEPEND="${DEPEND}" diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild new file mode 100644 index 000000000000..1a70305f545f --- /dev/null +++ b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild @@ -0,0 +1,58 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Physical position determination library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="geoclue +qml" + +DEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] + ~dev-qt/qtserialport-${PV}:6 + geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +RDEPEND=" + ${DEPEND} + geoclue? ( app-misc/geoclue:2.0 ) +" + +src_prepare() { + qt6-build_src_prepare + + # would use $(cmake_use_find_package geoclue Qt6DBus) but doing + # this side-disables gui+qml if do have qtbase[dbus] + use geoclue || + sed -e 's/TARGET Qt::DBus/FALSE/' \ + -i src/plugins/position/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake + "${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so + "${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so + ) + # using -f given not tracking which tests may be skipped or not + rm -f -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild new file mode 100644 index 000000000000..1a70305f545f --- /dev/null +++ b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild @@ -0,0 +1,58 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Physical position determination library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="geoclue +qml" + +DEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] + ~dev-qt/qtserialport-${PV}:6 + geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +RDEPEND=" + ${DEPEND} + geoclue? ( app-misc/geoclue:2.0 ) +" + +src_prepare() { + qt6-build_src_prepare + + # would use $(cmake_use_find_package geoclue Qt6DBus) but doing + # this side-disables gui+qml if do have qtbase[dbus] + use geoclue || + sed -e 's/TARGET Qt::DBus/FALSE/' \ + -i src/plugins/position/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake + "${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake + "${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so + "${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so + ) + # using -f given not tracking which tests may be skipped or not + rm -f -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest index 621e83c37a93..de1246f708ea 100644 --- a/dev-qt/qtquick3d/Manifest +++ b/dev-qt/qtquick3d/Manifest @@ -1,3 +1,5 @@ DIST qtquick3d-everywhere-src-6.5.2.tar.xz 59171420 BLAKE2B 91012368061acf6c4057362a380fea2e3fdc46cf63644a667d7b05450fbbeb8c8dae3765c5617fec8c8a1fd3f880fad21c8e6524c3240f040c9dfdbb80869423 SHA512 2a26f4fa4e4d88b4205813a8bba1c83811354e5ad5e7aa832fd46c5956b46d15e690c359d83f85018c1430e15edd151207411a50227855de4fc8451db710ace2 -EBUILD qtquick3d-6.5.2.ebuild 667 BLAKE2B 0cafb500af3c6ee81e35aa86ee82a2d891a4e5537382858d998c865dec646721f698176d523371e4bdbe124dc684900ec08d6a786e0822ca72a3aebecd2bfac6 SHA512 27467129bed7575cdaf45ec48087cce9bc4c5915fc12164dbe710d8096735083ae8fdd671ca184c163194f95dc6c91264fc66623ee1e43ab83dc9e866fe50139 -MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e +EBUILD qtquick3d-6.5.2-r1.ebuild 838 BLAKE2B 72e9f20f2df410e23984aba7b342e2a22d67ba1430e95260869caa330b7df38a2c42113a5814fe9c59b306d1249556d5a005734d1e8088d9b5a7c1005b21aad9 SHA512 c1560383c82c1846c92aff96424bd3b9274dec7ad10adf9922488ea4f005d6bdf8265a86719a1950ca10078747327990e93af2c158ba71f3739a688b755b23c7 +EBUILD qtquick3d-6.5.9999.ebuild 838 BLAKE2B 72e9f20f2df410e23984aba7b342e2a22d67ba1430e95260869caa330b7df38a2c42113a5814fe9c59b306d1249556d5a005734d1e8088d9b5a7c1005b21aad9 SHA512 c1560383c82c1846c92aff96424bd3b9274dec7ad10adf9922488ea4f005d6bdf8265a86719a1950ca10078747327990e93af2c158ba71f3739a688b755b23c7 +EBUILD qtquick3d-6.9999.ebuild 838 BLAKE2B 72e9f20f2df410e23984aba7b342e2a22d67ba1430e95260869caa330b7df38a2c42113a5814fe9c59b306d1249556d5a005734d1e8088d9b5a7c1005b21aad9 SHA512 c1560383c82c1846c92aff96424bd3b9274dec7ad10adf9922488ea4f005d6bdf8265a86719a1950ca10078747327990e93af2c158ba71f3739a688b755b23c7 +MISC metadata.xml 534 BLAKE2B 09cf606ee911d677c4a1fb8879a70bcbb527d23f81d39fb3263aef5ad6222b7b0027069cd50b76232f45322b1da0499f2eed6264ef636f3ff0d04c0a5793ec2b SHA512 66438122b8b1d1ce0b2a98b36925944806d3616ce7f653004d2b1a76ad4dee62759bcb8f342e0aefb730765648ca9ad193f833c3596252df3dbca596a8daff08 diff --git a/dev-qt/qtquick3d/metadata.xml b/dev-qt/qtquick3d/metadata.xml index ae8aa9597f20..8712e36848d5 100644 --- a/dev-qt/qtquick3d/metadata.xml +++ b/dev-qt/qtquick3d/metadata.xml @@ -8,6 +8,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtquick3d</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild index 92a82e63dc8d..91662e367108 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild @@ -10,18 +10,25 @@ DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools" if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" elif [[ ${QT6_BUILD_TYPE} == live ]]; then - # Don't clone qtquick3d-assimp. - EGIT_SUBMODULES=() + EGIT_SUBMODULES=() # skip qtquick3d-assimp fi -DEPEND=" - =dev-qt/qtbase-${PV}*[concurrent,network,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtshadertools-${PV}* - =dev-qt/qtquicktimeline-${PV}* +IUSE="opengl vulkan" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtquicktimeline-${PV}:6 + ~dev-qt/qtshadertools-${PV}:6 media-libs/assimp:= + sys-libs/zlib:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # collada support is disabled in system media-libs/assimp (bug #891787) + tst_qquick3dassetimport +) src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild new file mode 100644 index 000000000000..91662e367108 --- /dev/null +++ b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild @@ -0,0 +1,39 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +elif [[ ${QT6_BUILD_TYPE} == live ]]; then + EGIT_SUBMODULES=() # skip qtquick3d-assimp +fi + +IUSE="opengl vulkan" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtquicktimeline-${PV}:6 + ~dev-qt/qtshadertools-${PV}:6 + media-libs/assimp:= + sys-libs/zlib:= +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # collada support is disabled in system media-libs/assimp (bug #891787) + tst_qquick3dassetimport +) + +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_system_assimp=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild new file mode 100644 index 000000000000..91662e367108 --- /dev/null +++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild @@ -0,0 +1,39 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +elif [[ ${QT6_BUILD_TYPE} == live ]]; then + EGIT_SUBMODULES=() # skip qtquick3d-assimp +fi + +IUSE="opengl vulkan" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtquicktimeline-${PV}:6 + ~dev-qt/qtshadertools-${PV}:6 + media-libs/assimp:= + sys-libs/zlib:= +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # collada support is disabled in system media-libs/assimp (bug #891787) + tst_qquick3dassetimport +) + +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_system_assimp=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest index 9a1f28cbfe1a..edbab80fe96d 100644 --- a/dev-qt/qtquicktimeline/Manifest +++ b/dev-qt/qtquicktimeline/Manifest @@ -1,5 +1,7 @@ DIST qtquicktimeline-everywhere-opensource-src-5.15.10.tar.xz 105584 BLAKE2B a99e6b3813527ec0f7a835167ae356c555d2e18cc67cf40853264df8e6443543755e82177c8033aaa8ef7a0645a9263fd4b97dc2084b5470b51fd889c1c70e93 SHA512 702f3f260e52659cf58a093e6019e26402db867bd65052c2b01c9ee1a995e8eeb0ad1f1dcaa64a9db4ca56f81ffd2d177319a7a4f379ca0f3bb7f27295f08541 DIST qtquicktimeline-everywhere-src-6.5.2.tar.xz 113208 BLAKE2B bdf2537cfa13415e570d66a0b0f96c0852e62c8e2cd746c8ea7618e0eddb89b79dc8b75964460d806ea869b6c4dc1eced7cafa8c63dc2afcce231884cd601045 SHA512 4447973fba264b4a412f7a29b5d32c6ad1c62a5dc72ced8a8f88d565655fec3bab3e5047d0f7323f5415f2c7e5782bf533a67a778f1daa55cda588ccabe0054c EBUILD qtquicktimeline-5.15.10.ebuild 366 BLAKE2B b96a5118b144bdd8ecb543224e233d45a30a529a20d9795e1f2c1fe96ec4cbc52a921bf4d294e04cb51f07f866b5f62fcaf5ffb21f8984c387d5971ea78aa128 SHA512 933d5f932a33831742e2fe6001f9db49ab0dbb0cce45d8d42efca9036aa533ef55501b132e61daf03a19be8153defb7bc21e180efabbd9a98a6aa2224239b825 -EBUILD qtquicktimeline-6.5.2.ebuild 349 BLAKE2B 87abc1b15b3f35c9aaa0422bf73321342981ff72d9e2eac71746fb12488a9740f472306a9dc1e7ef04624df47d169a15baee90c66a537432055c1a220e1d2b38 SHA512 40bcd48c890001940463e12a49eff06f600a5dddfe039518b142ce83ccef86d01a2421af8beda249c7c81cc4c9845b6f00e8cdf2a4e74abbec91f25556928504 -MISC metadata.xml 383 BLAKE2B 8f734db19973b4ebfe57cf9417f7fbf6db00ca254cf2410e336c2f252aff7e85500d5fdb944e511a48bf08ebb3ee74e729073f567b9d7558efb19024f7c1e10e SHA512 c0c9a947c7ab5edce2487560d6d9c215966ba5804e370557f2d2a35d67bc6c1ac8a04afdaac8c733cc66be0977835826ecd817248b83c01f4230f8824fbc41a1 +EBUILD qtquicktimeline-6.5.2.ebuild 352 BLAKE2B 7430d0ca1c9a88311fdfcea591396edc773ddfbdfae0b70bb076d688a166d1d503d7f49314a3c0fef65ae4897a744e8276d6de74f0bab7332e298b7b032fb4fd SHA512 338728e8809cccf99921dfced0f5bc5b18e8cd0b31259a2e65cbef923858ea242296ed95ea62def15f1d6ca593d90744496affab03f816b1febcd6799b171f09 +EBUILD qtquicktimeline-6.5.9999.ebuild 352 BLAKE2B 7430d0ca1c9a88311fdfcea591396edc773ddfbdfae0b70bb076d688a166d1d503d7f49314a3c0fef65ae4897a744e8276d6de74f0bab7332e298b7b032fb4fd SHA512 338728e8809cccf99921dfced0f5bc5b18e8cd0b31259a2e65cbef923858ea242296ed95ea62def15f1d6ca593d90744496affab03f816b1febcd6799b171f09 +EBUILD qtquicktimeline-6.9999.ebuild 352 BLAKE2B 7430d0ca1c9a88311fdfcea591396edc773ddfbdfae0b70bb076d688a166d1d503d7f49314a3c0fef65ae4897a744e8276d6de74f0bab7332e298b7b032fb4fd SHA512 338728e8809cccf99921dfced0f5bc5b18e8cd0b31259a2e65cbef923858ea242296ed95ea62def15f1d6ca593d90744496affab03f816b1febcd6799b171f09 +MISC metadata.xml 441 BLAKE2B 74ac671e09bcf33c214467cee99e50cf1b0563655b52cd65916ac4e382c941f68f68ca13a5881ca4d2e85e3ef60e19ee9dd0f52d6d769dd67f89960adaac1263 SHA512 62ddfd6f5d6868707383f44f26f051308416f836373862e74f3b8af24fd6da166e31a1f0ab67fdc9c9c20e00887162f5b57a5224429e7b37c9deac44c8dca2b1 diff --git a/dev-qt/qtquicktimeline/metadata.xml b/dev-qt/qtquicktimeline/metadata.xml index 8c2f7f6368ce..e8164d036bd2 100644 --- a/dev-qt/qtquicktimeline/metadata.xml +++ b/dev-qt/qtquicktimeline/metadata.xml @@ -8,5 +8,6 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/qt-5/qtquicktimeline-index.html</doc> + <remote-id type="github">qt/qtquicktimeline</remote-id> </upstream> </pkgmetadata> diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild index 3b0370aab04e..48f8a5bde6c4 100644 --- a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}* - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtdeclarative-${PV}:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild new file mode 100644 index 000000000000..48f8a5bde6c4 --- /dev/null +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module for keyframe-based timeline construction" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtdeclarative-${PV}:6 +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild new file mode 100644 index 000000000000..48f8a5bde6c4 --- /dev/null +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module for keyframe-based timeline construction" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtdeclarative-${PV}:6 +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest index 4f38796d1e33..12086d2ceb36 100644 --- a/dev-qt/qtscxml/Manifest +++ b/dev-qt/qtscxml/Manifest @@ -1,5 +1,7 @@ DIST qtscxml-everywhere-opensource-src-5.15.10.tar.xz 437404 BLAKE2B e36e866e4c02722f88499cc92bf27d2401f2b89d19fed83915803f6c8a367007fc386df250d11ecd92e5c80713924dd9992608769dbb0a42071f0d928317d935 SHA512 93e2df05da176802a0439ba752f52d1c84d291a2addf9492aaab2099f06efb32d896edd0660711bb2e0b67f7a9ea2c4d31b4ec3366f6230140d3de0056478923 DIST qtscxml-everywhere-src-6.5.2.tar.xz 1163208 BLAKE2B 9e149a82f8f00a7f0c78beb393a87de2dd7b0c61f0168b7f2bb717591d2923b91ef2ebbea211cfe7c724e97a32f74a41537763c828e1e1a3fa16a017b1c73ffa SHA512 fafea704d5e592a31c11f0039336de587353a57d5a69b07d0346fd2906488810d0ed1fc9267a0bf06aeae7f93ae19e150c5734bc969c1e0c7bc4e6215744ac3a EBUILD qtscxml-5.15.10.ebuild 398 BLAKE2B 27b0f98657fad702cb2b14ad1c69bc80b9c42e5680ed3ba2db0e79bb9884c0f7e4960c3c4bea26a6e5577476030b52c172f327cb6b6ecd9ec72ec6b5d306725d SHA512 62f3dd6a55d8f8dc8af4d1e0f7ded88f8efd3fe1ada7a7f585bdd488c3599f160a9efbc52a014cb5016e11a13856dfabbc236cb4257bae8bbb18137bc02e22ce -EBUILD qtscxml-6.5.2.ebuild 397 BLAKE2B a479e813b27792c70211b5a8c20f473a0dc2517fce50394e233f78de410ee0c42dfb1bf6b4ba966d680516ef3777a2f3859a310d5c121c8a25d8b44c8a9aef30 SHA512 f52bb5c201d5d24944cec6a7385ce8fc5290e6f78f6d13fa652222678295d48ae5fbd24b8222f5add4ccab195b8902fbbbbe53bbf71be56a1f1b76b5ba98dc12 -MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e +EBUILD qtscxml-6.5.2.ebuild 561 BLAKE2B 1171b68a7a18764f3b1172e8f20f5c816fc33a88a74d807d947365e656400930a2670e50d7a8a3204561a0c38fc616e2e3b01befb8a0e78ed4d3577d3efa6cef SHA512 d4902e95cc8bef0574e184b8c955b9f6166d6e714a558b737c68775e2c32439fec65acf1b34252afe7346d075f94faaad71b81aa0c176acfe90cd31d027340ca +EBUILD qtscxml-6.5.9999.ebuild 561 BLAKE2B 1171b68a7a18764f3b1172e8f20f5c816fc33a88a74d807d947365e656400930a2670e50d7a8a3204561a0c38fc616e2e3b01befb8a0e78ed4d3577d3efa6cef SHA512 d4902e95cc8bef0574e184b8c955b9f6166d6e714a558b737c68775e2c32439fec65acf1b34252afe7346d075f94faaad71b81aa0c176acfe90cd31d027340ca +EBUILD qtscxml-6.9999.ebuild 561 BLAKE2B 1171b68a7a18764f3b1172e8f20f5c816fc33a88a74d807d947365e656400930a2670e50d7a8a3204561a0c38fc616e2e3b01befb8a0e78ed4d3577d3efa6cef SHA512 d4902e95cc8bef0574e184b8c955b9f6166d6e714a558b737c68775e2c32439fec65acf1b34252afe7346d075f94faaad71b81aa0c176acfe90cd31d027340ca +MISC metadata.xml 532 BLAKE2B b01b5680cf69e0aeb5bfec2c3c9e42728e6246ca515fe9024b1c4aeecaf660d7e4bd085b4065e4e8e40075eca1d63bbe309d7095e6e25441b9f0f13b95614ba5 SHA512 00f10c94d4a40337b094eabed3a9fe7ca05310eb8ceee4efcc0e2a7a636f548a6e74b096e85cfee437b6b5082046ba13cdff6e7b15c3614ca4759cab0f62eac8 diff --git a/dev-qt/qtscxml/metadata.xml b/dev-qt/qtscxml/metadata.xml index ae8aa9597f20..702f3c500dd7 100644 --- a/dev-qt/qtscxml/metadata.xml +++ b/dev-qt/qtscxml/metadata.xml @@ -8,6 +8,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtscxml</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtscxml/qtscxml-6.5.2.ebuild b/dev-qt/qtscxml/qtscxml-6.5.2.ebuild index 2fedc64db025..c3e29fd2e2f0 100644 --- a/dev-qt/qtscxml/qtscxml-6.5.2.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.5.2.ebuild @@ -11,10 +11,14 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,opengl,widgets] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,network,opengl,widgets] + ~dev-qt/qtdeclarative-${PV}:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # may fail with pid-sandbox, or at least musl/hardened+gcc (exact + # conditions unknown but passes without pid, consider flaky) + tst_qstatemachine +) diff --git a/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild new file mode 100644 index 000000000000..c3e29fd2e2f0 --- /dev/null +++ b/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild @@ -0,0 +1,24 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,network,opengl,widgets] + ~dev-qt/qtdeclarative-${PV}:6 +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # may fail with pid-sandbox, or at least musl/hardened+gcc (exact + # conditions unknown but passes without pid, consider flaky) + tst_qstatemachine +) diff --git a/dev-qt/qtscxml/qtscxml-6.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.9999.ebuild new file mode 100644 index 000000000000..c3e29fd2e2f0 --- /dev/null +++ b/dev-qt/qtscxml/qtscxml-6.9999.ebuild @@ -0,0 +1,24 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,network,opengl,widgets] + ~dev-qt/qtdeclarative-${PV}:6 +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # may fail with pid-sandbox, or at least musl/hardened+gcc (exact + # conditions unknown but passes without pid, consider flaky) + tst_qstatemachine +) diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest index 50783bf344d1..b658a0b387bc 100644 --- a/dev-qt/qtsensors/Manifest +++ b/dev-qt/qtsensors/Manifest @@ -1,3 +1,7 @@ DIST qtsensors-everywhere-opensource-src-5.15.10.tar.xz 2059812 BLAKE2B 80fb3587ebd50ac28ed3d15f1e6888f10d250253be0a7e176d37ae355f124d98ae8eeff63cfd4ff0c1785c994a48a043f83102689f3a5e644806dd90ded0ded5 SHA512 9950b0f8b90727a051299c5b7e7852819c165bcdb1cbe2f8bd7386768175c387ab838918e7d6f1dcf2a7d6d32bb1559dfda225c57e8b9b5b4ffeac5f3db432ac +DIST qtsensors-everywhere-src-6.5.2.tar.xz 1484712 BLAKE2B e285a4bf219f7b1b807cc07fa14bcb3129e21bdc10fbbb7cc1d7ec26a0327ea2293d90138251007f9ff657f1708076242d85684dc1f7bd4eff19ace81baf5166 SHA512 5014ba0bb2ebecd23b26c7eabe5aa1dde2a18f31e1448f2e86411593772cb1fda74520460d7be97c4f612ff6d25d1135fb551d2407660754611a83e8b35aaa7b EBUILD qtsensors-5.15.10.ebuild 566 BLAKE2B e798853d8e80272c044a99cec1afc8bb006ce73552d642d7b9852a55b3e018875fdf8bcdcef2a001ecbfbafd0cc2e36350d41bf93bce93e35b7a5e081a607ed8 SHA512 1927fa1e7693842aa7c08e604bc3033bdfabf28411ca6d748ac8a26f432187f14b8c10dc9a5a51b631b71d7f81048c893d700110fcb2888da02268b4529e7e4c -MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1 +EBUILD qtsensors-6.5.2.ebuild 486 BLAKE2B f872e54edd0ecca634a19cf769637758862e03c674a86e51b5289beef86759c0a0271a0a9844f5d4e3b969b4f80211a46843616c94aa106a074f2da4e5716a59 SHA512 3f2c1ab5ea5ee184c9b41f5c8062e3215cc69454a4c33c531b1edc9e2907262e322c4237307775097c2bd542a7d3959d7cea4fb845c452314ab8c412366e344d +EBUILD qtsensors-6.5.9999.ebuild 486 BLAKE2B f872e54edd0ecca634a19cf769637758862e03c674a86e51b5289beef86759c0a0271a0a9844f5d4e3b969b4f80211a46843616c94aa106a074f2da4e5716a59 SHA512 3f2c1ab5ea5ee184c9b41f5c8062e3215cc69454a4c33c531b1edc9e2907262e322c4237307775097c2bd542a7d3959d7cea4fb845c452314ab8c412366e344d +EBUILD qtsensors-6.9999.ebuild 486 BLAKE2B f872e54edd0ecca634a19cf769637758862e03c674a86e51b5289beef86759c0a0271a0a9844f5d4e3b969b4f80211a46843616c94aa106a074f2da4e5716a59 SHA512 3f2c1ab5ea5ee184c9b41f5c8062e3215cc69454a4c33c531b1edc9e2907262e322c4237307775097c2bd542a7d3959d7cea4fb845c452314ab8c412366e344d +MISC metadata.xml 594 BLAKE2B 93f6b9de5266ef5bba3342d149afd04d4fdb27cac760d91b7dfb866d81ff4d4e86a3de1a512815444aa825350dad45923437f5caa7fea7cf6066667f2328d00e SHA512 68d91bcb4c8904a65021a81b01474081565e55c6776d29b54a70318282ce604f8e29e75f3d7574aedf9397ec72b2c6bd1e81ed4e630a4ecf553e070baebd9d64 diff --git a/dev-qt/qtsensors/metadata.xml b/dev-qt/qtsensors/metadata.xml index 106818b8da8e..087b363d32cb 100644 --- a/dev-qt/qtsensors/metadata.xml +++ b/dev-qt/qtsensors/metadata.xml @@ -11,6 +11,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtsensors</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtsensors/qtsensors-6.5.2.ebuild b/dev-qt/qtsensors/qtsensors-6.5.2.ebuild new file mode 100644 index 000000000000..b70b8eb46e14 --- /dev/null +++ b/dev-qt/qtsensors/qtsensors-6.5.2.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Hardware sensor access library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[dbus] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtsensors/qtsensors-6.5.9999.ebuild b/dev-qt/qtsensors/qtsensors-6.5.9999.ebuild new file mode 100644 index 000000000000..b70b8eb46e14 --- /dev/null +++ b/dev-qt/qtsensors/qtsensors-6.5.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Hardware sensor access library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[dbus] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtsensors/qtsensors-6.9999.ebuild b/dev-qt/qtsensors/qtsensors-6.9999.ebuild new file mode 100644 index 000000000000..b70b8eb46e14 --- /dev/null +++ b/dev-qt/qtsensors/qtsensors-6.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Hardware sensor access library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[dbus] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest index f02e6a5fc0ca..7e73c5eddc18 100644 --- a/dev-qt/qtserialport/Manifest +++ b/dev-qt/qtserialport/Manifest @@ -1,5 +1,7 @@ DIST qtserialport-everywhere-opensource-src-5.15.10.tar.xz 324256 BLAKE2B 7d5492648854877b42a4a058ee2e1205f67d2ad949041d62f800f0fde701e02b7651efa16dcfa43d0396675009ebdc9362fd74eccec06f079847b7ffff0efd24 SHA512 59face48cce750fb02c112dbef9c997a5b61d84cf8085a0f8c59c3bb5c93d7110de9c9830f26f3ed61fffb2c23eb8a42d5683211abaa6e5147cf87643469a45e DIST qtserialport-everywhere-src-6.5.2.tar.xz 279364 BLAKE2B 7f1efb56f4e8f61e97faf62f4edeee8a638180245d0ccf6e85e6a41ac78906dafe4470a7884680b84838a8f409dbf27230659777922ce4250feda7c83b4b8e3b SHA512 9c26fe572272c1dfc7ce795451f2e4a5976a55e13ac8c91ab2dd2f8d07f77f0a18de80dc7b77c31e7233dba962ea2f88495286263fe59ec7f5ac62802f96b2f7 EBUILD qtserialport-5.15.10.ebuild 565 BLAKE2B 380cc83e92be8bd256a5e652a5018380da908a30a20a8676c3701caea63dba343b99edd1f67458ebb5556ca49cac3f0b766b0237c66b01e7b8087246ecda4bdd SHA512 acfee3720971a49241a821201849b840e1d019ed768e58da252a5e519bd142d9166e4551330ed8d21184a1b899d8175dbe1bf251f4a938d13d971514ca4063df -EBUILD qtserialport-6.5.2.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39 -MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e +EBUILD qtserialport-6.5.2.ebuild 356 BLAKE2B 064cf7caaf2ab7fdc6f0bcc5898c3a84a149312496bd3fa9013441393edc4340d38e78ba725e7054b74de8f1c23289116ebd01dafbff9d3679b0aeec959536f1 SHA512 3c5745609c94a7308bf781515345786032ac0771e33d054712265efbe21f110dbe6dd6f5ce7c98ed3317158d59404aba0259e02e977e8316acfa83ff80fbfbfd +EBUILD qtserialport-6.5.9999.ebuild 356 BLAKE2B 064cf7caaf2ab7fdc6f0bcc5898c3a84a149312496bd3fa9013441393edc4340d38e78ba725e7054b74de8f1c23289116ebd01dafbff9d3679b0aeec959536f1 SHA512 3c5745609c94a7308bf781515345786032ac0771e33d054712265efbe21f110dbe6dd6f5ce7c98ed3317158d59404aba0259e02e977e8316acfa83ff80fbfbfd +EBUILD qtserialport-6.9999.ebuild 356 BLAKE2B 064cf7caaf2ab7fdc6f0bcc5898c3a84a149312496bd3fa9013441393edc4340d38e78ba725e7054b74de8f1c23289116ebd01dafbff9d3679b0aeec959536f1 SHA512 3c5745609c94a7308bf781515345786032ac0771e33d054712265efbe21f110dbe6dd6f5ce7c98ed3317158d59404aba0259e02e977e8316acfa83ff80fbfbfd +MISC metadata.xml 537 BLAKE2B 48590dfe4d5912693284b963abe9e2fccfff319c2fcc3106fa8d20ec693f7430453eec3fc9ba16c7a9a2cf59f635c1b627f49c6f4e3a8f83be634a68a00b055c SHA512 60ab0488e4a3585fb036e22212f55b5ba5b512acefc9bc68b08a1b255fa6dd0e34e7652a77e55cd7107e1c1f6b742ed12ce20ae92df29a3a38cd2d9f22618f97 diff --git a/dev-qt/qtserialport/metadata.xml b/dev-qt/qtserialport/metadata.xml index ae8aa9597f20..f6e42eb8a172 100644 --- a/dev-qt/qtserialport/metadata.xml +++ b/dev-qt/qtserialport/metadata.xml @@ -8,6 +8,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtserialport</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtserialport/qtserialport-6.5.2.ebuild b/dev-qt/qtserialport/qtserialport-6.5.2.ebuild index bf569254cd0a..c764bce60412 100644 --- a/dev-qt/qtserialport/qtserialport-6.5.2.ebuild +++ b/dev-qt/qtserialport/qtserialport-6.5.2.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,widgets] +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] virtual/libudev:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild new file mode 100644 index 000000000000..c764bce60412 --- /dev/null +++ b/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Serial port abstraction library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] + virtual/libudev:= +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtserialport/qtserialport-6.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.9999.ebuild new file mode 100644 index 000000000000..c764bce60412 --- /dev/null +++ b/dev-qt/qtserialport/qtserialport-6.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Serial port abstraction library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] + virtual/libudev:= +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest index 300a8a098150..8e81b62094ec 100644 --- a/dev-qt/qtshadertools/Manifest +++ b/dev-qt/qtshadertools/Manifest @@ -1,3 +1,5 @@ DIST qtshadertools-everywhere-src-6.5.2.tar.xz 1061812 BLAKE2B 33b997f121ae408f9cbbba53c08d015f55709b3558e8ef1f0ec41c2313f1d4e51051c4bd540e25b1fa91c1bd9d7dbba381e363ee6fae1df6d728ad95727dc829 SHA512 95a697de1e0b415b700edc86c452847f37478951c547fad42c8373c592a1f474b824df7c2d1ae3b26fb9401df3c523431633e0293f5e472732964cb527def6be -EBUILD qtshadertools-6.5.2.ebuild 314 BLAKE2B 315c0b8587baa11c5617ba89725807911c0a85e7b25bfd9bf4b6b6a0fd3b463acd9dcc623473a4bed6fd3af1380e8843483390d59469ad37c9a497be579947d7 SHA512 ac316a5580819aebd7b94e2ed7d97baaeb2d054faa0d6d0c21b65bc5b2eeb90feb0a8a9fa66a92e6dd275dbb5e153f7728a930fbeca2d1abe3d17d210e74254c -MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e +EBUILD qtshadertools-6.5.2.ebuild 316 BLAKE2B af77183f14888dcd6060254987f681ad19285921233b4bc983f332a5b1ea3d002b69ae725c177c62eaf646a8d05180cab07786ac618ab9b839d3ea1ed8e39894 SHA512 c6763f935d73641aaa5ba093a63f664df57458c3650a0de501341b1ed313f814a0632dbfc2602b588e063bb60fee9dcc65545f22043234126ceb0c0ef742ee0c +EBUILD qtshadertools-6.5.9999.ebuild 316 BLAKE2B af77183f14888dcd6060254987f681ad19285921233b4bc983f332a5b1ea3d002b69ae725c177c62eaf646a8d05180cab07786ac618ab9b839d3ea1ed8e39894 SHA512 c6763f935d73641aaa5ba093a63f664df57458c3650a0de501341b1ed313f814a0632dbfc2602b588e063bb60fee9dcc65545f22043234126ceb0c0ef742ee0c +EBUILD qtshadertools-6.9999.ebuild 316 BLAKE2B af77183f14888dcd6060254987f681ad19285921233b4bc983f332a5b1ea3d002b69ae725c177c62eaf646a8d05180cab07786ac618ab9b839d3ea1ed8e39894 SHA512 c6763f935d73641aaa5ba093a63f664df57458c3650a0de501341b1ed313f814a0632dbfc2602b588e063bb60fee9dcc65545f22043234126ceb0c0ef742ee0c +MISC metadata.xml 538 BLAKE2B 59f8b1a838f1fadf78bc2d9f1c65fde2c7fdc306730671b16297ff19308186907744bcbd0924074001e1cdb43c1dde29486368bb0d2533b3cb12f7befa53d2dc SHA512 dfe1c793f5525ce4d4353d9131749247163021ec3d995d2cc95df53d214d2e0b24468a026df0dd6403cad41990ab5e8c5e801efa346a06a2d962f29990b16ddf diff --git a/dev-qt/qtshadertools/metadata.xml b/dev-qt/qtshadertools/metadata.xml index ae8aa9597f20..bb0aa35de704 100644 --- a/dev-qt/qtshadertools/metadata.xml +++ b/dev-qt/qtshadertools/metadata.xml @@ -8,6 +8,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtshadertools</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild index 88a20ffbb689..7655c47db240 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild @@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui] +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild new file mode 100644 index 000000000000..7655c47db240 --- /dev/null +++ b/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild @@ -0,0 +1,17 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt APIs and Tools for Graphics Pipelines" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild new file mode 100644 index 000000000000..7655c47db240 --- /dev/null +++ b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild @@ -0,0 +1,17 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt APIs and Tools for Graphics Pipelines" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest index d7ac87daf4fa..9c253f2529a7 100644 --- a/dev-qt/qtspeech/Manifest +++ b/dev-qt/qtspeech/Manifest @@ -1,4 +1,8 @@ DIST qtspeech-5.15.10-gentoo-kde-1.tar.xz 1044 BLAKE2B e555c475fa1824ffbe34c5a0e0b6c24eeec81ad29337966e89f9dbd7d43c3a5d079603ad6dbe51e695984741cff0a749921b329242bd68d23c4ff9eed3eff008 SHA512 c4551ba08e9c23af59b9ce86d4ea0420c0b60372e3bb177d17b066b8651bb6d726c1d9981b6cf762f1cbce0fdae8f05cd77055af13384eb333355c1ba834428b DIST qtspeech-everywhere-opensource-src-5.15.10.tar.xz 104944 BLAKE2B 7e664719d352cd29cb289f8b8f59d4595ffe343dca028a69030032030eb02c601b29492cea885bcab940264624b39042773bc70884512726abcd89dc27065b64 SHA512 b938c8baba11aa9a40a2ec5492df32c511164686aa2649d78023beccc8b23f1e0a77193672f7bc7d7f72aeb7b59fe30972683f5a4e22e1e39da9744ecd40201d +DIST qtspeech-everywhere-src-6.5.2.tar.xz 249568 BLAKE2B af86153ea1cf0f248ab80aa828a0457e23e1f97cc5ae91bf60fa426a43a44247230b643ae48e6ae839668ea9a66edc94e0358502abcab03788cd7d1368403592 SHA512 bc6ca225f9eadc838e63bb3b011f604c1ae18eee76445c2c0d22152e473b9316b6903e349aee2555c5a110ef65fbd25ca9065b22ae4cef6e5290daa665c78434 EBUILD qtspeech-5.15.10.ebuild 730 BLAKE2B 9ca79158cacdb395d0e845f8504a1846889bae0eb116af6255016b2b88f6ab30b5d511575e13561c3cc3941dc9bc3e8832472d90d1ac0471af2cc55bf64d5dde SHA512 4222158b97630d34ede62e8d0116834442fe72509ed0763fec33ce0306ba1689afec8e57ce732e140410e31a42bf6403c8ec6fc2dd3aefb8895058d8d3c44323 -MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9 +EBUILD qtspeech-6.5.2.ebuild 1299 BLAKE2B a3288360a7d306c2d055992075a2c48b02bbdb3b9d1b4e8a2228a51cd15558d8175577a4e6a42dcedf17f6cfce796dafd99a29945f91d82b7b554e5a45d02342 SHA512 44284d73c69a3fbd3b1988173250c25368ae8853b52fc2651e3b2987afac68fd64c9095defcf57f5bf46057b429d163487919da2c13f6fe600424c4255b4a86a +EBUILD qtspeech-6.5.9999.ebuild 1299 BLAKE2B a3288360a7d306c2d055992075a2c48b02bbdb3b9d1b4e8a2228a51cd15558d8175577a4e6a42dcedf17f6cfce796dafd99a29945f91d82b7b554e5a45d02342 SHA512 44284d73c69a3fbd3b1988173250c25368ae8853b52fc2651e3b2987afac68fd64c9095defcf57f5bf46057b429d163487919da2c13f6fe600424c4255b4a86a +EBUILD qtspeech-6.9999.ebuild 1299 BLAKE2B a3288360a7d306c2d055992075a2c48b02bbdb3b9d1b4e8a2228a51cd15558d8175577a4e6a42dcedf17f6cfce796dafd99a29945f91d82b7b554e5a45d02342 SHA512 44284d73c69a3fbd3b1988173250c25368ae8853b52fc2651e3b2987afac68fd64c9095defcf57f5bf46057b429d163487919da2c13f6fe600424c4255b4a86a +MISC metadata.xml 796 BLAKE2B ba57858003dc7f4700567573b10244fd4564ae411c53e046b898156de91c966d865e7fa1ecb452c66facc1cc849030fe9ee6603a6a504b69b032a75a31d116dc SHA512 535c63b7fb8853ad623c5e97bee1173065da948822a18c4540eb807bf4450c2fcc2aad31ddf70fa4c65d7a2c5b416e35f5eb04f21cb36e72cb94b14893545235 diff --git a/dev-qt/qtspeech/metadata.xml b/dev-qt/qtspeech/metadata.xml index aa174c30fde5..fa0f657a4256 100644 --- a/dev-qt/qtspeech/metadata.xml +++ b/dev-qt/qtspeech/metadata.xml @@ -8,9 +8,11 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtspeech</remote-id> </upstream> <use> <flag name="flite">Enable text-to-speech synthesizer plugin using <pkg>app-accessibility/flite</pkg> engine</flag> + <flag name="speechd">Enable text-to-speech synthesizer plugin using <pkg>app-accessibility/speech-dispatcher</pkg> engine</flag> </use> <slots> <subslots> diff --git a/dev-qt/qtspeech/qtspeech-6.5.2.ebuild b/dev-qt/qtspeech/qtspeech-6.5.2.ebuild new file mode 100644 index 000000000000..94803ab4eff3 --- /dev/null +++ b/dev-qt/qtspeech/qtspeech-6.5.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Text-to-speech library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="flite +speechd" +# can build with neither, but then it is just mock tts and may be confusing +REQUIRED_USE="|| ( flite speechd )" + +# TODO: tests are known failing with clang and needs looking into, albeit +# it is still usable at runtime save for applications segfaulting on exit +# similarly to QTBUG-90626 (not that this has in-tree revdeps as of writing +# of this). Restricting because also seen this result in hanging. Note that +# qtspeech:6 is still somewhat new (started in 6.4.0), and should review +# status on new major versions. +RESTRICT="test" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtdeclarative-${PV}:6 + flite? ( + app-accessibility/flite + ~dev-qt/qtmultimedia-${PV}:6 + ) + speechd? ( app-accessibility/speech-dispatcher ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(qt_feature flite) + $(qt_feature speechd) + + # flite_alsa was likely to work around old issues in flite, it does + # nothing but add -lasound (no code change, and is unneeded) + -DQT_FEATURE_flite_alsa=OFF + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtspeech/qtspeech-6.5.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.5.9999.ebuild new file mode 100644 index 000000000000..94803ab4eff3 --- /dev/null +++ b/dev-qt/qtspeech/qtspeech-6.5.9999.ebuild @@ -0,0 +1,48 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Text-to-speech library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="flite +speechd" +# can build with neither, but then it is just mock tts and may be confusing +REQUIRED_USE="|| ( flite speechd )" + +# TODO: tests are known failing with clang and needs looking into, albeit +# it is still usable at runtime save for applications segfaulting on exit +# similarly to QTBUG-90626 (not that this has in-tree revdeps as of writing +# of this). Restricting because also seen this result in hanging. Note that +# qtspeech:6 is still somewhat new (started in 6.4.0), and should review +# status on new major versions. +RESTRICT="test" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtdeclarative-${PV}:6 + flite? ( + app-accessibility/flite + ~dev-qt/qtmultimedia-${PV}:6 + ) + speechd? ( app-accessibility/speech-dispatcher ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(qt_feature flite) + $(qt_feature speechd) + + # flite_alsa was likely to work around old issues in flite, it does + # nothing but add -lasound (no code change, and is unneeded) + -DQT_FEATURE_flite_alsa=OFF + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtspeech/qtspeech-6.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.9999.ebuild new file mode 100644 index 000000000000..94803ab4eff3 --- /dev/null +++ b/dev-qt/qtspeech/qtspeech-6.9999.ebuild @@ -0,0 +1,48 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Text-to-speech library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="flite +speechd" +# can build with neither, but then it is just mock tts and may be confusing +REQUIRED_USE="|| ( flite speechd )" + +# TODO: tests are known failing with clang and needs looking into, albeit +# it is still usable at runtime save for applications segfaulting on exit +# similarly to QTBUG-90626 (not that this has in-tree revdeps as of writing +# of this). Restricting because also seen this result in hanging. Note that +# qtspeech:6 is still somewhat new (started in 6.4.0), and should review +# status on new major versions. +RESTRICT="test" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtdeclarative-${PV}:6 + flite? ( + app-accessibility/flite + ~dev-qt/qtmultimedia-${PV}:6 + ) + speechd? ( app-accessibility/speech-dispatcher ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(qt_feature flite) + $(qt_feature speechd) + + # flite_alsa was likely to work around old issues in flite, it does + # nothing but add -lasound (no code change, and is unneeded) + -DQT_FEATURE_flite_alsa=OFF + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index 141ccd484507..98a81a0aa62e 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -2,5 +2,7 @@ DIST qtsvg-5.15.10-gentoo-kde-1.tar.xz 5012 BLAKE2B 2eaab709cf165108b6f18ffd88ee DIST qtsvg-everywhere-opensource-src-5.15.10.tar.xz 1889960 BLAKE2B 14ee7bbf0914e47d8fc39790ce597fca0085e6018d33878752e707a9ece567bb139bc2f1e689840d6641aa6db958240a4f97fab69e7200385ddb2ee53abc5f04 SHA512 6de19c1dd6584f95bc3abbd391495bbdc13f15cc677a0c9e7afa2a0beffef8f8128eab5ccda741ed95af4553203b9daf1fc0327197912945e7211aeace33c6e7 DIST qtsvg-everywhere-src-6.5.2.tar.xz 1727648 BLAKE2B 65dc5184e89110d3543386526e2625431f162f0da2834e42f0c5f9d3b6e33e74315dfa5f0365d33d0ea1af824d4dbca6a4f4b9bcb8a32d13fcee4b5e82ce426e SHA512 34f572eceb27021d2b55d67ed2de84f9d41c0cb2463c5c8e9c9e270b52782d32f707b83fdc95c67f306bb82a3ea44a5d48921e6bc979197ce6bc94eaf89ccb20 EBUILD qtsvg-5.15.10.ebuild 496 BLAKE2B a9a417892487c84120f966f2bd06d84f7348e069ec3917aca6c88c33345109bf127802e01fae1da95a5945fc7e44db8f3a2f3b7f6b699fcfbcc3367b082f2563 SHA512 b94101d98d128f952a0bdc6b14e04c76e492d6925e06d6c0d97d077f908196d944169a196a28e4aac384c261c93a6b5fa2dd94646c4186b392fd1ec57f885e15 -EBUILD qtsvg-6.5.2.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe -MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e +EBUILD qtsvg-6.5.2.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871 +EBUILD qtsvg-6.5.9999.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871 +EBUILD qtsvg-6.9999.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871 +MISC metadata.xml 530 BLAKE2B 4cff37d5824321054b8131fc65a4a86433a2e33882c66411b7af25c0550ad4933a680ceb517d1ba2cd11dab4b3110da69f330f334d25577310d59d7ab4aca439 SHA512 f538df6a65076e6744ab7e498778ff1addd3f45af50708d5af3c0eefb5862fc0b82bf99c18b268bb6ed257b3feed51f64ed18cd4006ba717c03be37ea5258ab3 diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml index ae8aa9597f20..7dc6a408ba26 100644 --- a/dev-qt/qtsvg/metadata.xml +++ b/dev-qt/qtsvg/metadata.xml @@ -8,6 +8,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtsvg</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtsvg/qtsvg-6.5.2.ebuild b/dev-qt/qtsvg/qtsvg-6.5.2.ebuild index 960a981395e2..e1b14151f896 100644 --- a/dev-qt/qtsvg/qtsvg-6.5.2.ebuild +++ b/dev-qt/qtsvg/qtsvg-6.5.2.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,widgets] +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] sys-libs/zlib:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild new file mode 100644 index 000000000000..e1b14151f896 --- /dev/null +++ b/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="SVG rendering library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] + sys-libs/zlib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtsvg/qtsvg-6.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.9999.ebuild new file mode 100644 index 000000000000..e1b14151f896 --- /dev/null +++ b/dev-qt/qtsvg/qtsvg-6.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="SVG rendering library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] + sys-libs/zlib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index 1978f6df19c9..2adc70f5109d 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -1,3 +1,5 @@ DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397 SHA512 d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011 -EBUILD qttools-6.5.2.ebuild 1846 BLAKE2B 6b5787882cb6684fbb3f09c90de1ce9782d3d010ce3ce762f75439fb207d1bde9af9fd6d3a44c081626d12cdab6daf8d8dad7d8cb7d4abbaa8a601337222f60b SHA512 27d05449276f44ea507d3791432bf36c5530846184d98363f7bfa63888781957f6e73bead5c9b4df95891a4855cafc82fce68fa71b74d5f633053519b670e822 -MISC metadata.xml 1091 BLAKE2B b10645f2835b9c5163745ff656e5b2a25277f5d1de7de4c294161f85f7eae51a7bf55367215bc9c183eb6700ec12a3f1fe51cad98211c98a2f51df2efc972ae2 SHA512 93d7528b809549f111b61cef09176d62a25b6e67668cdb9cda8d099464496b5ed63eddaa81efed222d7f0afec287d75056a117d6379fe7af61f463ac85e33c1e +EBUILD qttools-6.5.2-r1.ebuild 1851 BLAKE2B a3347a7be8334f9cf3a5ecd6957d47c59199e06e0fea6b949bd827f268cae3c7e185c8068e9ae9fd8a7f91385a557ce82b41ae8f709d375b7f144320d01212a5 SHA512 fde51204cedd73be0933eaf545596b158b295d00ead13035a21431a8800a90ee5049cf8835ba28345a21a064b099a85a4b4f3f8e16002da762b30819bde88fb5 +EBUILD qttools-6.5.9999.ebuild 1851 BLAKE2B a3347a7be8334f9cf3a5ecd6957d47c59199e06e0fea6b949bd827f268cae3c7e185c8068e9ae9fd8a7f91385a557ce82b41ae8f709d375b7f144320d01212a5 SHA512 fde51204cedd73be0933eaf545596b158b295d00ead13035a21431a8800a90ee5049cf8835ba28345a21a064b099a85a4b4f3f8e16002da762b30819bde88fb5 +EBUILD qttools-6.9999.ebuild 1851 BLAKE2B a3347a7be8334f9cf3a5ecd6957d47c59199e06e0fea6b949bd827f268cae3c7e185c8068e9ae9fd8a7f91385a557ce82b41ae8f709d375b7f144320d01212a5 SHA512 fde51204cedd73be0933eaf545596b158b295d00ead13035a21431a8800a90ee5049cf8835ba28345a21a064b099a85a4b4f3f8e16002da762b30819bde88fb5 +MISC metadata.xml 1393 BLAKE2B ffe27b97fb8e5d072b2228ded8dfb59c4f0d5837cb1656ebdf4893818d3dbb3b7e359e273d8fdc356d21d3af5f5a841254b7ab26e348584e896b94151181a6c3 SHA512 3dad0d030fb1d92fb5719a1405199c4e9a2b445a5f6d3d3ac609c74a0cc6c6b5bcd414c556db8cb09e54549158b23b57175a04fdf21ae29f331827872db69a04 diff --git a/dev-qt/qttools/metadata.xml b/dev-qt/qttools/metadata.xml index 7664b3e6cd03..ce7dba6ed80a 100644 --- a/dev-qt/qttools/metadata.xml +++ b/dev-qt/qttools/metadata.xml @@ -7,19 +7,23 @@ </maintainer> <use> <flag name="assistant">Build Qt Assistant</flag> + <flag name="clang">Enable using libclang for code parsing (linguist/qdoc)</flag> <flag name="designer">Build Qt Designer</flag> <flag name="distancefieldgenerator">Build Qt Distance Field Generator</flag> - <flag name="linguist">Build Qt Linguist</flag> + <flag name="linguist">Build Qt Linguist (GUI requires USE=widgets)</flag> <flag name="pixeltool">Build Qt Pixeltool</flag> - <flag name="qattributionsscanner">Build Qt Source Code Attribution Scanner</flag> - <flag name="qdbus">Build the Qt D-Bus Interface and D-Bus Viewer</flag> + <flag name="qdbus">Build the Qt D-Bus Interface (D-Bus Viewer requires USE=widgets)</flag> <flag name="qdoc">Build Qt Documentation Generator</flag> - <flag name="qdiag">Build Qt Diag</flag> - <flag name="qplugininfo">Build Qt Plugin Info</flag> + <flag name="qml">Build QML/QtQuick bindings and imports</flag> + <flag name="qtattributionsscanner">Build Qt Source Code Attribution Scanner</flag> + <flag name="qtdiag">Build Qt Diag</flag> + <flag name="qtplugininfo">Build Qt Plugin Info</flag> + <flag name="widgets">Enable QtWidgets support</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qttools</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild b/dev-qt/qttools/qttools-6.5.2-r1.ebuild new file mode 100644 index 000000000000..4c7d4b23fe7b --- /dev/null +++ b/dev-qt/qttools/qttools-6.5.2-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit llvm qt6-build + +DESCRIPTION="Qt Tools Collection" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE=" + assistant clang designer distancefieldgenerator gles2-only + +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner + qtdiag qtplugininfo vulkan +widgets +" +# note that some tools do not *require* widgets but will skip a sub-tool +# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) +REQUIRED_USE=" + assistant? ( widgets ) + designer? ( qml widgets ) + distancefieldgenerator? ( qml widgets ) + pixeltool? ( widgets ) + qdoc? ( clang ) +" + +# behaves very badly when qttools is not already installed, also +# other more minor issues (clang tests flaky depending on version, +# and 3rdparty/ tries to FetchContent gtest) +RESTRICT="test" + +LLVM_MAX_SLOT=17 +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,widgets?] + assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) + clang? ( <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= ) + designer? ( ~dev-qt/qtbase-${PV}:6[xml] ) + qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) + qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) + widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) +" +DEPEND="${RDEPEND}" + +pkg_setup() { + use clang && llvm_pkg_setup +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package widgets Qt6Widgets) + $(qt_feature assistant) + $(qt_feature clang clangcpp) + $(qt_feature designer) + $(qt_feature distancefieldgenerator) + $(qt_feature linguist) + $(qt_feature pixeltool) + $(qt_feature qdbus) + $(qt_feature qdoc clang) + $(qt_feature qtattributionsscanner) + $(qt_feature qtdiag) + $(qt_feature qtplugininfo) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qttools/qttools-6.5.2.ebuild b/dev-qt/qttools/qttools-6.5.2.ebuild deleted file mode 100644 index e75eadff55af..000000000000 --- a/dev-qt/qttools/qttools-6.5.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt Tools Collection" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE=" - assistant designer distancefieldgenerator +linguist pixeltool - qattributionsscanner qdbus qdoc qdiag qplugininfo -" - -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] ) - designer? ( =dev-qt/qtbase-${PV}*[widgets] ) - distancefieldgenerator? ( - =dev-qt/qtbase-${PV}*[widgets] - =dev-qt/qtdeclarative-${PV}* - ) - pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] ) - qdbus? ( =dev-qt/qtbase-${PV}*[widgets] ) - qdoc? ( sys-devel/clang:= ) - qdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(qt_feature assistant) - -DQT_FEATURE_commandlineparser=ON - $(qt_feature designer) - $(qt_feature distancefieldgenerator) - $(qt_feature linguist) - $(qt_feature pixeltool) - $(qt_feature qattributionsscanner qtattributionsscanner) - $(qt_feature qdbus) - $(qt_feature qdoc clang) - $(qt_feature qdiag qtdiag) - $(qt_feature qplugininfo qtplugininfo) - -DQT_FEATURE_thread=ON - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - use assistant && qt6_symlink_binary_to_path assistant 6 - use designer && qt6_symlink_binary_to_path designer 6 - use distancefieldgenerator && qt6_symlink_binary_to_path qdistancefieldgenerator 6 - use linguist && qt6_symlink_binary_to_path linguist 6 - use pixeltool && qt6_symlink_binary_to_path pixeltool 6 - use qdbus && qt6_symlink_binary_to_path qdbus 6 - use qdbus && qt6_symlink_binary_to_path qdbusviewer 6 - use qdoc && qt6_symlink_binary_to_path qdoc 6 - use qdiag && qt6_symlink_binary_to_path qtdiag 6 - use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6 -} diff --git a/dev-qt/qttools/qttools-6.5.9999.ebuild b/dev-qt/qttools/qttools-6.5.9999.ebuild new file mode 100644 index 000000000000..4c7d4b23fe7b --- /dev/null +++ b/dev-qt/qttools/qttools-6.5.9999.ebuild @@ -0,0 +1,69 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit llvm qt6-build + +DESCRIPTION="Qt Tools Collection" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE=" + assistant clang designer distancefieldgenerator gles2-only + +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner + qtdiag qtplugininfo vulkan +widgets +" +# note that some tools do not *require* widgets but will skip a sub-tool +# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) +REQUIRED_USE=" + assistant? ( widgets ) + designer? ( qml widgets ) + distancefieldgenerator? ( qml widgets ) + pixeltool? ( widgets ) + qdoc? ( clang ) +" + +# behaves very badly when qttools is not already installed, also +# other more minor issues (clang tests flaky depending on version, +# and 3rdparty/ tries to FetchContent gtest) +RESTRICT="test" + +LLVM_MAX_SLOT=17 +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,widgets?] + assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) + clang? ( <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= ) + designer? ( ~dev-qt/qtbase-${PV}:6[xml] ) + qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) + qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) + widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) +" +DEPEND="${RDEPEND}" + +pkg_setup() { + use clang && llvm_pkg_setup +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package widgets Qt6Widgets) + $(qt_feature assistant) + $(qt_feature clang clangcpp) + $(qt_feature designer) + $(qt_feature distancefieldgenerator) + $(qt_feature linguist) + $(qt_feature pixeltool) + $(qt_feature qdbus) + $(qt_feature qdoc clang) + $(qt_feature qtattributionsscanner) + $(qt_feature qtdiag) + $(qt_feature qtplugininfo) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild new file mode 100644 index 000000000000..4c7d4b23fe7b --- /dev/null +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -0,0 +1,69 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit llvm qt6-build + +DESCRIPTION="Qt Tools Collection" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE=" + assistant clang designer distancefieldgenerator gles2-only + +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner + qtdiag qtplugininfo vulkan +widgets +" +# note that some tools do not *require* widgets but will skip a sub-tool +# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) +REQUIRED_USE=" + assistant? ( widgets ) + designer? ( qml widgets ) + distancefieldgenerator? ( qml widgets ) + pixeltool? ( widgets ) + qdoc? ( clang ) +" + +# behaves very badly when qttools is not already installed, also +# other more minor issues (clang tests flaky depending on version, +# and 3rdparty/ tries to FetchContent gtest) +RESTRICT="test" + +LLVM_MAX_SLOT=17 +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,widgets?] + assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) + clang? ( <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= ) + designer? ( ~dev-qt/qtbase-${PV}:6[xml] ) + qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) + qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) + widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) +" +DEPEND="${RDEPEND}" + +pkg_setup() { + use clang && llvm_pkg_setup +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package widgets Qt6Widgets) + $(qt_feature assistant) + $(qt_feature clang clangcpp) + $(qt_feature designer) + $(qt_feature distancefieldgenerator) + $(qt_feature linguist) + $(qt_feature pixeltool) + $(qt_feature qdbus) + $(qt_feature qdoc clang) + $(qt_feature qtattributionsscanner) + $(qt_feature qtdiag) + $(qt_feature qtplugininfo) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest index f1904d0cc7e5..c9f9522c1775 100644 --- a/dev-qt/qttranslations/Manifest +++ b/dev-qt/qttranslations/Manifest @@ -1,5 +1,7 @@ DIST qttranslations-everywhere-opensource-src-5.15.10.tar.xz 1635736 BLAKE2B c21f5fed04502622377bc1eaa11dab2d4e693ca7a882ced21920926fac74fc75b92d16a26c35133f1437cef51d1effbcaa292ef2a768e085f54b10774d47f8fd SHA512 94f22857cf9f14f13f774ee5632bfd0fc367ca5fb745cbfb3997fee8651961d9547f0a629afc54c35b2e4493244da9b94214777e20340c2b203c538bc1c84a22 DIST qttranslations-everywhere-src-6.5.2.tar.xz 1468624 BLAKE2B 4201ecaf6fedb920ff49fafed7579af2a676a9f34e33bda886f3898a111c49a716cf4c161a51724298f4b477320610ffdc03b00555b5d7e4486d729afcd4b162 SHA512 2930153207a6ba7bb6720171f2be1c845e84edef87abd5ec6a4464c4386fb58fbdd59740c210727eb6b058ceffcaaf0aaea99e968215b68b121eb35d6e4f05c2 EBUILD qttranslations-5.15.10.ebuild 379 BLAKE2B f7a1f63d58d4a09bdf92cf91f2ec0c546a8626cddc7bcc9d55c70eab8db038d3ae6912e0909f660099af7d4998e99353d0eda9d98da253f7021b8008c1d30b41 SHA512 bf741516c6b8ad79fac401a29befc1004926ce203460b0c5f261744c70db5bcc0047b9af8f36153668b1680fefcbd80f50840623d5379be43ce059e1373c4506 -EBUILD qttranslations-6.5.2.ebuild 337 BLAKE2B 8d8a63511ce337c9a7eea482bb42e1297914b0a0665debc3dc6f9b72cc10eb566e541a2077a02fb0c4736f14dfc733eccd154a772ae2dd9c5f90c2247cc0d96e SHA512 8f42f90e1ffaa944ba613596d7ec53248b591cbb4c7bc00da15486267da86905e20285de6216c223c7ee90780bf8d050a30de4b9a08fc5064a9a3532cb7306ef -MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e +EBUILD qttranslations-6.5.2.ebuild 330 BLAKE2B abc4eeef9e79487bd946e40db1c094b8556161d4422914f1ef2ca777944c554462525cae5b122411f432816da4196d22637c2af4daa521bf73b3ab40efa73c8e SHA512 377621adf3eb0c8dc733dae23910550eb78699dbb2913863b829ee5bace6971c6f1559b4c6c0f203eb73bca4d44567040546d5d64c98c104258de222aa4e77c8 +EBUILD qttranslations-6.5.9999.ebuild 330 BLAKE2B abc4eeef9e79487bd946e40db1c094b8556161d4422914f1ef2ca777944c554462525cae5b122411f432816da4196d22637c2af4daa521bf73b3ab40efa73c8e SHA512 377621adf3eb0c8dc733dae23910550eb78699dbb2913863b829ee5bace6971c6f1559b4c6c0f203eb73bca4d44567040546d5d64c98c104258de222aa4e77c8 +EBUILD qttranslations-6.9999.ebuild 330 BLAKE2B abc4eeef9e79487bd946e40db1c094b8556161d4422914f1ef2ca777944c554462525cae5b122411f432816da4196d22637c2af4daa521bf73b3ab40efa73c8e SHA512 377621adf3eb0c8dc733dae23910550eb78699dbb2913863b829ee5bace6971c6f1559b4c6c0f203eb73bca4d44567040546d5d64c98c104258de222aa4e77c8 +MISC metadata.xml 539 BLAKE2B 3fb53d125b7a1b83a71369a1a5787cc3ba243738c3ccd32f42e20723c671ec1a09076ba27a96e89609749a2529924c8735ceb1b37e16b4dc2ccb1d11cdefa801 SHA512 b61515e069c87057569a1d77a14fc6b1be7c4491307ca1b3e1b47f47d545f6e84c51f7824c320ed5f973569a25b0d8f4bb4645fba3a3ec2865b489bdd4fc819b diff --git a/dev-qt/qttranslations/metadata.xml b/dev-qt/qttranslations/metadata.xml index ae8aa9597f20..230e148cf03e 100644 --- a/dev-qt/qttranslations/metadata.xml +++ b/dev-qt/qttranslations/metadata.xml @@ -8,6 +8,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qttranslations</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qttranslations/qttranslations-6.5.2.ebuild b/dev-qt/qttranslations/qttranslations-6.5.2.ebuild index 1e3a9009724f..2f5770cc8b83 100644 --- a/dev-qt/qttranslations/qttranslations-6.5.2.ebuild +++ b/dev-qt/qttranslations/qttranslations-6.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,5 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - -DEPEND="=dev-qt/qtbase-${PV}*" -BDEPEND="=dev-qt/qttools-${PV}*[linguist]" +DEPEND="~dev-qt/qtbase-${PV}:6" +BDEPEND="~dev-qt/qttools-${PV}:6[linguist]" diff --git a/dev-qt/qttranslations/qttranslations-6.5.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.5.9999.ebuild new file mode 100644 index 000000000000..2f5770cc8b83 --- /dev/null +++ b/dev-qt/qttranslations/qttranslations-6.5.9999.ebuild @@ -0,0 +1,15 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Translation files for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND="~dev-qt/qtbase-${PV}:6" +BDEPEND="~dev-qt/qttools-${PV}:6[linguist]" diff --git a/dev-qt/qttranslations/qttranslations-6.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.9999.ebuild new file mode 100644 index 000000000000..2f5770cc8b83 --- /dev/null +++ b/dev-qt/qttranslations/qttranslations-6.9999.ebuild @@ -0,0 +1,15 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Translation files for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +DEPEND="~dev-qt/qtbase-${PV}:6" +BDEPEND="~dev-qt/qttools-${PV}:6[linguist]" diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest index b0023d340d7b..6e7ef6f41a36 100644 --- a/dev-qt/qtvirtualkeyboard/Manifest +++ b/dev-qt/qtvirtualkeyboard/Manifest @@ -1,3 +1,7 @@ DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.10.tar.xz 10958048 BLAKE2B 738a31b2c9e9f8ccaf34a794da92a659c570db614a6473a96e17eb42de31395602283a600e04d871603bad99be80474895364d3689f25cbae561ea9772a97140 SHA512 6d539af5e5a336f2bf4ac1e6006268e50b426f6bb174019f742847da86f8cd5c8eb2c5f353255b5d1bba9c9c7a7b035bcb12e0063be5b31e45741ea9bd478582 +DIST qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz 3735288 BLAKE2B 3c088e7b435754ed344136e4646b53ca0793824f7711829858853e3cd49bed7fb47af9caeda4d92dea46130af64eac60084256297fb3647f45127647601c20cc SHA512 acb1f5de2f0d7f985f14d8f77a37698b7ecc7db15a9911148a5f3dafa26db68f2712f9d0f2c9babec9c20b672e350e0431faed2959d2b6eb43113304ab049470 EBUILD qtvirtualkeyboard-5.15.10.ebuild 1215 BLAKE2B 5efc9c8205dd9bb16aeee41108fabdb91b0c279e1dd4a6438f59db0396ceee80b567cf2d26eaba12f2ecbf4d864073aa2e2541e21296d6137587a530e93c014f SHA512 dc3502caa1b1a6170ea77f54d44133794ebd226b46ff0eca1735eece767c5b4f291084114c556eb8064fb040f1abe77fecfba70ad9e9526de09dee5c4de1a36e -MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020 +EBUILD qtvirtualkeyboard-6.5.2.ebuild 1062 BLAKE2B 284f0d9c7b7533bf9ebecdebb5728fb6ebc6079306400be76198939e2cd40688018db8eef60035d582201bef6ef4fb17022df017c49d8803e4f82a50c687a3d7 SHA512 97b2732a7eac5db17b415170ef77c0d8380c569e1ab9a6c492e33b24cf0e4560d810cae0f1b2d8b9ae4e79c6e76f73e39263e0e4fce3325f4aec4054c5267d78 +EBUILD qtvirtualkeyboard-6.5.9999.ebuild 1062 BLAKE2B 284f0d9c7b7533bf9ebecdebb5728fb6ebc6079306400be76198939e2cd40688018db8eef60035d582201bef6ef4fb17022df017c49d8803e4f82a50c687a3d7 SHA512 97b2732a7eac5db17b415170ef77c0d8380c569e1ab9a6c492e33b24cf0e4560d810cae0f1b2d8b9ae4e79c6e76f73e39263e0e4fce3325f4aec4054c5267d78 +EBUILD qtvirtualkeyboard-6.9999.ebuild 1062 BLAKE2B 284f0d9c7b7533bf9ebecdebb5728fb6ebc6079306400be76198939e2cd40688018db8eef60035d582201bef6ef4fb17022df017c49d8803e4f82a50c687a3d7 SHA512 97b2732a7eac5db17b415170ef77c0d8380c569e1ab9a6c492e33b24cf0e4560d810cae0f1b2d8b9ae4e79c6e76f73e39263e0e4fce3325f4aec4054c5267d78 +MISC metadata.xml 640 BLAKE2B bdfed031e4d0191f510982695bca87366916ce6b7ba3ff7fad718ac55083cbd82d7b00b32048f65b3973944f2058cf8f652e19a7efb3606a2eb7e4b3cc3fd63f SHA512 a5b3338f67993f944258eb2fba56b6d6b927e0e298832c95e2c3b6b7eb148201e2912e1844de03a360c0b123c6322c7d956825913eeec7c866fed861ced34dfc diff --git a/dev-qt/qtvirtualkeyboard/metadata.xml b/dev-qt/qtvirtualkeyboard/metadata.xml index bbf24b44659f..e84bfa0f97be 100644 --- a/dev-qt/qtvirtualkeyboard/metadata.xml +++ b/dev-qt/qtvirtualkeyboard/metadata.xml @@ -11,6 +11,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtvirtualkeyboard</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.5.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.5.2.ebuild new file mode 100644 index 000000000000..a040a8b2bcce --- /dev/null +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.5.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Customizable input framework and virtual keyboard for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+spell" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtsvg-${PV}:6 + spell? ( app-text/hunspell:= ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(qt_feature spell hunspell) + -DINPUT_vkb_handwriting=no # neither cerence nor myscript are packaged + ) + + qt6-build_src_configure +} + +src_test() { + if use spell && has_version app-dicts/myspell-en; then + # 99% pass but minor sub-tests fail with myspell-en, needs looking into + ewarn "Warning: notable tests were skipped due to ${_} being installed" + local CMAKE_SKIP_TESTS=( + tst_inputpanel + tst_inputpanelcontrols2 + ) + else + einfo "tst_inputpanel can take >5mins, not known to actually hang" + fi + + # tst_layoutfilesystem seems to fail randomly without -j1 + qt6-build_src_test -j1 +} diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.5.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.5.9999.ebuild new file mode 100644 index 000000000000..a040a8b2bcce --- /dev/null +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.5.9999.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Customizable input framework and virtual keyboard for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+spell" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtsvg-${PV}:6 + spell? ( app-text/hunspell:= ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(qt_feature spell hunspell) + -DINPUT_vkb_handwriting=no # neither cerence nor myscript are packaged + ) + + qt6-build_src_configure +} + +src_test() { + if use spell && has_version app-dicts/myspell-en; then + # 99% pass but minor sub-tests fail with myspell-en, needs looking into + ewarn "Warning: notable tests were skipped due to ${_} being installed" + local CMAKE_SKIP_TESTS=( + tst_inputpanel + tst_inputpanelcontrols2 + ) + else + einfo "tst_inputpanel can take >5mins, not known to actually hang" + fi + + # tst_layoutfilesystem seems to fail randomly without -j1 + qt6-build_src_test -j1 +} diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild new file mode 100644 index 000000000000..a040a8b2bcce --- /dev/null +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Customizable input framework and virtual keyboard for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+spell" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtsvg-${PV}:6 + spell? ( app-text/hunspell:= ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(qt_feature spell hunspell) + -DINPUT_vkb_handwriting=no # neither cerence nor myscript are packaged + ) + + qt6-build_src_configure +} + +src_test() { + if use spell && has_version app-dicts/myspell-en; then + # 99% pass but minor sub-tests fail with myspell-en, needs looking into + ewarn "Warning: notable tests were skipped due to ${_} being installed" + local CMAKE_SKIP_TESTS=( + tst_inputpanel + tst_inputpanelcontrols2 + ) + else + einfo "tst_inputpanel can take >5mins, not known to actually hang" + fi + + # tst_layoutfilesystem seems to fail randomly without -j1 + qt6-build_src_test -j1 +} diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 41596f225e7b..d52326ec3d37 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -5,5 +5,7 @@ DIST qtwayland-5.15.10-gentoo-kde-2.tar.xz 43076 BLAKE2B 735ac875c0957de47f90d08 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477 EBUILD qtwayland-5.15.10-r4.ebuild 1353 BLAKE2B 3cab556185c182f4cd8ed280737e1434c51ec1c52719688a2ca5372d81baa5edca8675b22a7c0f9601f7dacec65f54e7e361fd851a2f226dcefaac38180bd9b5 SHA512 0ac3e896cc8c6c717e44dc3119b1c5cf3cc4cc6d22538f837699528c61e29e11a3969538b0518d21c7d7b1362ac81910e9508197076481a51b4bece379f7dca2 -EBUILD qtwayland-6.5.2-r1.ebuild 499 BLAKE2B 566a294312f80222e566020da980389f788854ee4604ab1e7943bbaa38943729745ff805aaa3e65b2bccb426291a684d675cbbde799f9fd5fdc91ec8ad05693d SHA512 b1268ce63b632223bfe524b4b6f34703c5299e7377a80670ab77951bd5c5a1f39a91fe56bacb13e969b28073cd51fe8eea622483a5c54e04fdd1fc8e937ebc6d -MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2 +EBUILD qtwayland-6.5.2-r2.ebuild 934 BLAKE2B 66a0bfdf290c008fa2dd480b0a25014f65dfa0b0543c9637468b1308c57429ca3b908a2968793c3bf5ae356aea40c9e5ee13aba40203730ab1471826c1916931 SHA512 69511cba09096263c550eebc257e5dff9f919396e035f2b1338b0f7070ff885d09d6ba31169ab66b2275b980633a67ba38d4c8772ba492eb172cd1efeb851d6b +EBUILD qtwayland-6.5.9999.ebuild 869 BLAKE2B 33abbf122dd0e5f17788af4ade5c9740c2422acd2bec0d64577aa0760e8c7d86df5d2f242d4d85488aa083c6b7d9f37ee71531484e60e55fe878331427795a6c SHA512 f39e084af6c3a9932a2ea056f3f4cb60375291c5909d682840af0fa7d74260ebca5f4ab8525a42b68ec2f35157069761f32435d2112629efec11ab55f321d394 +EBUILD qtwayland-6.9999.ebuild 869 BLAKE2B 33abbf122dd0e5f17788af4ade5c9740c2422acd2bec0d64577aa0760e8c7d86df5d2f242d4d85488aa083c6b7d9f37ee71531484e60e55fe878331427795a6c SHA512 f39e084af6c3a9932a2ea056f3f4cb60375291c5909d682840af0fa7d74260ebca5f4ab8525a42b68ec2f35157069761f32435d2112629efec11ab55f321d394 +MISC metadata.xml 701 BLAKE2B 4fb22f432cbefa04f10c1f988271ec1db696593f37b3f80edd14c7c669192013a6b43869646c710560bcd08e4acd176331b5c41920c7af111dd58a64c6557207 SHA512 fb99bb933700e619db5e7bec1977f0c51bc7bdbcb97a4411f56e8f41a357982ee3de8d8150dcffdf9a494a0a84437de8b7ccafd2e0006796cdd25947d25815d2 diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml index a8ce9005f0bb..fe0b049a950d 100644 --- a/dev-qt/qtwayland/metadata.xml +++ b/dev-qt/qtwayland/metadata.xml @@ -6,11 +6,13 @@ <name>Gentoo Qt Project</name> </maintainer> <use> + <flag name="qml">Build QML/QtQuick bindings and imports</flag> <flag name="vulkan">Enable support for Vulkan-based server buffer integration</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtwayland</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtwayland/qtwayland-6.5.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2-r1.ebuild deleted file mode 100644 index 4fbc8c272b2c..000000000000 --- a/dev-qt/qtwayland/qtwayland-6.5.2-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Wayland platform plugin for Qt" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -BDEPEND="dev-util/wayland-scanner" -DEPEND=" - dev-libs/wayland - =dev-qt/qtbase-${PV}*[egl,gui,opengl] - =dev-qt/qtdeclarative-${PV}* - media-libs/libglvnd - x11-libs/libxkbcommon -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-drag-drop-segfault.patch" ) diff --git a/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild new file mode 100644 index 000000000000..f625230b37ad --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild @@ -0,0 +1,48 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Wayland platform plugin for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml vulkan" + +RDEPEND=" + dev-libs/wayland + ~dev-qt/qtbase-${PV}:6[egl(+),gui,opengl,vulkan=] + media-libs/libglvnd + x11-libs/libxkbcommon + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND="dev-util/wayland-scanner" + +CMAKE_SKIP_TESTS=( + # segfaults for not-looked-into reasons, but not considered + # an issue given >=seatv5 exists since wayland-1.10 (2016) + tst_seatv4 + # needs a compositor/opengl, skip the extra trouble + tst_surface + tst_xdgdecorationv1 +) + +PATCHES=( + "${FILESDIR}"/${P}-drag-drop-segfault.patch +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild new file mode 100644 index 000000000000..ba9eec33aed3 --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild @@ -0,0 +1,44 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Wayland platform plugin for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml vulkan" + +RDEPEND=" + dev-libs/wayland + ~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=] + media-libs/libglvnd + x11-libs/libxkbcommon + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND="dev-util/wayland-scanner" + +CMAKE_SKIP_TESTS=( + # segfaults for not-looked-into reasons, but not considered + # an issue given >=seatv5 exists since wayland-1.10 (2016) + tst_seatv4 + # needs a compositor/opengl, skip the extra trouble + tst_surface + tst_xdgdecorationv1 +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild new file mode 100644 index 000000000000..ba9eec33aed3 --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild @@ -0,0 +1,44 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Wayland platform plugin for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml vulkan" + +RDEPEND=" + dev-libs/wayland + ~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=] + media-libs/libglvnd + x11-libs/libxkbcommon + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND="dev-util/wayland-scanner" + +CMAKE_SKIP_TESTS=( + # segfaults for not-looked-into reasons, but not considered + # an issue given >=seatv5 exists since wayland-1.10 (2016) + tst_seatv4 + # needs a compositor/opengl, skip the extra trouble + tst_surface + tst_xdgdecorationv1 +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest index 06d984953cb2..256ef82b4bf4 100644 --- a/dev-qt/qtwebchannel/Manifest +++ b/dev-qt/qtwebchannel/Manifest @@ -2,5 +2,7 @@ DIST qtwebchannel-5.15.10-gentoo-kde-1.tar.xz 5808 BLAKE2B 4aa01535519811778a3b7 DIST qtwebchannel-everywhere-opensource-src-5.15.10.tar.xz 211876 BLAKE2B fcc3a198a90826b2d16d3a9ed950b4e00d9a7645231c26af79f3271ad3dacb981f1c057ec95b9c3c71f2baf05e0b71a4fc4d5121cc3fc8ebe101cf21fc404d11 SHA512 ed8349820c623dd7abcd34244a2f05426667d6997a8952567c3cbe785bb2ea92f03dd931bb53f77b34faff16d04dd7d39e4165c75d7a9ebb4ae225d7582355bc DIST qtwebchannel-everywhere-src-6.5.2.tar.xz 213940 BLAKE2B c5b97c63c91ef282e37d51b0c9957c5603c05b5336537b1bf57da0c3d60d55eab6516a00db30248fe63a7407bf1713c23baad0bfb4089c76ed1105b3bcdbc120 SHA512 405595dfdfed48aafe42969881994472cb08dc4105a63ccf8c5ca059c0c243b654c38356059ea26cda9165a50b306c92d296dd3eca430b29615ec0ac68431c09 EBUILD qtwebchannel-5.15.10.ebuild 599 BLAKE2B c61043201e33bea4827e7726a31ef0f631bba2799aaf76f9aa849d58f2b958e9053a6d73438906c92ef5ff160cf69cf568692ba566fa55d513154c7fbb385a31 SHA512 62b65e38d50d9d337a4e6979ff758211350f720c4b7072d02213133a88e017f8996f69aabd0a22a495c0c86b5e6c19a4117f771ce1f58877413fcd57613e4dc8 -EBUILD qtwebchannel-6.5.2.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9 -MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30 +EBUILD qtwebchannel-6.5.2-r1.ebuild 458 BLAKE2B 36009cc2f5b309c36e01db9bac20716303ff24f4806b759b06e422da96a4a16c8c4d218620784306e428c06778257188ca878972145b156930c4c14420a777af SHA512 23365edd9fe10abff6b84e0ed616488116cf66b3c7bc22e7313a16c8a6a9625f13113e4a6ef9a96b5654fc2e1680a2d4881a7321c965431da628c8b5a615ecab +EBUILD qtwebchannel-6.5.9999.ebuild 458 BLAKE2B 36009cc2f5b309c36e01db9bac20716303ff24f4806b759b06e422da96a4a16c8c4d218620784306e428c06778257188ca878972145b156930c4c14420a777af SHA512 23365edd9fe10abff6b84e0ed616488116cf66b3c7bc22e7313a16c8a6a9625f13113e4a6ef9a96b5654fc2e1680a2d4881a7321c965431da628c8b5a615ecab +EBUILD qtwebchannel-6.9999.ebuild 458 BLAKE2B 36009cc2f5b309c36e01db9bac20716303ff24f4806b759b06e422da96a4a16c8c4d218620784306e428c06778257188ca878972145b156930c4c14420a777af SHA512 23365edd9fe10abff6b84e0ed616488116cf66b3c7bc22e7313a16c8a6a9625f13113e4a6ef9a96b5654fc2e1680a2d4881a7321c965431da628c8b5a615ecab +MISC metadata.xml 617 BLAKE2B c9bdd6bc7b0e0aae943acc9060d1ef91d46e5e836f7a034c863032dff51b540edc0643cfd3ea0c4c4e18472a099537aee2b13994ea6fa97249dff25ad5291575 SHA512 ecc344957ebad7d9adc689c343c8315d38fc4d219f0a3bfb6ca848d2d083b0d29d01365a5287d3d5943a95dc75c1147c2e60a2078083a88832296ed0fbee2d4c diff --git a/dev-qt/qtwebchannel/metadata.xml b/dev-qt/qtwebchannel/metadata.xml index 5ca993705e2e..40635300f984 100644 --- a/dev-qt/qtwebchannel/metadata.xml +++ b/dev-qt/qtwebchannel/metadata.xml @@ -11,6 +11,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtwebchannel</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r1.ebuild new file mode 100644 index 000000000000..999d8fe6f87d --- /dev/null +++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt WebChannel" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild new file mode 100644 index 000000000000..999d8fe6f87d --- /dev/null +++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt WebChannel" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild new file mode 100644 index 000000000000..999d8fe6f87d --- /dev/null +++ b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt WebChannel" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index b1722d44cf3e..6c5f4bd08f45 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -7,8 +7,12 @@ DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922 DIST qtwebengine-5.15.10_p20230815.tar.xz 299275336 BLAKE2B 9c64f09d982086d51af7d4134f174db9c23162bc3317ea4f19e44d91a52ad63aff56bacc7ae64a2bf693d900ef3ef5231c7333eb56237123799066055fc49450 SHA512 4e6abd825d124fddc63bc8ff92e94940b829289277aa17423403c6ce168c12fff1d52b604ae127c1a0fdbca852e3795482acefbe6e506a3059c0d32bec45a709 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec +DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407 DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12 EBUILD qtwebengine-5.15.10_p20230623.ebuild 8524 BLAKE2B cce6249550a5574ab7763c042117186201da9c006982eb99efc1da72d1d339e90f9c6e9a60371a25d314f3372234e9d976d2cd292d0abcc08a4442a699a95495 SHA512 95138584a3644d86b9835288446dd2d01997379f894a38f101bbf899e853235600c9c80b571ed8380a15d179cb72fb0b68324e83b1b230847325ff476fa992e3 EBUILD qtwebengine-5.15.10_p20230815.ebuild 8258 BLAKE2B 766d6ad760f73e66d9a7f0ee52c3916e14b7f640e26784abf0866b039aecbf809c9e21a00b13d030311fa1ab91360aacd837e1257474800732a5598c3910c646 SHA512 c2d9534d452db6f53238faa05f6b454c4daeb6fcf683997d5095f4a9b777248e8d7f67ba4203a4b26457782817b887ca0cce36fb8d14f887e1b9772e78173140 -EBUILD qtwebengine-6.5.2.ebuild 7525 BLAKE2B 36efc69a7d3bcb37cb0e1988a8f5181cb60e2df177fc12237b518e1a40a3a29eecb0e2968efa02eb22e066bf22af64a86e23c63eeb63709b9188d2eb3109e0c6 SHA512 1e67b3a05f3ea6f40c5595b00273e1c7d6df9cd65244ed7a47ec0c3e287dfda3b06edf41e2a520d7f1705c0def4f0a1c8fae2d0a0f5e2725cf993d9d01fc37e3 -MISC metadata.xml 1152 BLAKE2B 2975a3fabc6464a6207a6b1a9da943baa16bc9a3b77a987cffeb6ea7c8791c5d09171b74825e6f218612144d862de1f2865c60fb6c4c187a1c5f6940112117e9 SHA512 aa3ed598b19be8adceb5a9b90bbc5d5d2521aa1a742210f536d11cf0466204ac3dc373ccee5a9a6cf523827589d17022ca2b54c8e142e6bb3b2afcfc98fa242d +EBUILD qtwebengine-6.5.2-r1.ebuild 8043 BLAKE2B 4fe89267684300b6b04e1fa55a39f1b73a7bee0d0334966842d4be77e2b7cd1c6e4d0d4141df99aaa1690c734f514e106aa731c34f60524d917d7c07d3a6f4c1 SHA512 e2b13325d43e50475b8779170b50a061d936154e8b5e58d9491670540eeab8a944b0af8c843a9a6b1a837f4e66a6a24446451b8ecc1d9ff2cd42423e0fca0c7a +EBUILD qtwebengine-6.5.2.ebuild 8559 BLAKE2B afcca72bb25aab65e617a033bc7b4eb47241c86307184417151522da586fe38e9485151f139fed68b365061dbfd6d19a99ae8296507109e8ab71b8879da2d9de SHA512 4e53155411b17bd1ba2800b2a265a2d117d64d62b20a7c5f275cb08d1a6a3da3aa5646933a386020bfd09b6ef82763e4cae48644db0e6b5123a0314fa904a0ba +EBUILD qtwebengine-6.5.9999.ebuild 8043 BLAKE2B 4fe89267684300b6b04e1fa55a39f1b73a7bee0d0334966842d4be77e2b7cd1c6e4d0d4141df99aaa1690c734f514e106aa731c34f60524d917d7c07d3a6f4c1 SHA512 e2b13325d43e50475b8779170b50a061d936154e8b5e58d9491670540eeab8a944b0af8c843a9a6b1a837f4e66a6a24446451b8ecc1d9ff2cd42423e0fca0c7a +EBUILD qtwebengine-6.9999.ebuild 8043 BLAKE2B 4fe89267684300b6b04e1fa55a39f1b73a7bee0d0334966842d4be77e2b7cd1c6e4d0d4141df99aaa1690c734f514e106aa731c34f60524d917d7c07d3a6f4c1 SHA512 e2b13325d43e50475b8779170b50a061d936154e8b5e58d9491670540eeab8a944b0af8c843a9a6b1a837f4e66a6a24446451b8ecc1d9ff2cd42423e0fca0c7a +MISC metadata.xml 1225 BLAKE2B e98ba2a05a516ebdb11d2b669532ba64d2ec3e517a347a77fc9d15f2e9c0671ff521ce13d3e296149c0cfee6b484fa3cbd6013ef20fdbccdce18d38c96b7aa7c SHA512 3aad326e75587e160340740cf9feadbeffac22b7bb064112e67f9750251587d60fc2fdb8256a98ac0b4156cfaf0cac0e01334628ed76dee31de0c5fd65d9a66f diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml index f447332f270a..ca6040fdb1aa 100644 --- a/dev-qt/qtwebengine/metadata.xml +++ b/dev-qt/qtwebengine/metadata.xml @@ -12,14 +12,16 @@ </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="jumbo-build">Combine source files to speed up build process.</flag> + <flag name="qml">Build QML/QtQuick bindings and imports</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> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtwebengine</remote-id> + <remote-id type="github">qt/qtwebengine-chromium</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild new file mode 100644 index 000000000000..d00c5f329f78 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild @@ -0,0 +1,267 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# py3.12: uses imp and distutils among potentially more issues, refer to +# www-client/chromium for when adding/backporting support may be viable +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" +inherit check-reqs flag-o-matic multiprocessing optfeature +inherit prefix python-any-r1 qt6-build toolchain-funcs + +DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" +SRC_URI+=" + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz +" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE=" + +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos + opengl pulseaudio qml screencast +system-icu vulkan +widgets +" +REQUIRED_USE=" + designer? ( qml widgets ) +" + +# dlopen: krb5, pciutils, udev +RDEPEND=" + app-arch/snappy:= + dev-libs/expat + dev-libs/libevent:= + dev-libs/libxml2[icu] + dev-libs/libxslt + dev-libs/nspr + dev-libs/nss + ~dev-qt/qtbase-${PV}:6[X,gui,opengl=,vulkan?,widgets?] + ~dev-qt/qtwebchannel-${PV}:6[qml?] + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/libvpx:= + media-libs/libwebp:= + media-libs/openjpeg:2= + media-libs/opus + sys-apps/dbus + sys-apps/pciutils + sys-libs/zlib:=[minizip] + virtual/libudev + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + x11-libs/libxcb:= + x11-libs/libxkbcommon + x11-libs/libxkbfile + alsa? ( media-libs/alsa-lib ) + designer? ( ~dev-qt/qttools-${PV}:6[designer] ) + geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) + kerberos? ( virtual/krb5 ) + pulseaudio? ( media-libs/libpulse[glib] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + screencast? ( + dev-libs/glib:2 + media-libs/mesa[gbm(+)] + media-video/pipewire:= + x11-libs/libdrm + ) + system-icu? ( dev-libs/icu:= ) + widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) +" +DEPEND=" + ${RDEPEND} + media-libs/libglvnd + x11-base/xorg-proto + x11-libs/libxshmfence + screencast? ( media-libs/libepoxy[egl(+)] ) + test? ( + widgets? ( app-text/poppler[cxx(+)] ) + ) +" +BDEPEND=" + $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') + dev-util/gperf + net-libs/nodejs[ssl] + sys-devel/bison + sys-devel/flex +" + +PATCHES=( "${WORKDIR}"/patches/${PN} ) +[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999 + PATCHES+=( "${WORKDIR}"/patches/chromium ) + +PATCHES+=( + # add extras as needed here, may merge in set if carries across versions +) + +python_check_deps() { + python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" +} + +qtwebengine_check-reqs() { + [[ ${MERGE_TYPE} == binary ]] && return + + if is-flagq '-g?(gdb)?([1-9])'; then #307861 + ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb)," + ewarn "which is non-trivial with ${PN}. May experience extended" + ewarn "compilation times and increased disk/memory usage. If run into" + ewarn "issues, please disable before reporting a bug." + fi + + local CHECKREQS_DISK_BUILD=7G + local CHECKREQS_DISK_USR=220M + + if ! has distcc ${FEATURES}; then #830661 + # assume ~2GB per job or 1.5GB if clang, possible with less + # depending on free memory and *FLAGS, but prefer being safe as + # users having OOM issues with qtwebengine been rather common + tc-is-clang && : 15 || : 20 + local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G + fi + + check-reqs_${EBUILD_PHASE_FUNC} #570534 +} + +pkg_pretend() { + qtwebengine_check-reqs +} + +pkg_setup() { + qtwebengine_check-reqs + python-any-r1_pkg_setup +} + +src_prepare() { + qt6-build_src_prepare + + # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix + hprefixify -w /Gentoo/ src/core/content_client_qt.cpp + + # store chromium versions, only used in postinst for a warning + local chromium + mapfile -t chromium < CHROMIUM_VERSION || die + [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] && + QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die + [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] && + QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die +} + +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_qtpdf_build=OFF # TODO? + -DQT_FEATURE_qtpdf_quick_build=OFF + -DQT_FEATURE_qtpdf_widgets_build=OFF + + -DQT_FEATURE_qtwebengine_build=ON + $(qt_feature qml qtwebengine_quick_build) + $(qt_feature widgets qtwebengine_widgets_build) + + $(cmake_use_find_package designer Qt6Designer) + + $(qt_feature alsa webengine_system_alsa) + $(qt_feature !bindist webengine_proprietary_codecs) + $(qt_feature geolocation webengine_geolocation) + $(qt_feature jumbo-build webengine_jumbo_build) + $(qt_feature kerberos webengine_kerberos) + $(qt_feature pulseaudio webengine_system_pulseaudio) + $(qt_feature screencast webengine_webrtc_pipewire) + $(qt_feature system-icu webengine_system_icu) + $(qt_feature vulkan webengine_vulkan) + -DQT_FEATURE_webengine_embedded_build=OFF + -DQT_FEATURE_webengine_extensions=ON + -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet + -DQT_FEATURE_webengine_pepper_plugins=ON + -DQT_FEATURE_webengine_printing_and_pdf=ON + -DQT_FEATURE_webengine_spellchecker=ON + -DQT_FEATURE_webengine_webchannel=ON + -DQT_FEATURE_webengine_webrtc=ON + + # needs a modified ffmpeg to be usable, and even then it may not + # cooperate with new major ffmpeg versions (bug #831487) + -DQT_FEATURE_webengine_system_ffmpeg=OFF + + # preemptively using bundled to avoid complications, may revisit + # (see discussions in https://github.com/gentoo/gentoo/pull/32281) + -DQT_FEATURE_webengine_system_re2=OFF + + # not necessary to pass these (default), but in case detection fails + $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ + freetype glib harfbuzz lcms2 libevent libjpeg \ + libopenjpeg2 libpci libpng libvpx libwebp libxml \ + minizip opus poppler snappy zlib) + + # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON + -DINSTALL_GN=OFF + ) + + local mygnargs=( + # prefer no dlopen where possible + link_pulseaudio=true + rtc_link_pipewire=true + ) + + use custom-cflags || strip-flags # fragile + + export NINJA NINJAFLAGS=$(get_NINJAOPTS) + [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v" + + local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}" + einfo "Extra Gn args: ${EXTRA_GN}" + + qt6-build_src_configure +} + +src_test() { + if [[ ${EUID} == 0 ]]; then + # almost every tests fail, so skip entirely + ewarn "Skipping tests due to running as root (chromium refuses this configuration)." + return + fi + + local CMAKE_SKIP_TESTS=( + # fails with network sandbox + tst_loadsignals + tst_qquickwebengineview + tst_qwebengineview + # certs verfication seems flaky and gives expiration warnings + tst_qwebengineclientcertificatestore + ) + + # prevent using the system's qtwebengine + # (use glob to avoid unnecessary complications with arch dir) + local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* ) + [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}" + local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess + local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales + local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]} + + # random failures in several tests without -j1 + qt6-build_src_test -j1 +} + +pkg_postinst() { + # plugin may also be found in $HOME if provided by chrome or firefox + use amd64 && + optfeature "Widevine DRM support (protected media playback)" \ + www-plugins/chrome-binary-plugins + + elog + elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with" + elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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 + 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 "tl;dr your web browsing experience will be compromised." +} diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild index 36bdb9c96769..67509126a0c5 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild @@ -3,12 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="xml(+)" -CHROMIUM_VER="108.0.5359.181" -CHROMIUM_PATCHES_VER="114.0.5735.133" - -inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build +inherit check-reqs estack flag-o-matic multiprocessing +inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" @@ -17,20 +15,11 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast - +system-icu widgets + alsa bindist designer geolocation +jumbo-build kerberos + pulseaudio screencast +system-icu widgets " REQUIRED_USE="designer? ( widgets )" -BDEPEND=" - $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') - dev-util/gperf - dev-util/ninja - dev-util/re2c - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex -" RDEPEND=" app-arch/snappy:= dev-libs/glib:2 @@ -41,8 +30,8 @@ RDEPEND=" dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtwebchannel-${PV}* + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtwebchannel-${PV}:6 media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= @@ -74,18 +63,28 @@ RDEPEND=" x11-libs/libxshmfence:= x11-libs/libXtst alsa? ( media-libs/alsa-lib ) - geolocation? ( =dev-qt/qtpositioning-${PV}* ) + geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( - =dev-qt/qtbase-${PV}*[widgets] + ~dev-qt/qtbase-${PV}:6[widgets] ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} media-libs/libglvnd " +BDEPEND=" + $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') + dev-util/gperf + dev-util/ninja + dev-util/re2c + net-libs/nodejs[ssl] + sys-devel/bison + sys-devel/flex +" PATCHES=( "${FILESDIR}"/${PN}-5.15.10_p20230623-ffmpeg-binutils-2.41.patch @@ -96,6 +95,8 @@ python_check_deps() { } qtwebengine_check-reqs() { + [[ ${MERGE_TYPE} == binary ]] && return + # bug #307861 eshopts_push -s extglob if is-flagq '-g?(gdb)?([1-9])'; then @@ -105,8 +106,6 @@ qtwebengine_check-reqs() { fi eshopts_pop - [[ ${MERGE_TYPE} == binary ]] && return - # (check-reqs added for bug #570534) # # Estimate the amount of RAM required @@ -139,36 +138,9 @@ pkg_setup() { python-any-r1_pkg_setup } -pkg_preinst() { - elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with" - elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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 - 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 - - case ${QT6_BUILD_TYPE} in - live) git-r3_src_unpack ;& - release) default ;; - esac -} - src_prepare() { + qt6-build_src_prepare + # bug 620444 - ensure local headers are used find . -type f -name "*.pr[fio]" -exec \ sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die @@ -183,15 +155,27 @@ src_prepare() { 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) + done < <( + find src/3rdparty/chromium/third_party/icu -type f \ + \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) 2>/dev/null + ) fi - qt6-build_src_prepare + # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix + hprefixify -w /Gentoo/ src/core/content_client_qt.cpp + + # store chromium versions, only used in postinst for a warning + local chromium + mapfile -t chromium < CHROMIUM_VERSION || die + [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] && + QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die + [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] && + QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die } src_configure() { - export NINJA_PATH="${BROOT}"/usr/bin/ninja - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + export NINJA_PATH=${BROOT}/usr/bin/ninja + export NINJAFLAGS=${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v} local mycmakeargs=( #-DQT_FEATURE_accessibility=off @@ -242,7 +226,50 @@ src_configure() { -DQT_FEATURE_webengine_webrtc=on -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off) #-DQT_FEATURE_xcb=off + + # TODO: fix gn cross build or split + depend on dev-qt/qtwebengine-gn + -DINSTALL_GN=off ) qt6-build_src_configure } + +src_test() { + if [[ ${EUID} == 0 ]]; then + # almost every tests fail, so skip entirely + ewarn "Skipping tests due to running as root (chromium refuses this configuration)." + return + fi + + local CMAKE_SKIP_TESTS=( + # fails with network sandbox + tst_loadsignals + tst_qquickwebengineview + tst_qwebengineview + # certs verfication seems flaky and gives expiration warnings + tst_qwebengineclientcertificatestore + ) + + # prevent using the system's qtwebengine + # (use glob to avoid unnecessary complications with arch dir) + local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* ) + [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}" + local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess + local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales + local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]} + + # random failures in several tests without -j1 + qt6-build_src_test -j1 +} + +pkg_postinst() { + elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with" + elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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 + 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 "tl;dr your web browsing experience will be compromised." +} diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild new file mode 100644 index 000000000000..d00c5f329f78 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild @@ -0,0 +1,267 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# py3.12: uses imp and distutils among potentially more issues, refer to +# www-client/chromium for when adding/backporting support may be viable +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" +inherit check-reqs flag-o-matic multiprocessing optfeature +inherit prefix python-any-r1 qt6-build toolchain-funcs + +DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" +SRC_URI+=" + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz +" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE=" + +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos + opengl pulseaudio qml screencast +system-icu vulkan +widgets +" +REQUIRED_USE=" + designer? ( qml widgets ) +" + +# dlopen: krb5, pciutils, udev +RDEPEND=" + app-arch/snappy:= + dev-libs/expat + dev-libs/libevent:= + dev-libs/libxml2[icu] + dev-libs/libxslt + dev-libs/nspr + dev-libs/nss + ~dev-qt/qtbase-${PV}:6[X,gui,opengl=,vulkan?,widgets?] + ~dev-qt/qtwebchannel-${PV}:6[qml?] + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/libvpx:= + media-libs/libwebp:= + media-libs/openjpeg:2= + media-libs/opus + sys-apps/dbus + sys-apps/pciutils + sys-libs/zlib:=[minizip] + virtual/libudev + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + x11-libs/libxcb:= + x11-libs/libxkbcommon + x11-libs/libxkbfile + alsa? ( media-libs/alsa-lib ) + designer? ( ~dev-qt/qttools-${PV}:6[designer] ) + geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) + kerberos? ( virtual/krb5 ) + pulseaudio? ( media-libs/libpulse[glib] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + screencast? ( + dev-libs/glib:2 + media-libs/mesa[gbm(+)] + media-video/pipewire:= + x11-libs/libdrm + ) + system-icu? ( dev-libs/icu:= ) + widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) +" +DEPEND=" + ${RDEPEND} + media-libs/libglvnd + x11-base/xorg-proto + x11-libs/libxshmfence + screencast? ( media-libs/libepoxy[egl(+)] ) + test? ( + widgets? ( app-text/poppler[cxx(+)] ) + ) +" +BDEPEND=" + $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') + dev-util/gperf + net-libs/nodejs[ssl] + sys-devel/bison + sys-devel/flex +" + +PATCHES=( "${WORKDIR}"/patches/${PN} ) +[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999 + PATCHES+=( "${WORKDIR}"/patches/chromium ) + +PATCHES+=( + # add extras as needed here, may merge in set if carries across versions +) + +python_check_deps() { + python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" +} + +qtwebengine_check-reqs() { + [[ ${MERGE_TYPE} == binary ]] && return + + if is-flagq '-g?(gdb)?([1-9])'; then #307861 + ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb)," + ewarn "which is non-trivial with ${PN}. May experience extended" + ewarn "compilation times and increased disk/memory usage. If run into" + ewarn "issues, please disable before reporting a bug." + fi + + local CHECKREQS_DISK_BUILD=7G + local CHECKREQS_DISK_USR=220M + + if ! has distcc ${FEATURES}; then #830661 + # assume ~2GB per job or 1.5GB if clang, possible with less + # depending on free memory and *FLAGS, but prefer being safe as + # users having OOM issues with qtwebengine been rather common + tc-is-clang && : 15 || : 20 + local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G + fi + + check-reqs_${EBUILD_PHASE_FUNC} #570534 +} + +pkg_pretend() { + qtwebengine_check-reqs +} + +pkg_setup() { + qtwebengine_check-reqs + python-any-r1_pkg_setup +} + +src_prepare() { + qt6-build_src_prepare + + # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix + hprefixify -w /Gentoo/ src/core/content_client_qt.cpp + + # store chromium versions, only used in postinst for a warning + local chromium + mapfile -t chromium < CHROMIUM_VERSION || die + [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] && + QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die + [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] && + QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die +} + +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_qtpdf_build=OFF # TODO? + -DQT_FEATURE_qtpdf_quick_build=OFF + -DQT_FEATURE_qtpdf_widgets_build=OFF + + -DQT_FEATURE_qtwebengine_build=ON + $(qt_feature qml qtwebengine_quick_build) + $(qt_feature widgets qtwebengine_widgets_build) + + $(cmake_use_find_package designer Qt6Designer) + + $(qt_feature alsa webengine_system_alsa) + $(qt_feature !bindist webengine_proprietary_codecs) + $(qt_feature geolocation webengine_geolocation) + $(qt_feature jumbo-build webengine_jumbo_build) + $(qt_feature kerberos webengine_kerberos) + $(qt_feature pulseaudio webengine_system_pulseaudio) + $(qt_feature screencast webengine_webrtc_pipewire) + $(qt_feature system-icu webengine_system_icu) + $(qt_feature vulkan webengine_vulkan) + -DQT_FEATURE_webengine_embedded_build=OFF + -DQT_FEATURE_webengine_extensions=ON + -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet + -DQT_FEATURE_webengine_pepper_plugins=ON + -DQT_FEATURE_webengine_printing_and_pdf=ON + -DQT_FEATURE_webengine_spellchecker=ON + -DQT_FEATURE_webengine_webchannel=ON + -DQT_FEATURE_webengine_webrtc=ON + + # needs a modified ffmpeg to be usable, and even then it may not + # cooperate with new major ffmpeg versions (bug #831487) + -DQT_FEATURE_webengine_system_ffmpeg=OFF + + # preemptively using bundled to avoid complications, may revisit + # (see discussions in https://github.com/gentoo/gentoo/pull/32281) + -DQT_FEATURE_webengine_system_re2=OFF + + # not necessary to pass these (default), but in case detection fails + $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ + freetype glib harfbuzz lcms2 libevent libjpeg \ + libopenjpeg2 libpci libpng libvpx libwebp libxml \ + minizip opus poppler snappy zlib) + + # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON + -DINSTALL_GN=OFF + ) + + local mygnargs=( + # prefer no dlopen where possible + link_pulseaudio=true + rtc_link_pipewire=true + ) + + use custom-cflags || strip-flags # fragile + + export NINJA NINJAFLAGS=$(get_NINJAOPTS) + [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v" + + local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}" + einfo "Extra Gn args: ${EXTRA_GN}" + + qt6-build_src_configure +} + +src_test() { + if [[ ${EUID} == 0 ]]; then + # almost every tests fail, so skip entirely + ewarn "Skipping tests due to running as root (chromium refuses this configuration)." + return + fi + + local CMAKE_SKIP_TESTS=( + # fails with network sandbox + tst_loadsignals + tst_qquickwebengineview + tst_qwebengineview + # certs verfication seems flaky and gives expiration warnings + tst_qwebengineclientcertificatestore + ) + + # prevent using the system's qtwebengine + # (use glob to avoid unnecessary complications with arch dir) + local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* ) + [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}" + local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess + local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales + local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]} + + # random failures in several tests without -j1 + qt6-build_src_test -j1 +} + +pkg_postinst() { + # plugin may also be found in $HOME if provided by chrome or firefox + use amd64 && + optfeature "Widevine DRM support (protected media playback)" \ + www-plugins/chrome-binary-plugins + + elog + elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with" + elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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 + 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 "tl;dr your web browsing experience will be compromised." +} diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild new file mode 100644 index 000000000000..d00c5f329f78 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -0,0 +1,267 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# py3.12: uses imp and distutils among potentially more issues, refer to +# www-client/chromium for when adding/backporting support may be viable +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" +inherit check-reqs flag-o-matic multiprocessing optfeature +inherit prefix python-any-r1 qt6-build toolchain-funcs + +DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" +SRC_URI+=" + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz +" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE=" + +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos + opengl pulseaudio qml screencast +system-icu vulkan +widgets +" +REQUIRED_USE=" + designer? ( qml widgets ) +" + +# dlopen: krb5, pciutils, udev +RDEPEND=" + app-arch/snappy:= + dev-libs/expat + dev-libs/libevent:= + dev-libs/libxml2[icu] + dev-libs/libxslt + dev-libs/nspr + dev-libs/nss + ~dev-qt/qtbase-${PV}:6[X,gui,opengl=,vulkan?,widgets?] + ~dev-qt/qtwebchannel-${PV}:6[qml?] + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/libvpx:= + media-libs/libwebp:= + media-libs/openjpeg:2= + media-libs/opus + sys-apps/dbus + sys-apps/pciutils + sys-libs/zlib:=[minizip] + virtual/libudev + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + x11-libs/libxcb:= + x11-libs/libxkbcommon + x11-libs/libxkbfile + alsa? ( media-libs/alsa-lib ) + designer? ( ~dev-qt/qttools-${PV}:6[designer] ) + geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) + kerberos? ( virtual/krb5 ) + pulseaudio? ( media-libs/libpulse[glib] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + screencast? ( + dev-libs/glib:2 + media-libs/mesa[gbm(+)] + media-video/pipewire:= + x11-libs/libdrm + ) + system-icu? ( dev-libs/icu:= ) + widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) +" +DEPEND=" + ${RDEPEND} + media-libs/libglvnd + x11-base/xorg-proto + x11-libs/libxshmfence + screencast? ( media-libs/libepoxy[egl(+)] ) + test? ( + widgets? ( app-text/poppler[cxx(+)] ) + ) +" +BDEPEND=" + $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') + dev-util/gperf + net-libs/nodejs[ssl] + sys-devel/bison + sys-devel/flex +" + +PATCHES=( "${WORKDIR}"/patches/${PN} ) +[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999 + PATCHES+=( "${WORKDIR}"/patches/chromium ) + +PATCHES+=( + # add extras as needed here, may merge in set if carries across versions +) + +python_check_deps() { + python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" +} + +qtwebengine_check-reqs() { + [[ ${MERGE_TYPE} == binary ]] && return + + if is-flagq '-g?(gdb)?([1-9])'; then #307861 + ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb)," + ewarn "which is non-trivial with ${PN}. May experience extended" + ewarn "compilation times and increased disk/memory usage. If run into" + ewarn "issues, please disable before reporting a bug." + fi + + local CHECKREQS_DISK_BUILD=7G + local CHECKREQS_DISK_USR=220M + + if ! has distcc ${FEATURES}; then #830661 + # assume ~2GB per job or 1.5GB if clang, possible with less + # depending on free memory and *FLAGS, but prefer being safe as + # users having OOM issues with qtwebengine been rather common + tc-is-clang && : 15 || : 20 + local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G + fi + + check-reqs_${EBUILD_PHASE_FUNC} #570534 +} + +pkg_pretend() { + qtwebengine_check-reqs +} + +pkg_setup() { + qtwebengine_check-reqs + python-any-r1_pkg_setup +} + +src_prepare() { + qt6-build_src_prepare + + # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix + hprefixify -w /Gentoo/ src/core/content_client_qt.cpp + + # store chromium versions, only used in postinst for a warning + local chromium + mapfile -t chromium < CHROMIUM_VERSION || die + [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] && + QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die + [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] && + QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die +} + +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_qtpdf_build=OFF # TODO? + -DQT_FEATURE_qtpdf_quick_build=OFF + -DQT_FEATURE_qtpdf_widgets_build=OFF + + -DQT_FEATURE_qtwebengine_build=ON + $(qt_feature qml qtwebengine_quick_build) + $(qt_feature widgets qtwebengine_widgets_build) + + $(cmake_use_find_package designer Qt6Designer) + + $(qt_feature alsa webengine_system_alsa) + $(qt_feature !bindist webengine_proprietary_codecs) + $(qt_feature geolocation webengine_geolocation) + $(qt_feature jumbo-build webengine_jumbo_build) + $(qt_feature kerberos webengine_kerberos) + $(qt_feature pulseaudio webengine_system_pulseaudio) + $(qt_feature screencast webengine_webrtc_pipewire) + $(qt_feature system-icu webengine_system_icu) + $(qt_feature vulkan webengine_vulkan) + -DQT_FEATURE_webengine_embedded_build=OFF + -DQT_FEATURE_webengine_extensions=ON + -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet + -DQT_FEATURE_webengine_pepper_plugins=ON + -DQT_FEATURE_webengine_printing_and_pdf=ON + -DQT_FEATURE_webengine_spellchecker=ON + -DQT_FEATURE_webengine_webchannel=ON + -DQT_FEATURE_webengine_webrtc=ON + + # needs a modified ffmpeg to be usable, and even then it may not + # cooperate with new major ffmpeg versions (bug #831487) + -DQT_FEATURE_webengine_system_ffmpeg=OFF + + # preemptively using bundled to avoid complications, may revisit + # (see discussions in https://github.com/gentoo/gentoo/pull/32281) + -DQT_FEATURE_webengine_system_re2=OFF + + # not necessary to pass these (default), but in case detection fails + $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ + freetype glib harfbuzz lcms2 libevent libjpeg \ + libopenjpeg2 libpci libpng libvpx libwebp libxml \ + minizip opus poppler snappy zlib) + + # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON + -DINSTALL_GN=OFF + ) + + local mygnargs=( + # prefer no dlopen where possible + link_pulseaudio=true + rtc_link_pipewire=true + ) + + use custom-cflags || strip-flags # fragile + + export NINJA NINJAFLAGS=$(get_NINJAOPTS) + [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v" + + local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}" + einfo "Extra Gn args: ${EXTRA_GN}" + + qt6-build_src_configure +} + +src_test() { + if [[ ${EUID} == 0 ]]; then + # almost every tests fail, so skip entirely + ewarn "Skipping tests due to running as root (chromium refuses this configuration)." + return + fi + + local CMAKE_SKIP_TESTS=( + # fails with network sandbox + tst_loadsignals + tst_qquickwebengineview + tst_qwebengineview + # certs verfication seems flaky and gives expiration warnings + tst_qwebengineclientcertificatestore + ) + + # prevent using the system's qtwebengine + # (use glob to avoid unnecessary complications with arch dir) + local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* ) + [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}" + local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess + local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales + local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]} + + # random failures in several tests without -j1 + qt6-build_src_test -j1 +} + +pkg_postinst() { + # plugin may also be found in $HOME if provided by chrome or firefox + use amd64 && + optfeature "Widevine DRM support (protected media playback)" \ + www-plugins/chrome-binary-plugins + + elog + elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with" + elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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 + 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 "tl;dr your web browsing experience will be compromised." +} diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest index 84f8dbfdf9b2..5a2cca59335b 100644 --- a/dev-qt/qtwebsockets/Manifest +++ b/dev-qt/qtwebsockets/Manifest @@ -2,5 +2,7 @@ DIST qtwebsockets-5.15.10-gentoo-kde-1.tar.xz 1516 BLAKE2B e58309d058b7ba0233f77 DIST qtwebsockets-everywhere-opensource-src-5.15.10.tar.xz 261792 BLAKE2B 67461c8d87dfff155817489a30e1f0a100851523ead230600c3f6487d0006db78c5506af68d4b576dc89f445d52d97acbd8f83d179f2ecbf3b3bdde25c11d996 SHA512 b9a2593169f0ff8e3e77c178de689dacfed564b2100ae67194f3636bf6d2300be3531a01b7158b06657f4a2d2a32453a98b96c6ab13fb9d8094e7ceeb5fdcbe3 DIST qtwebsockets-everywhere-src-6.5.2.tar.xz 459540 BLAKE2B 486fcfe061fe27c512714e3c54c6cb382806b8fcff17bd6e88228f57972b107a654a64956989072cbb235ae5420ddda2ccbe5498334b43e336672a8a16482cd0 SHA512 0ede50ef09ec92cc9ff73ac8287d93c82eddaaefb8df05687f24fa1b9fcafe0e34cdef324ad81c89353ea9e21509243efce63bb42b640050309c61d100d354a7 EBUILD qtwebsockets-5.15.10.ebuild 578 BLAKE2B c89a75bff2dc425ed95717e37c667136a5082535d19fd58b341e7da4b210224bf9142da7abbf24130abc4c4e36ee4e5f59eb32505c0be39cf22c8bbdaedd8261 SHA512 b5baa375f6484fd77203b7402fa3e1555a214e6cca44405b44eadf0e201e546026af97675dd01daf8513ddc6a575a4f30a4ed1ba23985cd200058e631d593369 -EBUILD qtwebsockets-6.5.2.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17 -MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1 +EBUILD qtwebsockets-6.5.2-r1.ebuild 508 BLAKE2B e168d35e5135a066e35d096964d7713b9b5ddf20f855cfa73b17db9d37a16de4318da4d5306e05b39f4ffee04bb1cc89efbcea1c8033ebbc7e3f321be431a840 SHA512 8c78f3459fc65f6735283ef159a5534c48a685838078ecb57e673dc269db02f6cd965d8567f61fce634a9cf2f508052e62fe976bd2634ffb443a2ae126cfaff3 +EBUILD qtwebsockets-6.5.9999.ebuild 508 BLAKE2B e168d35e5135a066e35d096964d7713b9b5ddf20f855cfa73b17db9d37a16de4318da4d5306e05b39f4ffee04bb1cc89efbcea1c8033ebbc7e3f321be431a840 SHA512 8c78f3459fc65f6735283ef159a5534c48a685838078ecb57e673dc269db02f6cd965d8567f61fce634a9cf2f508052e62fe976bd2634ffb443a2ae126cfaff3 +EBUILD qtwebsockets-6.9999.ebuild 508 BLAKE2B e168d35e5135a066e35d096964d7713b9b5ddf20f855cfa73b17db9d37a16de4318da4d5306e05b39f4ffee04bb1cc89efbcea1c8033ebbc7e3f321be431a840 SHA512 8c78f3459fc65f6735283ef159a5534c48a685838078ecb57e673dc269db02f6cd965d8567f61fce634a9cf2f508052e62fe976bd2634ffb443a2ae126cfaff3 +MISC metadata.xml 597 BLAKE2B 9cd42a9c56fb752ea155093f8f9222b8abecc3219bc770c4746ac45bb5b741b829688d8363b2c3580125ac43a31420522ba83949534a0c16aef7386bb46648b3 SHA512 55df60c57864187551629b4f6d83803d29154d4c685b50151e89ce9aae733a6cb3a0930c482cdad40b1880904f9c2c0ec21483ac7b801932086ba0186dfeb1de diff --git a/dev-qt/qtwebsockets/metadata.xml b/dev-qt/qtwebsockets/metadata.xml index 106818b8da8e..5e77c4d01262 100644 --- a/dev-qt/qtwebsockets/metadata.xml +++ b/dev-qt/qtwebsockets/metadata.xml @@ -11,6 +11,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtwebsockets</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.5.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.5.2-r1.ebuild index abdcffa9a067..be939f48f61a 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-6.5.2.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-6.5.2-r1.ebuild @@ -11,8 +11,18 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - =dev-qt/qtdeclarative-${PV}* +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,ssl] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild new file mode 100644 index 000000000000..be939f48f61a --- /dev/null +++ b/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,ssl] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild new file mode 100644 index 000000000000..be939f48f61a --- /dev/null +++ b/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,ssl] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} |