diff options
Diffstat (limited to 'dev-qt')
358 files changed, 8977 insertions, 3755 deletions
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/assistant/Manifest +++ b/dev-qt/assistant/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/assistant/assistant-5.15.2.ebuild b/dev-qt/assistant/assistant-5.15.13.ebuild index da691bbbaefe..7244f21e1477 100644 --- a/dev-qt/assistant/assistant-5.15.2.ebuild +++ b/dev-qt/assistant/assistant-5.15.13.ebuild @@ -1,29 +1,33 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" +fi QT5_MODULE="qttools" inherit desktop qt5-build xdg-utils DESCRIPTION="Tool for viewing on-line documentation in Qt help file format" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" -fi - IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV} - ~dev-qt/qthelp-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtprintsupport-${PV} - ~dev-qt/qtsql-${PV}[sqlite] - ~dev-qt/qtwidgets-${PV} + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*[png] + =dev-qt/qthelp-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}* + =dev-qt/qtprintsupport-${QT5_PV}* + =dev-qt/qtsql-${QT5_PV}*[sqlite] + =dev-qt/qtwidgets-${QT5_PV}* +" +RDEPEND="${DEPEND} + !dev-qt/${PN}:5 + !<dev-qt/qtchooser-66-r2 " -RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/assistant/assistant @@ -38,6 +42,7 @@ src_prepare() { src_install() { qt5-build_src_install + qt5_symlink_binary_to_path assistant doicon -s 32 src/assistant/assistant/images/assistant.png newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/assistant/metadata.xml +++ b/dev-qt/assistant/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/designer/Manifest +++ b/dev-qt/designer/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/designer/designer-5.15.2.ebuild b/dev-qt/designer/designer-5.15.13.ebuild index 0ee67e0758db..df9e9ddcee8b 100644 --- a/dev-qt/designer/designer-5.15.2.ebuild +++ b/dev-qt/designer/designer-5.15.13.ebuild @@ -1,31 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" +fi QT5_MODULE="qttools" inherit desktop qt5-build xdg-utils DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86" -fi - IUSE="declarative" DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}:5= - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtprintsupport-${PV} - ~dev-qt/qtwidgets-${PV} - ~dev-qt/qtxml-${PV} - declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] ) -" -RDEPEND="${DEPEND} - dev-qt/qtchooser + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*:5=[png] + =dev-qt/qtnetwork-${QT5_PV}* + =dev-qt/qtprintsupport-${QT5_PV}* + =dev-qt/qtwidgets-${QT5_PV}* + =dev-qt/qtxml-${QT5_PV}* + declarative? ( =dev-qt/qtdeclarative-${QT5_PV}*[widgets] ) " +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/designer +) src_prepare() { qt_use_disable_mod declarative quickwidgets \ @@ -39,6 +42,7 @@ src_prepare() { src_install() { qt5-build_src_install + qt5_symlink_binary_to_path designer 5 doicon -s 128 src/designer/src/designer/images/designer.png make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner' diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml index d07a54a9ddc4..70c977d5dda0 100644 --- a/dev-qt/designer/metadata.xml +++ b/dev-qt/designer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/kdsingleapplication/Manifest b/dev-qt/kdsingleapplication/Manifest new file mode 100644 index 000000000000..934377590f4f --- /dev/null +++ b/dev-qt/kdsingleapplication/Manifest @@ -0,0 +1 @@ +DIST kdsingleapplication-1.1.0.tar.gz 73558 BLAKE2B 26eda1d7a9a48f6167db9d2d7cd143ab45a08e96eef277cf1099c1ed24528f56ec54e8ab44671e7584937dc21d3437b15c033991e48fafd8b9fab10473e07864 SHA512 61b34a36b05c58ede881f38d78c767726f8e23dc230e292568013fa428f50ff674f7eb12bc4d76ceaa9ef444264b2e86d95ab14cc41c6a275bf917edb8832c1f diff --git a/dev-qt/kdsingleapplication/kdsingleapplication-1.1.0.ebuild b/dev-qt/kdsingleapplication/kdsingleapplication-1.1.0.ebuild new file mode 100644 index 000000000000..67fef37a2e74 --- /dev/null +++ b/dev-qt/kdsingleapplication/kdsingleapplication-1.1.0.ebuild @@ -0,0 +1,96 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake multibuild + +DESCRIPTION="KDAB's helper class for single-instance policy applications" +HOMEPAGE="https://github.com/KDAB/KDSingleApplication" +SRC_URI="https://github.com/KDAB/KDSingleApplication/releases/download/v${PV}/kdsingleapplication-${PV}.tar.gz" + +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +IUSE="doc examples test qt6" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + qt6? ( + dev-qt/qtbase:6[network,widgets] + ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + dev-qt/qthelp:5 + qt6? ( + dev-qt/qttools:6[assistant] + ) + ) + examples? ( + dev-util/patchelf + ) + dev-qt/qttest:5 +" + +pkg_setup() { + MULTIBUILD_VARIANTS=( qt5 $(usev qt6) ) +} + +src_configure() { + myconfigure() { + local mycmakeargs=( + -DINSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + ) + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + mycmakeargs+=( + -DKDSingleApplication_DOCS=OFF + -DKDSingleApplication_EXAMPLES=OFF + -DKDSingleApplication_QT6=ON + -DKDSingleApplication_TESTS=OFF + ) + else + mycmakeargs+=( + -DKDSingleApplication_DOCS=$(usex doc) + -DKDSingleApplication_EXAMPLES=$(usex examples) + -DKDSingleApplication_QT6=OFF + -DKDSingleApplication_TESTS=$(usex test) + ) + fi + cmake_src_configure + } + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_test() { + mytest() { + [[ ${MULTIBUILD_VARIANT} == qt5 ]] && cmake_src_test + } + multibuild_foreach_variant mytest +} + +src_install() { + myinstall() { + cmake_src_install + if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then + rm -rf "${BUILD_DIR}"/docs/api/html/examples || die + use doc && HTML_DOCS="${BUILD_DIR}/docs/api/html/*" + if use examples; then + patchelf --remove-rpath "${BUILD_DIR}"/bin/widgetsingleapplication || die + dobin "${BUILD_DIR}"/bin/widgetsingleapplication + fi + fi + } + multibuild_foreach_variant myinstall + einstalldocs +} diff --git a/dev-qt/kdsingleapplication/metadata.xml b/dev-qt/kdsingleapplication/metadata.xml new file mode 100644 index 000000000000..a67b9dc76920 --- /dev/null +++ b/dev-qt/kdsingleapplication/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="github">KDAB/KDSingleApplication</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/linguist-tools/Manifest +++ b/dev-qt/linguist-tools/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.13.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.13.ebuild new file mode 100644 index 000000000000..49d8f26a1f3b --- /dev/null +++ b/dev-qt/linguist-tools/linguist-tools-5.15.13.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +QT5_MODULE="qttools" +inherit qt5-build + +DESCRIPTION="Tools for working with Qt translation data files" + +IUSE="qml" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtxml-${QT5_PV}* + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/linguist +) + +src_prepare() { + sed -i -e '/SUBDIRS += linguist/d' \ + src/linguist/linguist.pro || die + + qt_use_disable_mod qml qmldevtools-private \ + src/linguist/lupdate/lupdate.pro + + qt5-build_src_prepare +} diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild deleted file mode 100644 index 9d680f58c928..000000000000 --- a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Tools for working with Qt translation data files" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="qml" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtxml-${PV} - qml? ( ~dev-qt/qtdeclarative-${PV} ) -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" - -QT5_TARGET_SUBDIRS=( - src/linguist -) - -src_prepare() { - sed -i -e '/SUBDIRS += linguist/d' \ - src/linguist/linguist.pro || die - - qt_use_disable_mod qml qmldevtools-private \ - src/linguist/lupdate/lupdate.pro - - qt5-build_src_prepare -} - -src_configure() { - # Most of qttools require files that are only generated when qmake is - # run in the root directory. - # Related bugs: 633776, 676948, and 716514. - mkdir -p "${QT5_BUILD_DIR}" || die - qt5_qmake "${QT_BUILD_DIR}" - cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die - qt5-build_src_configure -} diff --git a/dev-qt/linguist-tools/metadata.xml b/dev-qt/linguist-tools/metadata.xml index 6577a64646a2..46e391478f13 100644 --- a/dev-qt/linguist-tools/metadata.xml +++ b/dev-qt/linguist-tools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <use> <flag name="qml">Enable QML support in lupdate</flag> diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/linguist/Manifest +++ b/dev-qt/linguist/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/linguist/linguist-5.15.2.ebuild b/dev-qt/linguist/linguist-5.15.13.ebuild index 23446cbce0c2..1d10ebf75c06 100644 --- a/dev-qt/linguist/linguist-5.15.2.ebuild +++ b/dev-qt/linguist/linguist-5.15.13.ebuild @@ -1,28 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86" +fi QT5_MODULE="qttools" inherit desktop qt5-build xdg-utils DESCRIPTION="Graphical tool for translating Qt applications" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86" -fi - IUSE="" DEPEND=" - ~dev-qt/designer-${PV} - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}:5= - ~dev-qt/qtprintsupport-${PV} - ~dev-qt/qtwidgets-${PV} - ~dev-qt/qtxml-${PV} + =dev-qt/designer-${QT5_PV}* + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*:5=[png] + =dev-qt/qtprintsupport-${QT5_PV}* + =dev-qt/qtwidgets-${QT5_PV}* + =dev-qt/qtxml-${QT5_PV}* +" +RDEPEND="${DEPEND} + !dev-qt/${PN}:5 + !<dev-qt/qtchooser-66-r2 " -RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/linguist/linguist @@ -30,6 +34,7 @@ QT5_TARGET_SUBDIRS=( src_install() { qt5-build_src_install + qt5_symlink_binary_to_path linguist local size for size in 16 32 48 64 128; do diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/linguist/metadata.xml +++ b/dev-qt/linguist/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/metadata.xml b/dev-qt/metadata.xml index 798c9b87977f..5ea359f250c8 100644 --- a/dev-qt/metadata.xml +++ b/dev-qt/metadata.xml @@ -1,11 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The dev-qt category contains packages for the Qt framework modules and directly related libraries and development applications from the upstream Qt Project. Do not add other packages to this category. </longdescription> + <longdescription lang="de"> + Die Kategorie dev-qt enthält Pakete für die Qt-Framework-Module + sowie direkt zugehörige Bibliotheken und Entwicklungsanwendungen + des Qt-Upstream-Projekts. Zu dieser Kategorie sollen keine anderen + Pakete hinzugefügt werden. + </longdescription> <longdescription lang="es"> La categorÃa dev-qt contiene paquetes para los módulos del marco de trabajo Qt y las librerÃas y aplicaciones de desarrollo directamente relacionadas diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/pixeltool/Manifest +++ b/dev-qt/pixeltool/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/pixeltool/metadata.xml +++ b/dev-qt/pixeltool/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/pixeltool/pixeltool-5.15.13.ebuild b/dev-qt/pixeltool/pixeltool-5.15.13.ebuild new file mode 100644 index 000000000000..85357825dd5c --- /dev/null +++ b/dev-qt/pixeltool/pixeltool-5.15.13.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" +fi + +QT5_MODULE="qttools" +inherit qt5-build + +DESCRIPTION="Qt screen magnifier" + +IUSE="" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*:5=[png] + =dev-qt/qtwidgets-${QT5_PV}* +" +RDEPEND="${DEPEND} + !dev-qt/${PN}:5 + !<dev-qt/qtchooser-66-r2 +" + +QT5_TARGET_SUBDIRS=( + src/pixeltool +) + +src_install() { + qt5-build_src_install + qt5_symlink_binary_to_path pixeltool +} diff --git a/dev-qt/pixeltool/pixeltool-5.15.2.ebuild b/dev-qt/pixeltool/pixeltool-5.15.2.ebuild deleted file mode 100644 index c90103ced4e4..000000000000 --- a/dev-qt/pixeltool/pixeltool-5.15.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Qt screen magnifier" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}:5= - ~dev-qt/qtwidgets-${PV} -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/qdbus/Manifest +++ b/dev-qt/qdbus/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/qdbus/metadata.xml b/dev-qt/qdbus/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qdbus/metadata.xml +++ b/dev-qt/qdbus/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qdbus/qdbus-5.15.13.ebuild b/dev-qt/qdbus/qdbus-5.15.13.ebuild new file mode 100644 index 000000000000..ebac49f9b11c --- /dev/null +++ b/dev-qt/qdbus/qdbus-5.15.13.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +QT5_MODULE="qttools" +inherit qt5-build + +DESCRIPTION="Interface to Qt applications communicating over D-Bus" + +IUSE="" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdbus-${QT5_PV}* + =dev-qt/qtxml-${QT5_PV}* +" +RDEPEND="${DEPEND} + !dev-qt/${PN}:5 + !<dev-qt/qtchooser-66-r2 +" + +QT5_TARGET_SUBDIRS=( + src/qdbus/qdbus +) + +src_install() { + qt5-build_src_install + qt5_symlink_binary_to_path qdbus +} diff --git a/dev-qt/qdbus/qdbus-5.15.2.ebuild b/dev-qt/qdbus/qdbus-5.15.2.ebuild deleted file mode 100644 index d4125f6b4f3e..000000000000 --- a/dev-qt/qdbus/qdbus-5.15.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Interface to Qt applications communicating over D-Bus" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdbus-${PV} - ~dev-qt/qtxml-${PV} -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/qdbus/qdbus -) diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/qdbusviewer/Manifest +++ b/dev-qt/qdbusviewer/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qdbusviewer/metadata.xml +++ b/dev-qt/qdbusviewer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.13.ebuild index a9976bf60249..b7beb738cb31 100644 --- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild +++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.13.ebuild @@ -1,27 +1,31 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" +fi QT5_MODULE="qttools" inherit desktop qt5-build xdg-utils DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86" -fi - IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdbus-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtwidgets-${PV} - ~dev-qt/qtxml-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdbus-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtwidgets-${QT5_PV}* + =dev-qt/qtxml-${QT5_PV}* +" +RDEPEND="${DEPEND} + !dev-qt/${PN}:5 + !<dev-qt/qtchooser-66-r2 " -RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/qdbus/qdbusviewer @@ -29,6 +33,7 @@ QT5_TARGET_SUBDIRS=( src_install() { qt5-build_src_install + qt5_symlink_binary_to_path qdbusviewer doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/qdoc/Manifest +++ b/dev-qt/qdoc/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/qdoc/metadata.xml b/dev-qt/qdoc/metadata.xml index 2184bb18c0d0..ca6cb8146596 100644 --- a/dev-qt/qdoc/metadata.xml +++ b/dev-qt/qdoc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qdoc/qdoc-5.15.13.ebuild b/dev-qt/qdoc/qdoc-5.15.13.ebuild new file mode 100644 index 000000000000..0690dba01d03 --- /dev/null +++ b/dev-qt/qdoc/qdoc-5.15.13.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +fi + +QT5_MODULE="qttools" +inherit qt5-build + +DESCRIPTION="Qt documentation generator" + +IUSE="qml" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-devel/clang:= + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/qdoc +) + +src_prepare() { + qt_use_disable_mod qml qmldevtools-private \ + src/qdoc/qdoc.pro + + qt5-build_src_prepare +} + +src_configure() { + # qt5_tools_configure() not enough here, needs another fix, bug 676948 + qt5_configure_oos_quirk qtqdoc-config.pri src/qdoc + qt5-build_src_configure +} diff --git a/dev-qt/qdoc/qdoc-5.15.2.ebuild b/dev-qt/qdoc/qdoc-5.15.2.ebuild deleted file mode 100644 index e13d781c84a5..000000000000 --- a/dev-qt/qdoc/qdoc-5.15.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Qt documentation generator" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -fi - -IUSE="qml" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - sys-devel/clang:= - qml? ( ~dev-qt/qtdeclarative-${PV} ) -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" - -src_prepare() { - qt_use_disable_mod qml qmldevtools-private \ - src/qdoc/qdoc.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 975ecb0a7d27..bc5430b952e8 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1 +1,2 @@ -DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a SHA512 a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3 +DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459 SHA512 cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1 +DIST qt-creator-opensource-src-13.0.0.tar.xz 52032860 BLAKE2B 63f1fbb5209c77b9fc9df9385e94808d7ea040de4af6305c16ac4ad540771ebc78b55d0552182fa30d80326da3989a96ee8a0cce218541e418b7f355e9542786 SHA512 26fea156becc136fb55702a65c29dad825fd3fa60d8e19d8d142ab6518dc8e40fbddfe70d79d2b71f14f76c8a1d9bca34fb65e565702e67c9276aec9758bf345 diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch new file mode 100644 index 000000000000..b36cfef2d4e7 --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch @@ -0,0 +1,47 @@ +execinfo is unavailable with musl (unless opted to package+use libexecinfo) +--- a/src/libs/utils/qtcassert.cpp ++++ b/src/libs/utils/qtcassert.cpp +@@ -9,5 +9,5 @@ + #include <QTime> + +-#if defined(Q_OS_UNIX) ++#if defined(Q_OS_UNIX) && defined(__GLIBC__) + #include <stdio.h> + #include <signal.h> +@@ -30,5 +30,5 @@ + if (maxdepth < 0 || maxdepth > ArraySize) + maxdepth = ArraySize; +-#if defined(Q_OS_UNIX) ++#if defined(Q_OS_UNIX) && defined(__GLIBC__) + void *bt[ArraySize] = {nullptr}; + int size = backtrace(bt, maxdepth); +--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp ++++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp +@@ -4,5 +4,5 @@ + #include "exception.h" + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + #include <execinfo.h> + #include <cxxabi.h> +@@ -31,5 +31,5 @@ + namespace QmlDesigner { + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + const char* demangle(const char* name) + { +@@ -76,5 +76,5 @@ + } + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + static QString getBackTrace() + { +@@ -114,5 +114,5 @@ + , m_file(QString::fromUtf8(file)) + , m_description(description) +- #ifdef Q_OS_LINUX ++ #if defined(Q_OS_LINUX) && defined(__GLIBC__) + , m_backTrace(getBackTrace()) + #endif diff --git a/dev-qt/qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch b/dev-qt/qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch new file mode 100644 index 000000000000..b22f20425129 --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch @@ -0,0 +1,8 @@ +malloc_trim() is unavailable with musl +--- a/src/plugins/coreplugin/icore.cpp ++++ b/src/plugins/coreplugin/icore.cpp +@@ -1276,3 +1276,3 @@ + // glibc may not actually free memory in free(). +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); }); diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml index c9357db9d2db..581b84c86cb1 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -1,54 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pesa@gentoo.org</email> - <name>Davide Pesavento</name> - </maintainer> <maintainer type="project"> <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="android">Build plugin for Android devices</flag> - <flag name="autotest">Enable integration with popular unit testing frameworks (QtTest, Google Test, Boost.Test)</flag> - <flag name="autotools">Build plugin for autotools-based projects</flag> - <flag name="baremetal">Build plugin for bare metal devices</flag> - <flag name="bazaar">Add support for GNU Bazaar version control system (requires manual installation of Bazaar client)</flag> - <flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag> - <flag name="boot2qt">Build plugin for Boot2Qt devices</flag> - <flag name="clang">Build clang-based plugins (code model, formatting, static analysis)</flag> - <flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag> - <flag name="cmake">Build plugin for CMake-based projects</flag> - <flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag> - <flag name="ctfvisualizer">Build the Chrome Trace Format visualizer plugin</flag> + <flag name="clang">Build clang-based plugins for C/C++ development (code model, formatting, static analysis)</flag> <flag name="designer">Enable designer for QtWidgets-based UIs</flag> - <flag name="glsl">Build the GLSL editor plugin</flag> - <flag name="help">Enable the integrated documentation viewer</flag> - <flag name="lsp">Add support for the Language Server Protocol (LSP)</flag> - <flag name="mcu">Build plugin for MCU devices</flag> - <flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag> - <flag name="modeling">Build the graphical model editor plugin</flag> - <flag name="nim">Build plugin for Nim language support</flag> - <flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag> - <flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag> - <flag name="python">Build plugin for Python language support</flag> - <flag name="qbs">Build plugin for QBS-based projects</flag> - <flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag> - <flag name="qmljs">Build the QML/JavaScript editor plugin</flag> - <flag name="qmlprofiler">Build the QML profiler plugin</flag> - <flag name="qnx">Build plugin for QNX devices</flag> - <flag name="remotelinux">Add support for deployment and execution on a remote Linux host</flag> - <flag name="scxml">Build the graphical SCXML editor plugin</flag> + <flag name="help">Enable the integrated <pkg>dev-qt/qt-docs</pkg> viewer (also needed for examples)</flag> + <flag name="plugin-dev">Install the 'Devel' component needed to build external Qt Creator plugins</flag> + <flag name="qmldesigner">Build QmlDesigner and related plugins (Insight, StudioWelcome)</flag> <flag name="serialterminal">Build the serial terminal plugin</flag> - <flag name="silversearcher">Enable integration with <pkg>sys-apps/the_silver_searcher</pkg></flag> - <flag name="systemd">Add support for retrieving application output from journald</flag> - <flag name="valgrind">Enable integration with <pkg>dev-util/valgrind</pkg></flag> - <flag name="webassembly">Build WebAssembly plugin</flag> - <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag> + <flag name="tracing">Build plugins requiring tracing capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)</flag> + <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> with the help USE rather than bundled litehtml</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/qtcreator/</doc> + <remote-id type="github">qt-creator/qt-creator</remote-id> </upstream> </pkgmetadata> diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild new file mode 100644 index 000000000000..84a477ae119f --- /dev/null +++ b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild @@ -0,0 +1,260 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI=( + "https://code.qt.io/qt-creator/qt-creator.git" + "https://github.com/qt-creator/qt-creator.git" + ) + EGIT_SUBMODULES=( + perfparser + src/libs/qlitehtml + src/libs/qlitehtml/src/3rdparty/litehtml + ) +else + QTC_PV=${PV/_/-} + QTC_P=${PN}-opensource-src-${QTC_PV} + [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development + SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" + S=${WORKDIR}/${QTC_P} + KEYWORDS="amd64" +fi + +DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" +HOMEPAGE="https://www.qt.io/product/development-tools" + +LICENSE="GPL-3" +SLOT="0" +IUSE=" + +clang +designer doc +help plugin-dev qmldesigner + serialterminal +svg test +tracing webengine +" +REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN + +# := is used where Qt's private APIs are used for safety +COMMON_DEPEND=" + >=dev-qt/qt5compat-${QT_PV} + >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QT_PV}= + clang? ( + dev-cpp/yaml-cpp:= + $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') + ) + designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) + help? ( + >=dev-qt/qttools-${QT_PV}[assistant] + webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) + ) + qmldesigner? ( + >=dev-qt/qtquick3d-${QT_PV}= + >=dev-qt/qtsvg-${QT_PV} + ) + serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) + svg? ( >=dev-qt/qtsvg-${QT_PV} ) + tracing? ( + app-arch/zstd:= + dev-libs/elfutils + >=dev-qt/qtshadertools-${QT_PV} + ) +" +# qtimageformats for .webp in examples, semi-optfeature but useful in general +RDEPEND=" + ${COMMON_DEPEND} + help? ( >=dev-qt/qtimageformats-${QT_PV} ) + qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) +" +DEPEND="${COMMON_DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-qt/qttools-${QT_PV}[linguist] + doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch + "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch +) + +pkg_setup() { + python-any-r1_pkg_setup + use clang && llvm-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # needed for finding docs at runtime in PF + sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ + -i cmake/QtCreatorAPIInternal.cmake || die + + if use plugin-dev; then #928423 + # cmake --install --component integrates poorly with the cmake + # eclass and the install targets are otherwise missing, so strip + # out EXCLUDE_FROM_ALL until figure out a better solution + find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \ + 's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die + fi +} + +src_configure() { + # -Werror=lto-type-mismatch issues, needs looking into + filter-lto + + # temporary workaround for musl-1.2.4 (bug #903611), this ideally + # needs fixing in qtbase as *64 usage comes from its headers' macros + use elibc_musl && append-lfs-flags + + local mycmakeargs=( + -DBUILD_WITH_PCH=no + -DWITH_DOCS=$(usex doc) + -DBUILD_DEVELOPER_DOCS=$(usex doc) + -DWITH_TESTS=$(usex test) + + # TODO?: try to unbundle with =no when syntax-highlighting:6 exists + -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes + + # Much can be optional, but do not want to flood users (or maintainers) + # with too many flags. Not to mention that many plugins are merely + # wrappers around still optional tools (e.g. cvs) and any unwanted + # plugins can be disabled at runtime. So optional flags are limited + # to plugins with additional build-time dependencies. + -DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual + -DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing) + + -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) + -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) + -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) + -DCLANGTOOLING_LINK_CLANG_DYLIB=yes + + -DBUILD_PLUGIN_DESIGNER=$(usex designer) + + -DBUILD_PLUGIN_HELP=$(usex help) + -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) + -DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine)) + # TODO?: package litehtml, but support for latest releases seem + # to lag behind and bundled may work out better for now + # https://bugreports.qt.io/browse/QTCREATORBUG-29169 + $(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes) + + -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) + + -DENABLE_SVG_SUPPORT=$(usex svg) + + -DWITH_QMLDESIGNER=$(usex qmldesigner) + + -Djournald=no # not really useful unless match qtbase (needs systemd) + + # not packaged, but allow using if found + #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes + ) + + cmake_src_configure +} + +src_test() { + local -x QT_QPA_PLATFORM=offscreen + + local CMAKE_SKIP_TESTS=( + # skipping same tests+label as upstream's CI by default + # `grep ctest .github/workflows/build_cmake.yml` + tst_perfdata + ) + + cmake_src_test --label-exclude exclude_from_precheck +} + +src_compile() { + cmake_src_compile + + use doc && cmake_build {qch,html}_docs +} + +src_install() { + cmake_src_install + + if use doc; then + dodoc -r "${BUILD_DIR}"/doc/html + dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch + docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch + fi + + local DISABLE_AUTOFORMATTING=yes + local DOC_CONTENTS="\ +Some plugins (if used) may need optional extra dependencies/USE. + +This list provides associations with Gentoo's packages (if exists) +ordered as in Qt Creator's Help -> About Plugins (not exhaustive). + +dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or +else the example tab will be empty alongside missing documentation. + +Build Systems: +- CMakeProjectManager (dev-build/cmake) +- MesonProjectManager (dev-build/meson) +- QbsProjectManager (dev-util/qbs) + +C++: +- Beautifier (dev-util/astyle and/or dev-util/uncrustify) +- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics) +- ClangFormat (USE=clang) + +Code Analyzer: +- ClangTools (USE=clang) +- Cppcheck (dev-util/cppcheck) +- CtfVisualizer (USE=tracing) +- PerfProfiler (USE=tracing) +- Valgrind (dev-debug/valgrind) + +Core: +- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\") + +Device Support: +- Android (virtual/jdk, will also want the unpackaged Qt for Android) + +Other Languages: +- Nim (dev-lang/nim) +- Python (dev-lang/python) + +Qt Creator: +- Designer (USE=designer) + +Qt Quick: +- Insight (USE=qmldesigner) +- QmlDesigner (USE=qmldesigner) +- QmlProfiler (USE=tracing) + +Utilities: +- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used) +- Conan (dev-util/conan) +- Docker (app-containers/docker) +- Haskell (dev-lang/ghc) +- ScreenRecorder (media-video/ffmpeg) +- SerialTerminal (USE=serialterminal) +- SilverSearcher (sys-apps/the_silver_searcher) +- StudioWelcome (USE=qmldesigner) + +Version Control: +- CVS (dev-vcs/cvs) +- Fossil (dev-vcs/fossil) +- Git (dev-vcs/git) +- Mercurial (dev-vcs/mercurial) +- Subversion (dev-vcs/subversion)" + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog +} diff --git a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild new file mode 100644 index 000000000000..b47f014ce15a --- /dev/null +++ b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild @@ -0,0 +1,268 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI=( + "https://code.qt.io/qt-creator/qt-creator.git" + "https://github.com/qt-creator/qt-creator.git" + ) + EGIT_SUBMODULES=( + perfparser + src/libs/qlitehtml + src/libs/qlitehtml/src/3rdparty/litehtml + ) +else + QTC_PV=${PV/_/-} + QTC_P=${PN}-opensource-src-${QTC_PV} + [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development + SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" + S=${WORKDIR}/${QTC_P} + KEYWORDS="~amd64" +fi + +DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" +HOMEPAGE="https://www.qt.io/product/development-tools" + +LICENSE="GPL-3" +SLOT="0" +IUSE=" + +clang designer doc +help keyring plugin-dev qmldesigner + serialterminal +svg test +tracing webengine +" +REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN + +# := is used where Qt's private APIs are used for safety +COMMON_DEPEND=" + >=dev-qt/qt5compat-${QT_PV} + >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QT_PV}= + clang? ( + dev-cpp/yaml-cpp:= + $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') + ) + designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) + help? ( + >=dev-qt/qttools-${QT_PV}[assistant] + webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) + ) + keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) + qmldesigner? ( + >=dev-qt/qtquick3d-${QT_PV}= + >=dev-qt/qtsvg-${QT_PV} + ) + serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) + svg? ( >=dev-qt/qtsvg-${QT_PV} ) + tracing? ( + app-arch/zstd:= + dev-libs/elfutils + >=dev-qt/qtshadertools-${QT_PV} + ) +" +# qtimageformats for .webp in examples, semi-optfeature but useful in general +RDEPEND=" + ${COMMON_DEPEND} + help? ( >=dev-qt/qtimageformats-${QT_PV} ) + qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) +" +DEPEND="${COMMON_DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-qt/qttools-${QT_PV}[linguist] + doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch + "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch +) + +pkg_setup() { + python-any-r1_pkg_setup + use clang && llvm-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # needed for finding docs at runtime in PF + sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ + -i cmake/QtCreatorAPIInternal.cmake || die + + if use plugin-dev; then #928423 + # cmake --install --component integrates poorly with the cmake + # eclass and the install targets are otherwise missing, so strip + # out EXCLUDE_FROM_ALL until figure out a better solution + find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \ + 's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die + fi +} + +src_configure() { + # -Werror=lto-type-mismatch issues, needs looking into + filter-lto + + # temporary workaround for musl-1.2.4 (bug #903611), this ideally + # needs fixing in qtbase as *64 usage comes from its headers' macros + use elibc_musl && append-lfs-flags + + local mycmakeargs=( + -DBUILD_WITH_PCH=no + -DWITH_DOCS=$(usex doc) + -DBUILD_DEVELOPER_DOCS=$(usex doc) + -DWITH_TESTS=$(usex test) + + # TODO?: try to unbundle with =no when syntax-highlighting:6 exists + -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes + + # Much can be optional, but do not want to flood users (or maintainers) + # with too many flags. Not to mention that many plugins are merely + # wrappers around still optional tools (e.g. cvs) and any unwanted + # plugins can be disabled at runtime. So optional flags are limited + # to plugins with additional build-time dependencies. + -DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual + -DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing) + + -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) + -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) + -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) + -DCLANGTOOLING_LINK_CLANG_DYLIB=yes + + -DBUILD_PLUGIN_DESIGNER=$(usex designer) + + -DBUILD_PLUGIN_HELP=$(usex help) + -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) + -DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine)) + # TODO?: package litehtml, but support for latest releases seem + # to lag behind and bundled may work out better for now + # https://bugreports.qt.io/browse/QTCREATORBUG-29169 + $(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes) + + -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) + + -DENABLE_SVG_SUPPORT=$(usex svg) + + -DWITH_QMLDESIGNER=$(usex qmldesigner) + + -Djournald=no # not really useful unless match qtbase (needs systemd) + + # not packaged, but allow using if found + #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes + + # for bundled qtkeychain (no switch to unbundle right now) + # reminder: if ever unbundled/optional, qtbase[dbus] can be removed + -DLIBSECRET_SUPPORT=$(usex keyring) + ) + + cmake_src_configure +} + +src_test() { + local -x QT_QPA_PLATFORM=offscreen + + local CMAKE_SKIP_TESTS=( + # skipping same tests+label as upstream's CI by default + # `grep ctest .github/workflows/build_cmake.yml` + tst_perfdata + ) + + cmake_src_test --label-exclude exclude_from_precheck +} + +src_compile() { + cmake_src_compile + + use doc && cmake_build {qch,html}_docs +} + +src_install() { + cmake_src_install + + if use doc; then + dodoc -r "${BUILD_DIR}"/doc/html + dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch + docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch + fi + + local DISABLE_AUTOFORMATTING=yes + local DOC_CONTENTS="\ +Some plugins (if used) may need optional extra dependencies/USE. + +This list provides associations with Gentoo's packages (if exists) +ordered as in Qt Creator's Help -> About Plugins (not exhaustive). + +dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or +else the example tab will be empty alongside missing documentation. + +Build Systems: +- CMakeProjectManager (dev-build/cmake) +- MesonProjectManager (dev-build/meson) +- QbsProjectManager (dev-util/qbs) + +C++: +- Beautifier (dev-util/astyle and/or dev-util/uncrustify) +- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics) +- ClangFormat (USE=clang) + +Code Analyzer: +- ClangTools (USE=clang) +- Cppcheck (dev-util/cppcheck) +- CtfVisualizer (USE=tracing) +- PerfProfiler (USE=tracing) +- Valgrind (dev-debug/valgrind) + +Core: +- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\") + +Device Support: +- Android (virtual/jdk, will also want the unpackaged Qt for Android) + +Other Languages: +- Nim (dev-lang/nim) +- Python (dev-lang/python) + +Qt Creator: +- Designer (USE=designer) + +Qt Quick: +- Insight (USE=qmldesigner) +- QmlDesigner (USE=qmldesigner) +- QmlProfiler (USE=tracing) + +Utilities: +- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used) +- Conan (dev-util/conan) +- Docker (app-containers/docker) +- Haskell (dev-lang/ghc) +- ScreenRecorder (media-video/ffmpeg) +- SerialTerminal (USE=serialterminal) +- SilverSearcher (sys-apps/the_silver_searcher) +- StudioWelcome (USE=qmldesigner) + +Version Control: +- CVS (dev-vcs/cvs) +- Fossil (dev-vcs/fossil) +- Git (dev-vcs/git) +- Mercurial (dev-vcs/mercurial) +- Subversion (dev-vcs/subversion)" + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog +} diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild deleted file mode 100644 index bfc4e05275dc..000000000000 --- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -LLVM_MAX_SLOT=12 -PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW" - -inherit llvm qmake-utils virtualx xdg - -DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" -HOMEPAGE="https://doc.qt.io/qtcreator/" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git" -else - MY_PV=${PV/_/-} - MY_P=${PN}-opensource-src-${MY_PV} - [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development - SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz" - S=${WORKDIR}/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt - '+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck - ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial - modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner - +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher - subversion valgrind webassembly) -IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - boot2qt? ( remotelinux ) - clang? ( test? ( qbs ) ) - mcu? ( cmake ) - python? ( lsp ) - qmldesigner? ( qmljs ) - qnx? ( remotelinux ) -" - -# minimum Qt version required -QT_PV="5.14:5" - -BDEPEND=" - >=dev-qt/linguist-tools-${QT_PV} - virtual/pkgconfig - doc? ( >=dev-qt/qdoc-${QT_PV} ) -" -CDEPEND=" - >=dev-qt/qtconcurrent-${QT_PV} - >=dev-qt/qtcore-${QT_PV} - >=dev-qt/qtdeclarative-${QT_PV}[widgets] - >=dev-qt/qtgui-${QT_PV} - >=dev-qt/qtnetwork-${QT_PV}[ssl] - >=dev-qt/qtprintsupport-${QT_PV} - >=dev-qt/qtquickcontrols-${QT_PV} - >=dev-qt/qtscript-${QT_PV} - >=dev-qt/qtsql-${QT_PV}[sqlite] - >=dev-qt/qtsvg-${QT_PV} - >=dev-qt/qtwidgets-${QT_PV} - >=dev-qt/qtx11extras-${QT_PV} - >=dev-qt/qtxml-${QT_PV} - kde-frameworks/syntax-highlighting:5 - clang? ( - >=dev-cpp/yaml-cpp-0.6.2:= - || ( - sys-devel/clang:12 - sys-devel/clang:11 - ) - <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= - ) - designer? ( >=dev-qt/designer-${QT_PV} ) - help? ( - >=dev-qt/qthelp-${QT_PV} - webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] ) - ) - perfprofiler? ( dev-libs/elfutils ) - serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) - systemd? ( sys-apps/systemd:= ) -" -DEPEND="${CDEPEND} - test? ( - >=dev-qt/qtdeclarative-${QT_PV}[localstorage] - >=dev-qt/qtquickcontrols2-${QT_PV} - >=dev-qt/qttest-${QT_PV} - >=dev-qt/qtxmlpatterns-${QT_PV}[qml] - ) -" -RDEPEND="${CDEPEND} - sys-devel/gdb[python] - autotools? ( sys-devel/autoconf ) - cmake? ( >=dev-util/cmake-3.14 ) - cppcheck? ( dev-util/cppcheck ) - cvs? ( dev-vcs/cvs ) - git? ( dev-vcs/git ) - mercurial? ( dev-vcs/mercurial ) - qbs? ( >=dev-util/qbs-1.18 ) - qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) - silversearcher? ( sys-apps/the_silver_searcher ) - subversion? ( dev-vcs/subversion ) - valgrind? ( dev-util/valgrind ) -" -# qt translations must also be installed or qt-creator translations won't be loaded -for x in ${PLOCALES}; do - IUSE+=" l10n_${x}" - RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )" -done -unset x - -llvm_check_deps() { - has_version -d "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - use clang && llvm_pkg_setup -} - -src_prepare() { - default - - # disable unwanted plugins - for plugin in "${QTC_PLUGINS[@]#[+-]}"; do - if ! use ${plugin%:*}; then - einfo "Disabling ${plugin%:*} plugin" - sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \ - src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin" - fi - done - sed -i -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die - sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.pro || die - - # avoid building unused support libraries and tools - if ! use clang; then - sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die - sed -i -e '/clangbackend/d' src/tools/tools.pro || die - fi - if ! use glsl; then - sed -i -e '/glsl/d' src/libs/libs.pro || die - fi - if ! use lsp; then - sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die - fi - if ! use modeling; then - sed -i -e '/modelinglib/d' src/libs/libs.pro || die - fi - if ! use perfprofiler; then - rm -r src/tools/perfparser || die - if ! use ctfvisualizer && ! use qmlprofiler; then - sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die - fi - fi - if ! use qmldesigner; then - sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die - sed -i -e '/qml2puppet/d' src/tools/tools.pro || die - sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die - fi - if ! use qmljs; then - sed -i -e '/qmleditorwidgets/d' src/libs/libs.pro || die - fi - if ! use valgrind; then - sed -i -e '/valgrindfake/d' src/tools/tools.pro || die - sed -i -e '/valgrind/d' tests/auto/auto.pro || die - fi - - # automagic dep on qtwebengine - if ! use webengine; then - sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die - fi - - # disable broken or unreliable tests - sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die - sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die - sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die - sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die - - # do not install test binaries - sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die - - # fix path to some clang headers - sed -i -e "/^CLANG_INCLUDE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die - - # fix translations - local lang languages= - for lang in ${PLOCALES}; do - use l10n_${lang} && languages+=" ${lang/-/_}" - done - sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die - - # remove bundled syntax-highlighting - rm -r src/libs/3rdparty/syntax-highlighting || die - - # remove bundled yaml-cpp - rm -r src/libs/3rdparty/yaml-cpp || die - - # remove bundled qbs - rm -r src/shared/qbs || die - - # TODO: unbundle sqlite -} - -src_configure() { - eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ - IDE_PACKAGE_MODE=1 \ - KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ - KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \ - $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ - $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ - $(use systemd && echo CONFIG+=journald) \ - $(use test && echo BUILD_TESTS=1) -} - -src_test() { - cd tests/auto && virtx default -} - -src_install() { - emake INSTALL_ROOT="${ED}/usr" install - - dodoc dist/{changes-*,known-issues} - - # install documentation - if use doc; then - emake docs - # don't use ${PF} or the doc will not be found - insinto /usr/share/doc/qtcreator - doins share/doc/qtcreator/qtcreator{,-dev}.qch - docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch - fi -} diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index bfc4e05275dc..b47f014ce15a 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -1,232 +1,268 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -LLVM_MAX_SLOT=12 -PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW" +EAPI=8 -inherit llvm qmake-utils virtualx xdg +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg -DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" -HOMEPAGE="https://doc.qt.io/qtcreator/" - -if [[ ${PV} == *9999 ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git" + EGIT_REPO_URI=( + "https://code.qt.io/qt-creator/qt-creator.git" + "https://github.com/qt-creator/qt-creator.git" + ) + EGIT_SUBMODULES=( + perfparser + src/libs/qlitehtml + src/libs/qlitehtml/src/3rdparty/litehtml + ) else - MY_PV=${PV/_/-} - MY_P=${PN}-opensource-src-${MY_PV} - [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development - SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz" - S=${WORKDIR}/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" + QTC_PV=${PV/_/-} + QTC_P=${PN}-opensource-src-${QTC_PV} + [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development + SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" + S=${WORKDIR}/${QTC_P} + KEYWORDS="~amd64" fi +DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" +HOMEPAGE="https://www.qt.io/product/development-tools" + LICENSE="GPL-3" SLOT="0" -QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt - '+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck - ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial - modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner - +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher - subversion valgrind webassembly) -IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - boot2qt? ( remotelinux ) - clang? ( test? ( qbs ) ) - mcu? ( cmake ) - python? ( lsp ) - qmldesigner? ( qmljs ) - qnx? ( remotelinux ) +IUSE=" + +clang designer doc +help keyring plugin-dev qmldesigner + serialterminal +svg test +tracing webengine " +REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" +RESTRICT="!test? ( test )" -# minimum Qt version required -QT_PV="5.14:5" +QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN -BDEPEND=" - >=dev-qt/linguist-tools-${QT_PV} - virtual/pkgconfig - doc? ( >=dev-qt/qdoc-${QT_PV} ) -" -CDEPEND=" - >=dev-qt/qtconcurrent-${QT_PV} - >=dev-qt/qtcore-${QT_PV} - >=dev-qt/qtdeclarative-${QT_PV}[widgets] - >=dev-qt/qtgui-${QT_PV} - >=dev-qt/qtnetwork-${QT_PV}[ssl] - >=dev-qt/qtprintsupport-${QT_PV} - >=dev-qt/qtquickcontrols-${QT_PV} - >=dev-qt/qtscript-${QT_PV} - >=dev-qt/qtsql-${QT_PV}[sqlite] - >=dev-qt/qtsvg-${QT_PV} - >=dev-qt/qtwidgets-${QT_PV} - >=dev-qt/qtx11extras-${QT_PV} - >=dev-qt/qtxml-${QT_PV} - kde-frameworks/syntax-highlighting:5 +# := is used where Qt's private APIs are used for safety +COMMON_DEPEND=" + >=dev-qt/qt5compat-${QT_PV} + >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QT_PV}= clang? ( - >=dev-cpp/yaml-cpp-0.6.2:= - || ( - sys-devel/clang:12 - sys-devel/clang:11 - ) - <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= + dev-cpp/yaml-cpp:= + $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') ) - designer? ( >=dev-qt/designer-${QT_PV} ) + designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) help? ( - >=dev-qt/qthelp-${QT_PV} - webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] ) + >=dev-qt/qttools-${QT_PV}[assistant] + webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) + ) + keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) + qmldesigner? ( + >=dev-qt/qtquick3d-${QT_PV}= + >=dev-qt/qtsvg-${QT_PV} ) - perfprofiler? ( dev-libs/elfutils ) serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) - systemd? ( sys-apps/systemd:= ) -" -DEPEND="${CDEPEND} - test? ( - >=dev-qt/qtdeclarative-${QT_PV}[localstorage] - >=dev-qt/qtquickcontrols2-${QT_PV} - >=dev-qt/qttest-${QT_PV} - >=dev-qt/qtxmlpatterns-${QT_PV}[qml] + svg? ( >=dev-qt/qtsvg-${QT_PV} ) + tracing? ( + app-arch/zstd:= + dev-libs/elfutils + >=dev-qt/qtshadertools-${QT_PV} ) " -RDEPEND="${CDEPEND} - sys-devel/gdb[python] - autotools? ( sys-devel/autoconf ) - cmake? ( >=dev-util/cmake-3.14 ) - cppcheck? ( dev-util/cppcheck ) - cvs? ( dev-vcs/cvs ) - git? ( dev-vcs/git ) - mercurial? ( dev-vcs/mercurial ) - qbs? ( >=dev-util/qbs-1.18 ) +# qtimageformats for .webp in examples, semi-optfeature but useful in general +RDEPEND=" + ${COMMON_DEPEND} + help? ( >=dev-qt/qtimageformats-${QT_PV} ) qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) - silversearcher? ( sys-apps/the_silver_searcher ) - subversion? ( dev-vcs/subversion ) - valgrind? ( dev-util/valgrind ) " -# qt translations must also be installed or qt-creator translations won't be loaded -for x in ${PLOCALES}; do - IUSE+=" l10n_${x}" - RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )" -done -unset x - -llvm_check_deps() { - has_version -d "sys-devel/clang:${LLVM_SLOT}" -} +DEPEND="${COMMON_DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-qt/qttools-${QT_PV}[linguist] + doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch + "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch +) pkg_setup() { - use clang && llvm_pkg_setup + python-any-r1_pkg_setup + use clang && llvm-r1_pkg_setup } src_prepare() { - default - - # disable unwanted plugins - for plugin in "${QTC_PLUGINS[@]#[+-]}"; do - if ! use ${plugin%:*}; then - einfo "Disabling ${plugin%:*} plugin" - sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \ - src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin" - fi - done - sed -i -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die - sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.pro || die - - # avoid building unused support libraries and tools - if ! use clang; then - sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die - sed -i -e '/clangbackend/d' src/tools/tools.pro || die - fi - if ! use glsl; then - sed -i -e '/glsl/d' src/libs/libs.pro || die - fi - if ! use lsp; then - sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die - fi - if ! use modeling; then - sed -i -e '/modelinglib/d' src/libs/libs.pro || die - fi - if ! use perfprofiler; then - rm -r src/tools/perfparser || die - if ! use ctfvisualizer && ! use qmlprofiler; then - sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die - fi - fi - if ! use qmldesigner; then - sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die - sed -i -e '/qml2puppet/d' src/tools/tools.pro || die - sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die - fi - if ! use qmljs; then - sed -i -e '/qmleditorwidgets/d' src/libs/libs.pro || die - fi - if ! use valgrind; then - sed -i -e '/valgrindfake/d' src/tools/tools.pro || die - sed -i -e '/valgrind/d' tests/auto/auto.pro || die - fi + cmake_src_prepare - # automagic dep on qtwebengine - if ! use webengine; then - sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die + # needed for finding docs at runtime in PF + sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ + -i cmake/QtCreatorAPIInternal.cmake || die + + if use plugin-dev; then #928423 + # cmake --install --component integrates poorly with the cmake + # eclass and the install targets are otherwise missing, so strip + # out EXCLUDE_FROM_ALL until figure out a better solution + find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \ + 's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die fi +} - # disable broken or unreliable tests - sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die - sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die - sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die - sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die +src_configure() { + # -Werror=lto-type-mismatch issues, needs looking into + filter-lto - # do not install test binaries - sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die + # temporary workaround for musl-1.2.4 (bug #903611), this ideally + # needs fixing in qtbase as *64 usage comes from its headers' macros + use elibc_musl && append-lfs-flags - # fix path to some clang headers - sed -i -e "/^CLANG_INCLUDE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die + local mycmakeargs=( + -DBUILD_WITH_PCH=no + -DWITH_DOCS=$(usex doc) + -DBUILD_DEVELOPER_DOCS=$(usex doc) + -DWITH_TESTS=$(usex test) - # fix translations - local lang languages= - for lang in ${PLOCALES}; do - use l10n_${lang} && languages+=" ${lang/-/_}" - done - sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die + # TODO?: try to unbundle with =no when syntax-highlighting:6 exists + -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes - # remove bundled syntax-highlighting - rm -r src/libs/3rdparty/syntax-highlighting || die + # Much can be optional, but do not want to flood users (or maintainers) + # with too many flags. Not to mention that many plugins are merely + # wrappers around still optional tools (e.g. cvs) and any unwanted + # plugins can be disabled at runtime. So optional flags are limited + # to plugins with additional build-time dependencies. + -DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual + -DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing) - # remove bundled yaml-cpp - rm -r src/libs/3rdparty/yaml-cpp || die + -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) + -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) + -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) + -DCLANGTOOLING_LINK_CLANG_DYLIB=yes - # remove bundled qbs - rm -r src/shared/qbs || die + -DBUILD_PLUGIN_DESIGNER=$(usex designer) - # TODO: unbundle sqlite -} + -DBUILD_PLUGIN_HELP=$(usex help) + -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) + -DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine)) + # TODO?: package litehtml, but support for latest releases seem + # to lag behind and bundled may work out better for now + # https://bugreports.qt.io/browse/QTCREATORBUG-29169 + $(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes) -src_configure() { - eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ - IDE_PACKAGE_MODE=1 \ - KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ - KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \ - $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ - $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ - $(use systemd && echo CONFIG+=journald) \ - $(use test && echo BUILD_TESTS=1) + -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) + + -DENABLE_SVG_SUPPORT=$(usex svg) + + -DWITH_QMLDESIGNER=$(usex qmldesigner) + + -Djournald=no # not really useful unless match qtbase (needs systemd) + + # not packaged, but allow using if found + #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes + + # for bundled qtkeychain (no switch to unbundle right now) + # reminder: if ever unbundled/optional, qtbase[dbus] can be removed + -DLIBSECRET_SUPPORT=$(usex keyring) + ) + + cmake_src_configure } src_test() { - cd tests/auto && virtx default + local -x QT_QPA_PLATFORM=offscreen + + local CMAKE_SKIP_TESTS=( + # skipping same tests+label as upstream's CI by default + # `grep ctest .github/workflows/build_cmake.yml` + tst_perfdata + ) + + cmake_src_test --label-exclude exclude_from_precheck } -src_install() { - emake INSTALL_ROOT="${ED}/usr" install +src_compile() { + cmake_src_compile - dodoc dist/{changes-*,known-issues} + use doc && cmake_build {qch,html}_docs +} + +src_install() { + cmake_src_install - # install documentation if use doc; then - emake docs - # don't use ${PF} or the doc will not be found - insinto /usr/share/doc/qtcreator - doins share/doc/qtcreator/qtcreator{,-dev}.qch - docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch + dodoc -r "${BUILD_DIR}"/doc/html + dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch + docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch fi + + local DISABLE_AUTOFORMATTING=yes + local DOC_CONTENTS="\ +Some plugins (if used) may need optional extra dependencies/USE. + +This list provides associations with Gentoo's packages (if exists) +ordered as in Qt Creator's Help -> About Plugins (not exhaustive). + +dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or +else the example tab will be empty alongside missing documentation. + +Build Systems: +- CMakeProjectManager (dev-build/cmake) +- MesonProjectManager (dev-build/meson) +- QbsProjectManager (dev-util/qbs) + +C++: +- Beautifier (dev-util/astyle and/or dev-util/uncrustify) +- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics) +- ClangFormat (USE=clang) + +Code Analyzer: +- ClangTools (USE=clang) +- Cppcheck (dev-util/cppcheck) +- CtfVisualizer (USE=tracing) +- PerfProfiler (USE=tracing) +- Valgrind (dev-debug/valgrind) + +Core: +- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\") + +Device Support: +- Android (virtual/jdk, will also want the unpackaged Qt for Android) + +Other Languages: +- Nim (dev-lang/nim) +- Python (dev-lang/python) + +Qt Creator: +- Designer (USE=designer) + +Qt Quick: +- Insight (USE=qmldesigner) +- QmlDesigner (USE=qmldesigner) +- QmlProfiler (USE=tracing) + +Utilities: +- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used) +- Conan (dev-util/conan) +- Docker (app-containers/docker) +- Haskell (dev-lang/ghc) +- ScreenRecorder (media-video/ffmpeg) +- SerialTerminal (USE=serialterminal) +- SilverSearcher (sys-apps/the_silver_searcher) +- StudioWelcome (USE=qmldesigner) + +Version Control: +- CVS (dev-vcs/cvs) +- Fossil (dev-vcs/fossil) +- Git (dev-vcs/git) +- Mercurial (dev-vcs/mercurial) +- Subversion (dev-vcs/subversion)" + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog } diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest index 51f131fc6710..1deaf7b35d80 100644 --- a/dev-qt/qt-docs/Manifest +++ b/dev-qt/qt-docs/Manifest @@ -53,3 +53,105 @@ DIST 5.15.2-0-202011130614qtwidgets-documentation.7z 26789215 BLAKE2B f0561ae272 DIST 5.15.2-0-202011130614qtx11extras-documentation.7z 36673 BLAKE2B b7eb8f048acecce20b911267755e1e467fb23b975911025cd43915e043ffc3f34b2b38862f32ae9959dc7e5c759d22731d33fa600c9b8d239f0f0ba1bd6343ff SHA512 ade0a62026d32342fb2b48ade9a164d24e506f5e392e68c451055238ce2a673ea4358472c1132daa779498ff7f2351440d73b6218d5a01e8162bda0907215894 DIST 5.15.2-0-202011130614qtxml-documentation.7z 448310 BLAKE2B 36de636799fbbe1b67db6e0ec19bc478d7d5003b840a7119ad8b11589a4d514b00c7aebc2ac2ff4a80004ecbb8a70b7297eae8f7624171f4ba62435996f62b32 SHA512 ac5d137311eb13491dac18746eef3a1c5dd87d37d3446047c380cfdacad8dfc9d5e54a078278d98ff4ff75b39ad6044fed9bda481e35e307b3f103b792d253cb DIST 5.15.2-0-202011130614qtxmlpatterns-documentation.7z 1199986 BLAKE2B 49caea50be44260696026fcc395df016ef69992fc2bb8e3f31005194cda4987729fbf4e837171732ac5d95184a36cf1574c1fa01f6f2520bb8c52515773564c1 SHA512 c2ad2759ef7dcd78c2039f47ee01f9d61338f6735b9ef2caf8c99b959dad94dfb32249ee5cf8d605d71ff8a3cb5549ec602df1877f3624dd9ba6ca7621a5cf0c +DIST 6.7.0-0-202403252230activeqt-documentation.tar.xz 248748 BLAKE2B 0fbc498e6cc4ed83c624bec466fd0463a581ebe4a19fe7016af2aa2693ef9510ce1312dee663550566b9164125c3f938fee4f73babc27099a02d85bcce489db1 SHA512 7f9a64b9f6b8cebef9c4369be53bab014aa80a06902d8083ad55e8299a46ccd6004687b32b8677a944ef7476649a51eb6495d7cf25d0d19e03d899489ee4404c +DIST 6.7.0-0-202403252230qdoc-documentation.tar.xz 287112 BLAKE2B d94e2609a32db7f5d6c478b4ab5c8be5c7338fef620f2f325876114814cd0191b1c32a3a582b7263ec3de5e5e6f6f1c90bcd21c017a26086b79c2b1f184c6d6d SHA512 83d882196d6db57ecfd2e63a32891959bdb7539038040b4edee009ec9495f805b7e131ac2c7866873807e3a7d24668fd8635e0cd1cb6badb13c3ae53642b63d3 +DIST 6.7.0-0-202403252230qmake-documentation.tar.xz 344340 BLAKE2B d8b0bb4c8e6abdce45214939c0370f61b70ffa2be1ed6663a0bef41d07a86057e803182e911cb514e26ef3f0be2d6b37611412da53eff6915ad047a4f266ca56 SHA512 5d4d417af9cbe776822038a67497c928db12a35634334a7b6adced768e0434c0857f5919fb628fc52345b815edc4d7fd5e38ab8011265e766eb696e4697c689c +DIST 6.7.0-0-202403252230qt3d-documentation.tar.xz 5597956 BLAKE2B e4f58a00af3915a1942b09b1af1b891253bdcf61b6019dd08442744db2f05b2e6f38434cb0f4d205539738267557ad302fdca595720064d2af0fba0ac2519ef9 SHA512 0d4a2a2eda338d1e1095254627396826da2e7f1bdccd656da1ab355d8233efd80f490fff85f4656150450568bbc6ce6a16511127f3515405e4656b5481e55721 +DIST 6.7.0-0-202403252230qt3d-examples-6.7.0.7z 60332750 BLAKE2B 66f262925744dd1b352abaf98269facf2677002f348e0e36375fe114fdf501fd8c7c1b752abc8a3bce8e0cf5e6fa61114f8c9a091cf404bb5579f2afbda59104 SHA512 c63543c2547aef3608721325be7df815ae221bc14aa0616b5f49f6250f75c0ab6075d8188399b3ac4ff3a7ed70c9c85c045001dc7d357b48360e71288c74c957 +DIST 6.7.0-0-202403252230qt5compat-examples-6.7.0.7z 27940 BLAKE2B ceb1f08b5a07e53a22410966bc66f8a7eec38461a2dc53b9417443d19718db254b45e41677e207422e8a1ab7578f25a8d6cde94e49b940f27f1c3415b600ceaa SHA512 5fdfeee326c42ff0ccd7a3f8cf57f1cb002a5d8d5448511613773ec9c6323bd7905f41c81594d101a60e958d333a8a051a2953e08b5b4a8484e29e027ba66929 +DIST 6.7.0-0-202403252230qtactiveqt-examples-6.7.0.7z 11967 BLAKE2B 6f6899a09cee2813b9e109f46d1f65e833a4baa9c951a73c75ca18bb7ac192e868bf517283ff5819bb4d2da39af5d0b4c66896d7a948bdd7369191e091a7a966 SHA512 f021ce9162f33353ba879b487b51ed57aec9f5153dd1ef1f9e968ed6ee86f7111505ae5cda2a9494b3a444bcce2d774bce6dab06811f32f910c9ff983e2ba6cd +DIST 6.7.0-0-202403252230qtassistant-documentation.tar.xz 469252 BLAKE2B 2db1d23beaf59fe9daa88e604c26d2e3de81f2f10caf16d97f9147ae74812eec0df227801ca52cc2c7de18ba120f622b1e665c4223572dd61476dca8da55f809 SHA512 8118ddf8796b1359280ef976241e090a0a71ad1d34d0c9404072037044b9170b1f2d72824faae7d105ebb4845b8cdb3c4ef827a1668da8e1ca556e13944ab8d0 +DIST 6.7.0-0-202403252230qtbase-examples-6.7.0.7z 4314361 BLAKE2B 7234952c1a430343d52d2dc0a62d1fdd618212cd1148c9616e4e1f8702a63bdbd032ceccdc6da460a8c798ab1d523445e1100d8c3b67a618f90c055a6608e27c SHA512 ac0d2162c9f8ef60b65d586abea23da79a3b11c0bbb3416aaa17b3a8c136924334871f7c100f7e89e91b55d7703aca379fe761f66151a7470e9bfe5a6a3f7c77 +DIST 6.7.0-0-202403252230qtbluetooth-documentation.tar.xz 1035400 BLAKE2B bb200bab7bf7fdfbfd290f03745cd71ab29eb4e6ab87522066697aea3bf865b3dad352378587ffedaee7fda33335395f427c688956a5ca07cff1a2a04787a5d8 SHA512 f5d83fbddcce7f67a78b41f857fa2040d62675cb58f91c20b74fda1d193b9573e05563f91ef9ac405f0c3a9a942c703278bdf9b39cc4c5e8b6b7d0f2105e086c +DIST 6.7.0-0-202403252230qtcharts-documentation.tar.xz 8849236 BLAKE2B 52e525f5b01ca64e18b9c6c05d30a5a840a3da546c0236bdc8b7e75820ff526fe6d9c536f0a3a0bc526cbe1c360e2ea6ab8de40cf297598044a14f0bb73f3270 SHA512 4152725a6f0b817b7c53e016caaee8cdb4f652646e15c38e0a920278c1f455a9ca76c9fa5a96fc130f6c3445a94702748f1b1dcf4f332e720a0f093c93ee48da +DIST 6.7.0-0-202403252230qtcharts-examples-6.7.0.7z 162695 BLAKE2B 8c00785dc9ace8c85a197086c6ce193bc4f5d2794c8b7830440c359c6493ea23412a4b9d20bcfd0eadc7eaf0358fcb9b36914ab3628d5493a312cf053b90ccd0 SHA512 811db095c0363b8f3f3927a8879e4a669f5bd443a858c6f24d51a9a1198876ac2e1715d1b070e140b57fb5da9c3518dcb4000acd62f80804d4a4764f643000a0 +DIST 6.7.0-0-202403252230qtcmake-documentation.tar.xz 93428 BLAKE2B 1a66dae60bb7d7fe1634aa89e9091da68dda53f81fe085154ea282537684cf5ac5467a7d091cf7f471ecd2f2de41d4209c85b8d8d74885f019ea94aa4011e678 SHA512 fe83293373488df1cf5e1b775161f0c3d3cec0f9ed047d1ce37ae65173d0976e41e5697cb66e9167eea8d2b0ba7260940ceeaae12622af1e60c7d2983f2c1114 +DIST 6.7.0-0-202403252230qtconcurrent-documentation.tar.xz 185836 BLAKE2B 13bf3cd6fb8329ff23492a7332819cdde3d45a6dca2d8b0f61d3a2ef75fd756107e412b5f35a22bc84cf85833221480b8478dfccfd7061fe4449c131e19d6534 SHA512 1bc525c5a170d884827fe36e33e7fd37773b7765dc73230c34f4db69b3cb1ab7153d05875a9e88cfc75850cf2f7f3a34f2a8a8822c3b51b1661f64ba94f748d9 +DIST 6.7.0-0-202403252230qtconnectivity-examples-6.7.0.7z 403606 BLAKE2B c25679614a5ac786913be77b43b9920cb142ba4adbb923c6619d1384e62a86d8f4c727693db651aeabc2f47d8563a9bbc4beb97f6777c0ea931ee9a793160a65 SHA512 59deaafc28f95372db0df682a8c07b96a8ac8875888d0c7377128523739825107e2f27c9f52f43dc08021e9b6c8becacfbc08d2dc204075567d314a6ba592025 +DIST 6.7.0-0-202403252230qtcore-documentation.tar.xz 7124536 BLAKE2B 52182c54349288df46942a56f8830bd6b634ede90a359f6e34e8f4a46a6bcc49090909ffa866f293fcfcae3d4cfff413a1e9a8a1b1dda5bc5dcc80a26b03de4e SHA512 06ff2d435e2619774b87e118bf01f3507936a492c2ed8155294423bfc5d79e075e7a7c06a4e73323f0cee16af3e5d8c471b69515015ebfd15403b30126c955ee +DIST 6.7.0-0-202403252230qtcore5compat-documentation.tar.xz 319584 BLAKE2B 48a9d494557e5a9e30f5f26a2f388c947c4107c6021e92a5fa49a5f636b4c91466fd91d875ee1608188e8fb9f4ca9842be7aced57338a8768a5c59295a36566b SHA512 af842f78b6135421e549ec28ea388c6b8af7ddc6046c8473ecd52919bec13f4104b1b6ed8911d4bf6d37d817de109b58ca91f333b9a6c59666b6283201067215 +DIST 6.7.0-0-202403252230qtdatavis3d-documentation.tar.xz 2709312 BLAKE2B c7bf5bf6664cb768a2e343cdf28eb1f004a93a009d9cd3d256891515207c40b86d2991f5888320f501b92cd00a2563086d0fa969549e5e41665569d038815ea8 SHA512 afacd994609ae784f815e98968fb50294b3830981ee568f9031eda288f0b2b8cd0b46041cd843adbdf0afbb1f6462bb7515d64e7accb36b9b7a11c98b5eaec9a +DIST 6.7.0-0-202403252230qtdatavis3d-examples-6.7.0.7z 2771245 BLAKE2B af164667d50e7145f1a9728973c383b0ba4ed970597e8c4b20964eac44ff7aca8e005a50c47f28351a618f47ab819780e0c2b8c3449c6ea70fc8c52850d3f7e6 SHA512 4850f0abc1aca2ecde1086ba49aaf6f95ef088c2c0bce0c70b536c77b4b5f951c93d15c4ab041f62cfa00c3cf9a59bfad143e0d4f14f9e74154138d27f50525e +DIST 6.7.0-0-202403252230qtdbus-documentation.tar.xz 333580 BLAKE2B 3d42c58626608394e44073501302911074e564e32829bca3c152dd6bfcbb98699acd27bd35f6a7995018aa1924d6e5d9feec8aa9533d6adb6eddfb0886c7c769 SHA512 f5cead74445d3183dd5ca733dcc4309548f8568d30c95cd6ab09cf859ae0a7d991397558562dbf002bda040e585cfd7d244d22b2d0812fbdbeddede356aa6eb9 +DIST 6.7.0-0-202403252230qtdeclarative-examples-6.7.0.7z 11413216 BLAKE2B 747e08ee51b72520aa5e6506b745daf4b80833ea141665d97d7b5fc2663c6785cc2e61d03dcb7adcfd24bd159abf0d51a2517c70ffc7e096ff9c937385e97ca7 SHA512 e09221f211185ec86bc1668892d6c0b3982c1058b89a258b02140a9541119df7aa77cf10a5e4f4cfffec7359c8ad078c7ddb3ee24065f15c19d7363e14b9738d +DIST 6.7.0-0-202403252230qtdesigner-documentation.tar.xz 3330912 BLAKE2B 4579eb8494e17a9ae67e0933c5a05d8c556f3895ee6c6db2314c649580e69d4ba5d2a3630e63a3b62aca0a5abdd4e7ab3f4d6e87c581420743594190043402bd SHA512 e467f41b8cb11fb84accbd98096d2df9f05b802ce30fee76c3f6a5d618473b0b5d7e2bcad71e26ef9e65d8a16ed52d6348fd3acaf13bd67594b75ef0e74e7a1c +DIST 6.7.0-0-202403252230qtdistancefieldgenerator-documentation.tar.xz 149764 BLAKE2B 9613e43e748243a52d400e87d2cbe3798046bbff76242807e07c3d20268a7914432b53d9272fa45915b7341665c5e286082477bfa0fd0eb71c6ed56dc8e6dc3a SHA512 f352652e1eb7a4d5a430872b95e776de7ac7ad4fcf1e58e9bd588bc8ce6369913dc2ae2253a15bd2f84ef389706646f6cfe2d8820fc310b2a17e67aff7808803 +DIST 6.7.0-0-202403252230qtdoc-documentation.tar.xz 13904148 BLAKE2B 98d1d24fb01415112b562a9be75e69ec91ba3b1e2367e58e62090973686deca999e7eb5299742ba533f7bbc802038eed26bf5b252f573d85e8b5b55ffaf3617f SHA512 7d8567934f1bc8646ead5fd606e8a1996094ed69422370c2ff1ab4590be4b959300cd8aa81a3529ec541d3fd364fce5400adf8472c701c1b4a67609aa7a99e56 +DIST 6.7.0-0-202403252230qtdoc-examples-6.7.0.7z 8044166 BLAKE2B c9be08b0352618966856f3ef67330ee863e38ac3c445578bdf7ddc5d2f4847eb076232a3746395bea52edeea628455ca76c759f93a50086a085d03296412bc78 SHA512 082b18d64f3f5ec7cfb50a3805515b6957487d4ab2390298f375054de9942a6594bd9fbb4d3f7cc0d539c60a1a1005b95883f40ccfb0012a23c70420abd7decb +DIST 6.7.0-0-202403252230qtgraphicaleffects5compat-documentation.tar.xz 25787048 BLAKE2B 765387f8ac7fc9985ab874c3fd02a70895ce751257def76e2e9c0b09f07fa3e3245bf65c0a8bac26abc43b0d82ebb3664f49527903c17685ce49cfe1f1c39358 SHA512 f9cd846c1fa2b25524f631931dc71fb764631508fa29a7f5b8dc17feba21a2748152b4fbd89183bd995352fca24a6983cb81279b847c4d212bbd84a3fb6e2f60 +DIST 6.7.0-0-202403252230qtgraphs-documentation.tar.xz 6791492 BLAKE2B 4115f3387836534448956d3356e2db2837bf4ec7556daf647fc4934d6a885398872fa19728eed56f26cfc217979f03d6fc82033632c9b4d8c89df6d75c26d13a SHA512 a5b039f2f8fe7e196ce9f631190989dd5e65a6720deaffd516ecd77634df8cd9180725a05be4c810e7de99867a3c0a839c843bb844354c7e222a2bbda9764590 +DIST 6.7.0-0-202403252230qtgraphs-examples-6.7.0.7z 2456245 BLAKE2B 61fc44478535c9568125e80c9157f03c72fcbc3199d63f7df4530d1b6903fa28e532ef6fe61bf5be92a4a8b15f900c51a8c8333298e7c7e4c307f52f4dc85837 SHA512 512efc46f6f2a757ed0f0cab85de57fa4e5307f2c2ba8e4bee942e36e93007c279df1e136388691bae45cfce620c52323ac0ab91c8c96c83698ab5076f211e79 +DIST 6.7.0-0-202403252230qtgrpc-documentation.tar.xz 273772 BLAKE2B cfc5b0ad1e1aecf34c46afaa4c08e3fb2ab38cf4fc60042cbf4a3880fb6c1fc7985ddf6381ac1af2f578aab99d8ffa8bbb6ce3bcf0f9c576750c3ecb3794aa25 SHA512 783dc9e2ee299adfe5a6a62bdaac3caa3fc1831937dc2a099a0d8c2e25304876933bfd471ae4c16d55dbfde22aaf713949e47b2d6da81d2cc05158a36fe039c1 +DIST 6.7.0-0-202403252230qtgrpc-examples-6.7.0.7z 96503 BLAKE2B f0fe02a0fafb144c5c150651c441b123df8f461038a8a849be557b9267859dd87811affd3147c0b9bd6caadbae9c930f686fc2405442f3052522dfebfb5d9156 SHA512 c47c8f3eb924607637f47ab4349b90607d157952258c176d5b44ed6618cfc08ff934879f7a18eba82242dc631d293d74511439c930a3ada25c4d9dba1c28e6f2 +DIST 6.7.0-0-202403252230qtgui-documentation.tar.xz 7203696 BLAKE2B a96c0e744663c1891c8511484e14ccb0c7724a82bcdc0079d2662d9cbf0c31aa22c8a8b85e39be852b2ccc94191a3aa1058939f023dfb2c1c724d04428401017 SHA512 d76c03283acbd2ca339f66884c25e231ef4454afd8915585c57c8a04645b161dcc96be5970542e9e9b56f0e308827354338029b16adb4ee2bed59d08aa79baf5 +DIST 6.7.0-0-202403252230qthelp-documentation.tar.xz 212264 BLAKE2B 13d65615d94770aa706b57cb28cb5b17e4d9fa9976c952b699ba20d3b64a85bf5d0b4f7a13ac6650017f4149e8abe804af9d04766e1c227b3ee138261bab3251 SHA512 af5bc71a894788c830ef96f2413fc5f9ba5e03d1e9d58d4cf8a916e410d8794f064649a6125d4cb6afb77befdcc94e13756542e318e82c4f9b52f49bd8dbc35c +DIST 6.7.0-0-202403252230qthttpserver-documentation.tar.xz 292040 BLAKE2B 537ac93a8de1aed0f98b32ff73ccf31ef51b28adc6e048d36f212d1934648b542624243409c82d1a97414c850cb121f70e8a83b876a1aea45c6344d816b7e3bb SHA512 25d0733abb2e8789212551c51a5a42efa5bd5bafff8e0d7007310e1dbef5c45f4d0971cc52df49d1d69a985e3eb338ec5ffa7b2938e518465fb1660ce635b50c +DIST 6.7.0-0-202403252230qthttpserver-examples-6.7.0.7z 51568 BLAKE2B 39c86a6e59eb8db3c8f85b65d72f563964757e3d66fc56c5291e3d2fb4ac2caefa814d57fb553cdfc3bf62106957e770d02ab57bbb58b3ab208a53ea7232ecdd SHA512 ce11c8045c48a4fa759ff33ba135fbaf33e0fa57e69d32e2940c23f59626f8b0395b285ceda3bd38f68df07aae9b878ab83e1fa75e02b78718ce25d746d9657f +DIST 6.7.0-0-202403252230qtimageformats-documentation.tar.xz 32236 BLAKE2B 89607acb972754f74e178cf015f27346ee6e7898e6aa54cf49af605a6754ae222bbb5e08ff9f1c5958fe57f0699cb26f00e2500a4078d70aaba0dec847f121f5 SHA512 01038aba712b595a6a59d4e06cfce82b9b0d41b7ce305553398bcd2ed851ec93cc3e9524f076518e33fe0a1632e3070c253577477a374071df5c96d9901c303c +DIST 6.7.0-0-202403252230qtlabsplatform-documentation.tar.xz 539376 BLAKE2B 3ae0219aa821f4f627d791db68ba2693b131a3e43beded36506115f1dc7aaa76e41b8e27e3e151307a48e75e224cfc20fea3509fc0f2ec2e4f225bb1b0a998fa SHA512 53d87ca5cf0c5ac5e2a5a7810df895ab096354e473d36499fe5526a01d9dae4e9eead36c86d2eb10e0f91e5767f088b032e3959f6f80ee415cba041fabc4b2cd +DIST 6.7.0-0-202403252230qtlinguist-documentation.tar.xz 1133804 BLAKE2B d1dace2390bdcc56b12aa7f77362db30628a611c826c505a8ecb48c8aff3980b28f5f410aabb369caab9978b69b8764734516b08c0c025ebbfe55fe27454bd52 SHA512 8260d7435411b4f0bd248db20fa4f482a7756ed196d00bc00426aad000f15f72ec6490180fc8dcc212be90ccbad6a598ea4f4e1260e701755c19edf732889924 +DIST 6.7.0-0-202403252230qtlocation-documentation.tar.xz 2935816 BLAKE2B 4fd7ba776dc3d2df6a110dc222c921ead84585bce74185a4727e8645a0348cd02b3d58805034cfc10d04559b03ebddb1c136d059069e84bd1ad05d9d168210d1 SHA512 755d7a068cb2e151ca0488d61d6a8ca4f2a4e81db6ab815937cdc6421d57ea983aa2d744ce0b996dd26d8935b144d54d40d17163dd5f126b3a42656d1931274b +DIST 6.7.0-0-202403252230qtlocation-examples-6.7.0.7z 1570045 BLAKE2B 8e62daeb0826555a9875a4f243ea3af445b5fb278728e9645ca487a0b2d8e7614f643463d76b77e14a6a52bbf9a3a771b1f22eae86a3396095c6ea36c9967fef SHA512 ae1e349388c7ce4d53521cf78b20ccbaeffedfbf958c2f3b002beaefe60bdd2a8e8bab660d6f7b9dc218d66219cc9d0a07797cb6173b8d272ee455c7af700542 +DIST 6.7.0-0-202403252230qtlottieanimation-documentation.tar.xz 40596 BLAKE2B 89de82a96cdb872c7fa3c7c55b4fb56edc206dc9a867e653996c6c52bbc20c51c7423c3dea39da1eb959fdea38405f96a65b45ddaf65dba63f58f48285ac9cf8 SHA512 79f6c61cdd78d80bf81ea107f15b01f6530f943eb328edc3901c4dd80323e9dceca592a81e6e4492c567ba86df20e22dde184496a4b03ce1f6072ae9f0df2529 +DIST 6.7.0-0-202403252230qtmultimedia-documentation.tar.xz 6697224 BLAKE2B 1dfd0a68ad9a1845a7001cf7c716d0258169ef1e76fa56b2b5229d7d7ff2c5e4d8f1cd51add66fb02a8e91001462b86b7b91ea60e0a4cd01272a116f1689b182 SHA512 e75a57408d85eef832869fe9b54fcd1b69ae40dfd66e8a650f12750fab3837cb0f6de275b41c169542923a3dca590063b581607af178d39aa39152a00feab8d6 +DIST 6.7.0-0-202403252230qtmultimedia-examples-6.7.0.7z 2643804 BLAKE2B ba78867ad68aca29ed4e0c51c1596a548385ab4a70eeb7f388335ce6265750659917fdfc7e80497a5047394aeb2f2f50d6823a052f3257ea9c2ab4fcea7d05e3 SHA512 a5c7bbc62f6007ed4fa5222ae2cc46e579a3175c9ba8af0442b7f96a267a8180454d64d420d91bc777f1ec33eebf2da4d9f9a3b31453a8042e2c2d760f76220e +DIST 6.7.0-0-202403252230qtnetwork-documentation.tar.xz 1431600 BLAKE2B d733ad49f33b7f7487aab8844416f138e0826ddf5032cc4e41ee2ba5cec6806ef8badba3ac7af678e16113a0dc784e041f16f34ba27033531b3d965be3171699 SHA512 42a4a17e1fcb24bf4764db16ed2ea144afee6e8b2377dfeca32463fbd5fc80febbd5912f8413f700fd1f076aa38cd367e16f7f6ce0d52fc19b2e1868e6e993f2 +DIST 6.7.0-0-202403252230qtnetworkauth-documentation.tar.xz 189152 BLAKE2B ebf4f3a8f30a2fc23716f04e2914624f82af95a51d531b5ed5e20d19dc8e2c6f8fa0a05606a0a74819ce65c697e90c2ac47f13d0a740c4ddb9621279574b791a SHA512 493c8a191b50ad029757215d35b045ed6733577d59dee801fc9076dc9ec06161679b99ea38564d477309efea2d5369e044d7be678ea834f15d76b1302ca6bece +DIST 6.7.0-0-202403252230qtnetworkauth-examples-6.7.0.7z 41496 BLAKE2B 20296f6c0697fa18cace3d89fa858739957afc08ccb46392d523f13dbe7354ec0dea1057a52f83688cb44fe4fe1aa6c32fc575ee174380b40ac20e0b898a8c46 SHA512 4d7b12756d98dab9d67c49182e73e510ea2473a123146ab5ad4fbcdabb8af5268935e4af5d6764795e6077c20753ac1e9e33cf4e20faf3b6b21edec42427bd10 +DIST 6.7.0-0-202403252230qtnfc-documentation.tar.xz 234540 BLAKE2B 3d3029bb2f5a6cece0129c3e40f093383b16ecfb74b5392ab7f0ced7c4e06bf7408994b1c78d8799b77ec06eca0706fa644f6b10ae1d9b5e951bf09305c72f36 SHA512 7e650e7fbd22ad50548ab5b809d9a25b65f266c7650a0ce6703e6a3ea7ea0f459ced4eba580e3754b7e2b3a28b448cd19a443597b79963eed6558a05ce00048b +DIST 6.7.0-0-202403252230qtopengl-documentation.tar.xz 1022256 BLAKE2B dee9d9b8e014cf75f809869f1ee88b47fd47334d4a20f08b77c363271aa6b92f8fc82671334fdef40985bc95a487c297599c9918559ac28ee3314c8ac9682d28 SHA512 dd13bcd3f2a42a52423eb3d13342d911edf70e6d2538374ef38a38604b364bb6b758bfcbbfe03157669061a84f8ced66a02dac72577882bbc2e9f25d861ff2ac +DIST 6.7.0-0-202403252230qtpdf-documentation.tar.xz 1023664 BLAKE2B ac18e62d5df065fb72a36c637caf39e951f375a07cc3c4000a4b1ca9b26cdfba248196506fb925a50bea3a1ffcb965b0011203960cf2615602a327e8bd5762a4 SHA512 df34cc7233813e77a49ee7568a5360a70b8c7b2dd86e3022311b73e03529b577e12e49b6cd240594831542358b8b2282f2328d6048fd075f3c9215ea2295008e +DIST 6.7.0-0-202403252230qtplatformintegration-documentation.tar.xz 42228 BLAKE2B 1452a82215a3b94ec7afc8a4f01fa73820a60ad8eabcaeac94194a1d08b4ba1d9929fa00f91d82562484f4adf1680041fdb4045482c6908926b02b9ab55134f4 SHA512 361de99367a920963a48aa18a68be477c0bef1659dbcf90e4af52c26de5297a9183c31d23c9dcb8df9ecc7def0ee12efa7b3b88ae76e99eaeebc435bb8ffc972 +DIST 6.7.0-0-202403252230qtpositioning-documentation.tar.xz 681600 BLAKE2B beea53e129dcc0f5402215a0cc09a6523bb6008cf606b22a0d7b3304b020cf23ff50e666a2dc3b51879bff3ce04696208cfe837285aedf3149caf61efb535f56 SHA512 e7b139b5095382b0928c460058914ebe5853b91effcfb894470dc12c16990a19554c8b2691b105f05f2439622c435a7f499f9ca7eeddef2aa1882284096f71ce +DIST 6.7.0-0-202403252230qtpositioning-examples-6.7.0.7z 272133 BLAKE2B 256e770b60d5e5f3fea2fc7251f862e33f27c50d25b357bc31fcb5b6dd7dee5a91f5ae58c4b84589ea38869b9960c9878fda6fb3408812764b4af1fd82b25321 SHA512 25921e4fe8d74391360d13d927a748a565f2a3364fe436acd6ee0fa3c06b6bee0e0d169951daa46e4aa7e3f4be78c47a966977fc22f57b52e0eead5b11bb4c43 +DIST 6.7.0-0-202403252230qtprintsupport-documentation.tar.xz 349912 BLAKE2B d52b7a3223195b5f97af85ede261e004e70419b3a45cf78347440f867b126d504e8ff16803b480a56416704c59713d5c0e4120b37028fad2ca48dc6605395744 SHA512 80bb5a8132accabc4499da1043beffb8ca0523793da6267c0b7ec6cf53e554cd57da07f82d6b844f5cb274a74fc0e24b3208860f277ef6fd23b479037643d26c +DIST 6.7.0-0-202403252230qtprotobuf-documentation.tar.xz 320456 BLAKE2B 21047dfa9af4a1bb1daff95ae4334b821a02ca45e09785b3b9a0dc628af8c04890c3871392efca5a06520d0be9bc683f80d98dac8026db2ffafa84a2c9ff3941 SHA512 cbf9900852d895254844a0ee133807862348343b3869d075286b3d13b656b776ecba54d3cf602552ab6ed1a86bd790761ba9e4284da560c7ef308bdc537166af +DIST 6.7.0-0-202403252230qtqml-documentation.tar.xz 1501228 BLAKE2B 3b6a23f69c8a6a4c2e825cd4e9ab5372b21a916b9c32c0f87ceb77e6c7766f90c3dfc3ef95d2293894d42230f56d1aba8e3a46e04bbb070318aa1851b586b415 SHA512 f1f4ad52cd4411927339aa935aa89f4e19564604bf1d95de1d2fc5d66c265f87728ec3a6a621efcda95fee184a4ca14d424dc30e56406ae1ece142fc09b9d948 +DIST 6.7.0-0-202403252230qtqmlcore-documentation.tar.xz 69044 BLAKE2B 2b5a800dc03ad6f098a73987ff0a51de09f0037cfdd273b5a42a6560230bd00f7cd2c14a594bd330392316eaed435d69dc12a61f86daf17a701fa8a93489e9bb SHA512 8f2bfd20d739291c4b4f2aa7d5f904cd40b821efd9204fad9c4a510ecf103cd8d6cdc2f7470e6992475a11f7bdec66256ee9ab7e6ed012cb5d064c3d5e2650c4 +DIST 6.7.0-0-202403252230qtqmlmodels-documentation.tar.xz 138752 BLAKE2B b07e1df18751d14b199da5f802d7848b4313d4d480eb381c693ef11ebaecd7cf241bb6e83054449818dbfab930de82e57c5db20d4c330ebeb8d31e931b87ccc6 SHA512 a3cd2dd72bf4da335af347783dee4a5d4b342e43e959888456bf57b1bbc22c2a254b1ba5ff1345a06cee1816895d300f52206d88d8d9c3471762fa041c45d2cb +DIST 6.7.0-0-202403252230qtqmltest-documentation.tar.xz 90912 BLAKE2B cf35aecb9f666f3e5a8861f85e546357fdd87d342364c0fb4773c78733a5462dfc28b32cebc83ab71112757d38e73d9abcbae4c19c70ef76d13a294c903bdce4 SHA512 82d953fa542d49cef44f8bf31a2edd2031815c29435687176edba013a0c9bc3cd8cb230b2863a8abd6df83142425cd07111709ed5ca23328fce09c454d4f18b5 +DIST 6.7.0-0-202403252230qtqmlworkerscript-documentation.tar.xz 31272 BLAKE2B 15d11c6ffe44bac4d98d5b959fcf51ee915d56e6d232dba38d4fb1358800831a06144900a8ef354b39fa47ff01acfbc6564e9bb0507fbdfaea83eb11f4a1e1ef SHA512 ae2ed2cbbd9de11326b9aad3c9a447dbf8e21d5e897b7cc5adfb35903107069a4c09b545a071118e9da0713691510c4af1326c8ccdf46b2d134f31d0ae772d06 +DIST 6.7.0-0-202403252230qtqmlxmllistmodel-documentation.tar.xz 37144 BLAKE2B f964eac9142797b6a85258657a5f32d9bd24ab8bfba627031f0e5e4242853bacb0cb5a6f1929be56a85494d222056b86f91e98e9ac8e37f8d01f031d1c4f3603 SHA512 73e0c8bee72c8ac14b10aa56e0c4b5a1b274c7e31768708bee160b2ff3330660cabd8361ecec55f0b716910786b26d771a6ccea522227b9eaf03f745d7aaeab5 +DIST 6.7.0-0-202403252230qtquick-documentation.tar.xz 24048400 BLAKE2B 559b97846d5ab18d12bf4e4dd5f665a9ed63ab709e6c7b5fabe1cc67f38dabcdf965c408af70c2695fbf3a9fad693602bb67c022f45bcbfd5ad38bc39cfa93cb SHA512 6bc2383d8cde235d60436f2de761fe9bfba8c920b0899f4421a9041a2aea2cec51d4f03f2a65a53231cc3e527047ad2c20c2e9a6261833104dc809042d0068ec +DIST 6.7.0-0-202403252230qtquick3d-documentation.tar.xz 62768032 BLAKE2B e747f199d02448b7e43a1885925ae253b48903d537c4426c37ea01b45365cef43319e892f65c614cf71adff8c03923146a5b9e9c3e669396adc9dd2407927be6 SHA512 504bc5991c4d423a41e5719d1965637ca101029d5d13038ee5156904615fb80061c40751353a7e6ef04f34528f93adc5c8657a9e14dce728840b4414f44939f3 +DIST 6.7.0-0-202403252230qtquick3d-examples-6.7.0.7z 19424579 BLAKE2B 1e3cdc3a6bb454bd7437e8a9db47144e6d0a0d8b2b2b0d86555ecb13db7dd4a1d87f4838ed59958ba747b7c8e88c547cf416ab81041cad3400295071d22bf82d SHA512 bbc8614f0c9127e59e595bab7cbcc7c231a770928520244d68d2d489876f4dcacf30045aaa2bdb3596502e734701af899fbc3b244ba6514f1d8ab7bf44244147 +DIST 6.7.0-0-202403252230qtquick3dphysics-documentation.tar.xz 4591940 BLAKE2B 216dd97f1e3586a09636dfe8e2f4059ba2ece9c761f5061b1e63fc24dcbfb6b991959df51636a53e7a69dfcbb0d32887eee9ef21091a46a50bff6b6b20442484 SHA512 01cf34a8005e38fdcf8b2e9048f475909ed2e46ec804634ddbb2608231604eb2cf36929d47f85fb937cf3816a46b42112340ca8e1d9fc5f89cbb31a11cc9cf74 +DIST 6.7.0-0-202403252230qtquick3dphysics-examples-6.7.0.7z 2354992 BLAKE2B e13e22229c14743fa2d830f8d5c2f5a17949de6fc347d3433a3ec4576278289457e96c530e72931b7278f9eff98a9f201c279936610a132c17649c9b013c50e4 SHA512 da549258572fc819247be01429888fb5789240c0e25adbb8268bdcbb0533025ecd32e1abfc75664847cc368ee2f645b97899518f1392c9459c855d69ca354e11 +DIST 6.7.0-0-202403252230qtquickcontrols-documentation.tar.xz 7158676 BLAKE2B b5c7a6174f57bf3bcd0486671a78143deadeebc6e86ab57f21257187437c84ea1955106a770cc6b2f90abcc0ce500c1397a94677a64c5a43e4366029586f1bef SHA512 1e25d1bc60d2b924bb0c5c2a1bf8777a99812dc13db0a54b46d3609a8d8a95c8e803f963b1a9a09cba4a0b688b97234c7ebe3b62d3949e6d804b30a89ae4bc4d +DIST 6.7.0-0-202403252230qtquickdialogs-documentation.tar.xz 314268 BLAKE2B eaf24af84b0e5c158f2afb2781cc79ca43e8c9037c3d76a302935a287f8e4846f9a61215a11a1e0e1e690f2ca8328d7b72e9ea5573c6d66dd1eb68285e6837d4 SHA512 d03a915f2c1be57fb9e10a457aa5155b7739b21f9d0b84501dc5caabfaf963565f43411e8a9734ca261b68dce49787ce41e6839bb31b7c19d1a3ed7be31f32e1 +DIST 6.7.0-0-202403252230qtquickeffectmaker-documentation.tar.xz 804656 BLAKE2B d72f7674d350d519f1bdafdbe67e036fb9de22ab5ecb4426afb4d5a79b14a8a320b4b2a7caa02ac13c55a1d1359a3e408642557ea32a5032ab859d59c95cfde9 SHA512 35998cc42f49560c6976a6b1366dbea3035537182715a71ac4f7d99e4817c35e2bbacd33b69adc3b69189984f466e8d4d357488dbf041c1c8ff65fe241afde84 +DIST 6.7.0-0-202403252230qtquickeffectmaker-examples-6.7.0.7z 244674 BLAKE2B 402024185b85023b1ca5c4d4e579a10fb8df0e39c4564128dc1027aa28ee2bbd70cb9bc38d42e129a94829eb5f4c761b240eccf9011da992f831401cf0e72b2d SHA512 a0837a1cacb42b89bb5c495adf88e2e7437b17d6a69a49aa8d884143bea4ca1f906d624907796fda80a9cafc3fc7d0ff5bb131c62a26588aa86a566d8cab6c91 +DIST 6.7.0-0-202403252230qtquicktimeline-documentation.tar.xz 166240 BLAKE2B 3fc6f17b957323d11ef8c56a9c1b1eed8cedd7e2c57001ba629161f4c03a4ed1cb3b66b09ae71b119de665cf04d152ec682e9b3873ce14b95c28e6250fba78aa SHA512 38c2dc18dae2e195aa0bb7afe7bd39563994247d820cf659114fa1d0a9070faaae4d595911e118cd6214d6dace70e6111e4060906bd15aeb35f52a6123ef0501 +DIST 6.7.0-0-202403252230qtremoteobjects-documentation.tar.xz 492760 BLAKE2B 36ecc0f2177582e4327fa3f9e64b490b0d88a5cf0bc68b92fabbcf51cb92c65371ce54823d463dec01fc8f14da57c8fc8b9f39830145c24e910abd9c41a6fa24 SHA512 6fe2259ab78d719d982465c3f5bc342f07195da4e393b7b78c8a993f4512d4b7811a80ac651b2e439e4f448d296f5338acb45afc814f614a9030775451bb50b1 +DIST 6.7.0-0-202403252230qtremoteobjects-examples-6.7.0.7z 81332 BLAKE2B d8af60881fc684aafc52f683a3fa36eaebe3fdc127bf562164e4cb23ae763d323551f820b0eff85182c3ddab4ea654e349d3665b5817fe799de86ae7c96bc700 SHA512 a7cd9ffaa3d5973fbe40a6daceacff48a980086dced991aa60007360073f1d60c0290ed3d3344285f8cb71c1009423e0a4fb0d1c801fdd82c33e63eed314e291 +DIST 6.7.0-0-202403252230qtscxml-documentation.tar.xz 395840 BLAKE2B 27e391a67a4f50ac0592b47a6cfef0b6a742f862cc81fa6db2446987fd80de200c608f67534fe9c80a71fb35405066f2e55077ee60f37d2deb268cf84e0755aa SHA512 dc5a39b4926f64b92719c67725dcf6595d097cf3c4a0f4db7883a4acbe69caf8116047f91a46bd330ca4d3e28b7ac3b1dd2fdea469fd8f68c2c79212124787e6 +DIST 6.7.0-0-202403252230qtscxml-examples-6.7.0.7z 140135 BLAKE2B a2daab396585bb3c548efd97ffe485212a694e001a02a1b49a9ef200a111642c7a37d49e695db6839db17365a25639ffbe361081584b839eb1f1cbc83a4efca7 SHA512 ac848923ed18e21bcd97581de6d0a883c29b73734516802060430816130a16cd8914a4e790c66aca3759947ecf3fc437fdc16194aecc63b16a26af06ceeef841 +DIST 6.7.0-0-202403252230qtsensors-documentation.tar.xz 2139364 BLAKE2B b83db48d439789cddd264849390e49f59b9ad82ac6ef23a8025baf7fb456c392a160a901afab83e5d1f1dc244c8d5082016cb9a6951946d7064b11e2a02d5a36 SHA512 0930bc50f6f859ca2223c3d0a5bfe30b6a2264885d7ae7a52f33e8a5f07ed3f92e53ae4da7be9b5879f362ba63570bee96aaba91b3b38f8d923fa8192cd3d59e +DIST 6.7.0-0-202403252230qtsensors-examples-6.7.0.7z 53368 BLAKE2B 4bd56e52f51207f03404135aaa8485507f928dd640ccd1c528cbf8c61b02bb5d5ae605f053fba8356482dc69ebbed074fda2579ecb5f39038f3bb61ed695bfcb SHA512 8c08079a0c760242c3c5e28cffd6e3f0458e9e854d974f7b0ac10b258c1f5cd7e79ea683de57d05f1f6cdb7d1a46b07ad5ef8e74f823af880fb3cff82c2d5f65 +DIST 6.7.0-0-202403252230qtserialbus-documentation.tar.xz 737792 BLAKE2B d33ec1ddc36b2e68ac4fbc14777d7588b4a259dd2272e67b4f2af4c231db0548c4ffaa562c2fe4bc41130c226797a9061a8edb8b8d44d27bf896f936da9af9e3 SHA512 709f944d3f54a0ec6dea3f4cc487ef03deb889f4cc1b128a7ee2ded302b0a8ba93b9e13db6d467c42618929c2631977085c40df27bb18dedce95076e8b498ad2 +DIST 6.7.0-0-202403252230qtserialbus-examples-6.7.0.7z 211993 BLAKE2B d88f2dbe226b38a8afdb778e49835ee442e9cfbbe581fa4c54396bdd30902b095bbb7fbc0e57c05cb4ddb272886d13865f58236cc2166c4c5463450d2448e212 SHA512 5a61c8e4f56dc623d0e7a5fbc8fa57a83fb418f634b3df8b96245f2cb4f2609f219ba17b9c6e00c550ea91a518bc9082d6decfae36fac36c986fa5f129423355 +DIST 6.7.0-0-202403252230qtserialport-documentation.tar.xz 184016 BLAKE2B 420d2e371943b0fdc7a27ab6443c7e112cf1b909f89c29858039ff9abd1960eec5895a7ef12011c7672d619dd0694f077e783510d73269f0e918f2b169829719 SHA512 a63be61abd142026c56db793f1818cd6e281dcebaa23da19188502e7043fae98b35c0fc797357a1447b6bd6d174c24c057982b41e06a6d677d91512abb1e23df +DIST 6.7.0-0-202403252230qtserialport-examples-6.7.0.7z 80952 BLAKE2B 45eaac4b846488c3ec3a1faed4f75b94b11ce40538329d65da0aae2415afcea3faf607d670cc2580e431785393b69d01608bca7f05f6199fea3a8f7a7eda6b3f SHA512 6d9d23b9babf5dd323d3a1286e7935bae29eb34baa584c56ffefb66077b466006bb3f48704097e57fffe08d0264ce3f41f7e2d0b58c3f86d4aef16826512fade +DIST 6.7.0-0-202403252230qtshadertools-documentation.tar.xz 196068 BLAKE2B 7f610b8dc40a4c5d30b893721e4b6c1cf6ac0ae84afacd5fc49e366fcbeb2042a2b8bbb36e246b846673185c952e3ae7de292afc8d559a729e7b2ae37e664e49 SHA512 68e03391770b9a8fcde1d291c8e16cae233db7248bfcb5da34021c39709f80510e082c96813154845e26a2746b772326c17cad4b53a18555f7d310686ef78d13 +DIST 6.7.0-0-202403252230qtspeech-examples-6.7.0.7z 157696 BLAKE2B 32c48b8296cebaec708ad08f89d131cf5e2d74e15f49d8c09e27343155f4cd2fd23615dc390f99b745f7e555356252d0ebd29ab44690bf795c23f448f778ffea SHA512 9f2b8d52e4fbd3dc4a4809c060c88ed6c97964c05e7e6599a067f32e690b7811be45f9d28a6d63da588d28b09534289257f36cb67d2826d7b4dd8d3c9c00df1f +DIST 6.7.0-0-202403252230qtsql-documentation.tar.xz 902996 BLAKE2B 1e18da7525629a186aa63d9046ad5593312b9552620b22eff7c9f6cefb28a4ea23803b55900a026e039601f703cb1030658c6c9be72463bbd23fe6d0054c3943 SHA512 37b8b242d0513d66a8274d217e190faf4e7ed533cc4c884f5477e9048decfd04cd29f462c1a558047c184815b50166566c107b32cf8d10ab72b4e4e8709b8bb5 +DIST 6.7.0-0-202403252230qtsvg-documentation.tar.xz 104080 BLAKE2B 0a527d587229b45ca64f5ac79092ff46c1699f0a77b46baca0716800ec32bb6b5d9023702726eeee4603fefa0bebd9011f61561e79119cc1a16faec3879e731c SHA512 372a096d65db79529f895ab5cadb04470205adbe94ad07a9ffa0269b0c4c7f0a136b7d303453b770b8d8a62923072aeab79354dae6e91a532043b6090bf8a140 +DIST 6.7.0-0-202403252230qtsvg-examples-6.7.0.7z 157 BLAKE2B 62710905ab8be2e4ca1a4c5465765ac6a2ac02c314ee1222f8e04bebc7defc7807219962aff22ba8eedb78d3c398617f4f804dce9939f4853016764eeb6b99ce SHA512 f0cd73be79c3fd7d9bbfd08de6198aceacb9ff24e235a89f3f324136bf2ef5a2670b2afafb75baf3874b7b27e04a8a9e37759721e7bc8e1f343d8059ab981eea +DIST 6.7.0-0-202403252230qttestlib-documentation.tar.xz 220300 BLAKE2B 675deed47f29706f0e601d021dc7e04ff981cc8d983d696454aa462f4df210566c722f90239872532797059ea7903ee8b5e12a4523163fd16f63ea04bba16149 SHA512 9bbd998a77fefb4a56cee10fdf747972f99baf86cad1dc553e621b030986b455eeeb564b38108bdf3b625fabf7423c08a76c2175069e284af5e3a46f67efbb94 +DIST 6.7.0-0-202403252230qttexttospeech-documentation.tar.xz 401632 BLAKE2B 052693ec4dd6689b4b694baa0d92fcb511401661d62db3f6de7f161e5da6dcae227a53fc9044e2d454bb7b2d221573efb0e6a29ca679fb8c21dd595ed49bc4cd SHA512 2e1bcc017909f4978a1da691a450548d5be915e43cfa7d88ba114420336053b2cb9bbd19ac913065c6a8265ebf8c5905bb9eef14faa6cfe9397ee7392754ac82 +DIST 6.7.0-0-202403252230qttools-examples-6.7.0.7z 468609 BLAKE2B 14fb611282295f1e64303b3aadaaa2b7bf0b3cd61c7a402a3ac6b93e7b628d1d8e3d4f59b822bfd095355652166e9c674fdee1cd02dfb6d8eb08b399ab88e54f SHA512 72216602ca8109176eddbd73dc14551a8cc7a99bc62f77cc7f3cbcb99fb8f9a9a828a60972d5325b9c6630b35426d7a14afdcd48e2bfa8a7ea58d9d00629a647 +DIST 6.7.0-0-202403252230qtuitools-documentation.tar.xz 206520 BLAKE2B 674f9fa9c3efae166aa0513866006f757ee6ae66a064f6f653c223cd938767d44a5687d07dd698dd8b6790d2813c4303fb7c61e6b96f86f59c03c419509d07e5 SHA512 08e0720b47a00df5e9c11f76f6d3af7b93da37f4d2ff519102c9904b679c33829364684ebacb79284429396182186dee46d0643b92b1b9ef00d20fcad495a039 +DIST 6.7.0-0-202403252230qtvirtualkeyboard-documentation.tar.xz 2071332 BLAKE2B 2502dcf5a1f7468d768c3b8318edad893a071553e31836081006e833ffe23b8372097b1a75487821e1d67e4e2c1d0902c3ca32f43a0c9f8a8a4d2172a6dd1e52 SHA512 d3ed5a6b9ca46fcda15300dbeb423d6023bb4ff6229530f5d507d7c541dcf9f9941392b11e837fcf41b857d9bd4415f1dadba0aa2bb0833f0fd6f10a4bd8008e +DIST 6.7.0-0-202403252230qtvirtualkeyboard-examples-6.7.0.7z 7018 BLAKE2B 96e4710198ecc6235d7e8fb2f97bf7ae2fc8d256642d94617e5e32d2d007189973981d5a8c07ebcb17a0d4d6533309eb1f6cffba7dcb3ec25d1c94b01a4e0368 SHA512 0b0be896a9c2ac9ae3b9de17668671f43fc17fe8ba6ef444cd0a9b3936ca63e516794b84c9865ab333fd9f9244d1ed9ee49c9d485babbcb2ef9215e90720ca93 +DIST 6.7.0-0-202403252230qtwayland-examples-6.7.0.7z 568035 BLAKE2B 81193cfcd9d6cdae2303dd5856442eefb072d9e864a6ba714de8d21a233ef902cf319efd72298ee2a4efb6c2e1396a2e05a33fd8b1dcaf20692459da2889115f SHA512 cf630445059173bc0b8ef33d864cb6735deacadea19b57d94d880184e1e4f1e632d475f0d8d304d94dce71fbba50f3a7961869717fa19485d4aaa4b8342123f5 +DIST 6.7.0-0-202403252230qtwaylandcompositor-documentation.tar.xz 1602072 BLAKE2B 26d9bb152a3e518f5fdf1c6ada45711233b7eacae91e1b168eb34a58b1b15e50cffeb3e0c7df9880d8dbe2aab04296ea4d88d8209c778244a91268e4f8da2747 SHA512 a38e47d1a3ac3e85e6c73c78319df77f45c63f169e39fef37b1975d7f85897f1ad14308eb037c7fb2567022fe1782fe90f1d8492e69f065fee0fd0edb9e1dd90 +DIST 6.7.0-0-202403252230qtwebchannel-documentation.tar.xz 166332 BLAKE2B 249220366aa01a3fc91eb0704b65f1f42d12200d4e99f929897c5e99b0f0c927cf27bd220d8ee9f20ef6ae49be74ac64dd66f3383d0c64e310ca39b01b11c700 SHA512 4e3c42a350c8c78479f7d0fc7bce0942e0fac03013c08d2675b61fabd8b5285ad1e3429a9e1eb41391e4beb5cc4c1a0bf2b80e0bbe35a662c2bf2d2ab00939a5 +DIST 6.7.0-0-202403252230qtwebchannel-examples-6.7.0.7z 65949 BLAKE2B 775087cdcd9a15e37612abb820aad5b7f8ee5db2236a3204c3827aa2d7d50615a178c108b5db1038b84fed7ce6e99ad5f5927efc3decd062204c5778d00e4afc SHA512 d99121ecda64fc4c8819e2d047f98ef4dcc7e4524cdf540e8528ee463d9d383441a62f718e1ff900965cc7aef96d4b9b2364c79a65481b433a9989af9152c599 +DIST 6.7.0-0-202403252230qtwebengine-documentation.tar.xz 2004956 BLAKE2B 8a710846459b26da1f2af6f9adc134aaea5ff0109b437768f6382684d3e9e9a72435c6fff85cd28e94832c5a1c52ca637963b8c56e67e5af25d69f10db4f4f9c SHA512 501e4f4517c52ae1d39e759feaefb5db1a8629aace0f6fde6aab64b3708053715d242df795b815677126f303f0d46aa3b5f361dce2f90b4f54662d5381b96caa +DIST 6.7.0-0-202403252230qtwebengine-examples-6.7.0.7z 1115037 BLAKE2B f7de4668bde9db0c70739d892794bf963605e78add0d7cea8614eadb898bc504c901e2e1299176ec96b4527421d9e221319f329d477f5c9be9473d3d22c6cabf SHA512 0b05232bce76558d916b423ae19496bf7924aa2799b2773688c1fa9c0289c11182d069c7d2eef6011d870113afecef61f62d2d09c0a77b444b3dd49a4aa93249 +DIST 6.7.0-0-202403252230qtwebsockets-documentation.tar.xz 532440 BLAKE2B 0e362c91d6735996d2dbd66f4355c95e704b70ab7c2b649fd3e3a3e95561ea5d094522df047bf65b541432ab38d0189f15d3800702cf2f4fc7218ed3872d0e25 SHA512 e903fd985b045c979641522494dd15b24b350069db967e68cd85d9e92dd05eaf6a46caf78527e86b4e6320da7f91dbac2eedf88a7e806ed3a9d2506b16cde66e +DIST 6.7.0-0-202403252230qtwebsockets-examples-6.7.0.7z 246697 BLAKE2B 1d5ab6608572916efc479087ab1c967da4337b8847dd926aa43dc201183a37cbd6ddb9626afe1798403cc04a5d8eb01320c58094e82f25baa4bb91fdbd1b6810 SHA512 646f7249a001978604cdea0f77ded628bedc4470cfc7fd63429084851acaccc2aff210d3044a74fee237b5bf247ef8df6d6cb3995c5a022e8d255de14439f15c +DIST 6.7.0-0-202403252230qtwebview-documentation.tar.xz 126028 BLAKE2B e9b7815a930ac58a5651756e9a058a6ce2cdadbd6e2b927ff04c653e16b412fb635906e14771e20b3d5fb7a26746e41a75e0aaa1ff99ab5f94e1b18748bc88e6 SHA512 c7d8f55d734b3eade7a856e19d0810ff0d3d1522e089806f3e6b236d7695cd9f2b7d888f93fb988c02f84ce15d5292123856ccdb96c9885db3f968ce2703f95c +DIST 6.7.0-0-202403252230qtwebview-examples-6.7.0.7z 47243 BLAKE2B e71c0b29e2724fa9327deb81fc01abbcbbce840c39b1fe1c73a2e4acdf885501f82f43a553abd51bc74423d4ff9a2ae3f2cebe48ecef0479fc4e5860ea7017d5 SHA512 1bf1b690d705341088bf2f9f9590d3c20d4401c2c892c45ba95bd439dee61640883e64a9299708b6ac04f57d6cb0cb6710c073f5179b3b259f9d5cb8dffa4f67 +DIST 6.7.0-0-202403252230qtwidgets-documentation.tar.xz 18106824 BLAKE2B f3c84450cf00c66387360ceead9581289592ff8df37830d17f1a1744ac2966643c5eaa4ba0c56d74de6eabcbfdeff5fe332ba7e53fa705102a41d43bc7d20ca7 SHA512 7330682ffce376867410a502e2796643217e55e03ba93d5338df6d97e9cbb14cad1805b354ba2a0a66b8473172f30b17bf5023eee9886fcc2c5ea857cd6f06a4 +DIST 6.7.0-0-202403252230qtxml-documentation.tar.xz 341100 BLAKE2B 3b4eb622eba7e7c9e504ddb6e2a92982fdb7de57ae0452b9fc336026a799a069d4fc2678abf1fd3f0366e2b6d6956e7655213cd1e3cb5f0f1b0bf6d5c1aafa1b SHA512 9e4f0b8617153ee32dc648e49f6ef37c1b8be6542d9489ad3f2192cd1b2c2ba0bef13b587f8b912081d957c17c0dff43de2dd7117a655b674983226b56a47a65 diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml index d54e1fe9c862..82468b0b6e60 100644 --- a/dev-qt/qt-docs/metadata.xml +++ b/dev-qt/qt-docs/metadata.xml @@ -1,27 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <stabilize-allarches/> <use> <flag name="3d">Install documentation for <pkg>dev-qt/qt3d</pkg></flag> + <flag name="activeqt">Install documentation for ActiveQt (unpackaged, Windows-only)</flag> <flag name="assistant">Install documentation for <pkg>dev-qt/assistant</pkg></flag> <flag name="bluetooth">Install documentation for <pkg>dev-qt/qtbluetooth</pkg></flag> <flag name="charts">Install documentation for <pkg>dev-qt/qtcharts</pkg></flag> <flag name="concurrent">Install documentation for <pkg>dev-qt/qtconcurrent</pkg></flag> - <flag name="datavis">Install documentation for <pkg>dev-qt/qtdatavis3d</pkg></flag> + <flag name="connectivity">Install documentation for <pkg>dev-qt/qtconnectivity</pkg></flag> + <flag name="datavis">Install documentation for <pkg>dev-qt/qtdatavis3d</pkg> (unpackaged for Qt6)</flag> <flag name="declarative">Install documentation for <pkg>dev-qt/qtdeclarative</pkg></flag> <flag name="designer">Install documentation for <pkg>dev-qt/designer</pkg></flag> - <flag name="gamepad">Install documentation for dev-qt/qtgamepad (available in qt overlay only)</flag> + <flag name="gamepad">Install documentation for <pkg>dev-qt/qtgamepad</pkg> (available in qt overlay only)</flag> <flag name="graphicaleffects">Install documentation for <pkg>dev-qt/qtgraphicaleffects</pkg></flag> + <flag name="graphs">Install documentation for QtGraphs (unpackaged)</flag> + <flag name="grpc">Install documentation for QtGRPC (unpackaged)</flag> <flag name="gui">Install documentation for <pkg>dev-qt/qtgui</pkg></flag> <flag name="help">Install documentation for <pkg>dev-qt/qthelp</pkg></flag> <flag name="html">Install documentation in HTML format</flag> + <flag name="httpserver">Install documentation for QtHTTPServer (unpackaged)</flag> <flag name="imageformats">Install documentation for <pkg>dev-qt/qtimageformats</pkg></flag> <flag name="linguist">Install documentation for <pkg>dev-qt/linguist</pkg></flag> <flag name="location">Install documentation for <pkg>dev-qt/qtlocation</pkg></flag> + <flag name="lottie">Install documentation for QtLottie (unpackaged)</flag> <flag name="multimedia">Install documentation for <pkg>dev-qt/qtmultimedia</pkg></flag> <flag name="network">Install documentation for <pkg>dev-qt/qtnetwork</pkg></flag> <flag name="networkauth">Install documentation for <pkg>dev-qt/qtnetworkauth</pkg></flag> @@ -29,21 +36,30 @@ <flag name="printsupport">Install documentation for <pkg>dev-qt/qtprintsupport</pkg></flag> <flag name="qch">Install documentation in QCH format</flag> <flag name="qdoc">Install documentation for <pkg>dev-qt/qdoc</pkg></flag> + <flag name="qt5compat">Install documentation for <pkg>dev-qt/qt5compat</pkg></flag> + <flag name="quick3d">Install documentation for <pkg>dev-qt/qtquick3d</pkg></flag> + <flag name="quick3dphysics">Install documentation for QtQuick3DPhysics (unpackaged)</flag> <flag name="quickcontrols">Install documentation for <pkg>dev-qt/qtquickcontrols</pkg></flag> <flag name="quickcontrols2">Install documentation for <pkg>dev-qt/qtquickcontrols2</pkg></flag> + <flag name="quickeffectmaker">Install documentation for QtQuickEffectMaker (unpackaged)</flag> + <flag name="remoteobjects">Install documentation for QtRemoteObjects (unpackaged)</flag> <flag name="script">Install documentation for <pkg>dev-qt/qtscript</pkg></flag> <flag name="scxml">Install documentation for <pkg>dev-qt/qtscxml</pkg></flag> <flag name="sensors">Install documentation for <pkg>dev-qt/qtsensors</pkg></flag> - <flag name="serialbus">Install documentation for <pkg>dev-qt/qtserialbus</pkg></flag> + <flag name="serialbus">Install documentation for <pkg>dev-qt/qtserialbus</pkg> (unpacakged for Qt6)</flag> <flag name="serialport">Install documentation for <pkg>dev-qt/qtserialport</pkg></flag> + <flag name="shadertools">Install documentation for <pkg>dev-qt/qtshadertools</pkg></flag> <flag name="speech">Install documentation for <pkg>dev-qt/qtspeech</pkg></flag> <flag name="sql">Install documentation for <pkg>dev-qt/qtsql</pkg></flag> + <flag name="svg">Install documentation for <pkg>dev-qt/qtsvg</pkg></flag> <flag name="timeline">Install documentation for <pkg>dev-qt/qtquicktimeline</pkg></flag> + <flag name="tools">Install documentation for <pkg>dev-qt/qttools</pkg></flag> <flag name="virtualkeyboard">Install documentation for <pkg>dev-qt/qtvirtualkeyboard</pkg></flag> + <flag name="wayland">Install documentation for <pkg>dev-qt/qtwayland</pkg></flag> <flag name="webchannel">Install documentation for <pkg>dev-qt/qtwebchannel</pkg></flag> <flag name="webengine">Install documentation for <pkg>dev-qt/qtwebengine</pkg></flag> <flag name="websockets">Install documentation for <pkg>dev-qt/qtwebsockets</pkg></flag> - <flag name="webview">Install documentation for <pkg>dev-qt/qtwebview</pkg></flag> + <flag name="webview">Install documentation for <pkg>dev-qt/qtwebview</pkg> (unpackaged for Qt6)</flag> <flag name="widgets">Install documentation for <pkg>dev-qt/qtwidgets</pkg></flag> <flag name="x11extras">Install documentation for <pkg>dev-qt/qtx11extras</pkg></flag> <flag name="xmlpatterns">Install documentation for <pkg>dev-qt/qtxmlpatterns</pkg></flag> diff --git a/dev-qt/qt-docs/qt-docs-5.15.2_p202011130614.ebuild b/dev-qt/qt-docs/qt-docs-5.15.2_p202011130614.ebuild index 351c5273763e..f015595836c8 100644 --- a/dev-qt/qt-docs/qt-docs-5.15.2_p202011130614.ebuild +++ b/dev-qt/qt-docs/qt-docs-5.15.2_p202011130614.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit unpacker PV_FULL=${PV/_p/-0-} PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*}) @@ -53,7 +55,7 @@ HOMEPAGE="https://doc.qt.io/" LICENSE="FDL-1.3" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine" REQUIRED_USE="|| ( html qch )" @@ -80,13 +82,13 @@ for DOCUSE in ${!QT5_DOCS[@]}; do done unset DOCTAR DOCUSE +S=${WORKDIR}/Docs/Qt-${PV%_p*} + BDEPEND=" - app-arch/p7zip + $(unpacker_src_uri_depends .7z) media-libs/libpng:0 " -S=${WORKDIR}/Docs/Qt-${PV%_p*} - src_prepare() { default diff --git a/dev-qt/qt-docs/qt-docs-6.7.0_p202403252230.ebuild b/dev-qt/qt-docs/qt-docs-6.7.0_p202403252230.ebuild new file mode 100644 index 000000000000..f0105fb148a1 --- /dev/null +++ b/dev-qt/qt-docs/qt-docs-6.7.0_p202403252230.ebuild @@ -0,0 +1,152 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit unpacker + +DESCRIPTION="Qt6 documentation and examples for Qt Creator and other tools" +HOMEPAGE="https://doc.qt.io/" + +LICENSE="FDL-1.3" +SLOT="6" +KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+examples +html +qch" +REQUIRED_USE="|| ( examples html qch )" + +BDEPEND=" + examples? ( $(unpacker_src_uri_depends .7z) ) +" + +qt6_docs_generate_metadata() { + local qtver=${PV%%_p*} + local prefix=${qtver}-0-${PV##*_p} + local doc_suffix=-documentation.tar.xz + local exa_suffix=-examples-${qtver}.7z + local baseuri=https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_${qtver//.}_src_doc_examples/qt.qt6.${qtver//.} + SRC_URI= + S=${WORKDIR} + + # Bumping involves diff'ing the unversioned *_src_doc_examples/*/ files + # list from old version to the new for -documentation and -examples + # files, then adding/removing entries if anything changed. + # + # Format: [+-%]<USE>[</|^><package>[!|:]][="<module> ..."] + # - [+-%]<USE>: enable(+), disable(-), or no IUSE(%) + # (should disable if associated package is not in tree) + # - /<package>: qt.qt6.*.examples.<package>/*-<package>-examples* + # - ^<package>: qt.qt6.*.examples/*-<package>-examples.7z + # - <module>: qt.qt6.*.doc.<package>/*-<module>-documentation* + # (if <module> is unspecified, defaults to <package>) + # - <package>[!:]: only has examples(!) or documentation(:) + # Note: sub-300 bytes examples archives are empty, can be skipped + local map=( + # map with (non-split) Qt6 packages rather than per-module + %base^qtbase=" + qmake qtcmake qtconcurrent qtcore qtdbus + qtgui qtnetwork qtopengl qtplatformintegration + qtprintsupport qtsql qttestlib qtwidgets qtxml + " + +3d/qt3d + -activeqt/qtactiveqt="activeqt" + +charts/qtcharts + +connectivity/qtbluetooth: + +connectivity/qtconnectivity! + +connectivity/qtnfc: + -datavis/qtdatavis3d + +declarative^qtdeclarative=" + qtlabsplatform qtqml qtqmlcore qtqmlmodels + qtqmltest qtqmlworkerscript qtqmlxmllistmodel + qtquick qtquickcontrols qtquickdialogs + " + %doc^qtdoc + -graphs/qtgraphs + -grpc/qtgrpc="qtgrpc qtprotobuf" + +httpserver/qthttpserver + +imageformats/qtimageformats: # empty examples +# +languageserver/qtlanguageserver # docs and examples are empty + +location/qtlocation + -lottie/qtlottie:="qtlottieanimation" # empty examples + +multimedia/qtmultimedia + +networkauth/qtnetworkauth + +positioning/qtpositioning + +qt5compat/qt5compat="qtcore5compat qtgraphicaleffects5compat" +# +qt5="qt5" # already installed by qtbase (conflicts) + -quick3dphysics/qtquick3dphysics + +quick3d/qtquick3d + -quickeffectmaker/qtquickeffectmaker + -remoteobjects/qtremoteobjects + +scxml/qtscxml + +sensors/qtsensors + +serialbus/qtserialbus + +serialport/qtserialport + +shadertools/qtshadertools: # empty examples + +speech/qtspeech="qttexttospeech" + +svg^qtsvg + +timeline/qtquicktimeline: + +tools^qttools=" + qdoc qtassistant qtdesigner qtdistancefieldgenerator + qthelp qtlinguist qtuitools + " + +virtualkeyboard/qtvirtualkeyboard + +wayland^qtwayland="qtwaylandcompositor" + +webchannel/qtwebchannel + +webengine/qtpdf: + +webengine/qtwebengine + +websockets/qtwebsockets + +webview/qtwebview + ) + + local entry operator use subdir package exception modules uris + local -A iuse + for entry in "${map[@]}"; do + [[ ${entry} =~ ^([%+-])([^/^!:=]+)([/^])?([^!:=]+)?([!:])?=?(.+)? ]] # || die + operator=${BASH_REMATCH[1]#-} + use=${BASH_REMATCH[2]} + subdir=${BASH_REMATCH[3]} + package=${BASH_REMATCH[4]} + exception=${BASH_REMATCH[5]} + modules=${BASH_REMATCH[6]:-${package}} + + [[ ${subdir} == / ]] && subdir=.${package} || subdir= + + [[ ${exception} == ! ]] || + printf -v uris "${baseuri}.doc${subdir}/${prefix}%s${doc_suffix} " \ + ${modules} + [[ ${exception} == : ]] || + uris+=" examples? ( ${baseuri}.examples${subdir}/${prefix}${package}${exa_suffix} )" + + if [[ ${operator} == % ]]; then + SRC_URI+=" ${uris}" + else + iuse[${operator}${use}]= # avoid duplicates + SRC_URI+=" ${use}? ( ${uris} )" + fi + done + IUSE+=" ${!iuse[*]}" +} +qt6_docs_generate_metadata + +src_install() { + insinto /usr/share/qt6-doc # QT6_DOCDIR + use qch && doins -r Docs/*/*.qch + + if use html; then + doins -r Docs/*/*/ + + # needed not to let Qt Creator believe that these examples exist + use examples || + find "${ED}" -type f -name examples-manifest.xml -delete || die + elif use examples; then + # still need docs tarballs even with USE="-html -qch" + for dir in Docs/*/*/; do + if [[ -e ${dir}/examples-manifest.xml ]]; then + insinto /usr/share/qt6-doc/"${dir#*/*/}" + doins ${dir}/examples-manifest.xml + fi + done + fi + + insinto /usr/share/qt6/examples # QT6_EXAMPLESDIR + use examples && doins -r Examples/*/*/ +} diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest index c089dc49562c..b48741a74ffd 100644 --- a/dev-qt/qt3d/Manifest +++ b/dev-qt/qt3d/Manifest @@ -1 +1,2 @@ -DIST qt3d-everywhere-src-5.15.2.tar.xz 81925416 BLAKE2B 358a071f775d460d794ce3451ea6904f9d1ac0a388176ba62f7d6c7c574621cdcd3db8f7af3aaa361e5ac172056e8e8a32b894b401720e93ae2a2cfad4282da3 SHA512 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b +DIST qt3d-everywhere-opensource-src-5.15.13.tar.xz 118272832 BLAKE2B 35726c265e4abae44549e6ace3994bd7b82e522b5b1aa2dab835ade79c1fba531940ddc62c9c0c8b3ceda3d7b173ae45806e46c20428fc71c209971335d6c687 SHA512 30bb061b13f91a8137e961948431b0ca697135a62c8f601eb0c65dc46f0a1f3e7d850141952f0b673a80002e8493289860d9b86840406e3e72fab4eb515688ad +DIST qt3d-everywhere-src-6.7.0.tar.xz 141570596 BLAKE2B d9731f48157cbeb7e4fb5d1307cd09866bc4eb00f68f42299e1b35ce7ab4ec494418c50fae3513907d41d083e2fb13ff955b31e201e4235abb0d13c4e837c880 SHA512 538027077f9729b91ecc3a4de4a14be212236d0bc4b1f4533a558753b6cb7aa23e1c169c921fa71d61d5f9cffbb85a0535000bf677ca09962ca62cbfcc60e70d diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml index d359595b1800..12e16d119066 100644 --- a/dev-qt/qt3d/metadata.xml +++ b/dev-qt/qt3d/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -8,11 +8,11 @@ <use> <flag name="gamepad">Add support for gamepad hardware via <pkg>dev-qt/qtgamepad</pkg></flag> <flag name="qml">Build QML/QtQuick bindings</flag> - <flag name="vulkan">Enable support for Vulkan</flag> </use> <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-5.15.13.ebuild b/dev-qt/qt3d/qt3d-5.15.13.ebuild new file mode 100644 index 000000000000..268e053052df --- /dev/null +++ b/dev-qt/qt3d/qt3d-5.15.13.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="amd64 ~arm arm64 ~riscv x86" +fi +inherit qt5-build + +DESCRIPTION="3D rendering module for the Qt5 framework" + +# TODO: tools +IUSE="gamepad gles2-only qml vulkan" + +RDEPEND=" + =dev-qt/qtconcurrent-${QT5_PV}* + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=] + =dev-qt/qtnetwork-${QT5_PV}* + >=media-libs/assimp-4.0.0:= + gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* ) + qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] ) +" +DEPEND="${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" + +src_prepare() { + rm -r src/3rdparty/assimp/src/{code,contrib,include} || die + + qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri + qt_use_disable_mod qml quick src/src.pro + + qt5-build_src_prepare +} + +src_configure() { + local myqmakeargs=( + -- + -system-assimp + ) + qt5-build_src_configure +} diff --git a/dev-qt/qt3d/qt3d-5.15.2.ebuild b/dev-qt/qt3d/qt3d-5.15.2.ebuild deleted file mode 100644 index 6a12fcf3062a..000000000000 --- a/dev-qt/qt3d/qt3d-5.15.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qt5-build - -DESCRIPTION="3D rendering module for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64 x86" -fi - -# TODO: tools -IUSE="gamepad gles2-only qml vulkan" - -COMMON_DEPEND=" - ~dev-qt/qtconcurrent-${PV} - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}:5=[vulkan=] - ~dev-qt/qtnetwork-${PV} - >=media-libs/assimp-4.0.0 - gamepad? ( ~dev-qt/qtgamepad-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) -" -DEPEND="${COMMON_DEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -RDEPEND="${COMMON_DEPEND} - dev-qt/qtchooser -" - -src_prepare() { - rm -r src/3rdparty/assimp/{code,contrib,include} || die - - qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri - qt_use_disable_mod qml quick src/src.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qt3d/qt3d-6.7.0.ebuild b/dev-qt/qt3d/qt3d-6.7.0.ebuild new file mode 100644 index 000000000000..a7e384a54768 --- /dev/null +++ b/dev-qt/qt3d/qt3d-6.7.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 2021-2024 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 ~arm ~riscv ~x86" +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=] + ~dev-qt/qtshadertools-${PV}:6 + media-libs/assimp:= + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + -DQT_FEATURE_qt3d_system_assimp=ON + -DQT_UNITY_BUILD=OFF # fails to build + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qt3d/qt3d-6.7.9999.ebuild b/dev-qt/qt3d/qt3d-6.7.9999.ebuild new file mode 100644 index 000000000000..f0094074cd16 --- /dev/null +++ b/dev-qt/qt3d/qt3d-6.7.9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 2021-2024 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 ~arm ~riscv ~x86" +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=] + ~dev-qt/qtshadertools-${PV}:6 + media-libs/assimp:= + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + -DQT_FEATURE_qt3d_system_assimp=ON + -DQT_UNITY_BUILD=OFF # fails to build + ) + + 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..f0094074cd16 --- /dev/null +++ b/dev-qt/qt3d/qt3d-6.9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 2021-2024 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 ~arm ~riscv ~x86" +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=] + ~dev-qt/qtshadertools-${PV}:6 + media-libs/assimp:= + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + -DQT_FEATURE_qt3d_system_assimp=ON + -DQT_UNITY_BUILD=OFF # fails to build + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest new file mode 100644 index 000000000000..812a5a1dfb3d --- /dev/null +++ b/dev-qt/qt5compat/Manifest @@ -0,0 +1 @@ +DIST qt5compat-everywhere-src-6.7.0.tar.xz 14629204 BLAKE2B e7227cee9a73f2f06cf060dfeedc03abefb213363fe866d908abc1d4f144f442d590792584cfe90145c6ddc70fab1da1b440a146cca6495c534bca2419d01c7d SHA512 92115ca88b839171cf69360e0c3add64bb84305fdc28b9459da5eb69df79bfc2884616991ada898242e3614ac4f188dd76aa17889b5fb7fa72316a11efd61c85 diff --git a/dev-qt/qt5compat/metadata.xml b/dev-qt/qt5compat/metadata.xml new file mode 100644 index 000000000000..00a322d647f6 --- /dev/null +++ b/dev-qt/qt5compat/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="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> + 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/qt5compat/qt5compat-6.7.0.ebuild b/dev-qt/qt5compat/qt5compat-6.7.0.ebuild new file mode 100644 index 000000000000..506e617217f4 --- /dev/null +++ b/dev-qt/qt5compat/qt5compat-6.7.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023-2024 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 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +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 Qt6Quick) + ) + + 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.7.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.7.9999.ebuild new file mode 100644 index 000000000000..4462f312f154 --- /dev/null +++ b/dev-qt/qt5compat/qt5compat-6.7.9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +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 Qt6Quick) + ) + + 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..4462f312f154 --- /dev/null +++ b/dev-qt/qt5compat/qt5compat-6.9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +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 Qt6Quick) + ) + + 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 new file mode 100644 index 000000000000..339951b9f97a --- /dev/null +++ b/dev-qt/qtbase/Manifest @@ -0,0 +1 @@ +DIST qtbase-everywhere-src-6.7.0.tar.xz 49314276 BLAKE2B f4ec35fd3c15d56a28e1608dec927eaf34d84c2250405d921adadc16d90ec148f4983024dcf9be1832de91381d18e33fd7578d60d8654469e23530a210618e11 SHA512 72896cc5a677361779f49d60dbdfc33a21d77bd479e0586b0beb03eee2016d613aee56e798143a489431a07a5e7a7db4c7c046105a11b63dd178768f3a7f195a diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-hppa-forkfd-grow-stack.patch b/dev-qt/qtbase/files/qtbase-6.5.2-hppa-forkfd-grow-stack.patch new file mode 100644 index 000000000000..ccada9f80e34 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.5.2-hppa-forkfd-grow-stack.patch @@ -0,0 +1,28 @@ +Patch taken from Debian[1], largely broken on HPPA without and several +tests give segmentation faults[2]. + +Needs upstreaming if someone familiar with HPPA wants to give this +attention. Note forkfd is essentially maintained in qtbase's repo[3] +rather than truly third party. + +[1] https://bugs.debian.org/1042018 +[2] https://bugs.gentoo.org/914371 +[3] https://code.qt.io/cgit/qt/qtbase.git/tree/src/3rdparty/forkfd + +Description: Change how stack grows on HPPA. + On HPPA stack grows upwards. This patch introduces this change for + this 3rd party code. +Author: John David Anglin <dave.anglin@bell.net> +--- a/src/3rdparty/forkfd/forkfd_linux.c ++++ b/src/3rdparty/forkfd/forkfd_linux.c +@@ -170,5 +170,10 @@ + *system = 1; + ++#if defined(__hppa__) ++ /* Stack grows up */ ++ pid = clone(childFn, childStack, cloneflags, token, &pidfd, NULL, NULL); ++#else + pid = clone(childFn, childStack + sizeof(childStack), cloneflags, token, &pidfd, NULL, NULL); ++#endif + if (pid < 0) + return pid; diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch b/dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch new file mode 100644 index 000000000000..815fd3955420 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch @@ -0,0 +1,5 @@ +https://bugs.gentoo.org/914195 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65 +64,0 @@ +-qt_internal_check_if_path_has_symlinks("${CMAKE_BINARY_DIR}") diff --git a/dev-qt/qtbase/files/qtbase-6.6.1-forkfd-childstack-size.patch b/dev-qt/qtbase/files/qtbase-6.6.1-forkfd-childstack-size.patch new file mode 100644 index 000000000000..3b9df41bf719 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.6.1-forkfd-childstack-size.patch @@ -0,0 +1,27 @@ +Avoid crash that happens for some users in qsb, qmake, and +potentially other Qt tools when ran under sandbox leading +to build failures for qtdeclarative and other packages. + +Former fix involved replacing 4096 by SIGSTKSZ but +bug #918664 shown that this may be insufficient so this +tries 32k instead. + +Update: after https://bugs.gentoo.org/923013 and a fixed +sandbox been stabilized for some time, it should in theory +be possible to drop this + +https://bugs.gentoo.org/908809 +https://bugs.gentoo.org/908816 +https://bugs.gentoo.org/913493 +https://bugs.gentoo.org/915695 +https://bugs.gentoo.org/918664 +https://codereview.qt-project.org/c/qt/qtbase/+/513140 +--- a/src/3rdparty/forkfd/forkfd_linux.c ++++ b/src/3rdparty/forkfd/forkfd_linux.c +@@ -158,5 +158,5 @@ + int system_vforkfd(int flags, pid_t *ppid, int (*childFn)(void *), void *token, int *system) + { +- __attribute__((aligned(64))) char childStack[SIGSTKSZ]; ++ __attribute__((aligned(64))) char childStack[32768]; + pid_t pid; + int pidfd; diff --git a/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch b/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch new file mode 100644 index 000000000000..e7eb9dcc9209 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch @@ -0,0 +1,15 @@ +Simply disable the broken path rather than worry about it for now. + +Likely an easy fix but would rather this be handled upstream and +reported by someone that is affected and can test. + +https://bugs.gentoo.org/926287 +--- a/src/gui/painting/qrgbafloat.h ++++ b/src/gui/painting/qrgbafloat.h +@@ -20,5 +20,5 @@ + public: + using Type = F; +-#if defined(__AVX512FP16__) && QFLOAT16_IS_NATIVE ++#if 0 + // AVX512FP16 has multiplication instructions + using FastType = F; diff --git a/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch b/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch new file mode 100644 index 000000000000..965dade1c133 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/928299 +https://bugreports.qt.io/browse/QTBUG-124135 +https://codereview.qt-project.org/c/qt/qtbase/+/553372 +From: Alexey Edelev <alexey.edelev@qt.io> +Date: Fri, 05 Apr 2024 14:50:37 +0200 +Subject: [PATCH] Prefer the versioned targets over the namespaceless one when collecting deps + +Change the way we collect dependencies in __qt_internal_walk_libs. +Prefer the versioned Qt targets over the namespaceless. This fixes the +generating of the pkg-config configs. + +Pick-to: 6.5 6.6 6.7 +Task-number: QTBUG-124135 +Change-Id: I660376e122a99b5bc0874f2bc6ccd4d80c9ad453 +--- a/cmake/QtPublicWalkLibsHelpers.cmake ++++ b/cmake/QtPublicWalkLibsHelpers.cmake +@@ -184,13 +184,13 @@ + if(lib_target MATCHES "^::@") + continue() + elseif(TARGET ${lib_target}) +- if ("${lib_target}" MATCHES "^Qt::(.*)") +- # If both, Qt::Foo and Foo targets exist, prefer the target name without ++ if(NOT "${lib_target}" MATCHES "^(Qt|${QT_CMAKE_EXPORT_NAMESPACE})::.+") ++ # If both, Qt::Foo and Foo targets exist, prefer the target name with versioned + # namespace. Which one is preferred doesn't really matter. This code exists to + # avoid ending up with both, Qt::Foo and Foo in our dependencies. +- set(namespaceless_lib_target "${CMAKE_MATCH_1}") +- if(TARGET "${namespaceless_lib_target}") +- set(lib_target ${namespaceless_lib_target}) ++ set(versioned_qt_target "${QT_CMAKE_EXPORT_NAMESPACE}::${lib_target}") ++ if(TARGET "${versioned_qt_target}") ++ set(lib_target ${versioned_qt_target}) + endif() + endif() + get_target_property(lib_target_type ${lib_target} TYPE) diff --git a/dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch b/dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch new file mode 100644 index 000000000000..4c2a37cb6c35 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch @@ -0,0 +1,29 @@ +https://bugreports.qt.io/browse/QTBUG-123937 +From 6810220218cbbf2854ecdedb291f7e4a84b31e54 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Wed, 3 Apr 2024 00:47:01 +0200 +Subject: [PATCH] Use ifdef instead of if for __cpp_lib_span + +Like the other times it's used in this file + +This is causing compilation errors in projects that use -Werror=undef + +Fixes: QTBUG-123937 +Change-Id: I0cdd2910755dc9079890011dd8dbc27a6e64793e +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +(cherry picked from commit 699ddcb15b5e981d32ea65d1c1a12f8fa0b06e0d) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +--- a/src/corelib/tools/qspan.h ++++ b/src/corelib/tools/qspan.h +@@ -297,7 +297,7 @@ public: + : QSpanBase(il.begin(), il.size()) + {} + +-#if __cpp_lib_span ++#ifdef __cpp_lib_span + template <typename S, size_t N, if_qualification_conversion<S> = true> + Q_IMPLICIT constexpr QSpanBase(std::span<S, N> other) noexcept + : QSpanBase(other.data(), other.size()) +-- +2.44.0 + diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml new file mode 100644 index 000000000000..61564794deab --- /dev/null +++ b/dev-qt/qtbase/metadata.xml @@ -0,0 +1,35 @@ +<?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="X">Build the XCB platform plugin and enable X11 integration</flag> + <flag name="concurrent">Build Qt6Concurrent module</flag> + <flag name="dbus">Build Qt6DBus module</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> + <flag name="gtk">Build the GTK platform theme plugin</flag> + <flag name="gui">Build Qt6Gui module</flag> + <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> + <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic HTTP/SOCKS proxy configuration</flag> + <flag name="network">Build Qt6Network module</flag> + <flag name="renderdoc">Enable support for capturing graphic's API calls using <pkg>media-gfx/renderdoc</pkg></flag> + <flag name="sql">Build Qt6Sql module</flag> + <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> + <flag name="widgets">Build Qt6Widgets module</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> + 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/qtbase/qtbase-6.7.0-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.0-r1.ebuild new file mode 100644 index 000000000000..23c59f62fc8d --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.7.0-r1.ebuild @@ -0,0 +1,381 @@ +# Copyright 2021-2024 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 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +declare -A QT6_IUSE=( + [global]="+ssl +udev zstd" + [core]="icu" + [modules]="+concurrent +dbus +gui +network +sql +xml" + + [gui]=" + +X accessibility eglfs evdev gles2-only +libinput + opengl renderdoc tslib vulkan wayland +widgets + " + [network]="brotli gssapi libproxy sctp" + [sql]="mysql oci8 odbc postgres +sqlite" + [widgets]="cups gtk" + + [optfeature]="nls" #810802 +) +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? ( dbus ) + eglfs? ( opengl ) + gles2-only? ( 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) +# dlopen: renderdoc +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:= ) + + 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? ( + gles2-only? ( media-libs/libglvnd ) + !gles2-only? ( media-libs/libglvnd[X?] ) + ) + renderdoc? ( media-gfx/renderdoc ) + 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=" + nls? ( ~dev-qt/qttranslations-${PV}:6 ) + wayland? ( ~dev-qt/qtwayland-${PV}:6 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch + "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch + "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch + "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch + "${FILESDIR}"/${PN}-6.6.3-pkgconf-deps.patch + "${FILESDIR}"/${PN}-6.7.0-qspan-ifdef.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 + + # workaround for __extendhfxf2 being used for tst_qfloat16.cpp + # which is unavailable with compiler-rt (assume used if clang) + if tc-is-clang; then + sed -e '/add_subdirectory(qfloat16)/d' \ + -i tests/auto/corelib/global/CMakeLists.txt || die + fi + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_PCH=OFF + + -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_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too + + -DQT_FEATURE_relocatable=OFF #927691 + $(qt_feature ssl openssl) + $(qt_feature ssl openssl_linked) + $(qt_feature udev libudev) + $(qt_feature zstd) + + # qtcore + $(qt_feature icu) + + # tools + -DQT_FEATURE_androiddeployqt=OFF + + # modules + $(qt_feature concurrent) + $(qt_feature dbus) + $(qt_feature gui) + $(qt_feature network) + $(qt_feature sql) + # trivial, and is often needed (sometimes even when not building tests) + -DQT_FEATURE_testlib=ON + $(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 libinput) + $(qt_feature renderdoc graphicsframecapture) + $(qt_feature tslib) + $(qt_feature vulkan) + $(qt_feature wayland) + $(qt_feature widgets) + -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) + -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c + ) && use widgets && mycmakeargs+=( + # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups + $(qt_feature cups) + $(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 + -DQT_FEATURE_sql_mimer=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) + ) + + 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 + $(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 + # similarly broken when relocatable=OFF (bug #927691) + tst_qapplication + tst_qt_cmake_create + tst_uic + # 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 + # fails with sandbox + tst_qsharedmemory + # typical to lack SCTP support on non-generic kernels + tst_qsctpsocket + # randomly fails without -j1, and not worth it over this (bug #916181) + tst_qfiledialog{,2} + # may randomly hang+timeout, perhaps related to -j as well + tst_qtimer + # these can be flaky depending on the environment/toolchain + tst_qlogging # backtrace log test can easily vary + tst_q{,raw}font # affected by available fonts / settings (bug #914737) + tst_qprinter # checks system's printers (bug #916216) + 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 + # similarly, but on armv7 and potentially others (bug #914028) + tst_qlineedit + tst_qpainter + # likewise, known failing on BE arches (bug #914033,914371,918878) + tst_qimagereader + tst_qimagewriter + tst_qpluginloader + tst_quuid # >=6.6.2 had related fixes, needs retesting + # partially broken on llvm-musl, needs looking into but skip to have + # a baseline for regressions (rest of dev-qt still passes with musl) + $(usev elibc_musl ' + tst_qicoimageformat + tst_qimagereader + tst_qimage + tst_qprocess + ') + # fails due to hppa's NaN handling, needs looking into (bug #914371) + $(usev hppa ' + tst_qcborvalue + tst_qnumeric + ') + # bug #914033 + $(usev sparc ' + tst_qbuffer + tst_qprocess + tst_qtconcurrentiteratekernel + ') + # 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.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild new file mode 100644 index 000000000000..016279f8fec5 --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild @@ -0,0 +1,379 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +declare -A QT6_IUSE=( + [global]="+ssl +udev zstd" + [core]="icu" + [modules]="+concurrent +dbus +gui +network +sql +xml" + + [gui]=" + +X accessibility eglfs evdev gles2-only +libinput + opengl renderdoc tslib vulkan wayland +widgets + " + [network]="brotli gssapi libproxy sctp" + [sql]="mysql oci8 odbc postgres +sqlite" + [widgets]="cups gtk" + + [optfeature]="nls" #810802 +) +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? ( dbus ) + eglfs? ( opengl ) + gles2-only? ( 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) +# dlopen: renderdoc +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:= ) + + 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? ( + gles2-only? ( media-libs/libglvnd ) + !gles2-only? ( media-libs/libglvnd[X?] ) + ) + renderdoc? ( media-gfx/renderdoc ) + 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=" + nls? ( ~dev-qt/qttranslations-${PV}:6 ) + wayland? ( ~dev-qt/qtwayland-${PV}:6 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch + "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch + "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch + "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.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 + + # workaround for __extendhfxf2 being used for tst_qfloat16.cpp + # which is unavailable with compiler-rt (assume used if clang) + if tc-is-clang; then + sed -e '/add_subdirectory(qfloat16)/d' \ + -i tests/auto/corelib/global/CMakeLists.txt || die + fi + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_PCH=OFF + + -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_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too + + -DQT_FEATURE_relocatable=OFF #927691 + $(qt_feature ssl openssl) + $(qt_feature ssl openssl_linked) + $(qt_feature udev libudev) + $(qt_feature zstd) + + # qtcore + $(qt_feature icu) + + # tools + -DQT_FEATURE_androiddeployqt=OFF + + # modules + $(qt_feature concurrent) + $(qt_feature dbus) + $(qt_feature gui) + $(qt_feature network) + $(qt_feature sql) + # trivial, and is often needed (sometimes even when not building tests) + -DQT_FEATURE_testlib=ON + $(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 libinput) + $(qt_feature renderdoc graphicsframecapture) + $(qt_feature tslib) + $(qt_feature vulkan) + $(qt_feature wayland) + $(qt_feature widgets) + -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) + -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c + ) && use widgets && mycmakeargs+=( + # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups + $(qt_feature cups) + $(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 + -DQT_FEATURE_sql_mimer=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) + ) + + 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 + $(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 + # similarly broken when relocatable=OFF (bug #927691) + tst_qapplication + tst_qt_cmake_create + tst_uic + # 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 + # fails with sandbox + tst_qsharedmemory + # typical to lack SCTP support on non-generic kernels + tst_qsctpsocket + # randomly fails without -j1, and not worth it over this (bug #916181) + tst_qfiledialog{,2} + # may randomly hang+timeout, perhaps related to -j as well + tst_qtimer + # these can be flaky depending on the environment/toolchain + tst_qlogging # backtrace log test can easily vary + tst_q{,raw}font # affected by available fonts / settings (bug #914737) + tst_qprinter # checks system's printers (bug #916216) + 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 + # similarly, but on armv7 and potentially others (bug #914028) + tst_qlineedit + tst_qpainter + # likewise, known failing on BE arches (bug #914033,914371,918878) + tst_qimagereader + tst_qimagewriter + tst_qpluginloader + tst_quuid # >=6.6.2 had related fixes, needs retesting + # partially broken on llvm-musl, needs looking into but skip to have + # a baseline for regressions (rest of dev-qt still passes with musl) + $(usev elibc_musl ' + tst_qicoimageformat + tst_qimagereader + tst_qimage + tst_qprocess + ') + # fails due to hppa's NaN handling, needs looking into (bug #914371) + $(usev hppa ' + tst_qcborvalue + tst_qnumeric + ') + # bug #914033 + $(usev sparc ' + tst_qbuffer + tst_qprocess + tst_qtconcurrentiteratekernel + ') + # 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..016279f8fec5 --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -0,0 +1,379 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +declare -A QT6_IUSE=( + [global]="+ssl +udev zstd" + [core]="icu" + [modules]="+concurrent +dbus +gui +network +sql +xml" + + [gui]=" + +X accessibility eglfs evdev gles2-only +libinput + opengl renderdoc tslib vulkan wayland +widgets + " + [network]="brotli gssapi libproxy sctp" + [sql]="mysql oci8 odbc postgres +sqlite" + [widgets]="cups gtk" + + [optfeature]="nls" #810802 +) +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? ( dbus ) + eglfs? ( opengl ) + gles2-only? ( 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) +# dlopen: renderdoc +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:= ) + + 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? ( + gles2-only? ( media-libs/libglvnd ) + !gles2-only? ( media-libs/libglvnd[X?] ) + ) + renderdoc? ( media-gfx/renderdoc ) + 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=" + nls? ( ~dev-qt/qttranslations-${PV}:6 ) + wayland? ( ~dev-qt/qtwayland-${PV}:6 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch + "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch + "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch + "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.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 + + # workaround for __extendhfxf2 being used for tst_qfloat16.cpp + # which is unavailable with compiler-rt (assume used if clang) + if tc-is-clang; then + sed -e '/add_subdirectory(qfloat16)/d' \ + -i tests/auto/corelib/global/CMakeLists.txt || die + fi + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_PCH=OFF + + -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_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too + + -DQT_FEATURE_relocatable=OFF #927691 + $(qt_feature ssl openssl) + $(qt_feature ssl openssl_linked) + $(qt_feature udev libudev) + $(qt_feature zstd) + + # qtcore + $(qt_feature icu) + + # tools + -DQT_FEATURE_androiddeployqt=OFF + + # modules + $(qt_feature concurrent) + $(qt_feature dbus) + $(qt_feature gui) + $(qt_feature network) + $(qt_feature sql) + # trivial, and is often needed (sometimes even when not building tests) + -DQT_FEATURE_testlib=ON + $(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 libinput) + $(qt_feature renderdoc graphicsframecapture) + $(qt_feature tslib) + $(qt_feature vulkan) + $(qt_feature wayland) + $(qt_feature widgets) + -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) + -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c + ) && use widgets && mycmakeargs+=( + # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups + $(qt_feature cups) + $(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 + -DQT_FEATURE_sql_mimer=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) + ) + + 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 + $(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 + # similarly broken when relocatable=OFF (bug #927691) + tst_qapplication + tst_qt_cmake_create + tst_uic + # 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 + # fails with sandbox + tst_qsharedmemory + # typical to lack SCTP support on non-generic kernels + tst_qsctpsocket + # randomly fails without -j1, and not worth it over this (bug #916181) + tst_qfiledialog{,2} + # may randomly hang+timeout, perhaps related to -j as well + tst_qtimer + # these can be flaky depending on the environment/toolchain + tst_qlogging # backtrace log test can easily vary + tst_q{,raw}font # affected by available fonts / settings (bug #914737) + tst_qprinter # checks system's printers (bug #916216) + 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 + # similarly, but on armv7 and potentially others (bug #914028) + tst_qlineedit + tst_qpainter + # likewise, known failing on BE arches (bug #914033,914371,918878) + tst_qimagereader + tst_qimagewriter + tst_qpluginloader + tst_quuid # >=6.6.2 had related fixes, needs retesting + # partially broken on llvm-musl, needs looking into but skip to have + # a baseline for regressions (rest of dev-qt still passes with musl) + $(usev elibc_musl ' + tst_qicoimageformat + tst_qimagereader + tst_qimage + tst_qprocess + ') + # fails due to hppa's NaN handling, needs looking into (bug #914371) + $(usev hppa ' + tst_qcborvalue + tst_qnumeric + ') + # bug #914033 + $(usev sparc ' + tst_qbuffer + tst_qprocess + tst_qtconcurrentiteratekernel + ') + # 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/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest index fb34f083fc73..1b6f08ffd2cd 100644 --- a/dev-qt/qtbluetooth/Manifest +++ b/dev-qt/qtbluetooth/Manifest @@ -1 +1,2 @@ -DIST qtconnectivity-everywhere-src-5.15.2.tar.xz 2815492 BLAKE2B 0702601266d46669e0a39740b6df539b1d3f6dcb62d06b14f5ba89782e9bd38faa391892841434feccd9599eef09c7c7238efb82e11a0633e73f58dd721d3324 SHA512 a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c +DIST qtconnectivity-5.15.13-gentoo-kde-1.tar.xz 3860 BLAKE2B baab5cb0ff95f149e9df81997eb497869477647a4b63b4da479496daa949948e46f764f1408b48e22dd22b90f99226d9d36eadef4c0587015c3d42ed7cfa573d SHA512 18997aaf37d6cc3b0c05d8bd1a3a9f729cc3fbc3e59fd69045be1f5f6421282ebe1c905cd700120b60ad6490c1e4374e5586880db8e622aeec1662ea0b5c906d +DIST qtconnectivity-everywhere-opensource-src-5.15.13.tar.xz 2829340 BLAKE2B de9cdf9fe4e6fa78b5d14712a57f714eb7f7c8e9c9b89d07db098a41ab8f0c8a6ba4ce54e3652f352335370aa44fac201459abdb550f71a1884919caa5188959 SHA512 631947135a362b5a417b84702b3755588e5c7fe1c9cca5b523c8d8ca340b42f929aaf58c49d8282ec46b85b58afe8f0f2600024875fb9a7bd1145566ca328966 diff --git a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch b/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch deleted file mode 100644 index 7c27730574b6..000000000000 --- a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0ae88b90f857bfcc2d0ea33d16753d8eed5db9e1 Mon Sep 17 00:00:00 2001 -From: Jeff Law <law@redhat.com> -Date: Oct 16 2020 20:08:46 +0000 -Subject: Add missing #include for gcc-11 - - -diff --git a/src/bluetooth/lecmaccalculator.cpp b/src/bluetooth/lecmaccalculator.cpp -index b150466..507603c 100644 ---- a/src/bluetooth/lecmaccalculator.cpp -+++ b/src/bluetooth/lecmaccalculator.cpp -@@ -38,6 +38,8 @@ - ****************************************************************************/ - #include "lecmaccalculator_p.h" - -+#include <limits> -+ - #include "bluez/bluez_data_p.h" - - #include <QtCore/qbytearray.h> diff --git a/dev-qt/qtbluetooth/metadata.xml b/dev-qt/qtbluetooth/metadata.xml index d437181335d4..5ca993705e2e 100644 --- a/dev-qt/qtbluetooth/metadata.xml +++ b/dev-qt/qtbluetooth/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.13.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.13.ebuild new file mode 100644 index 000000000000..199dd5baf53e --- /dev/null +++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.13.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86" +fi + +QT5_MODULE="qtconnectivity" +inherit qt5-build + +DESCRIPTION="Bluetooth support library for the Qt5 framework" + +IUSE="qml" + +DEPEND=" + =dev-qt/qtconcurrent-${QT5_PV}* + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtdbus-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}* + >=net-wireless/bluez-5:= + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -i -e 's/nfc//' src/src.pro || die + + qt_use_disable_mod qml quick src/src.pro + + qt5-build_src_prepare +} diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild deleted file mode 100644 index f4571c977b8d..000000000000 --- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtconnectivity" -inherit qt5-build - -DESCRIPTION="Bluetooth support library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~ppc64 x86" -fi - -IUSE="qml" - -RDEPEND=" - ~dev-qt/qtconcurrent-${PV} - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtdbus-${PV} - >=net-wireless/bluez-5:= - qml? ( ~dev-qt/qtdeclarative-${PV} ) -" -DEPEND="${RDEPEND} - ~dev-qt/qtnetwork-${PV} -" - -PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 752012 - -src_prepare() { - sed -i -e 's/nfc//' src/src.pro || die - - qt_use_disable_mod qml quick src/src.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest index 079eb701fa00..1fc472041bcd 100644 --- a/dev-qt/qtcharts/Manifest +++ b/dev-qt/qtcharts/Manifest @@ -1 +1,2 @@ -DIST qtcharts-everywhere-src-5.15.2.tar.xz 4251992 BLAKE2B 84a683f0ef327437ce801f3b1e0622e31bbc69c33173b3a52e66191120189b6c46e5840ae72861093a9c2f37cf486494fd947a75bd40c8dc2fd54cfd0324eb41 SHA512 d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f +DIST qtcharts-everywhere-opensource-src-5.15.13.tar.xz 4254788 BLAKE2B 7f1f40951d26260ff625befc0834e12471f9c0c6f622b66092f8624ec6ecd8ee6d8fb82874b9f4f34b75173f5b0a1e3e8182f96c1939cd319c7d16625b8dc6e0 SHA512 a4ebdb7577683a68c960fee649ffac543528791daa88fd412ab5fdda3765719921cd4daebc49395c4108a3da2bafdbf8e08008fcced4c18b4d1a3acedb377796 +DIST qtcharts-everywhere-src-6.7.0.tar.xz 4660736 BLAKE2B 7be97979f3ddbd861f813abe55b21487a6c74599116468a45523afe2bb1d3513eae11ec09947812e1e9ef94f9439c13c7d91d453aa558fac35e200f9b77a6ca2 SHA512 4cdabacd053630e0783850d8a2204e717e2508ef749eb3d5f365494bc8cda31db066bb0bcba91bccf379f4667ca6825b8c7bc59e87e918c7e2e126b4c52655a6 diff --git a/dev-qt/qtcharts/metadata.xml b/dev-qt/qtcharts/metadata.xml index d437181335d4..0833bb7edb1a 100644 --- a/dev-qt/qtcharts/metadata.xml +++ b/dev-qt/qtcharts/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.2.ebuild b/dev-qt/qtcharts/qtcharts-5.15.13.ebuild index f57bad391ee5..fdd730c0d344 100644 --- a/dev-qt/qtcharts/qtcharts-5.15.2.ebuild +++ b/dev-qt/qtcharts/qtcharts-5.15.13.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qt5-build DESCRIPTION="Chart component library for the Qt5 framework" LICENSE="GPL-3" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" + KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" fi IUSE="qml" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtwidgets-${PV} - qml? ( ~dev-qt/qtdeclarative-${PV} ) + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtwidgets-${QT5_PV}* + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtcharts/qtcharts-6.7.0.ebuild b/dev-qt/qtcharts/qtcharts-6.7.0.ebuild new file mode 100644 index 000000000000..7b7d54225d6a --- /dev/null +++ b/dev-qt/qtcharts/qtcharts-6.7.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2024 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 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +IUSE="gles2-only qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets] + qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtcharts/qtcharts-6.7.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.7.9999.ebuild new file mode 100644 index 000000000000..264ac86f8886 --- /dev/null +++ b/dev-qt/qtcharts/qtcharts-6.7.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +IUSE="gles2-only qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets] + qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] ) +" +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..264ac86f8886 --- /dev/null +++ b/dev-qt/qtcharts/qtcharts-6.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +IUSE="gles2-only qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets] + qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtchooser/files/qtchooser-66-qt-5.15.3-compat.patch b/dev-qt/qtchooser/files/qtchooser-66-qt-5.15.3-compat.patch new file mode 100644 index 000000000000..0a8569ff90b8 --- /dev/null +++ b/dev-qt/qtchooser/files/qtchooser-66-qt-5.15.3-compat.patch @@ -0,0 +1,33 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,18 +1,13 @@ + MKDIR = mkdir -p + prefix = /usr + bindir = $(prefix)/bin +-TOOLS = assistant \ +- designer \ ++TOOLS = designer \ + lconvert \ +- linguist \ + lrelease \ + lupdate \ + moc \ +- pixeltool \ + qcollectiongenerator \ +- qdbus \ + qdbuscpp2xml \ +- qdbusviewer \ + qdbusxml2cpp \ + qdoc \ + qdoc3 \ +@@ -44,9 +39,7 @@ + rcc \ + repc \ + uic \ +- uic3 \ +- xmlpatterns \ +- xmlpatternsvalidator \ ++ uic3 + + # keep the above line empty + diff --git a/dev-qt/qtchooser/metadata.xml b/dev-qt/qtchooser/metadata.xml index 17237689dcfd..610d2d8ea120 100644 --- a/dev-qt/qtchooser/metadata.xml +++ b/dev-qt/qtchooser/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtchooser/qtchooser-66.ebuild b/dev-qt/qtchooser/qtchooser-66-r2.ebuild index 50298a23a94b..ca1cf11931e1 100644 --- a/dev-qt/qtchooser/qtchooser-66.ebuild +++ b/dev-qt/qtchooser/qtchooser-66-r2.ebuild @@ -1,17 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qmake-utils toolchain-funcs DESCRIPTION="Tool to quickly switch between multiple Qt installations" HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/" -SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git" + inherit git-r3 +else + SRC_URI="https://download.qt.io/official_releases/${PN}/${P}.tar.xz" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi LICENSE="|| ( LGPL-2.1 GPL-3 )" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" @@ -19,7 +25,9 @@ DEPEND="test? ( dev-qt/qtcore:5 dev-qt/qttest:5 )" -RDEPEND="" +RDEPEND="!<dev-qt/qtcore-5.15.3:5" + +PATCHES=( "${FILESDIR}/${PN}-66-qt-5.15.3-compat.patch" ) qtchooser_make() { emake \ @@ -44,7 +52,21 @@ src_test() { src_install() { qtchooser_make INSTALL_ROOT="${D}" install - keepdir /etc/xdg/qtchooser + # install configuration file + cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die + $(qt5_get_bindir) + $(qt5_get_libdir) + _EOF_ + + ( + insinto /etc/xdg/qtchooser + doins "${T}/qt5-${CHOST}.conf" + ) + + # convenience symlinks + dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf + dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf + dosym qt5.conf /etc/xdg/qtchooser/default.conf # TODO: bash and zsh completion # newbashcomp scripts/${PN}.bash ${PN} diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qtconcurrent/Manifest +++ b/dev-qt/qtconcurrent/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtconcurrent/metadata.xml b/dev-qt/qtconcurrent/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtconcurrent/metadata.xml +++ b/dev-qt/qtconcurrent/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.13.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.13.ebuild new file mode 100644 index 000000000000..39dca7203cea --- /dev/null +++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.13.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework" + +IUSE="" + +DEPEND="=dev-qt/qtcore-${QT5_PV}*:5=" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/concurrent +) diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild deleted file mode 100644 index 346697ad3187..000000000000 --- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/concurrent -) - -PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012 diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest new file mode 100644 index 000000000000..09b3b7344b19 --- /dev/null +++ b/dev-qt/qtconnectivity/Manifest @@ -0,0 +1 @@ +DIST qtconnectivity-everywhere-src-6.7.0.tar.xz 1060904 BLAKE2B 83669930846e57495c193b467c8a004eb2a61017934b5f1c8ecb39de24f538b40671dc06ec558e0809e131f008abc16826a246abbe5acee59ebaf69849070652 SHA512 bbdb6798a9cca5ec523d0f06aa3e1ea0024e4c7bd5cba765ad87b7b2f40ec59bd2a557bb45224bb3490c818292ccf04283f7c5d47723d95d83f2edf85c214b78 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.7.0.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.0.ebuild new file mode 100644 index 000000000000..02d652404d9a --- /dev/null +++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 2023-2024 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 ~arm arm64 ~loong ~riscv ~x86" +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 auto-skipped, but some still misbehave + # if bluez/hardware is available (generally tests here may not be + # very relevant without hardware, lists may need to be extended) + tst_qbluetoothlocaldevice + tst_qbluetoothserver + tst_qbluetoothservicediscoveryagent + tst_qbluetoothserviceinfo + 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.7.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild new file mode 100644 index 000000000000..de07cbfd1ffe --- /dev/null +++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild @@ -0,0 +1,72 @@ +# Copyright 2023-2024 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 ~arm ~arm64 ~loong ~riscv ~x86" +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 auto-skipped, but some still misbehave + # if bluez/hardware is available (generally tests here may not be + # very relevant without hardware, lists may need to be extended) + tst_qbluetoothlocaldevice + tst_qbluetoothserver + tst_qbluetoothservicediscoveryagent + tst_qbluetoothserviceinfo + 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..de07cbfd1ffe --- /dev/null +++ b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild @@ -0,0 +1,72 @@ +# Copyright 2023-2024 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 ~arm ~arm64 ~loong ~riscv ~x86" +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 auto-skipped, but some still misbehave + # if bluez/hardware is available (generally tests here may not be + # very relevant without hardware, lists may need to be extended) + tst_qbluetoothlocaldevice + tst_qbluetoothserver + tst_qbluetoothservicediscoveryagent + tst_qbluetoothserviceinfo + 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/qtcore/Manifest b/dev-qt/qtcore/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch deleted file mode 100644 index 30b5abc39759..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 9 Feb 2020 11:45:00 +0100 -Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14 - -In upstream commit: - -https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17 - -_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument -IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for -QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland. -During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some -reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their -cmake files regenerated, leading to cmake errors like: - -https://bugs.gentoo.org/703306 -https://bugs.gentoo.org/705198 - -From mkspecs/features/create_cmake.prf: - -# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties -# functions whether a Configuration specific generator expression needs to be added to the values -# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need -# configuration specific values. For singular builds (only release or only debug), we want the -# values to be applied regardless of the configuration. -# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to -# build a Debug configuration of an application, even if Qt was built in a Release configuration. - -qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease -optional and default to FALSE. - ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100 -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100 -@@ -538,8 +538,14 @@ - - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - -- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION -- IsDebugAndRelease) -+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) -+ set(IsDebugAndRelease FALSE) -+ set (list_var ${ARGN}) -+ list(LENGTH list_var num_extra_arg) -+ if (${num_extra_arg} GREATER 0) -+ list(GET list_var 0 IsDebugAndRelease) -+ endif() -+ - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch deleted file mode 100644 index 1c8f1e89e7d5..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch +++ /dev/null @@ -1,271 +0,0 @@ -From c337f6fae51b987ce7dbed1fd9bea41e6073efbb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> -Date: Sat, 10 Oct 2020 19:26:13 +0200 -Subject: [PATCH 1/2] Revert "Cache system zone ID when fetched from the - file-system" - -This reverts commit c70ce3d042025c858faffe661f85d2482a2a0d8c. ---- - src/corelib/time/qtimezoneprivate_tz.cpp | 205 +++++++---------------- - 1 file changed, 64 insertions(+), 141 deletions(-) - -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index c5c70b7364..01f9a6cce0 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -1,6 +1,5 @@ - /**************************************************************************** - ** --** Copyright (C) 2020 The Qt Company Ltd. - ** Copyright (C) 2019 Crimson AS <info@crimson.no> - ** Copyright (C) 2013 John Layt <jlayt@kde.org> - ** Contact: https://www.qt.io/licensing/ -@@ -43,19 +42,18 @@ - #include "qtimezoneprivate_p.h" - #include "private/qlocale_tools_p.h" - --#include <QtCore/QDataStream> --#include <QtCore/QDateTime> - #include <QtCore/QFile> --#include <QtCore/QHash> - #include <QtCore/QMutex> -+#include <QtCore/QHash> -+#include <QtCore/QDataStream> -+#include <QtCore/QDateTime> - - #include <qdebug.h> --#include <qplatformdefs.h> - - #include <algorithm> - #include <errno.h> - #include <limits.h> --#ifndef Q_OS_INTEGRITY -+#if !defined(Q_OS_INTEGRITY) - #include <sys/param.h> // to use MAXSYMLINKS constant - #endif - #include <unistd.h> // to use _SC_SYMLOOP_MAX constant -@@ -1102,146 +1100,28 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::previousTransition(qint64 beforeMSecs - return last > tranCache().cbegin() ? dataForTzTransition(*--last) : invalidData(); - } - --bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const --{ -- return tzZones->contains(ianaId); --} -- --QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const --{ -- QList<QByteArray> result = tzZones->keys(); -- std::sort(result.begin(), result.end()); -- return result; --} -- --QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const -+static long getSymloopMax() - { -- // TODO AnyCountry -- QList<QByteArray> result; -- for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) { -- if (it.value().country == country) -- result << it.key(); -- } -- std::sort(result.begin(), result.end()); -- return result; --} -- --// Getting the system zone's ID: -- --namespace { --class ZoneNameReader : public QObject --{ --public: -- QByteArray name() -- { -- /* Assumptions: -- a) Systems don't change which of localtime and TZ they use without a -- reboot. -- b) When they change, they use atomic renames, hence a new device and -- inode for the new file. -- c) If we change which *name* is used for a zone, while referencing -- the same final zoneinfo file, we don't care about the change of -- name (e.g. if Europe/Oslo and Europe/Berlin are both symlinks to -- the same CET file, continuing to use the old name, after -- /etc/localtime changes which of the two it points to, is -- harmless). -- -- The alternative would be to use a file-system watcher, but they are a -- scarce resource. -- */ -- const StatIdent local = identify("/etc/localtime"); -- const StatIdent tz = identify("/etc/TZ"); -- if (!m_name.isEmpty() && m_last.isValid() && (m_last == local || m_last == tz)) -- return m_name; -- -- m_name = etcLocalTime(); -- if (!m_name.isEmpty()) { -- m_last = local; -- return m_name; -- } -- -- m_name = etcTZ(); -- m_last = m_name.isEmpty() ? StatIdent() : tz; -- return m_name; -- } -- -- --private: -- QByteArray m_name; -- struct StatIdent -- { -- static constexpr unsigned long bad = ~0ul; -- unsigned long m_dev, m_ino; -- StatIdent() : m_dev(bad), m_ino(bad) {} -- StatIdent(const QT_STATBUF &data) : m_dev(data.st_dev), m_ino(data.st_ino) {} -- bool isValid() { return m_dev != bad || m_ino != bad; } -- bool operator==(const StatIdent &other) -- { return other.m_dev == m_dev && other.m_ino == m_ino; } -- }; -- StatIdent m_last; -- -- static StatIdent identify(const char *path) -- { -- QT_STATBUF data; -- return QT_STAT(path, &data) == -1 ? StatIdent() : StatIdent(data); -- } -- -- static QByteArray etcLocalTime() -- { -- // On most distros /etc/localtime is a symlink to a real file so extract -- // name from the path -- const QLatin1String zoneinfo("/zoneinfo/"); -- QString path = QStringLiteral("/etc/localtime"); -- long iteration = getSymloopMax(); -- // Symlink may point to another symlink etc. before being under zoneinfo/ -- // We stop on the first path under /zoneinfo/, even if it is itself a -- // symlink, like America/Montreal pointing to America/Toronto -- do { -- path = QFile::symLinkTarget(path); -- int index = path.indexOf(zoneinfo); -- if (index >= 0) // Found zoneinfo file; extract zone name from path: -- return path.midRef(index + zoneinfo.size()).toUtf8(); -- } while (!path.isEmpty() && --iteration > 0); -- -- return QByteArray(); -- } -- -- static QByteArray etcTZ() -- { -- // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ: -- const QString path = QStringLiteral("/etc/TZ"); -- QFile zone(path); -- if (zone.open(QIODevice::ReadOnly)) -- return zone.readAll().trimmed(); -- -- return QByteArray(); -- } -- -- // Any chain of symlinks longer than this is assumed to be a loop: -- static long getSymloopMax() -- { --#ifdef SYMLOOP_MAX -- // If defined, at runtime it can only be greater than this, so this is a safe bet: -- return SYMLOOP_MAX; -+#if defined(SYMLOOP_MAX) -+ return SYMLOOP_MAX; // if defined, at runtime it can only be greater than this, so this is a safe bet - #else -- errno = 0; -- long result = sysconf(_SC_SYMLOOP_MAX); -- if (result >= 0) -- return result; -- // result is -1, meaning either error or no limit -- Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX -- -- // therefore we can make up our own limit --# ifdef MAXSYMLINKS -- return MAXSYMLINKS; -+ errno = 0; -+ long result = sysconf(_SC_SYMLOOP_MAX); -+ if (result >= 0) -+ return result; -+ // result is -1, meaning either error or no limit -+ Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX -+ -+ // therefore we can make up our own limit -+# if defined(MAXSYMLINKS) -+ return MAXSYMLINKS; - # else -- return 8; -+ return 8; - # endif - #endif -- } --}; - } - -+// TODO Could cache the value and monitor the required files for any changes - QByteArray QTzTimeZonePrivate::systemTimeZoneId() const - { - // Check TZ env var first, if not populated try find it -@@ -1256,9 +1136,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const - else if (ianaId.startsWith(':')) - ianaId = ianaId.mid(1); - -+ // On most distros /etc/localtime is a symlink to a real file so extract name from the path -+ if (ianaId.isEmpty()) { -+ const QLatin1String zoneinfo("/zoneinfo/"); -+ QString path = QFile::symLinkTarget(QStringLiteral("/etc/localtime")); -+ int index = -1; -+ long iteration = getSymloopMax(); -+ // Symlink may point to another symlink etc. before being under zoneinfo/ -+ // We stop on the first path under /zoneinfo/, even if it is itself a -+ // symlink, like America/Montreal pointing to America/Toronto -+ while (iteration-- > 0 && !path.isEmpty() && (index = path.indexOf(zoneinfo)) < 0) -+ path = QFile::symLinkTarget(path); -+ if (index >= 0) { -+ // /etc/localtime is a symlink to the current TZ file, so extract from path -+ ianaId = path.midRef(index + zoneinfo.size()).toUtf8(); -+ } -+ } -+ -+ // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ: - if (ianaId.isEmpty()) { -- thread_local static ZoneNameReader reader; -- ianaId = reader.name(); -+ QFile zone(QStringLiteral("/etc/TZ")); -+ if (zone.open(QIODevice::ReadOnly)) -+ ianaId = zone.readAll().trimmed(); - } - - // Give up for now and return UTC -@@ -1268,4 +1167,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const - return ianaId; - } - -+bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const -+{ -+ return tzZones->contains(ianaId); -+} -+ -+QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const -+{ -+ QList<QByteArray> result = tzZones->keys(); -+ std::sort(result.begin(), result.end()); -+ return result; -+} -+ -+QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const -+{ -+ // TODO AnyCountry -+ QList<QByteArray> result; -+ for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) { -+ if (it.value().country == country) -+ result << it.key(); -+ } -+ std::sort(result.begin(), result.end()); -+ return result; -+} -+ - QT_END_NAMESPACE --- -2.28.0 - diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch deleted file mode 100644 index 611c979a469c..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ffc9093a199a542791920b30d1835c3248920aa0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> -Date: Sat, 10 Oct 2020 19:26:35 +0200 -Subject: [PATCH 2/2] Revert "Purge two old time-zone lookup fallbacks" - -This reverts commit b0383cbd388336f698ceeac11a4f50cdff931dd9. ---- - src/corelib/time/qtimezoneprivate_tz.cpp | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index 01f9a6cce0..eea6f5e962 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -1153,6 +1153,29 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const - } - } - -+ // On Debian Etch up to Jessie, /etc/localtime is a copy of the relevant -+ // zoneinfo file, whose name is recorded in /etc/timezone: -+ if (ianaId.isEmpty()) { -+ QFile tzif(QStringLiteral("/etc/timezone")); -+ if (tzif.open(QIODevice::ReadOnly)) -+ ianaId = tzif.readAll().trimmed(); -+ } -+ -+ // On some Red Hat distros /etc/localtime is real file with name held in /etc/sysconfig/clock -+ // in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo" -+ if (ianaId.isEmpty()) { -+ QFile tzif(QStringLiteral("/etc/sysconfig/clock")); -+ if (tzif.open(QIODevice::ReadOnly)) { -+ while (ianaId.isEmpty() && !tzif.atEnd()) { -+ const QByteArray line(tzif.readLine().trimmed()); -+ if (line.startsWith("ZONE=")) -+ ianaId = line.mid(6, line.length() - 7); -+ else if (line.startsWith("TIMEZONE=")) -+ ianaId = line.mid(10, line.length() - 11); -+ } -+ } -+ } -+ - // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ: - if (ianaId.isEmpty()) { - QFile zone(QStringLiteral("/etc/TZ")); --- -2.28.0 - diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch deleted file mode 100644 index b131b7af3657..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch +++ /dev/null @@ -1,88 +0,0 @@ -From d2c0fc2b5f1c07c1e0acb1c0127578066b6f9b8e Mon Sep 17 00:00:00 2001 -From: Edward Welbourne <edward.welbourne@qt.io> -Date: Tue, 24 Nov 2020 12:45:11 +0100 -Subject: [PATCH] Bounds-check time-zone offsets when parsing - -Parsing of time-zone offsets should check the offset string conforms -to the expected format and has valid values in its fields. The -QDateTime parser, fromOffsetString(), neglected the bounds check on -hours; the QTzTimeZonePrivate parser, parsePosixTime(), neglected all -upper bounds checks, only checking against negative valus. - -Drive-by - refined phrasing of a comment. - -Fixes: QTBUG-88656 -Change-Id: If04cdbe65064108eaa87c42310527783ad21b4c0 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -(cherry picked from commit 380d97e1bd15e753907c378a070bdf7f1c1cf06e) -Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> ---- - src/corelib/time/qdatetime.cpp | 2 +- - src/corelib/time/qtimezoneprivate_tz.cpp | 27 ++++++++++++++++----------- - 2 files changed, 17 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp -index e824787880c..a2816e87f4a 100644 ---- a/src/corelib/time/qdatetime.cpp -+++ b/src/corelib/time/qdatetime.cpp -@@ -240,7 +240,7 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept - const QStringView hhRef = time.left(qMin(hhLen, time.size())); - bool ok = false; - const int hour = C.toInt(hhRef, &ok); -- if (!ok) -+ if (!ok || hour > 23) // More generous than QTimeZone::MaxUtcOffsetSecs - return 0; - - const QStringView mmRef = time.mid(qMin(mmIndex, time.size())); -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index b816b4ecff2..adc590878d7 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -394,29 +394,34 @@ static int parsePosixTime(const char *begin, const char *end) - // Format "hh[:mm[:ss]]" - int hour, min = 0, sec = 0; - -- // Note that the calls to qstrtoll do *not* check the end pointer, which -- // means they proceed until they find a non-digit. We check that we're -- // still in range at the end, but we may have read from past end. It's the -- // caller's responsibility to ensure that begin is part of a -- // null-terminated string. -+ // Note that the calls to qstrtoll do *not* check against the end pointer, -+ // which means they proceed until they find a non-digit. We check that we're -+ // still in range at the end, but we may have read past end. It's the -+ // caller's responsibility to ensure that begin is part of a null-terminated -+ // string. - -+ const int maxHour = QTimeZone::MaxUtcOffsetSecs / 3600; - bool ok = false; -- hour = qstrtoll(begin, &begin, 10, &ok); -- if (!ok || hour < 0) -+ const char *cut = begin; -+ hour = qstrtoll(begin, &cut, 10, &ok); -+ if (!ok || hour < 0 || hour > maxHour || cut > begin + 2) - return INT_MIN; -+ begin = cut; - if (begin < end && *begin == ':') { - // minutes - ++begin; -- min = qstrtoll(begin, &begin, 10, &ok); -- if (!ok || min < 0) -+ min = qstrtoll(begin, &cut, 10, &ok); -+ if (!ok || min < 0 || min > 59 || cut > begin + 2) - return INT_MIN; - -+ begin = cut; - if (begin < end && *begin == ':') { - // seconds - ++begin; -- sec = qstrtoll(begin, &begin, 10, &ok); -- if (!ok || sec < 0) -+ sec = qstrtoll(begin, &cut, 10, &ok); -+ if (!ok || sec < 0 || sec > 59 || cut > begin + 2) - return INT_MIN; -+ begin = cut; - } - } - --- -2.16.3 diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch deleted file mode 100644 index 892d89d2948c..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001 -From: Kai Koehne <kai.koehne@qt.io> -Date: Tue, 13 Oct 2020 15:47:31 +0200 -Subject: [PATCH] Fix allocated memory of QByteArray returned by - QIODevice::readLine - -If the maxSize argument is 0 (the default), QIODevice::readLine will -allocate a QByteArray with the size of the next chunk of data, which -may be quite large. Before returning, it then resizes the byte array -to the actual size that was read. - -But since change 6b884d2aa129, QByteArray::resize() does no -longer shrink the capacity. This means that the returned QByteArray -keeps it's maximum size as allocated memory. This can lead to -excessive memory consumption, especially if the returned QByteArray's -are stored for further processing in the client code. - -Fix this by explicitly calling QByteArray::squeeze() before returning. - -[ChangeLog][QtCore][QIODevice] Fixes a regression in Qt 5.15 causing -QByteArray's that are returned by QIODevice::readLine() to -consume large amounts of memory. - -Fixes: QTBUG-87010 -Change-Id: I1f95fc4098849e900680fc945238bfeda881022c -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -(cherry picked from commit 263b29eedb223dec1ecaee193302070af87a1852, -limited squeeze() call if bytes are actually read to preserve retVal.isNull() -behavior in 5.15) ---- - src/corelib/io/qiodevice.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp -index cc1d1102522..0f11c2e805c 100644 ---- a/src/corelib/io/qiodevice.cpp -+++ b/src/corelib/io/qiodevice.cpp -@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize) - } else - readBytes = readLine(result.data(), result.size()); - -- if (readBytes <= 0) -+ if (readBytes <= 0) { - result.clear(); -- else -+ } else { - result.resize(readBytes); -+ result.squeeze(); -+ } - - return result; - } --- -2.16.3 diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch b/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch deleted file mode 100644 index 9d391311c345..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: include <limits> to fix some GCC 11 build issues -Origin: upstream, commits: - https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986 - https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 -Last-Update: 2021-01-26 - ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -44,6 +44,8 @@ - #include <QtCore/qfloat16.h> - #include <QtCore/qglobal.h> - -+#include <limits> -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include <stdlib.h> - #include <string.h> ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -43,6 +43,7 @@ - - #include <QtCore/qglobal.h> - #include <QtCore/qmetatype.h> -+#include <limits> - #include <string.h> - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include <QtCore/qbytearray.h> - -+#include <limits> -+ - QT_BEGIN_NAMESPACE - - diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml index 9354e57ac71b..2bc45aff3552 100644 --- a/dev-qt/qtcore/metadata.xml +++ b/dev-qt/qtcore/metadata.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="old-kernel" restrict="<dev-qt/qtcore-5.15.0">Disable syscalls not available on Linux kernels older than 3.17</flag> - <flag name="old-kernel" restrict=">=dev-qt/qtcore-5.15.0">Disable syscalls not available on Linux kernels older than 4.11</flag> - <flag name="systemd">Enable native journald logging support</flag> + <flag name="old-kernel">Disable syscalls not available on Linux kernels older than 4.11</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qtcore/qtcore-5.15.13.ebuild b/dev-qt/qtcore/qtcore-5.15.13.ebuild new file mode 100644 index 000000000000..8a419f7c95fb --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.15.13.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +QT5_MODULE="qtbase" +inherit linux-info flag-o-matic toolchain-funcs qt5-build + +DESCRIPTION="Cross-platform application development framework" +SLOT=5/${QT5_PV} + +IUSE="icu old-kernel" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2[pcre16,unicode] + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) +" +RDEPEND="${DEPEND} + !<dev-qt/designer-${QT5_PV}:5 + !<dev-qt/qt3d-${QT5_PV}:5 + !<dev-qt/qtbluetooth-${QT5_PV}:5 + !<dev-qt/qtcharts-${QT5_PV}:5 + !<dev-qt/qtconcurrent-${QT5_PV}:5 + !<dev-qt/qtdatavis3d-${QT5_PV}:5 + !<dev-qt/qtdbus-${QT5_PV}:5 + !<dev-qt/qtdeclarative-${QT5_PV}:5 + !<dev-qt/qtgamepad-${QT5_PV}:5 + !<dev-qt/qtgraphicaleffects-${QT5_PV}:5 + !<dev-qt/qtgui-${QT5_PV}:5 + !<dev-qt/qthelp-${QT5_PV}:5 + !<dev-qt/qtimageformats-${QT5_PV}:5 + !<dev-qt/qtlocation-${QT5_PV}:5 + !<dev-qt/qtmultimedia-${QT5_PV}:5 + !<dev-qt/qtnetwork-${QT5_PV}:5 + !<dev-qt/qtnetworkauth-${QT5_PV}:5 + !<dev-qt/qtopengl-${QT5_PV}:5 + !<dev-qt/qtpositioning-${QT5_PV}:5 + !<dev-qt/qtprintsupport-${QT5_PV}:5 + !<dev-qt/qtquickcontrols-${QT5_PV}:5 + !<dev-qt/qtquickcontrols2-${QT5_PV}:5 + !<dev-qt/qtquicktimeline-${QT5_PV}:5 + !<dev-qt/qtscript-${QT5_PV}:5 + !<dev-qt/qtscxml-${QT5_PV}:5 + !<dev-qt/qtsensors-${QT5_PV}:5 + !<dev-qt/qtserialbus-${QT5_PV}:5 + !<dev-qt/qtserialport-${QT5_PV}:5 + !<dev-qt/qtspeech-${QT5_PV}:5 + !<dev-qt/qtsql-${QT5_PV}:5 + !<dev-qt/qtsvg-${QT5_PV}:5 + !<dev-qt/qttest-${QT5_PV}:5 + !<dev-qt/qtvirtualkeyboard-${QT5_PV}:5 + !<dev-qt/qtwayland-${QT5_PV}:5 + !<dev-qt/qtwebchannel-${QT5_PV}:5 + !<dev-qt/qtwebengine-${QT5_PV}:5 + !<dev-qt/qtwebsockets-${QT5_PV}:5 + !<dev-qt/qtwebview-${QT5_PV}:5 + !<dev-qt/qtwidgets-${QT5_PV}:5 + !<dev-qt/qtx11extras-${QT5_PV}:5 + !<dev-qt/qtxml-${QT5_PV}:5 + !<dev-qt/qtxmlpatterns-${QT5_PV}:5 +" + +QT5_TARGET_SUBDIRS=( + src/tools/bootstrap + src/tools/moc + src/tools/rcc + src/corelib + src/tools/qlalr + doc +) + +QT5_GENTOO_PRIVATE_CONFIG=( + !:network + !:sql + !:testlib + !:xml +) + +pkg_pretend() { + use kernel_linux || return + get_running_version + if kernel_is -lt 4 11 && ! use old-kernel; then + ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for" + ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856" + fi +} + +src_prepare() { + # don't add -O3 to CXXFLAGS, bug 549140 + sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die + + # fix missing qt_version_tag symbol w/ LTO, bug 674382 + sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die + + # Broken with FORTIFY_SOURCE=3 + # + # Our toolchain sets F_S=2 by default w/ >= -O2, so we need + # to unset F_S first, then explicitly set 2, to negate any default + # and anything set by the user if they're choosing 3 (or if they've + # modified GCC to set 3). + # + # Refs: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709 + # https://bugreports.qt.io/browse/QTBUG-103782 + # bug #847145 + if tc-enables-fortify-source ; then + # We can't unconditionally do this b/c we fortify needs + # some level of optimisation. + filter-flags -D_FORTIFY_SOURCE=3 + # (Qt doesn't seem to respect CPPFLAGS?) + append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + fi + + qt5-build_src_prepare + + # workaround for a79a370c (...Annotate-QMutex-...patch) adding a header + qt5_syncqt_version +} + +src_configure() { + local myconf=( + $(qt_use icu) + $(qt_use !icu iconv) + ) + use old-kernel && myconf+=( + -no-feature-renameat2 # needs Linux 3.16, bug 669994 + -no-feature-getentropy # needs Linux 3.17, bug 669994 + -no-feature-statx # needs Linux 4.11, bug 672856 + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + qt5_symlink_binary_to_path qmake 5 + + local flags=( + DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG + OPENGL OPENSSL SSL WIDGETS + ) + + for flag in ${flags[@]}; do + cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} diff --git a/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild deleted file mode 100644 index dadcd5585a58..000000000000 --- a/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit linux-info qt5-build - -DESCRIPTION="Cross-platform application development framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -SLOT=5/$(ver_cut 1-3) - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="icu old-kernel systemd" - -DEPEND=" - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2[pcre16,unicode] - sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND} - !<dev-qt/qtcore-4.8.7-r4:4 - dev-qt/qtchooser -" - -QT5_TARGET_SUBDIRS=( - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/corelib - src/tools/qlalr - doc -) - -QT5_GENTOO_PRIVATE_CONFIG=( - !:network - !:sql - !:testlib - !:xml -) - -PATCHES=( - "${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306 - "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914 - "${FILESDIR}"/${P}-fix-UB-in-QDateTime.patch # QTBUG-88656 - "${FILESDIR}"/${P}-fix-alloc-mem-of-QByteArray.patch # QTBUG-87010 - "${FILESDIR}"/${P}-gcc11.patch # bug 768342, 768354 - "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 -) - -pkg_pretend() { - use kernel_linux || return - get_running_version - if kernel_is -lt 4 11 && ! use old-kernel; then - ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for" - ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856" - fi -} - -src_prepare() { - # don't add -O3 to CXXFLAGS, bug 549140 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die - - # fix missing qt_version_tag symbol w/ LTO, bug 674382 - sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die - - qt5-build_src_prepare -} - -src_configure() { - local myconf=( - $(qt_use icu) - $(qt_use !icu iconv) - $(qt_use systemd journald) - ) - use old-kernel && myconf+=( - -no-feature-renameat2 # needs Linux 3.16, bug 669994 - -no-feature-getentropy # needs Linux 3.17, bug 669994 - -no-feature-statx # needs Linux 4.11, bug 672856 - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - local flags=( - DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG - OPENGL OPENSSL SSL WIDGETS - ) - - for flag in ${flags[@]}; do - cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die - - #if defined(QT_NO_${flag}) && defined(QT_${flag}) - # undef QT_NO_${flag} - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) - # define QT_NO_${flag} - #endif - _EOF_ - done -} diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest index 7a6cc71d24ed..a96b03302965 100644 --- a/dev-qt/qtdatavis3d/Manifest +++ b/dev-qt/qtdatavis3d/Manifest @@ -1 +1 @@ -DIST qtdatavis3d-everywhere-src-5.15.2.tar.xz 5191436 BLAKE2B 2c319d7569f4dd62711f4de23661413f6d1a19ef1653543506afcdb455875447cb84980d780fefdb677f0856075e0b1df4525662bed92ae9b6272f91112c8f58 SHA512 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3 +DIST qtdatavis3d-everywhere-opensource-src-5.15.13.tar.xz 5193400 BLAKE2B a18ea618e4c3b55ca4584347f38f7c570d1c0d940115169413e272dd6f1f4629021d16997c40857a9322e61b223b03d87d825bfe02ebb9b5bbee612939adc026 SHA512 ced9c6083ade43f43db2a86b20188a75a7028b7f89613a0d94ea48ec795b234af669caa45227cbbc7c2c3187b017fb5521c2d7c16834277d9dba1671afb00076 diff --git a/dev-qt/qtdatavis3d/metadata.xml b/dev-qt/qtdatavis3d/metadata.xml index d437181335d4..5ca993705e2e 100644 --- a/dev-qt/qtdatavis3d/metadata.xml +++ b/dev-qt/qtdatavis3d/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.13.ebuild index 46e32e2b4d71..3f51132a6a8f 100644 --- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2.ebuild +++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.13.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qt5-build DESCRIPTION="3D data visualization library for the Qt5 framework" LICENSE="GPL-3" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64 x86" + KEYWORDS="amd64 ~arm arm64 x86" fi IUSE="gles2-only qml" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2-only=] - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}*[gles2-only=] + qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qtdbus/Manifest +++ b/dev-qt/qtdbus/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtdbus/metadata.xml +++ b/dev-qt/qtdbus/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtdbus/qtdbus-5.15.2.ebuild b/dev-qt/qtdbus/qtdbus-5.15.13.ebuild index 3cc9ecda38d2..6d45c7d06d1f 100644 --- a/dev-qt/qtdbus/qtdbus-5.15.2.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.15.13.ebuild @@ -1,27 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV}:5= - >=sys-apps/dbus-1.4.20 -" -RDEPEND="${DEPEND} - dev-qt/qtchooser + =dev-qt/qtcore-${QT5_PV}*:5= + sys-apps/dbus " +RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/dbus @@ -39,8 +37,6 @@ QT5_GENTOO_PRIVATE_CONFIG=( :dbus-linked ) -PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012 - src_configure() { local myconf=( -dbus-linked diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 71839bb30c0d..0b041c2d91a1 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1 +1,3 @@ -DIST qtdeclarative-everywhere-src-5.15.2.tar.xz 21559880 BLAKE2B 07fa82a55f79c081cf3cb713e6b90274f2b2c420eba958042f58989502e2ae572294c4cd02eb73767e87d84c9173fb154e45370c043f6adfc7fb1a93377e2edc SHA512 a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3 +DIST qtdeclarative-5.15.13-gentoo-kde-1.tar.xz 29248 BLAKE2B 461a602e27ef73e7a41c3bfb7fc20eb236d9d0559a5ef640d483f1765970731e0b1850a4cc976852f6ef3b292093b07904e0de3d710d64b8b38a59164e5ec19b SHA512 4fac0e76c4095c806a42767668c332548ad376dbdaae54556fa38a150aea915be52f69acd287eafc9b2f1a0f86fcd24c285565e46d34f6e47943a7a677e9bf2d +DIST qtdeclarative-everywhere-opensource-src-5.15.13.tar.xz 21604012 BLAKE2B 3569cb1de1a2693a759929f54d87277e974e7b9d41eea5b57c5f096b80b0193456c4445de8c97df6b651fc5137e3f90563767a56053ed189b8d90321b234855a SHA512 fd16159217f7526f6e56d1849ffb2d219e0bee48581e4a1d3bdec1602f884038f3747da68b8905a6858e6e8e03e18b9da4d598a154d4d0a11a62b818940d3113 +DIST qtdeclarative-everywhere-src-6.7.0.tar.xz 35360444 BLAKE2B 28aa00dfd59967ebd0d3f5fc845483bea83522cbd592f2bb98cbe6ff2a6f549abb865f636579d90e3bf4374f58af6da5e2e28bf7005fa97e451e9f7c88203f4c SHA512 b189f3fc4ae9ad3e5c26aa56696b97cb2f1894cb23110928a31e5a62fb779578b492bec2f4dda5b31958a33eb2571ec4e1085ae6864442507be3ae0da83c96ee diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch deleted file mode 100644 index c5dd916912d1..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 543594243ad0006bf4d98998ecfa52b46242f0ed Mon Sep 17 00:00:00 2001 -From: Jeff Law <law@redhat.com> -Date: Oct 16 2020 21:12:18 +0000 -Subject: Fix missing #include for gcc-11 - - -diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp -index 76daead8..4f707703 100644 ---- a/src/qml/jsruntime/qv4regexp.cpp -+++ b/src/qml/jsruntime/qv4regexp.cpp -@@ -37,6 +37,7 @@ - ** - ****************************************************************************/ - -+#include <limits> - #include "qv4regexp_p.h" - #include "qv4engine_p.h" - #include "qv4scopedvalue_p.h" -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d19..21c3b465 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -40,6 +40,8 @@ - #ifndef QQMLPROFILEREVENT_P_H - #define QQMLPROFILEREVENT_P_H - -+#include <limits> -+ - #include "qqmlprofilerclientdefinitions_p.h" - - #include <QtCore/qstring.h> diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch deleted file mode 100644 index a619f3db833c..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/qml/qml.pro b/src/qml/qml.pro -index 7d5a92a..01f3b79 100644 ---- a/src/qml/qml.pro -+++ b/src/qml/qml.pro -@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 - - # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT. - gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks -+gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic - - DEFINES += QT_NO_FOREACH - diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch deleted file mode 100644 index 7799ef71b7e4..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h -index 4b08194..224ddb1 100644 ---- a/src/qml/jsruntime/qv4global_p.h -+++ b/src/qml/jsruntime/qv4global_p.h -@@ -96,8 +96,13 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } - # undef V4_ENABLE_JIT - #endif - #endif - -+// Gentoo note: disable the JIT due to USE="-jit" -+#ifdef V4_ENABLE_JIT -+#undef V4_ENABLE_JIT -+#endif -+ - // Do certain things depending on whether the JIT is enabled or disabled - - #ifdef V4_ENABLE_JIT - #define ENABLE_YARR_JIT 1 diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index b036c9a0afc9..b6df94c4541c 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -7,12 +7,16 @@ </maintainer> <use> <flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag> - <flag name="vulkan">Enable support for Vulkan</flag> + <flag name="network">Enable QtNetwork support</flag> + <flag name="opengl">Enable OpenGL support</flag> + <flag name="qmlls">Build the qmlls tool using <pkg>dev-qt/qtlanguageserver</pkg></flag> + <flag name="sql">Enable QtSQL support</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/qtdeclarative</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.13.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.13.ebuild new file mode 100644 index 000000000000..05448ba255e6 --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.13.ebuild @@ -0,0 +1,67 @@ +# Copyright 2009-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +PYTHON_COMPAT=( python3_{8..12} ) +inherit flag-o-matic python-any-r1 qt5-build + +DESCRIPTION="The QML and Quick modules for the Qt5 framework" + +IUSE="gles2-only +jit localstorage vulkan +widgets" + +# qtgui[gles2-only=] is needed because of bug 504322 +DEPEND=" + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=] + =dev-qt/qtnetwork-${QT5_PV}* + =dev-qt/qttest-${QT5_PV}* + media-libs/libglvnd + localstorage? ( =dev-qt/qtsql-${QT5_PV}* ) + widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] ) +" +RDEPEND="${DEPEND}" +BDEPEND="${PYTHON_DEPS}" + +PATCHES=( + "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 +) + +src_prepare() { + qt_use_disable_mod localstorage sql \ + src/imports/imports.pro + + qt_use_disable_mod widgets widgets \ + src/src.pro \ + src/qmltest/qmltest.pro \ + tests/auto/auto.pro \ + tools/tools.pro \ + tools/qmlscene/qmlscene.pro \ + tools/qml/qml.pro + + qt5-build_src_prepare +} + +src_configure() { + replace-flags "-Os" "-O2" # bug 840861 + + local myqmakeargs=( + -- + -qml-debug + $(qt_use jit feature-qml-jit) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + qt5_symlink_binary_to_path qml 5 + qt5_symlink_binary_to_path qmleasing 5 + qt5_symlink_binary_to_path qmlpreview 5 + qt5_symlink_binary_to_path qmlscene 5 +} diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild deleted file mode 100644 index 643829a93cc1..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2009-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit python-any-r1 qt5-build - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="gles2-only +jit localstorage vulkan +widgets" - -BDEPEND="${PYTHON_DEPS}" -# qtgui[gles2-only=] is needed because of bug 504322 -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=] - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qttest-${PV} - localstorage? ( ~dev-qt/qtsql-${PV} ) - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] ) -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" - -PATCHES=( - "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 - "${FILESDIR}/${P}-gcc11.patch" # bug 752093 - "${FILESDIR}/${P}-riscv-atomic.patch" #bug 790689 -) - -src_prepare() { - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") - - qt_use_disable_mod localstorage sql \ - src/imports/imports.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/qmltest/qmltest.pro \ - tests/auto/auto.pro \ - tools/tools.pro \ - tools/qmlscene/qmlscene.pro \ - tools/qml/qml.pro - - qt5-build_src_prepare -} - -src_configure() { - local myqmakeargs=( - -- - -qml-debug - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild new file mode 100644 index 000000000000..d10f4bff90d1 --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +# behaves very badly when qtdeclarative is not already installed, also +# other more minor issues (installs junk, sandbox/offscreen issues) +QT6_RESTRICT_TESTS=1 + +inherit python-any-r1 qt6-build + +DESCRIPTION="Qt Declarative (Quick 2)" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="accessibility +network opengl qmlls +sql +ssl svg vulkan +widgets" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] + qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) + svg? ( ~dev-qt/qtsvg-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND=" + ${PYTHON_DEPS} + ~dev-qt/qtshadertools-${PV}:6 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) + $(cmake_use_find_package sql Qt6Sql) + $(cmake_use_find_package svg Qt6Svg) + $(qt_feature network qml_network) + $(qt_feature ssl qml_ssl) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild new file mode 100644 index 000000000000..f03eb001f0e5 --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild @@ -0,0 +1,46 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +# behaves very badly when qtdeclarative is not already installed, also +# other more minor issues (installs junk, sandbox/offscreen issues) +QT6_RESTRICT_TESTS=1 + +inherit python-any-r1 qt6-build + +DESCRIPTION="Qt Declarative (Quick 2)" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="accessibility +network opengl qmlls +sql +ssl svg vulkan +widgets" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] + qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) + svg? ( ~dev-qt/qtsvg-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND=" + ${PYTHON_DEPS} + ~dev-qt/qtshadertools-${PV}:6 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) + $(cmake_use_find_package sql Qt6Sql) + $(cmake_use_find_package svg Qt6Svg) + $(qt_feature network qml_network) + $(qt_feature ssl qml_ssl) + ) + + 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..f03eb001f0e5 --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -0,0 +1,46 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +# behaves very badly when qtdeclarative is not already installed, also +# other more minor issues (installs junk, sandbox/offscreen issues) +QT6_RESTRICT_TESTS=1 + +inherit python-any-r1 qt6-build + +DESCRIPTION="Qt Declarative (Quick 2)" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="accessibility +network opengl qmlls +sql +ssl svg vulkan +widgets" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] + qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) + svg? ( ~dev-qt/qtsvg-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND=" + ${PYTHON_DEPS} + ~dev-qt/qtshadertools-${PV}:6 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) + $(cmake_use_find_package sql Qt6Sql) + $(cmake_use_find_package svg Qt6Svg) + $(qt_feature network qml_network) + $(qt_feature ssl qml_ssl) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/qtdiag/Manifest +++ b/dev-qt/qtdiag/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/qtdiag/metadata.xml b/dev-qt/qtdiag/metadata.xml index ca160995c703..82e091805238 100644 --- a/dev-qt/qtdiag/metadata.xml +++ b/dev-qt/qtdiag/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtdiag/qtdiag-5.15.2.ebuild b/dev-qt/qtdiag/qtdiag-5.15.13.ebuild index b0713c09732f..52479a5ac725 100644 --- a/dev-qt/qtdiag/qtdiag-5.15.2.ebuild +++ b/dev-qt/qtdiag/qtdiag-5.15.13.ebuild @@ -1,32 +1,31 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86" +fi QT5_MODULE="qttools" inherit qt5-build DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86" -fi - IUSE="+network +widgets" -COMMON_DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}:5= - network? ( ~dev-qt/qtnetwork-${PV}[ssl] ) - widgets? ( ~dev-qt/qtwidgets-${PV} ) -" -# TODO: we know it is bogus, figure out how to disable checks, bug 728278 -DEPEND="${COMMON_DEPEND} - ~dev-qt/qtxml-${PV} -" -RDEPEND="${COMMON_DEPEND} - dev-qt/qtchooser +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*:5= + network? ( =dev-qt/qtnetwork-${QT5_PV}*[ssl] ) + widgets? ( =dev-qt/qtwidgets-${QT5_PV}* ) " +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/qtdiag +) src_prepare() { qt_use_disable_mod network network \ @@ -37,3 +36,8 @@ src_prepare() { qt5-build_src_prepare } + +src_install() { + qt5-build_src_install + qt5_symlink_binary_to_path qtdiag 5 +} diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest index 98e030844561..a8f1d909359b 100644 --- a/dev-qt/qtgamepad/Manifest +++ b/dev-qt/qtgamepad/Manifest @@ -1 +1 @@ -DIST qtgamepad-everywhere-src-5.15.2.tar.xz 387084 BLAKE2B bced25244afb2f97adb7b05dbe68021923c45083abaeec92ff405a8c65b89910803dcfe28f4982f9d54dacab616b9917c7cd04b475ac7c36e8002bb6cbbc9b6a SHA512 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1 +DIST qtgamepad-everywhere-opensource-src-5.15.13.tar.xz 389840 BLAKE2B f6308286594c0adb2542244d921b17c9d3454935813015aa16cbd9ac47e6d6131f8bdea00a6be748bc47d20a478812fbc7bb2a267e19ac3c9cdf4d2f54679fad SHA512 03f403c0f966c95b0c64286c047c54bc09e49ad7029de8476d792cc240d0d8b78a426f98e6358376cfc2abcaefb2500ff2182414bd8c2244541b065220780f63 diff --git a/dev-qt/qtgamepad/metadata.xml b/dev-qt/qtgamepad/metadata.xml index 2b9a633c286b..0f21dea52bf1 100644 --- a/dev-qt/qtgamepad/metadata.xml +++ b/dev-qt/qtgamepad/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.2.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.13.ebuild index 4da7b8c4a69c..2eb0ece47843 100644 --- a/dev-qt/qtgamepad/qtgamepad-5.15.2.ebuild +++ b/dev-qt/qtgamepad/qtgamepad-5.15.13.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qt5-build DESCRIPTION="Qt module to support gamepad hardware" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64 x86" + KEYWORDS="amd64 ~arm arm64 ~riscv x86" fi IUSE="evdev qml sdl" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[evdev?] + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}*[evdev?] evdev? ( virtual/libudev:= ) - qml? ( ~dev-qt/qtdeclarative-${PV} ) - sdl? ( media-libs/libsdl ) + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) + sdl? ( media-libs/libsdl2 ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest index 7b92e4abf1dc..0388f063e122 100644 --- a/dev-qt/qtgraphicaleffects/Manifest +++ b/dev-qt/qtgraphicaleffects/Manifest @@ -1 +1 @@ -DIST qtgraphicaleffects-everywhere-src-5.15.2.tar.xz 14040900 BLAKE2B 15564a1f849520adcf5cdaecf9ce015a4143c2843e339f11b291c7799242210187336a8894fa67608c172a9f1df9695124da470c67fc0448b0d1fefe59a89238 SHA512 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d +DIST qtgraphicaleffects-everywhere-opensource-src-5.15.13.tar.xz 14045368 BLAKE2B abf15115c90baf2d91bd050ca055bf390e94e68ad99b8af14660ece092aad760a16ceb573ee6ebfe94fe9172ae03808fa948cdb77cc3f3501c33458b2816a277 SHA512 ee2f4e24ced70c1531ceb310c90d6c0bb5300f527a247f07599467f355fb89a426cce6bacb25b77b6ec62f4e358d2345093343ad442acd182dcaca77e031a0bf diff --git a/dev-qt/qtgraphicaleffects/metadata.xml b/dev-qt/qtgraphicaleffects/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtgraphicaleffects/metadata.xml +++ b/dev-qt/qtgraphicaleffects/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.13.ebuild index 4ad065e1ce37..af898ff7ad54 100644 --- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2.ebuild +++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.13.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + VIRTUALX_REQUIRED="test" inherit qt5-build DESCRIPTION="Set of QML types for adding visual effects to user interfaces" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi IUSE="" RDEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* " DEPEND="${RDEPEND}" diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch deleted file mode 100644 index 41814c061a46..000000000000 --- a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3f302cb16ebfefade17b3ea90c5ed258c9150f3a Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Fri, 1 Mar 2019 21:37:52 -0500 -Subject: [PATCH] gcc: pass -mavx2 instead of -march=core-avx2 - -Resolves a build failure when QMAKE_CXXFLAGS contains -march=native -and the compiler is running on a CPU which does not support AVX2. - -Bug: https://bugs.gentoo.org/672946 ---- - mkspecs/common/gcc-base.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf -index c2669e4833..44aa96af38 100644 ---- a/mkspecs/common/gcc-base.conf -+++ b/mkspecs/common/gcc-base.conf -@@ -109,7 +109,7 @@ QMAKE_CFLAGS_MIPS_DSP += -mdsp - QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2 - - # -march=haswell is supported as of GCC 4.9 and Clang 3.6 --QMAKE_CFLAGS_ARCH_HASWELL = -march=core-avx2 -+QMAKE_CFLAGS_ARCH_HASWELL = -mavx2 - - # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code - QMAKE_AR_LTCG = gcc-ar cqs --- -2.21.0.rc1 - diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch deleted file mode 100644 index 30b5abc39759..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 9 Feb 2020 11:45:00 +0100 -Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14 - -In upstream commit: - -https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17 - -_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument -IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for -QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland. -During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some -reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their -cmake files regenerated, leading to cmake errors like: - -https://bugs.gentoo.org/703306 -https://bugs.gentoo.org/705198 - -From mkspecs/features/create_cmake.prf: - -# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties -# functions whether a Configuration specific generator expression needs to be added to the values -# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need -# configuration specific values. For singular builds (only release or only debug), we want the -# values to be applied regardless of the configuration. -# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to -# build a Debug configuration of an application, even if Qt was built in a Release configuration. - -qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease -optional and default to FALSE. - ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100 -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100 -@@ -538,8 +538,14 @@ - - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - -- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION -- IsDebugAndRelease) -+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) -+ set(IsDebugAndRelease FALSE) -+ set (list_var ${ARGN}) -+ list(LENGTH list_var num_extra_arg) -+ if (${num_extra_arg} GREATER 0) -+ list(GET list_var 0 IsDebugAndRelease) -+ endif() -+ - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) diff --git a/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch b/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch deleted file mode 100644 index b7f65483fb1b..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 61b07d75f96d4dfb07b485b2a9bd7aed099df987 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@qt.io> -Date: Tue, 1 Dec 2020 08:43:28 +0100 -Subject: [PATCH] Revert "xcb: add xcb-util dependency for xcb-image" -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -This reverts commit adc42bebcac764ca8de78578e3a4ac39b621bd09. - -adc42beb is wrong, the bug is for static build of qt with static -xcb. It adds the explicit dependency of xcb-util 0.3.9, which is -not available on Debian yet. - -Task-number: QTBUG-86287 -Fixes: QTBUG-88688 -Change-Id: Iffc821f49bdfcad3f2556951d3677c35a7682266 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> -(adapted from commit 92a57e0b016f811876ec1d62328ca8edfe452a3a) ---- - src/gui/configure.json | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -diff --git a/src/gui/configure.json b/src/gui/configure.json -index c8c4864eca6..1f08795c57b 100644 ---- a/src/gui/configure.json -+++ b/src/gui/configure.json -@@ -601,15 +601,6 @@ - ], - "use": "xcb" - }, -- "xcb_util": { -- "label": "XCB Util >= 0.3.9", -- "headers": "xcb/xcb_util.h", -- "sources": [ -- { "type": "pkgConfig", "args": "xcb-util >= 0.3.9" }, -- "-lxcb-util" -- ], -- "use": "xcb" -- }, - "xcb_image": { - "label": "XCB Image >= 0.3.9", - "headers": "xcb/xcb_image.h", -@@ -617,7 +608,7 @@ - { "type": "pkgConfig", "args": "xcb-image >= 0.3.9" }, - "-lxcb-image" - ], -- "use": "xcb_shm xcb_util xcb" -+ "use": "xcb_shm xcb" - }, - "xcb_keysyms": { - "label": "XCB Keysyms >= 0.3.9", -@@ -1065,7 +1056,6 @@ - "tail": "#undef explicit", - "include": [ - "xcb/xcb.h", -- "xcb/xcb_util.h", - "xcb/xcb_image.h", - "xcb/xcb_keysyms.h", - "xcb/randr.h", -@@ -1097,7 +1087,7 @@ - "xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, 0, 0, 0, 0);" - ] - }, -- "use": "xcb_icccm xcb_util xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" -+ "use": "xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" - }, - "x11prefix": { - "label": "X11 prefix", --- -2.16.3 diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index cfa040fbec83..55e237a8d1ef 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -1,19 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="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="ibus">Build the IBus input method plugin</flag> <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> + <flag name="linuxfb">Enable Linux framebuffer support for embedded devices</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="vulkan">Enable support for Vulkan</flag> <flag name="wayland">Provide <pkg>dev-qt/qtwayland</pkg> to ensure Qt applications can be run as Wayland clients</flag> <flag name="X">Build the XCB platform plugin and enable X11 integration</flag> </use> diff --git a/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.13.ebuild index 34d58b305ba0..9ed93471cf64 100644 --- a/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.13.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -SLOT=5/$(ver_cut 1-3) # bug 707658 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi -# TODO: linuxfb -IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg - +libinput +png tslib tuio +udev vnc vulkan wayland +X" +SLOT=5/${QT5_PV} # bug 707658 +IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput + linuxfb +png tslib tuio +udev vnc vulkan wayland +X" REQUIRED_USE=" - || ( eglfs X ) + || ( eglfs linuxfb vnc wayland X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) @@ -27,56 +25,55 @@ REQUIRED_USE=" X? ( gles2-only? ( egl ) ) " -COMMON_DEPEND=" +RDEPEND=" dev-libs/glib:2 - ~dev-qt/qtcore-${PV}:5= + =dev-qt/qtcore-${QT5_PV}*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig - >=media-libs/freetype-2.6.1:2 - >=media-libs/harfbuzz-1.6.0:= + media-libs/freetype:2 + media-libs/harfbuzz:= sys-libs/zlib:= - dbus? ( ~dev-qt/qtdbus-${PV} ) - egl? ( media-libs/mesa[egl] ) + accessibility? ( app-accessibility/at-spi2-core:2 ) + dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) eglfs? ( - media-libs/mesa[gbm] + media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) - gles2-only? ( media-libs/mesa[gles2] ) - !gles2-only? ( virtual/opengl ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + gles2-only? ( media-libs/libglvnd ) + !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= - >=x11-libs/libxkbcommon-0.5.0 + x11-libs/libxkbcommon ) - png? ( media-libs/libpng:0= ) + png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) - tuio? ( ~dev-qt/qtnetwork-${PV} ) + tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) udev? ( virtual/libudev:= ) - vnc? ( ~dev-qt/qtnetwork-${PV} ) + vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 - >=x11-libs/libxcb-1.12:=[xkb] - >=x11-libs/libxkbcommon-0.5.0[X] + x11-libs/libxcb:= + x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} evdev? ( sys-kernel/linux-headers ) + linuxfb? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) -" -RDEPEND="${COMMON_DEPEND} - dev-qt/qtchooser + X? ( x11-base/xorg-proto ) " PDEPEND=" ibus? ( app-i18n/ibus ) - wayland? ( ~dev-qt/qtwayland-${PV} ) + wayland? ( =dev-qt/qtwayland-${QT5_PV}* ) " QT5_TARGET_SUBDIRS=( @@ -102,7 +99,6 @@ QT5_GENTOO_CONFIG=( :fontconfig: :system-freetype:FREETYPE !:no-freetype: - !gif:no-gif: gles2-only::OPENGL_ES gles2-only:opengles2:OPENGL_ES_2 !:no-gui: @@ -132,13 +128,6 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) -PATCHES=( - "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 - "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306 - "${FILESDIR}/${P}-bogus-xcb-util-dep.patch" # QTBUG-86287, QTBUG-88688 - "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 764038 -) - src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die @@ -162,26 +151,27 @@ src_prepare() { src_configure() { local myconf=( - $(usex dbus -dbus-linked '') + $(qt_use accessibility feature-accessibility-atspi-bridge) + $(usev dbus -dbus-linked) $(qt_use egl) $(qt_use eglfs) - $(usex eglfs '-gbm -kms' '') + $(usev eglfs '-gbm -kms') $(qt_use evdev) $(qt_use evdev mtdev) -fontconfig -system-freetype - $(usex gif '' -no-gif) -gui -system-harfbuzz $(qt_use jpeg libjpeg system) $(qt_use libinput) + $(qt_use linuxfb) -opengl $(usex gles2-only es2 desktop) $(qt_use png libpng system) $(qt_use tslib) $(qt_use udev libudev) $(qt_use vulkan) $(qt_use X xcb) - $(usex X '-xcb-xlib' '') + $(usev X '-xcb-xlib') ) if use libinput || use X; then myconf+=( -xkbcommon ) diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/qthelp/Manifest +++ b/dev-qt/qthelp/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qthelp/metadata.xml +++ b/dev-qt/qthelp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qthelp/qthelp-5.15.2.ebuild b/dev-qt/qthelp/qthelp-5.15.13.ebuild index c6f472aab2bd..9aacb12ebef3 100644 --- a/dev-qt/qthelp/qthelp-5.15.2.ebuild +++ b/dev-qt/qthelp/qthelp-5.15.13.ebuild @@ -1,29 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi QT5_MODULE="qttools" inherit qt5-build DESCRIPTION="Qt5 module for integrating online documentation into applications" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtsql-${PV}[sqlite] - ~dev-qt/qtwidgets-${PV} -" -RDEPEND="${DEPEND} - dev-qt/qtchooser + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtsql-${QT5_PV}*[sqlite] + =dev-qt/qtwidgets-${QT5_PV}* " +RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/assistant/help diff --git a/dev-qt/qthttpserver/Manifest b/dev-qt/qthttpserver/Manifest new file mode 100644 index 000000000000..e0fcba08b0fd --- /dev/null +++ b/dev-qt/qthttpserver/Manifest @@ -0,0 +1 @@ +DIST qthttpserver-everywhere-src-6.7.0.tar.xz 163044 BLAKE2B 319e19f8b1682b98b3577459ea1cf6e8069137dbe5dd48d93acfcfbc2a51eac1e592856d6901fc1f143b47e37c698ba4c08838dd0125323334c182e37e9ca5d9 SHA512 e63c87b9a8b0a2aff5fbbb012582045cd9fbd6bbbc81089707ef5d71ad078c8a9a52d443213b3e9c137c2349bb107641a267ed71d562e64b55a18abca4bea8ce diff --git a/dev-qt/qthttpserver/metadata.xml b/dev-qt/qthttpserver/metadata.xml new file mode 100644 index 000000000000..4b6f4c329cd8 --- /dev/null +++ b/dev-qt/qthttpserver/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="websockets">Enable websockets support using <pkg>dev-qt/qtwebsockets</pkg></flag> + </use> + <upstream> + <bugs-to>https://bugreports.qt.io/</bugs-to> + <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qthttpserver</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/qthttpserver/qthttpserver-6.7.0.ebuild b/dev-qt/qthttpserver/qthttpserver-6.7.0.ebuild new file mode 100644 index 000000000000..a4b020165245 --- /dev/null +++ b/dev-qt/qthttpserver/qthttpserver-6.7.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="HTTP server functionality for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +IUSE="+ssl websockets" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,ssl=] + websockets? ( ~dev-qt/qtwebsockets-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + test? ( ~dev-qt/qtbase-${PV}:6[concurrent] ) +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package websockets Qt6WebSockets) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qthttpserver/qthttpserver-6.7.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.7.9999.ebuild new file mode 100644 index 000000000000..49febbf2b658 --- /dev/null +++ b/dev-qt/qthttpserver/qthttpserver-6.7.9999.ebuild @@ -0,0 +1,31 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="HTTP server functionality for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+ssl websockets" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,ssl=] + websockets? ( ~dev-qt/qtwebsockets-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + test? ( ~dev-qt/qtbase-${PV}:6[concurrent] ) +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package websockets Qt6WebSockets) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qthttpserver/qthttpserver-6.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.9999.ebuild new file mode 100644 index 000000000000..49febbf2b658 --- /dev/null +++ b/dev-qt/qthttpserver/qthttpserver-6.9999.ebuild @@ -0,0 +1,31 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="HTTP server functionality for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="+ssl websockets" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,ssl=] + websockets? ( ~dev-qt/qtwebsockets-${PV}:6 ) +" +DEPEND=" + ${RDEPEND} + test? ( ~dev-qt/qtbase-${PV}:6[concurrent] ) +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package websockets Qt6WebSockets) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest index d804150e2318..f8fe9bad93c7 100644 --- a/dev-qt/qtimageformats/Manifest +++ b/dev-qt/qtimageformats/Manifest @@ -1 +1,3 @@ -DIST qtimageformats-everywhere-src-5.15.2.tar.xz 1806740 BLAKE2B 11da7926a50c17d5a36259d15a5c7e6af68f9f2e7e26626b7e04a031ae428a8d220daa8fa4461efd4b8db85bcbaa1ccf24b72271f3599c7298a4d1a49c25f9c3 SHA512 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e +DIST qtimageformats-5.15.13-gentoo-kde-1.tar.xz 62204 BLAKE2B deb450b19bc3f6253dfa16a12ddfcc16374e2d7b3ed8a49a807f5f83731f63d5479a88b390ffc24c81552a64a4c3dfe0bee91526d2a96846edab8f61b4ccffec SHA512 a52e6fd6fce358c75c9dc09d727082bd4069c36dee14e3c15c437ca62699b31bea3fa042a47c450ff26f72359f9eda6158d5c01474906a36490df31e6fe810ea +DIST qtimageformats-everywhere-opensource-src-5.15.13.tar.xz 1888944 BLAKE2B ff71d92749691bcf79622b7a8e9873c7f7b44e01a88365d4b86f627164c26060f582442c9a11de1ad627a15c7da8cdfbca7ec0e1a5ffb30aa295a329331a6d3a SHA512 48b0dac1acfdae1b090bc5d0054610f61290135363400a629ce3650cddd4c11f7bd95edd5bd1d36d758006a5fd54ded29f540a6e8dc675ca2e85d4ae169add50 +DIST qtimageformats-everywhere-src-6.7.0.tar.xz 1968344 BLAKE2B b0d91c5a8d902ac2c4afd285d27adf5cde3af05607333606a4721b1622e1eac87bc58d1452ae3e38684a35ec921b023d2101f9f47a19a7701d72d0cfb62cefbf SHA512 0e30021b028a4e6754c300d343aa72f93ab855cba043ddb2d24855989823c82c78ea67871399d78105dbc092abe2666e0a92caa50aa780ca4e267bf6f05bd914 diff --git a/dev-qt/qtimageformats/metadata.xml b/dev-qt/qtimageformats/metadata.xml index 32568f62fb8e..120e744af9b3 100644 --- a/dev-qt/qtimageformats/metadata.xml +++ b/dev-qt/qtimageformats/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.13.ebuild index dc39e71a9b7c..8054f491986d 100644 --- a/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-5.15.13.ebuild @@ -1,22 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc64 ~riscv ~sparc x86" +fi + inherit qt5-build DESCRIPTION="Additional format plugins for the Qt image I/O system" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86" -fi - IUSE="mng" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* media-libs/libwebp:= - media-libs/tiff:0 + media-libs/tiff:= mng? ( media-libs/libmng:= ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtimageformats/qtimageformats-6.7.0.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.0.ebuild new file mode 100644 index 000000000000..bc7acf3262df --- /dev/null +++ b/dev-qt/qtimageformats/qtimageformats-6.7.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 2021-2024 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 ~arm arm64 ~hppa ~loong ~ppc64 ~riscv ~x86" +fi + +IUSE="mng" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + media-libs/libwebp:= + media-libs/tiff:= + mng? ( media-libs/libmng:= ) +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # heif plugin is only for Mac, test is normally auto-skipped but may + # misbehave with kde-frameworks/kimageformats:6[heif] (bug #927971) + tst_qheif +) + +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.7.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.9999.ebuild new file mode 100644 index 000000000000..9d1a9a6f9685 --- /dev/null +++ b/dev-qt/qtimageformats/qtimageformats-6.7.9999.ebuild @@ -0,0 +1,41 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86" +fi + +IUSE="mng" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + media-libs/libwebp:= + media-libs/tiff:= + mng? ( media-libs/libmng:= ) +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # heif plugin is only for Mac, test is normally auto-skipped but may + # misbehave with kde-frameworks/kimageformats:6[heif] (bug #927971) + tst_qheif +) + +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..9d1a9a6f9685 --- /dev/null +++ b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild @@ -0,0 +1,41 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86" +fi + +IUSE="mng" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + media-libs/libwebp:= + media-libs/tiff:= + mng? ( media-libs/libmng:= ) +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # heif plugin is only for Mac, test is normally auto-skipped but may + # misbehave with kde-frameworks/kimageformats:6[heif] (bug #927971) + tst_qheif +) + +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/qtlanguageserver/Manifest b/dev-qt/qtlanguageserver/Manifest new file mode 100644 index 000000000000..be3a4ad3ceaf --- /dev/null +++ b/dev-qt/qtlanguageserver/Manifest @@ -0,0 +1 @@ +DIST qtlanguageserver-everywhere-src-6.7.0.tar.xz 145140 BLAKE2B 216b0b8c777361416d179dc970e4adcf78310eab603dba1907ff59bb1efa958ddcfc2de131dc37597096bb7f5d54bc68fe1c4f8a92eff23ef108abdbb9251dee SHA512 b3ebfd6e3093e6105dfda173cb8e8f7686e139621a882373f9a27ff7c3b7f7e4b10ccdbc1f71cab474ae6eddca4e68733a053b0045111575ff1f49741ecfe02f diff --git a/dev-qt/qtlanguageserver/metadata.xml b/dev-qt/qtlanguageserver/metadata.xml new file mode 100644 index 000000000000..59773d989592 --- /dev/null +++ b/dev-qt/qtlanguageserver/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugreports.qt.io/</bugs-to> + <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtlanguageserver</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/qtlanguageserver/qtlanguageserver-6.7.0.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.0.ebuild new file mode 100644 index 000000000000..3dbf250ac2cc --- /dev/null +++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Implementation of the Language Server Protocol for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +RDEPEND="~dev-qt/qtbase-${PV}:6" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild new file mode 100644 index 000000000000..b02596ef5aab --- /dev/null +++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild @@ -0,0 +1,15 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Implementation of the Language Server Protocol for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND="~dev-qt/qtbase-${PV}:6" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.9999.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.9999.ebuild new file mode 100644 index 000000000000..b02596ef5aab --- /dev/null +++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.9999.ebuild @@ -0,0 +1,15 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Implementation of the Language Server Protocol for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND="~dev-qt/qtbase-${PV}:6" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index d6548eb5847d..f0042c44d64e 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -1 +1,4 @@ -DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f +DIST qtlocation-5.15.11-patchset.tar.xz 4796 BLAKE2B dcfa75bd3fb2e9069e1a530c27e2b4e9ac921fcf0ccb712f0894375b575ba25103948c6e5b85b56a8f9c9f2d7edf7df8e38501e93356e69f060b577a04c2d221 SHA512 14bd2864abc6f446dc4fbac03548cb42305685b46db757d856360780144095a021130bc0ebf1d07a516dc7991dc0cfbf733bd0ef6be58237bc15822c21af1d0b +DIST qtlocation-everywhere-opensource-src-5.15.13.tar.xz 6554724 BLAKE2B 26cc97cc210a4c2afcd5ca57f849081772f8e65f2fb809424f257f6e24309a702483be73085825f63ac283705db8e967b96132dac710cfaa0759c882802aad60 SHA512 37ccec9d9ce4ab59c0e4a2827c94d2e7247786fa53dc340539160631aaa9e5de02fbff1a5fadc5d96c64b2d9a81a5912a562beb6e4d0ec09186f8508626ade36 +DIST qtlocation-everywhere-src-6.7.0.tar.xz 3165588 BLAKE2B ee2f3be403942d91f1a87e89d42d1f969eefc90654c77732d7249766e680ce1cb63685203989ceef984365ff59152995e6886bf5f112834d55abf0e6239229ae SHA512 51e3777cdee6c27bf5770dfa4f21509ab4699161b5b49d99696aa09018ee5a355c921a85f8f1a732a80b19730ac30d40795d20cd73e4aefc1a4d4a989d41bc3d +DIST qtlocation-mapboxgl-5.15.13-4c88f2c0.tar.gz 3726387 BLAKE2B e9b818505ace86516262d1407450c14be82122bb91363a57708795844089371ac7d511a857f713c7cb4e6f8b54867aab0bc5dcdb9c49aa28aa3f8363271378e0 SHA512 e4d9133db892fd8b7b1bcf584bf7dae30c0f0353f3b0a696a6cabc9485067f262d42554b583640521734498572e5480b5e8d0143d5be47bb92077f3192fefa4d diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch b/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch deleted file mode 100644 index d4cd0188d1a1..000000000000 --- a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4fe9e0ed027134a833b2243597a2ccd00987b559 Mon Sep 17 00:00:00 2001 -From: Piotr Mikolajczyk <piotr.mikolajczyk@qt.io> -Date: Tue, 29 Sep 2020 10:41:23 +0200 -Subject: [PATCH] Fix crash when showing Map QML comp. for 2nd+ time - -Crash caused by storing pointer to a node that could be deleted elsewhere - -Fixes: QTBUG-85260 -Change-Id: I871123322fac84b8bf91e9bab8ecad08e75c2854 -Reviewed-by: Paolo Angelelli <paolo.angelelli.qt@gmail.com> ---- - src/location/labs/qsg/qgeomapobjectqsgsupport.cpp | 29 ++++++++++++++++++++++- - 1 file changed, 28 insertions(+), 1 deletion(-) - -diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -index 0e1df8f6c..cd1801305 100644 ---- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -@@ -48,7 +48,32 @@ static int findMapObject(QGeoMapObject *o, const QList<MapObject> &list) - } - return -1; - } -+namespace { -+bool findNodeInStructure(QSGNode *root, QSGNode *item) -+{ -+ if (root == nullptr || item == nullptr) -+ return false; -+ if (root == item) -+ return true; -+ auto currentChild = root->firstChild(); -+ // First check the direct child nodes and if not found let's dive deeper -+ bool bFound = (item == currentChild); -+ -+ while (!bFound && currentChild) { -+ currentChild = currentChild->nextSibling(); -+ bFound = (item == currentChild); -+ } - -+ if (!bFound) { -+ currentChild = root->firstChild(); -+ while (!bFound && currentChild) { -+ bFound = findNodeInStructure(currentChild, item); -+ currentChild = currentChild->nextSibling(); -+ } -+ } -+ return bFound; -+} -+} - bool QGeoMapObjectQSGSupport::createMapObjectImplementation(QGeoMapObject *obj, QGeoMapPrivate *d) - { - QExplicitlySharedDataPointer<QGeoMapObjectPrivate> pimpl = -@@ -157,9 +182,11 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind - { - if (!root) - return; -+ if (!findNodeInStructure(root, m_mapObjectsRootNode)) -+ m_mapObjectsRootNode = nullptr; - if (!m_mapObjectsRootNode) { - m_mapObjectsRootNode = new QDeclarativePolygonMapItemPrivateOpenGL::RootNode(); -- root->appendChildNode(m_mapObjectsRootNode); -+ root->appendChildNode(m_mapObjectsRootNode); // PASSING OWNERSHIP! - } - - m_mapObjectsRootNode->removeAllChildNodes(); --- -2.16.3 diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch b/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch deleted file mode 100644 index 4bd70b99abbf..000000000000 --- a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 861e372b6ad81570d4f496e42fb25a6699b72f2f Mon Sep 17 00:00:00 2001 -From: Piotr Mikolajczyk <piotr.mikolajczyk@qt.io> -Date: Tue, 3 Nov 2020 11:43:22 +0100 -Subject: [PATCH] Simpler fix to crashing Qml Map appearing 2nd+ time - -Previous solution did not take advantage of the QSGNode::OwnedByParent -flag. Setting this flag to false allows to use parent() property -to determine if the node has been removed from node tree. -This amends 4fe9e0ed027134a833b2243597a2ccd00987b559 - -Fixes: QTBUG-85260 -Change-Id: I705848483d7dc2639dffffa0ff66c682b3fffca0 -Reviewed-by: Andy Shaw <andy.shaw@qt.io> ---- - src/location/labs/qsg/qgeomapobjectqsgsupport.cpp | 40 +++++------------------ - src/location/labs/qsg/qgeomapobjectqsgsupport_p.h | 3 +- - 2 files changed, 11 insertions(+), 32 deletions(-) - -diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -index cd1801305..a978573d6 100644 ---- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp -@@ -48,32 +48,7 @@ static int findMapObject(QGeoMapObject *o, const QList<MapObject> &list) - } - return -1; - } --namespace { --bool findNodeInStructure(QSGNode *root, QSGNode *item) --{ -- if (root == nullptr || item == nullptr) -- return false; -- if (root == item) -- return true; -- auto currentChild = root->firstChild(); -- // First check the direct child nodes and if not found let's dive deeper -- bool bFound = (item == currentChild); -- -- while (!bFound && currentChild) { -- currentChild = currentChild->nextSibling(); -- bFound = (item == currentChild); -- } - -- if (!bFound) { -- currentChild = root->firstChild(); -- while (!bFound && currentChild) { -- bFound = findNodeInStructure(currentChild, item); -- currentChild = currentChild->nextSibling(); -- } -- } -- return bFound; --} --} - bool QGeoMapObjectQSGSupport::createMapObjectImplementation(QGeoMapObject *obj, QGeoMapPrivate *d) - { - QExplicitlySharedDataPointer<QGeoMapObjectPrivate> pimpl = -@@ -182,11 +157,14 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind - { - if (!root) - return; -- if (!findNodeInStructure(root, m_mapObjectsRootNode)) -- m_mapObjectsRootNode = nullptr; -+ -+ if (m_mapObjectsRootNode && m_mapObjectsRootNode->parent()) -+ root->appendChildNode(m_mapObjectsRootNode.get()); -+ - if (!m_mapObjectsRootNode) { -- m_mapObjectsRootNode = new QDeclarativePolygonMapItemPrivateOpenGL::RootNode(); -- root->appendChildNode(m_mapObjectsRootNode); // PASSING OWNERSHIP! -+ m_mapObjectsRootNode = std::make_unique<QDeclarativePolygonMapItemPrivateOpenGL::RootNode>(); -+ root->appendChildNode(m_mapObjectsRootNode.get()); -+ m_mapObjectsRootNode->setFlag(QSGNode::OwnedByParent, false); - } - - m_mapObjectsRootNode->removeAllChildNodes(); -@@ -211,7 +189,7 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind - MapObject &mo = m_mapObjects[i]; - QQSGMapObject *sgo = mo.sgObject; - QSGNode *oldNode = mo.qsgNode; -- mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode, window); -+ mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode.get(), window); - if (Q_UNLIKELY(!mo.qsgNode)) { - qWarning() << "updateMapObjectNode for "<<mo.object->type() << " returned NULL"; - } else if (mo.visibleNode && (mo.visibleNode->visible() != mo.object->visible())) { -@@ -227,7 +205,7 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind - QQSGMapObject *sgo = mo.sgObject; - QSGNode *oldNode = mo.qsgNode; - sgo->updateGeometry(); // or subtree will be blocked -- mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode, window); -+ mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode.get(), window); - if (mo.qsgNode) { - if (mo.visibleNode && (mo.visibleNode->visible() != mo.object->visible())) { - mo.visibleNode->setVisible(mo.object->visible()); -diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h b/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h -index 1ec966fa9..cbbc09691 100644 ---- a/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h -+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h -@@ -59,6 +59,7 @@ - #include <QtLocation/private/qdeclarativepolylinemapitem_p.h> - #include <QtLocation/private/qdeclarativepolygonmapitem_p_p.h> - #include <QtCore/qpointer.h> -+#include <memory> - - QT_BEGIN_NAMESPACE - struct Q_LOCATION_PRIVATE_EXPORT MapObject { -@@ -85,7 +86,7 @@ public: - QList<MapObject> m_pendingMapObjects; - QList<MapObject> m_removedMapObjects; - QGeoMap *m_map = nullptr; -- QDeclarativePolygonMapItemPrivateOpenGL::RootNode *m_mapObjectsRootNode = nullptr; -+ std::unique_ptr<QDeclarativePolygonMapItemPrivateOpenGL::RootNode> m_mapObjectsRootNode; - }; - - QT_END_NAMESPACE --- -2.16.3 diff --git a/dev-qt/qtlocation/metadata.xml b/dev-qt/qtlocation/metadata.xml index 32568f62fb8e..4e925ad20fd6 100644 --- a/dev-qt/qtlocation/metadata.xml +++ b/dev-qt/qtlocation/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.13.ebuild b/dev-qt/qtlocation/qtlocation-5.15.13.ebuild new file mode 100644 index 000000000000..ddbc8cffd58c --- /dev/null +++ b/dev-qt/qtlocation/qtlocation-5.15.13.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PATCHSET="${PN}-5.15.11-patchset" +inherit qt5-build + +DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + MAPBOXGL_COMMIT=4c88f2c0e61daa89f584a8a9a3eba210221c6920 + SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz + https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" +fi + +RDEPEND=" + dev-libs/icu:= + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}* + =dev-qt/qtpositioning-${QT5_PV}*[qml] + =dev-qt/qtsql-${QT5_PV}* + sys-libs/zlib +" +DEPEND="${RDEPEND} + =dev-qt/qtconcurrent-${QT5_PV}* +" + +QT5_TARGET_SUBDIRS=( + src/3rdparty/clipper + src/3rdparty/poly2tri + src/3rdparty/clip2tri + src/3rdparty/mapbox-gl-native + src/location + src/imports/location + src/imports/locationlabs + src/plugins/geoservices +) + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + +PATCHES=( "${WORKDIR}/${PATCHSET}" ) + +src_prepare() { + rm -rf src/3rdparty/mapbox-gl-native/* || die + mv "${WORKDIR}"/${PN}-mapboxgl-${MAPBOXGL_COMMIT}/* src/3rdparty/mapbox-gl-native || die + qt5-build_src_prepare +} +fi + +src_configure() { + # src/plugins/geoservices requires files that are only generated when + # qmake is run in the root directory. Bug 633776. + qt5_configure_oos_quirk qtlocation-config.pri src/location + qt5-build_src_configure +} diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild deleted file mode 100644 index 2f1e239e5a63..000000000000 --- a/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qt5-build - -DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 x86" -fi - -IUSE="" - -RDEPEND=" - dev-libs/icu:= - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtpositioning-${PV}[qml] - ~dev-qt/qtsql-${PV} - sys-libs/zlib -" -DEPEND="${RDEPEND} - ~dev-qt/qtconcurrent-${PV} -" - -QT5_TARGET_SUBDIRS=( - src/3rdparty/clipper - src/3rdparty/poly2tri - src/3rdparty/clip2tri - src/3rdparty/mapbox-gl-native - src/location - src/imports/location - src/imports/locationlabs - src/plugins/geoservices -) - -PATCHES=( "${FILESDIR}"/${P}-qsg-render-thread-crash-{1,2}.patch ) # QTBUG-85260 - -src_configure() { - # src/plugins/geoservices requires files that are only generated when - # qmake is run in the root directory. Bug 633776. - mkdir -p "${QT5_BUILD_DIR}"/src/location || die - qt5_qmake "${QT5_BUILD_DIR}" - cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die - qt5-build_src_configure -} diff --git a/dev-qt/qtlocation/qtlocation-6.7.0.ebuild b/dev-qt/qtlocation/qtlocation-6.7.0.ebuild new file mode 100644 index 000000000000..6a7b3e52fb17 --- /dev/null +++ b/dev-qt/qtlocation/qtlocation-6.7.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 2021-2024 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 ~arm ~riscv ~x86" +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/*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.7.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.7.9999.ebuild new file mode 100644 index 000000000000..9ffb31700378 --- /dev/null +++ b/dev-qt/qtlocation/qtlocation-6.7.9999.ebuild @@ -0,0 +1,44 @@ +# Copyright 2021-2024 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 ~arm ~riscv ~x86" +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/*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..9ffb31700378 --- /dev/null +++ b/dev-qt/qtlocation/qtlocation-6.9999.ebuild @@ -0,0 +1,44 @@ +# Copyright 2021-2024 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 ~arm ~riscv ~x86" +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/*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/qtlockedfile/metadata.xml b/dev-qt/qtlockedfile/metadata.xml index 17237689dcfd..610d2d8ea120 100644 --- a/dev-qt/qtlockedfile/metadata.xml +++ b/dev-qt/qtlockedfile/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild index 8ce005c4ebea..018cdc5e96a3 100644 --- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild +++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_P=qt-solutions-${PV#*_p} inherit qmake-utils @@ -9,17 +9,16 @@ inherit qmake-utils DESCRIPTION="QFile extension with advisory locking functions" HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/" SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/${PN}" LICENSE="|| ( LGPL-2.1 GPL-3 )" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" IUSE="doc" DEPEND="dev-qt/qtcore:5" RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}/${PN}" - src_prepare() { default diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 696b51d2b52e..2a210b39fc36 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1 +1,3 @@ -DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd +DIST qtmultimedia-5.15.13-gentoo-kde-1.tar.xz 1500 BLAKE2B 68cfdb828aa931e63502c1570e5fb04909f4331d79fa9ae0f34ab53adc858405faab0fc782547466b573113973c4deb1a4e1dab0917cb0513bdc3eb7597b0bce SHA512 f045b051c6065f9a7daf7d7c1da457bc8348a5d6fa871352f18cc7895e3b21d090c3a362a434ac783d793b1d9e59a4b23b9329892c15e9a8fc4fbb0a871d9c6d +DIST qtmultimedia-everywhere-opensource-src-5.15.13.tar.xz 3831376 BLAKE2B a8634a1dbba8c13dda2c97731806b1014ad80a1ed2506e9a4d42e1d002e562947496e045638875ed4d0c2d637605414dd8eab656fa03766817b7aa80db10145b SHA512 fa70146275d03c1bb8da1930eb66a9bbbf2a6c25cb6e6204a58b8338f58e671634eab878e9bac785ae2394de7dc38d30025a4afe4d26060e2f23a44758b2e5a4 +DIST qtmultimedia-everywhere-src-6.7.0.tar.xz 8315312 BLAKE2B 769689567de9c400a5472d8d40966c942a2ec95d599d166f8a3c47cb6ac0c4d1dd66f33fa0f6f5fac22675134798ef986053eb924ed6c3a1d9035f27127cc612 SHA512 4e5fa8fff408b8abf761a12d9637c425fe9bfbf6475b44a69c8489fd61bf6cbcca95940a22d1b24aec59634a458888d2b34cb883c8e38d542f2f1cb36046e4c1 diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index 6ffb1f8577e9..28f9bdbd0ddf 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="eglfs">Enable screen capture support with Qt's EGL Full Screen/Single Surface platform plugin</flag> <flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer</pkg></flag> <flag name="qml">Build QML/QtQuick bindings and imports</flag> <flag name="widgets">Build the QtMultimediaWidgets module</flag> @@ -13,6 +14,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-5.15.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.13.ebuild index e8a14eae07ec..135e11b14425 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.13.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + inherit qt5-build DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets" RDEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2-only=] - ~dev-qt/qtnetwork-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}*[gles2-only=] + =dev-qt/qtnetwork-${QT5_PV}* alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 @@ -23,15 +25,15 @@ RDEPEND=" media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) - pulseaudio? ( media-sound/pulseaudio[glib] ) + pulseaudio? ( media-libs/libpulse[glib] ) qml? ( - ~dev-qt/qtdeclarative-${PV} - gles2-only? ( ~dev-qt/qtgui-${PV}[egl] ) + =dev-qt/qtdeclarative-${QT5_PV}* + gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] ) openal? ( media-libs/openal ) ) widgets? ( - ~dev-qt/qtopengl-${PV} - ~dev-qt/qtwidgets-${PV}[gles2-only=] + =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] + media-libs/libglvnd ) " DEPEND="${RDEPEND} diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.0.ebuild new file mode 100644 index 000000000000..b7fa9c982158 --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.0.ebuild @@ -0,0 +1,104 @@ +# Copyright 2021-2024 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 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" +# tst_qmediaplayerbackend hard requires qml, review in case becomes optional +REQUIRED_USE=" + || ( ffmpeg gstreamer ) + eglfs? ( ffmpeg opengl ) + vaapi? ( ffmpeg opengl ) + 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=,concurrent,eglfs=] + media-video/ffmpeg:=[vaapi?] + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + ) + ) + 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 ) + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND="~dev-qt/qtshadertools-${PV}:6" + +CMAKE_SKIP_TESTS=( + # unimportant and expects all backends to be available (bug #928420) + tst_backends + # 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 v4l2 or hardware acceleration depending on availability + tst_qscreencapture_integration + tst_qscreencapturebackend + # fails with offscreen rendering + tst_qvideoframecolormanagement + tst_qwindowcapturebackend +) + +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 +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake + "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri + "${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.* + "${D}${QT6_PLUGINDIR}"/multimedia/objects-* + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild new file mode 100644 index 000000000000..99d03b1ca8be --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild @@ -0,0 +1,105 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" +# tst_qmediaplayerbackend hard requires qml, review in case becomes optional +REQUIRED_USE=" + || ( ffmpeg gstreamer ) + eglfs? ( ffmpeg opengl ) + vaapi? ( ffmpeg opengl ) + 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=,concurrent,eglfs=] + media-video/ffmpeg:=[vaapi?] + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + ) + ) + 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 ) + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND="~dev-qt/qtshadertools-${PV}:6" + +CMAKE_SKIP_TESTS=( + # unimportant and expects all backends to be available (bug #928420) + tst_backends + # 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 v4l2 or hardware acceleration depending on availability + tst_qscreencapture_integration + tst_qscreencapturebackend + tst_qvideoframebackend + # fails with offscreen rendering + tst_qvideoframecolormanagement + tst_qwindowcapturebackend +) + +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 +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake + "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri + "${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.* + "${D}${QT6_PLUGINDIR}"/multimedia/objects-* + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild new file mode 100644 index 000000000000..99d03b1ca8be --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -0,0 +1,105 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" +# tst_qmediaplayerbackend hard requires qml, review in case becomes optional +REQUIRED_USE=" + || ( ffmpeg gstreamer ) + eglfs? ( ffmpeg opengl ) + vaapi? ( ffmpeg opengl ) + 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=,concurrent,eglfs=] + media-video/ffmpeg:=[vaapi?] + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + ) + ) + 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 ) + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND="~dev-qt/qtshadertools-${PV}:6" + +CMAKE_SKIP_TESTS=( + # unimportant and expects all backends to be available (bug #928420) + tst_backends + # 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 v4l2 or hardware acceleration depending on availability + tst_qscreencapture_integration + tst_qscreencapturebackend + tst_qvideoframebackend + # fails with offscreen rendering + tst_qvideoframecolormanagement + tst_qwindowcapturebackend +) + +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 +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake + "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri + "${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.* + "${D}${QT6_PLUGINDIR}"/multimedia/objects-* + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch deleted file mode 100644 index be2c1f6e1a04..000000000000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0807f16eb407eaf8a5b34b67602d0a97778d945d Mon Sep 17 00:00:00 2001 -From: =?utf8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io> -Date: Fri, 6 Nov 2020 12:51:42 +0100 -Subject: [PATCH] QNAM: Work around QObject finicky orphan cleanup details - -Details described in a comment. - -Task-number: QTBUG-88063 -Change-Id: I763ecfedf518de97615e04a8eaae0fe1fd784f52 -Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> -(cherry picked from commit 1c6d6cbb62c5e93cbcad2d740c3b0ed01095618c) -Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> ---- - src/network/access/qnetworkreplyhttpimpl.cpp | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp -index 21916f53f15..727c1a0316d 100644 ---- a/src/network/access/qnetworkreplyhttpimpl.cpp -+++ b/src/network/access/qnetworkreplyhttpimpl.cpp -@@ -808,7 +808,17 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq - - // For the synchronous HTTP, this is the normal way the delegate gets deleted - // For the asynchronous HTTP this is a safety measure, the delegate deletes itself when HTTP is finished -- QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater())); -+ QMetaObject::Connection threadFinishedConnection = -+ QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater())); -+ -+ // QTBUG-88063: When 'delegate' is deleted the connection will be added to 'thread''s orphaned -+ // connections list. This orphaned list will be cleaned up next time 'thread' emits a signal, -+ // unfortunately that's the finished signal. It leads to a soft-leak so we do this to disconnect -+ // it on deletion so that it cleans up the orphan immediately. -+ QObject::connect(delegate, &QObject::destroyed, delegate, [threadFinishedConnection]() { -+ if (bool(threadFinishedConnection)) -+ QObject::disconnect(threadFinishedConnection); -+ }); - - // Set the properties it needs - delegate->httpRequest = httpRequest; --- -2.16.3 diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml index 19a09a6d744f..dfe9a543ba96 100644 --- a/dev-qt/qtnetwork/metadata.xml +++ b/dev-qt/qtnetwork/metadata.xml @@ -1,18 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="bindist">Disable EC support via <pkg>dev-libs/openssl</pkg></flag> - <flag name="connman">Enable <pkg>net-misc/connman</pkg>-based bearer plugin</flag> <flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag> <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic HTTP/SOCKS proxy configuration</flag> - <flag name="networkmanager">Enable <pkg>net-misc/networkmanager</pkg>-based - bearer plugin</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild new file mode 100644 index 000000000000..3f6f663d648f --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="gssapi libproxy sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/network + src/plugins/bearer/generic +) + +QT5_GENTOO_CONFIG=( + libproxy:libproxy: + ssl::SSL + ssl::OPENSSL + ssl:openssl-linked:LINKED_OPENSSL +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :network +) + +src_configure() { + local myconf=( + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(qt_use sctp) + $(usev ssl -openssl-linked) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +} diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild deleted file mode 100644 index 23709c175e8b..000000000000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - sys-libs/zlib:= - connman? ( ~dev-qt/qtdbus-${PV} ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - networkmanager? ( ~dev-qt/qtdbus-${PV} ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( - >=dev-libs/openssl-1.1.1:0=[bindist(-)=] - ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -QT5_TARGET_SUBDIRS=( - src/network - src/plugins/bearer/generic -) - -QT5_GENTOO_CONFIG=( - libproxy:libproxy: - ssl::SSL - ssl::OPENSSL - ssl:openssl-linked:LINKED_OPENSSL -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :network -) - -PATCHES=( - "${FILESDIR}"/${P}-QNetworkAccessManager-memleak.patch # QTBUG-88063 - "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 -) - -pkg_setup() { - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) -} - -src_configure() { - local myconf=( - $(usex connman -dbus-linked '') - $(usex gssapi -feature-gssapi -no-feature-gssapi) - $(qt_use libproxy) - $(usex networkmanager -dbus-linked '') - $(qt_use sctp) - $(usex ssl -openssl-linked '') - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die - fi -} diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest index e7e5b552beb0..9daed28a7951 100644 --- a/dev-qt/qtnetworkauth/Manifest +++ b/dev-qt/qtnetworkauth/Manifest @@ -1 +1,2 @@ -DIST qtnetworkauth-everywhere-src-5.15.2.tar.xz 141688 BLAKE2B dc850ffb257e2f2c8ece0d8676cf91454df49550883548206d1362946d09bd0ddf74b2a73ea4860c1cbf68f59f0d06312a7d21279f1401bf27c11b66341df95c SHA512 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d +DIST qtnetworkauth-everywhere-opensource-src-5.15.13.tar.xz 144696 BLAKE2B 54e0ce0467df8f3cb7bde484434177bf3ba84d2b05edd3287b8146297cc540287130e3cfdf042214e04fc0a8aaf992eccb0eb4f6905a68470b9eb70fc066ab47 SHA512 939ee9759fa0584aab060f420bdd98a44c49d93291dabff74bd90536a4cbd666899d3c1e19b438c1c3333d7d3f374a7a3b0beb8728b69ef19b915d2496f3fba8 +DIST qtnetworkauth-everywhere-src-6.7.0.tar.xz 143660 BLAKE2B 6e599b41dc2e483e3249894fec74c1e53a520de206f10e9967b9a4e97feaa2dfe50e233feec7c832b8fc90915e39c1aea16c0ee6778c3e07c130a49861e4aaae SHA512 1a92cd2f129260cacad51cf2d6dbb86f9b9e1b14df695117b1734d32897279b0a6f30a2c8e410fb105e13b45d7109c58c36fc73acf75c4e7ccf5be07913cec55 diff --git a/dev-qt/qtnetworkauth/metadata.xml b/dev-qt/qtnetworkauth/metadata.xml index 32568f62fb8e..f57c41c38251 100644 --- a/dev-qt/qtnetworkauth/metadata.xml +++ b/dev-qt/qtnetworkauth/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.13.ebuild index ab41e5c6f79a..a609f61ec1a7 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.13.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qt5-build DESCRIPTION="Network authorization library for the Qt5 framework" LICENSE="GPL-3" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64 ~ppc64 x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" fi IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtnetwork-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}* " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.0.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.0.ebuild new file mode 100644 index 000000000000..827bfff8c970 --- /dev/null +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 2021-2024 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 ~riscv ~x86" +fi + +RDEPEND="~dev-qt/qtbase-${PV}:6[network]" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild new file mode 100644 index 000000000000..422f1bcf7f3b --- /dev/null +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild @@ -0,0 +1,15 @@ +# Copyright 2021-2024 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 ~riscv ~x86" +fi + +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..422f1bcf7f3b --- /dev/null +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild @@ -0,0 +1,15 @@ +# Copyright 2021-2024 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 ~riscv ~x86" +fi + +RDEPEND="~dev-qt/qtbase-${PV}:6[network]" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qtopengl/Manifest +++ b/dev-qt/qtopengl/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtopengl/metadata.xml +++ b/dev-qt/qtopengl/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtopengl/qtopengl-5.15.13.ebuild b/dev-qt/qtopengl/qtopengl-5.15.13.ebuild new file mode 100644 index 000000000000..f8c62aa70a01 --- /dev/null +++ b/dev-qt/qtopengl/qtopengl-5.15.13.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +QT5_MODULE="qtbase" +VIRTUALX_REQUIRED="test" +inherit qt5-build + +DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)" + +IUSE="gles2-only" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*[gles2-only=] + =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/opengl +) + +src_configure() { + local myconf=( + -opengl $(usex gles2-only es2 desktop) + ) + qt5-build_src_configure +} diff --git a/dev-qt/qtopengl/qtopengl-5.15.2.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2.ebuild deleted file mode 100644 index bae6df383265..000000000000 --- a/dev-qt/qtopengl/qtopengl-5.15.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -VIRTUALX_REQUIRED="test" -inherit qt5-build - -DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - -IUSE="gles2-only" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}[gles2-only=] - ~dev-qt/qtwidgets-${PV}[gles2-only=] - !gles2-only? ( virtual/opengl ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/opengl -) - -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 - -src_configure() { - local myconf=( - -opengl $(usex gles2-only es2 desktop) - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/qtpaths/Manifest +++ b/dev-qt/qtpaths/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/qtpaths/metadata.xml b/dev-qt/qtpaths/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtpaths/metadata.xml +++ b/dev-qt/qtpaths/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtpaths/qtpaths-5.15.13.ebuild b/dev-qt/qtpaths/qtpaths-5.15.13.ebuild new file mode 100644 index 000000000000..18d2be6723f4 --- /dev/null +++ b/dev-qt/qtpaths/qtpaths-5.15.13.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +QT5_MODULE="qttools" +inherit qt5-build + +DESCRIPTION="Command line client to QStandardPaths" + +IUSE="" + +DEPEND="=dev-qt/qtcore-${QT5_PV}*" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/qtpaths +) + +src_install() { + qt5-build_src_install + qt5_symlink_binary_to_path qtpaths 5 +} diff --git a/dev-qt/qtpaths/qtpaths-5.15.2.ebuild b/dev-qt/qtpaths/qtpaths-5.15.2.ebuild deleted file mode 100644 index 0044084b4098..000000000000 --- a/dev-qt/qtpaths/qtpaths-5.15.2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Command line client to QStandardPaths" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest index c9faaf55f594..2bc7a875934f 100644 --- a/dev-qt/qtplugininfo/Manifest +++ b/dev-qt/qtplugininfo/Manifest @@ -1 +1,2 @@ -DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b +DIST qttools-5.15.13-gentoo-kde-1.tar.xz 3948 BLAKE2B 081e5d9fa81809545a15da707c58eb3754672f68084c8514282f7edbea3f469b681c003da9e59053d7f5654883ca06769cf46398461930f6222bb3ed86758522 SHA512 8afc3f763732a40e7e827de339395b4398b84bc2b2c0749f96f3cf6afdc655ba59b94809658f16d975eed63c28fd2b2b4f96b9b50fda251c2a1d085ed3c1cd15 +DIST qttools-everywhere-opensource-src-5.15.13.tar.xz 8897928 BLAKE2B cd4743e5cf8f444f8d8d8cd971eedd727ea7e7d8c3d237e61222cece0c0d10cb5090bba4db2f9c6a8dabfb0002eb21d58fe1c9aa916188d29e58f04ddfa24504 SHA512 a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500 diff --git a/dev-qt/qtplugininfo/metadata.xml b/dev-qt/qtplugininfo/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtplugininfo/metadata.xml +++ b/dev-qt/qtplugininfo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.13.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.13.ebuild new file mode 100644 index 000000000000..c42c99644f6b --- /dev/null +++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.13.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~x86" +fi + +QT5_MODULE="qttools" +inherit qt5-build + +DESCRIPTION="Qt5 plugin metadata dumper" + +IUSE="" + +DEPEND="=dev-qt/qtcore-${QT5_PV}*" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/qtplugininfo +) diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild deleted file mode 100644 index 69fcef78f572..000000000000 --- a/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Qt5 plugin metadata dumper" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} -" -RDEPEND="${DEPEND} - dev-qt/qtchooser -" diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest index d6548eb5847d..b78d59dceaa0 100644 --- a/dev-qt/qtpositioning/Manifest +++ b/dev-qt/qtpositioning/Manifest @@ -1 +1,2 @@ -DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f +DIST qtlocation-everywhere-opensource-src-5.15.13.tar.xz 6554724 BLAKE2B 26cc97cc210a4c2afcd5ca57f849081772f8e65f2fb809424f257f6e24309a702483be73085825f63ac283705db8e967b96132dac710cfaa0759c882802aad60 SHA512 37ccec9d9ce4ab59c0e4a2827c94d2e7247786fa53dc340539160631aaa9e5de02fbff1a5fadc5d96c64b2d9a81a5912a562beb6e4d0ec09186f8508626ade36 +DIST qtpositioning-everywhere-src-6.7.0.tar.xz 658368 BLAKE2B 162b4d3ea4e57d5a1ef4c243ba2272b32baae6d987ed788cee8e039f83388c0a062c5b2009c778008274f41d22c54f96f7372f49acf9877c9641bb6a5f6ba047 SHA512 ba0bce58321d967ddb3fcbe4b978212f660e48afd788ba36a0068ca7c6804e7febd74d6a15bc541f6cf9ebeef72aeeceb3e2779f53bdaa432391fb64781e68a1 diff --git a/dev-qt/qtpositioning/metadata.xml b/dev-qt/qtpositioning/metadata.xml index 23d4d81fd3d8..2d5119ff80c9 100644 --- a/dev-qt/qtpositioning/metadata.xml +++ b/dev-qt/qtpositioning/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -7,11 +7,13 @@ </maintainer> <use> <flag name="geoclue">Use enhanced location information from <pkg>app-misc/geoclue</pkg></flag> + <flag name="nmea">Build plugin for parsing NMEA (National Marine Electronics Association) sentences</flag> <flag name="qml">Build QML bindings</flag> </use> <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-5.15.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.13.ebuild index a989534143b8..a3d3f33c6b1a 100644 --- a/dev-qt/qtpositioning/qtpositioning-5.15.2.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-5.15.13.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + QT5_MODULE="qtlocation" inherit qt5-build DESCRIPTION="Physical position determination library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi IUSE="geoclue +qml" RDEPEND=" - ~dev-qt/qtcore-${PV} - geoclue? ( ~dev-qt/qtdbus-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV} ) + =dev-qt/qtcore-${QT5_PV}* + geoclue? ( =dev-qt/qtdbus-${QT5_PV}* ) + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) " DEPEND="${RDEPEND}" PDEPEND=" diff --git a/dev-qt/qtpositioning/qtpositioning-6.7.0.ebuild b/dev-qt/qtpositioning/qtpositioning-6.7.0.ebuild new file mode 100644 index 000000000000..fa98d67a0570 --- /dev/null +++ b/dev-qt/qtpositioning/qtpositioning-6.7.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 2021-2024 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 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +IUSE="geoclue nmea +qml" + +DEPEND=" + ~dev-qt/qtbase-${PV}:6 + geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) + nmea? ( + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtserialport-${PV}:6 + ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +RDEPEND=" + ${DEPEND} + geoclue? ( app-misc/geoclue:2.0 ) +" + +CMAKE_SKIP_TESTS=( + # threads test (rarely) fails randomly + tst_qgeoareamonitor +) + +src_prepare() { + qt6-build_src_prepare + + # unfortunately cmake_use_find_package would break things with qtbase + use geoclue || + sed -e 's/TARGET Qt::DBus/FALSE/' \ + -i src/plugins/position/CMakeLists.txt || die + use nmea || + sed -e 's/TARGET Qt::Network/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.7.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.7.9999.ebuild new file mode 100644 index 000000000000..c872768c9bd8 --- /dev/null +++ b/dev-qt/qtpositioning/qtpositioning-6.7.9999.ebuild @@ -0,0 +1,68 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +IUSE="geoclue nmea +qml" + +DEPEND=" + ~dev-qt/qtbase-${PV}:6 + geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) + nmea? ( + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtserialport-${PV}:6 + ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +RDEPEND=" + ${DEPEND} + geoclue? ( app-misc/geoclue:2.0 ) +" + +CMAKE_SKIP_TESTS=( + # threads test (rarely) fails randomly + tst_qgeoareamonitor +) + +src_prepare() { + qt6-build_src_prepare + + # unfortunately cmake_use_find_package would break things with qtbase + use geoclue || + sed -e 's/TARGET Qt::DBus/FALSE/' \ + -i src/plugins/position/CMakeLists.txt || die + use nmea || + sed -e 's/TARGET Qt::Network/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..c872768c9bd8 --- /dev/null +++ b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild @@ -0,0 +1,68 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +IUSE="geoclue nmea +qml" + +DEPEND=" + ~dev-qt/qtbase-${PV}:6 + geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) + nmea? ( + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtserialport-${PV}:6 + ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +RDEPEND=" + ${DEPEND} + geoclue? ( app-misc/geoclue:2.0 ) +" + +CMAKE_SKIP_TESTS=( + # threads test (rarely) fails randomly + tst_qgeoareamonitor +) + +src_prepare() { + qt6-build_src_prepare + + # unfortunately cmake_use_find_package would break things with qtbase + use geoclue || + sed -e 's/TARGET Qt::DBus/FALSE/' \ + -i src/plugins/position/CMakeLists.txt || die + use nmea || + sed -e 's/TARGET Qt::Network/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/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qtprintsupport/Manifest +++ b/dev-qt/qtprintsupport/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtprintsupport/metadata.xml b/dev-qt/qtprintsupport/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtprintsupport/metadata.xml +++ b/dev-qt/qtprintsupport/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.13.ebuild index 6442c1d07e48..b5da706c81fc 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.13.ebuild @@ -1,29 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi QT5_MODULE="qtbase" VIRTUALX_REQUIRED="test" inherit qt5-build DESCRIPTION="Printing support library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi IUSE="cups gles2-only" RDEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}[gles2-only=] - ~dev-qt/qtwidgets-${PV}[gles2-only=] - cups? ( >=net-print/cups-1.4 ) + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*[gles2-only=] + =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] + cups? ( net-print/cups ) " DEPEND="${RDEPEND} - test? ( ~dev-qt/qtnetwork-${PV} ) + test? ( =dev-qt/qtnetwork-${QT5_PV}* ) " QT5_TARGET_SUBDIRS=( @@ -35,8 +35,6 @@ QT5_GENTOO_CONFIG=( cups ) -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 - src_configure() { local myconf=( $(qt_use cups) diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest new file mode 100644 index 000000000000..99c974d958b9 --- /dev/null +++ b/dev-qt/qtquick3d/Manifest @@ -0,0 +1 @@ +DIST qtquick3d-everywhere-src-6.7.0.tar.xz 66175916 BLAKE2B 6e351845fd1056a1ee3cbb1f66a715c6a23b3eb2e09812e9cf262930404b3d0a6aaf52e619ac9bff502f3f07df2c54716baf262d6ffbe4cb77658d6090cd1765 SHA512 1262fccbbf7bd31aa122837998f3a903c191e70a270a2a678842e6f8209336b39f5523582e7b4ab88f0db98e357993c34f857ae2a34c7e7ac29597377459576b diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.6.2-gcc14.patch b/dev-qt/qtquick3d/files/qtquick3d-6.6.2-gcc14.patch new file mode 100644 index 000000000000..f6362641a00c --- /dev/null +++ b/dev-qt/qtquick3d/files/qtquick3d-6.6.2-gcc14.patch @@ -0,0 +1,23 @@ +Qt undefs __AVX__ and others[1] to prevent bundled embree from using +AVX/SSE4.2 code paths and result in linking errors, but this appears +insufficient with gcc14[2]. + +Until Qt improves this, for simplicity pass -mno-* to bundled embree +as a workaround which lets the compiler disable these instead and +that includes other features which depend on these. + +(note that embree is only used on amd64 and aarch64) + +Ideal would be to unbundle this and let system embree use the full +feature set, but there is no machinery to easily allow it. + +[1] https://github.com/qt/qtquick3d/commit/7980cfd0 +[2] https://bugs.gentoo.org/917407 +--- a/src/3rdparty/embree/CMakeLists.txt ++++ b/src/3rdparty/embree/CMakeLists.txt +@@ -64,2 +64,5 @@ + # Use SSE2 only, ignore AVX/SSE4.2 for now ++if (TEST_architecture_arch STREQUAL x86_64) ++ qt_internal_extend_target(BundledEmbree COMPILE_OPTIONS -mno-avx -mno-sse4.2) ++endif() + qt_internal_extend_target(BundledEmbree DEFINES diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch b/dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch new file mode 100644 index 000000000000..981f2f87b3c6 --- /dev/null +++ b/dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/926094 +https://bugreports.qt.io/browse/QTBUG-122955 + +https://bugs.gentoo.org/926093 +https://github.com/embree/embree/issues/477 +--- a/src/3rdparty/embree/common/sys/platform.h ++++ b/src/3rdparty/embree/common/sys/platform.h +@@ -34,3 +34,3 @@ + /* detect 64 bit platform */ +-#if defined(__X86_64__) || defined(__aarch64__) ++#if (defined(__X86_64__) || defined(__aarch64__)) && ! defined(__ILP32__) + #define __64BIT__ diff --git a/dev-qt/qtquick3d/metadata.xml b/dev-qt/qtquick3d/metadata.xml new file mode 100644 index 000000000000..8712e36848d5 --- /dev/null +++ b/dev-qt/qtquick3d/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugreports.qt.io/</bugs-to> + <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtquick3d</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/qtquick3d/qtquick3d-6.7.0.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.0.ebuild new file mode 100644 index 000000000000..1e7d17bf3fa6 --- /dev/null +++ b/dev-qt/qtquick3d/qtquick3d-6.7.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 2021-2024 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 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +elif [[ ${QT6_BUILD_TYPE} == live ]]; then + EGIT_SUBMODULES=() # skip qtquick3d-assimp +fi + +IUSE="opengl vulkan" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent,gui,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} + test? ( ~dev-qt/qtbase-${PV}:6[network] ) + vulkan? ( dev-util/vulkan-headers ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.6.2-gcc14.patch + "${FILESDIR}"/${PN}-6.6.2-x32abi.patch +) + +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.7.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild new file mode 100644 index 000000000000..b7438f43ac1d --- /dev/null +++ b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild @@ -0,0 +1,48 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +elif [[ ${QT6_BUILD_TYPE} == live ]]; then + EGIT_SUBMODULES=() # skip qtquick3d-assimp +fi + +IUSE="opengl vulkan" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent,gui,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} + test? ( ~dev-qt/qtbase-${PV}:6[network] ) + vulkan? ( dev-util/vulkan-headers ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.6.2-gcc14.patch + "${FILESDIR}"/${PN}-6.6.2-x32abi.patch +) + +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..b7438f43ac1d --- /dev/null +++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild @@ -0,0 +1,48 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +elif [[ ${QT6_BUILD_TYPE} == live ]]; then + EGIT_SUBMODULES=() # skip qtquick3d-assimp +fi + +IUSE="opengl vulkan" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent,gui,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} + test? ( ~dev-qt/qtbase-${PV}:6[network] ) + vulkan? ( dev-util/vulkan-headers ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.6.2-gcc14.patch + "${FILESDIR}"/${PN}-6.6.2-x32abi.patch +) + +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/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest index 772be7c936eb..f075cfbc7842 100644 --- a/dev-qt/qtquickcontrols/Manifest +++ b/dev-qt/qtquickcontrols/Manifest @@ -1 +1 @@ -DIST qtquickcontrols-everywhere-src-5.15.2.tar.xz 5982344 BLAKE2B 425bf2841cf12dd636955abeeb520dda580f6b509c01562192d8f2c91d7a9c32349992cbb9f0c1f84a12a98c135656158660ed2d7b21fda204927d0c5255f708 SHA512 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2 +DIST qtquickcontrols-everywhere-opensource-src-5.15.13.tar.xz 5983000 BLAKE2B 3bc035277d476eab327bd7ff0b71a0e8381e1bf2edc44f654e22cd6da3815d9d00628250c094473d16547f78cedfbf2a82fb9b3fbdc8a16c643e28c4c3b61370 SHA512 9d84b2a0b0c752df7dd735a29b04a2e6351e016bb693ace49d05b51754784f7da3e335e8da1070b2e31391a4dc35a55adb36286bb5ec4e29e608801fcd8d2bcc diff --git a/dev-qt/qtquickcontrols/metadata.xml b/dev-qt/qtquickcontrols/metadata.xml index cc8ed92a390e..f426874b5f6a 100644 --- a/dev-qt/qtquickcontrols/metadata.xml +++ b/dev-qt/qtquickcontrols/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.13.ebuild index 91ad5b9e09f6..b0bbd28a2d21 100644 --- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2.ebuild +++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.13.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qt5-build DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" fi IUSE="+widgets" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - widgets? ( ~dev-qt/qtwidgets-${PV} ) + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + widgets? ( =dev-qt/qtwidgets-${QT5_PV}* ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest index 203c90e379ab..b99466c9063d 100644 --- a/dev-qt/qtquickcontrols2/Manifest +++ b/dev-qt/qtquickcontrols2/Manifest @@ -1 +1,2 @@ -DIST qtquickcontrols2-everywhere-src-5.15.2.tar.xz 8284692 BLAKE2B c5c4550ff75bf655969b8601f36c38a0d5a6c9dbe406bc03d431c133f8f0b83a89098c3a64afa4073e4810ee73016a19e11fde1685732c3a9124ddaa2b21393f SHA512 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f +DIST qtquickcontrols2-5.15.13-gentoo-kde-1.tar.xz 7040 BLAKE2B 4f222239135181f1660cfe36c98c19b2640a664fdd28d742df901c68b9f9f87f20f198e417a990c92f006404f14176df84bb35f23e7766b6bdc74228e51fa5c0 SHA512 f80faaa972e8bebff0ea312a9e8c312f1bb020f2577a91c1ce59c0fd56b6d4fc6649f31a15f0c53cabd00fc37658c5ae0b500948eb08a50e016249cc1de3f5a3 +DIST qtquickcontrols2-everywhere-opensource-src-5.15.13.tar.xz 8294276 BLAKE2B 3e2bec0b0cb8e3fc6dba01c0dcbdb99af10d60d7dfb7752c17180a8a51196f4ed495340355386e75010e9797b59a484c66b2fcf1652ef18f9482d6e55816508a SHA512 0aae8d2f208a47c38f8604879a55e019b7b34a1f1202fa9b447a30753d540de9cdc3c7a8658c36a5d4c01596d2c8c65ba279d7c67e70c48a6ebdb5ad443ca8b0 diff --git a/dev-qt/qtquickcontrols2/metadata.xml b/dev-qt/qtquickcontrols2/metadata.xml index cc8ed92a390e..f426874b5f6a 100644 --- a/dev-qt/qtquickcontrols2/metadata.xml +++ b/dev-qt/qtquickcontrols2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.13.ebuild index 10f200644e51..d23198b2f81e 100644 --- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2.ebuild +++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.13.ebuild @@ -1,25 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +fi + inherit qt5-build DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -fi - IUSE="widgets" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - widgets? ( ~dev-qt/qtwidgets-${PV} ) + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + widgets? ( =dev-qt/qtwidgets-${QT5_PV}* ) " RDEPEND="${DEPEND} - ~dev-qt/qtgraphicaleffects-${PV} + =dev-qt/qtgraphicaleffects-${QT5_PV}* " src_prepare() { diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest index 685f69e4d0f0..84f0fdc57b10 100644 --- a/dev-qt/qtquicktimeline/Manifest +++ b/dev-qt/qtquicktimeline/Manifest @@ -1 +1,2 @@ -DIST qtquicktimeline-everywhere-src-5.15.2.tar.xz 102624 BLAKE2B 65cd3ba114e8da442a32ebe43d36b653b3d9a35b65d4fd0eaf17985545ce918cf45da9484094ee889fe56d935c9b988a1deef1c7c416bcfd3cf153fd458eadbd SHA512 2ea623bf2d74ce4dea8e8639a9a8e4bbc9cfaf7b9ec84eec3da3b41b580962cfa6c443c8c47d7dfe312885f4250ccd6a7c91ca1cbbb0fe8385d0f41ad44c3b92 +DIST qtquicktimeline-everywhere-opensource-src-5.15.13.tar.xz 105592 BLAKE2B aa578030d0e6b403ba934755d67c174505b4c14d3aa27a3f3502285d1754506eddcba8d421531eaa8f416cbb1a45f81c1ff3c9a632ab44ec7de066213ffc3308 SHA512 9a7a781226098006f83cb9cb004d9f01f9145efc5b738cb7448743af822df84be733393396303a1b67b581fd788df3f85d8ad0648bc2b283db7e09eb36314143 +DIST qtquicktimeline-everywhere-src-6.7.0.tar.xz 109548 BLAKE2B 2051f0198336dc9f405ca951ae4d45501716e382ac5281cb8836675e6d20567cfff5f82aa6f07cf6332f86cab91dd1230c68670a3e75d74d9d572b64298d52a7 SHA512 605fe39fc1b31b9281f291348ef73059bfd338531ab1d58d526307b775d34a65e3edcd6c4296824db3f99b4440ec0f7dbbe61a84a852eb5601b377b7f3597208 diff --git a/dev-qt/qtquicktimeline/metadata.xml b/dev-qt/qtquicktimeline/metadata.xml index c3b4f7735310..e8164d036bd2 100644 --- a/dev-qt/qtquicktimeline/metadata.xml +++ b/dev-qt/qtquicktimeline/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.13.ebuild index bf8d344fb0b3..03fdfedfebd2 100644 --- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2.ebuild +++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.13.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qt5-build @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.0.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.0.ebuild new file mode 100644 index 000000000000..ecfa676e5d32 --- /dev/null +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2024 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 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtdeclarative-${PV}:6 +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.9999.ebuild new file mode 100644 index 000000000000..393a5c2037bc --- /dev/null +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +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..393a5c2037bc --- /dev/null +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtdeclarative-${PV}:6 +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest index 54fed450c1df..ed0c94496138 100644 --- a/dev-qt/qtscript/Manifest +++ b/dev-qt/qtscript/Manifest @@ -1 +1 @@ -DIST qtscript-everywhere-src-5.15.2.tar.xz 2663016 BLAKE2B f3cf09396fbcd9c386de9628042d2b70263343fec3e1fa49e53e705f56802a244373a37e5daafe6d90252ad67a8b1d3e0446aa4520ff8ff4a8bd010951a5d86e SHA512 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32 +DIST qtscript-everywhere-opensource-src-5.15.13.tar.xz 2665924 BLAKE2B d6a5c942a2d523adbadb8c12f27bd7829c8650af619c430488cee3cbd2f8c221115055ed70b85fdf96acaa6985f76d3b2cf6579c19ea4b1c99abd9550a6f8324 SHA512 38060e3cece2819befa67e078eee6a4bcf9c0135015724af4786eb3190cb1bf6895dc5b8a919da83b6d0576d1aa109ab4050c997409c7f5eed52385ef325e2de diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml index da283d207fe3..a20bf4dd62b1 100644 --- a/dev-qt/qtscript/metadata.xml +++ b/dev-qt/qtscript/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtscript/qtscript-5.15.2.ebuild b/dev-qt/qtscript/qtscript-5.15.13.ebuild index 6b4ca85b7275..463d26748afe 100644 --- a/dev-qt/qtscript/qtscript-5.15.2.ebuild +++ b/dev-qt/qtscript/qtscript-5.15.13.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qt5-build DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="+jit scripttools" DEPEND=" - ~dev-qt/qtcore-${PV} + =dev-qt/qtcore-${QT5_PV}* scripttools? ( - ~dev-qt/qtgui-${PV} - ~dev-qt/qtwidgets-${PV} + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtwidgets-${QT5_PV}* ) " RDEPEND="${DEPEND}" @@ -30,7 +31,7 @@ src_prepare() { src_configure() { local myqmakeargs=( - JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no') + JAVASCRIPTCORE_JIT=$(usex jit) ) qt5-build_src_configure } diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest index 8e018db4479d..b8b35a8b0b5a 100644 --- a/dev-qt/qtscxml/Manifest +++ b/dev-qt/qtscxml/Manifest @@ -1 +1,2 @@ -DIST qtscxml-everywhere-src-5.15.2.tar.xz 434204 BLAKE2B 8deaa46eb784690937160470b20dc01ae1b2ee80be89f1f19a22e1e2f2252d3d33427e96bb97b4ec8033b54a78c2a73e3b00fe3bbbe061e9b9bfb299801847fe SHA512 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8 +DIST qtscxml-everywhere-opensource-src-5.15.13.tar.xz 438060 BLAKE2B 3207be9571b862d015341ab193d335d9f958b9c9431e5590ccba31200fd9c59ad695b763d213f0eec5ec568b5ad5a4674742ef488b6fd24a2cc4755cb3aea3fc SHA512 ba7c40b08951521e8d56372456c6e613a49cd2bc42d8def7b477e0334100dd741fb20a6ef9d860dba9be44547998eee6bea30de0f16f43b3152e51132bcb2d90 +DIST qtscxml-everywhere-src-6.7.0.tar.xz 1167668 BLAKE2B 13f46c399afea117933bf6be9d3052d2565dd69667c2c89c55a247e5c7b6d79ff6fe0f2ed186655c140e2d6b544b11e827212160d4bcd905db0e5e68563bf829 SHA512 d732e9c70c11334614efdfe527334a12da683b918bd9c6c49809f4cd2f6d6d06436c64b8d46e3bf014b9a3f092b0c3a752ad7e94844b2f82bf9384380aec60c7 diff --git a/dev-qt/qtscxml/metadata.xml b/dev-qt/qtscxml/metadata.xml index 32568f62fb8e..ef86286201dd 100644 --- a/dev-qt/qtscxml/metadata.xml +++ b/dev-qt/qtscxml/metadata.xml @@ -1,13 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="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/qtscxml</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtscxml/qtscxml-5.15.2.ebuild b/dev-qt/qtscxml/qtscxml-5.15.13.ebuild index 8a38c015dba4..1a299c680c85 100644 --- a/dev-qt/qtscxml/qtscxml-5.15.2.ebuild +++ b/dev-qt/qtscxml/qtscxml-5.15.13.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qt5-build DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm64 x86" + KEYWORDS="amd64 ~arm arm64 ~riscv x86" fi IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtscxml/qtscxml-6.7.0.ebuild b/dev-qt/qtscxml/qtscxml-6.7.0.ebuild new file mode 100644 index 000000000000..170b62f0b535 --- /dev/null +++ b/dev-qt/qtscxml/qtscxml-6.7.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 2021-2024 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 ~arm ~riscv ~x86" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + qml? ( ~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, considering this flaky) + tst_qstatemachine +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild new file mode 100644 index 000000000000..93f1b939859d --- /dev/null +++ b/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild @@ -0,0 +1,34 @@ +# Copyright 2021-2024 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 ~arm ~riscv ~x86" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + qml? ( ~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, considering this flaky) + tst_qstatemachine +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtscxml/qtscxml-6.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.9999.ebuild new file mode 100644 index 000000000000..93f1b939859d --- /dev/null +++ b/dev-qt/qtscxml/qtscxml-6.9999.ebuild @@ -0,0 +1,34 @@ +# Copyright 2021-2024 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 ~arm ~riscv ~x86" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + qml? ( ~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, considering this flaky) + tst_qstatemachine +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest index c6b24fe48dbd..2c3e76c739fe 100644 --- a/dev-qt/qtsensors/Manifest +++ b/dev-qt/qtsensors/Manifest @@ -1 +1,2 @@ -DIST qtsensors-everywhere-src-5.15.2.tar.xz 2056944 BLAKE2B 49f4e91027b122a16d65d953275b8720ecb9c12e9bff3a190df59dba703f6f3f8e8ec8c8fec1084154ec7a03a9a2c5d2fe196ec09ddf8f2282c16edd3873a965 SHA512 d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b +DIST qtsensors-everywhere-opensource-src-5.15.13.tar.xz 2059796 BLAKE2B ca89ca21bf8dfaa9583c69a97ee041e02b365e853469b60706dc6be93429f07a5ba4fdb1959a08a0faf2145c65b07f914d108ae84b45621373b17f20aebeedae SHA512 d6bd4fe02625272786f8c0f384ecce7497eebc3d691deaf9a42b9b221e4905715c7adb4e56fc04487b39f950b34f2239e8902e6e7880bf793461e808d6c9d245 +DIST qtsensors-everywhere-src-6.7.0.tar.xz 1494212 BLAKE2B 1b5ea0bbb4ad2f101213c01bdeb576c4086c71148bef71023e2227d6931cb5c6a56c6305eefb72008015c1865d7100775a01a3dc8502fb49a559e210055986c5 SHA512 d51c1f0b1348336688cd2d640987684c0be40fc702bf18bc7a6089a341fb094f8e0f6d80e1c8cbcaf28f0b8ee095679f10a0253ea8ad4054651b7cd2b2529e54 diff --git a/dev-qt/qtsensors/metadata.xml b/dev-qt/qtsensors/metadata.xml index c33b152da0be..087b363d32cb 100644 --- a/dev-qt/qtsensors/metadata.xml +++ b/dev-qt/qtsensors/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.2.ebuild b/dev-qt/qtsensors/qtsensors-5.15.13.ebuild index 51bc755decba..89e803fd2176 100644 --- a/dev-qt/qtsensors/qtsensors-5.15.2.ebuild +++ b/dev-qt/qtsensors/qtsensors-5.15.13.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qt5-build DESCRIPTION="Hardware sensor access library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" fi # TODO: simulator IUSE="qml" RDEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdbus-${PV} - qml? ( ~dev-qt/qtdeclarative-${PV} ) + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdbus-${QT5_PV}* + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) " DEPEND="${RDEPEND}" diff --git a/dev-qt/qtsensors/qtsensors-6.7.0.ebuild b/dev-qt/qtsensors/qtsensors-6.7.0.ebuild new file mode 100644 index 000000000000..55055cfc02a7 --- /dev/null +++ b/dev-qt/qtsensors/qtsensors-6.7.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023-2024 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 ~arm arm64 ~loong ~ppc ~riscv ~x86" +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.7.9999.ebuild b/dev-qt/qtsensors/qtsensors-6.7.9999.ebuild new file mode 100644 index 000000000000..aea4399fe738 --- /dev/null +++ b/dev-qt/qtsensors/qtsensors-6.7.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023-2024 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 ~arm ~arm64 ~loong ~ppc ~riscv ~x86" +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..aea4399fe738 --- /dev/null +++ b/dev-qt/qtsensors/qtsensors-6.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023-2024 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 ~arm ~arm64 ~loong ~ppc ~riscv ~x86" +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/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest index 7c8d3a7a2146..d92b267030c3 100644 --- a/dev-qt/qtserialbus/Manifest +++ b/dev-qt/qtserialbus/Manifest @@ -1 +1,2 @@ -DIST qtserialbus-everywhere-src-5.15.2.tar.xz 356360 BLAKE2B 491f3a7b9df8f58496cff1c4fea87615335486ec834f859029340c7e34551e1127ce4e2689f16e06e195e40691300475ccace19c1fd43fefe0a56c10961184c2 SHA512 c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b +DIST qtserialbus-everywhere-opensource-src-5.15.13.tar.xz 359612 BLAKE2B 67da230018ec58e8fbb87e8b3f6b1394d8339e33b8aaac6c988907dd94f63e35f3a4b0e9776824af3c3b7678bd73e2dc6a973d2de886bf1e1f0b0f898bc7e3ce SHA512 12e5580249f0d241b0536be8c4ab5a01eed722c9cbaaa4c052ecacb8e105c0d31f4e83e87fcf7f30711e48b0a6d0ee413bd837ea2bb7fbc41bddb7e6ab18ea22 +DIST qtserialbus-everywhere-src-6.7.0.tar.xz 546788 BLAKE2B 3bd9eeec9768942c65eab210db49fb82bfe30cab9c18378eee76651fa7613ec8bd0cf4a8bd1339c815a9692bef3fadf8477d2556caa63accd76c9370ee226a96 SHA512 33c4fd04da0904c43e937fe94724c4318280e45a2f18b727379beb04ddae0285338486ea82be47950a5f4fa28cc0ac1f2c03d6ff8a45730e6be8d5ab84c50892 diff --git a/dev-qt/qtserialbus/metadata.xml b/dev-qt/qtserialbus/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtserialbus/metadata.xml +++ b/dev-qt/qtserialbus/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.2.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.13.ebuild index 2b783f499663..13855b803b1e 100644 --- a/dev-qt/qtserialbus/qtserialbus-5.15.2.ebuild +++ b/dev-qt/qtserialbus/qtserialbus-5.15.13.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qt5-build DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols" @@ -13,8 +14,8 @@ fi IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtserialport-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}* + =dev-qt/qtserialport-${QT5_PV}* " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtserialbus/qtserialbus-6.7.0.ebuild b/dev-qt/qtserialbus/qtserialbus-6.7.0.ebuild new file mode 100644 index 000000000000..df066ca5492e --- /dev/null +++ b/dev-qt/qtserialbus/qtserialbus-6.7.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtserialport-${PV}:6 +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # rarely fails randomly (perhaps related to -j) + tst_qcandbcfileparser +) + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6SerialBus/*TestCanBusPlugin*.cmake + "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_qttestcanbus.pri + "${D}${QT6_PLUGINDIR}"/canbus/libqttestcanbus.* + "${D}${QT6_PLUGINDIR}"/canbus/objects-*/ + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtserialbus/qtserialbus-6.7.9999.ebuild b/dev-qt/qtserialbus/qtserialbus-6.7.9999.ebuild new file mode 100644 index 000000000000..7f316fa23bbc --- /dev/null +++ b/dev-qt/qtserialbus/qtserialbus-6.7.9999.ebuild @@ -0,0 +1,38 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtserialport-${PV}:6 +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # rarely fails randomly (perhaps related to -j) + tst_qcandbcfileparser +) + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6SerialBus/*TestCanBusPlugin*.cmake + "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_qttestcanbus.pri + "${D}${QT6_PLUGINDIR}"/canbus/libqttestcanbus.* + "${D}${QT6_PLUGINDIR}"/canbus/objects-*/ + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtserialbus/qtserialbus-6.9999.ebuild b/dev-qt/qtserialbus/qtserialbus-6.9999.ebuild new file mode 100644 index 000000000000..7f316fa23bbc --- /dev/null +++ b/dev-qt/qtserialbus/qtserialbus-6.9999.ebuild @@ -0,0 +1,38 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtserialport-${PV}:6 +" +DEPEND="${RDEPEND}" + +CMAKE_SKIP_TESTS=( + # rarely fails randomly (perhaps related to -j) + tst_qcandbcfileparser +) + +src_install() { + qt6-build_src_install + + if use test; then + local delete=( # sigh + "${D}${QT6_LIBDIR}"/cmake/Qt6SerialBus/*TestCanBusPlugin*.cmake + "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_qttestcanbus.pri + "${D}${QT6_PLUGINDIR}"/canbus/libqttestcanbus.* + "${D}${QT6_PLUGINDIR}"/canbus/objects-*/ + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest index 4fbf20380e3d..67722ed1cd79 100644 --- a/dev-qt/qtserialport/Manifest +++ b/dev-qt/qtserialport/Manifest @@ -1 +1,2 @@ -DIST qtserialport-everywhere-src-5.15.2.tar.xz 321496 BLAKE2B 1a2d1a925a1f8224de6babad131efa9bb2e417574be939be35edf3a3b9f34a7fb12cc282f94ee2d8e52178cec7679caf1402f5a45a14bb15a546023fed494907 SHA512 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b +DIST qtserialport-everywhere-opensource-src-5.15.13.tar.xz 323888 BLAKE2B e8f0bd1cb318029d1d822bfff8116843c913d700b8288d50d39a23d559dfbdf24b88c1c7829d840f8d1b76b155f26483364c52aaeac80afded9f8821213ca8d5 SHA512 5eab045b704f101f046880e57ff5f3c0f901867d092892939c0c20e54624f30b676802ec9535f3be39e9687497e28bfb71b560635b0cb38e241a225d377e74ee +DIST qtserialport-everywhere-src-6.7.0.tar.xz 270604 BLAKE2B ef49662261489901137541af99241f6202a5a19b22be708858e5a74015824160da204c9f25ea894693a8025dd1246402db93125ba204ad77b2d8d59ffc102d95 SHA512 2dd424a82786aec48550f89c5f3c104fa630de742f97014a5ab8fb324a7be02ff35f974fa88ff2af8a8eb262b1e8fd653fe8fa83c3fc9c7bb9b19d44b5eb70f0 diff --git a/dev-qt/qtserialport/metadata.xml b/dev-qt/qtserialport/metadata.xml index 32568f62fb8e..f6e42eb8a172 100644 --- a/dev-qt/qtserialport/metadata.xml +++ b/dev-qt/qtserialport/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.2.ebuild b/dev-qt/qtserialport/qtserialport-5.15.13.ebuild index aef90f2f562b..14cd2075f774 100644 --- a/dev-qt/qtserialport/qtserialport-5.15.2.ebuild +++ b/dev-qt/qtserialport/qtserialport-5.15.13.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qt5-build DESCRIPTION="Serial port abstraction library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV} + =dev-qt/qtcore-${QT5_PV}* virtual/libudev:= " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtserialport/qtserialport-6.7.0.ebuild b/dev-qt/qtserialport/qtserialport-6.7.0.ebuild new file mode 100644 index 000000000000..585478a3e2f0 --- /dev/null +++ b/dev-qt/qtserialport/qtserialport-6.7.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2024 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 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + virtual/libudev:= +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtserialport/qtserialport-6.7.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.7.9999.ebuild new file mode 100644 index 000000000000..95b360fac6cf --- /dev/null +++ b/dev-qt/qtserialport/qtserialport-6.7.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + 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..95b360fac6cf --- /dev/null +++ b/dev-qt/qtserialport/qtserialport-6.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + virtual/libudev:= +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest new file mode 100644 index 000000000000..3064ab2341c4 --- /dev/null +++ b/dev-qt/qtshadertools/Manifest @@ -0,0 +1 @@ +DIST qtshadertools-everywhere-src-6.7.0.tar.xz 1110704 BLAKE2B 031406ceca95f2e41087a502ba10fcf58c2b0f154b1e10485e4cb4c76ed3d847683d8d25129ebdb048375c93133097b93c717fa7e240a703edd6815f90fe0609 SHA512 30f737093fcdba6b247425c21f15d5682454255fdcf04cbe9f822e5b549dcdbb6fa519bfbcd0f2ba8acfa775cec7c30a630b61d50e00afa8c017ae9a16a73497 diff --git a/dev-qt/qtshadertools/metadata.xml b/dev-qt/qtshadertools/metadata.xml new file mode 100644 index 000000000000..bb0aa35de704 --- /dev/null +++ b/dev-qt/qtshadertools/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugreports.qt.io/</bugs-to> + <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtshadertools</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/qtshadertools/qtshadertools-6.7.0.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.0.ebuild new file mode 100644 index 000000000000..36029d23743c --- /dev/null +++ b/dev-qt/qtshadertools/qtshadertools-6.7.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 2021-2024 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 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild new file mode 100644 index 000000000000..68dae044e31f --- /dev/null +++ b/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild @@ -0,0 +1,17 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +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..68dae044e31f --- /dev/null +++ b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild @@ -0,0 +1,17 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtsingleapplication/metadata.xml b/dev-qt/qtsingleapplication/metadata.xml index 17237689dcfd..610d2d8ea120 100644 --- a/dev-qt/qtsingleapplication/metadata.xml +++ b/dev-qt/qtsingleapplication/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild index c8d3c9c8e5d8..96e458c36dd6 100644 --- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild +++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_P=qt-solutions-${PV#*_p} inherit qmake-utils @@ -9,10 +9,11 @@ inherit qmake-utils DESCRIPTION="Qt library to start applications only once per user" HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/" SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/${PN}" LICENSE="|| ( LGPL-2.1 GPL-3 )" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" IUSE="doc X" DEPEND=" @@ -26,8 +27,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}/${PN}" - PATCHES=( "${FILESDIR}/2.6.1_p20130904-unbundle-qtlockedfile.patch" "${FILESDIR}/2.6.1_p20130904-no-gui.patch" diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest index cb4d63847263..55bb3673d17f 100644 --- a/dev-qt/qtspeech/Manifest +++ b/dev-qt/qtspeech/Manifest @@ -1 +1,3 @@ -DIST qtspeech-everywhere-src-5.15.2.tar.xz 101940 BLAKE2B 0b100fddac7bc880b79914be54a8618e3e31e9a2486e8cd4ab9f65eabaec605d9aba7c66f71569466798b9cc94e97a2e136868a6f8eda3208f9d0a9515e71ac9 SHA512 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05 +DIST qtspeech-5.15.13-gentoo-kde-1.tar.xz 1048 BLAKE2B 93b16166dd8fd83eb9d7ce84cd3fff2dd330cc4060327e107b12a084aa47b7dc2d237bbf0852d207d2b4fbe9a5688d0236ebc5e7c1e6a42da84fd92fbd912050 SHA512 8eb6b865663b9fb837e88f859c1f407c4fab5d0976630e29bb0c3f2e2d01f225f3a614cba6c20495c56429d37427c75e314194d0c74c69296ab3e5df128290c6 +DIST qtspeech-everywhere-opensource-src-5.15.13.tar.xz 104612 BLAKE2B 3c35098f0d4f4b4f804808f3d11abc0c0d189e3883cb1d15ea9b350948e061125299df1207ad44ed7af207c417980b0360ab6b44733efbbe7e5bdac6fe2402b5 SHA512 43b97ddc333d1c4a9715b1c306ced0506eb8faf69f1d22500b74e509d33b5a5cb9d0c166b9211a32a78eaba57925195d8ba0c39c8ae6a15551f841426294c75f +DIST qtspeech-everywhere-src-6.7.0.tar.xz 261732 BLAKE2B a7e99c3c9efdaa7aa5d44537b9aaaed87af0607daa6b6ab21d602594081f5bcc5ead4da9eebbee15a7cc735a36e80cfa312452f2cdfa5ce4136bd0c06797eba2 SHA512 10d086633da8cc478619023baa4d2495bb394aa30e7ba7141b0e698ade5a4a723f5643a5df64e9920b90251e89722598b7d5b720d7b8d3a04449e94fd5984f82 diff --git a/dev-qt/qtspeech/metadata.xml b/dev-qt/qtspeech/metadata.xml index 32568f62fb8e..b51b2479697c 100644 --- a/dev-qt/qtspeech/metadata.xml +++ b/dev-qt/qtspeech/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -8,7 +8,13 @@ <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="qml">Build QML/QtQuick bindings and imports</flag> + <flag name="speechd">Enable text-to-speech synthesizer plugin using <pkg>app-accessibility/speech-dispatcher</pkg> engine</flag> + </use> <slots> <subslots> Must only be used by packages that are known to use private parts of the Qt API. diff --git a/dev-qt/qtspeech/qtspeech-5.15.13.ebuild b/dev-qt/qtspeech/qtspeech-5.15.13.ebuild new file mode 100644 index 000000000000..07a269a79b0d --- /dev/null +++ b/dev-qt/qtspeech/qtspeech-5.15.13.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" +fi + +inherit qt5-build + +DESCRIPTION="Text-to-speech library for the Qt5 framework" + +IUSE="alsa flite" + +RDEPEND=" + >=app-accessibility/speech-dispatcher-0.8.7 + =dev-qt/qtcore-${QT5_PV}* + flite? ( + >=app-accessibility/flite-2[alsa?] + =dev-qt/qtmultimedia-${QT5_PV}*[alsa?] + alsa? ( media-libs/alsa-lib ) + ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + qt_use_disable_config flite flite \ + src/plugins/tts/tts.pro + + qt_use_disable_config alsa flite_alsa \ + src/plugins/tts/flite/flite.pro + + qt5-build_src_prepare +} diff --git a/dev-qt/qtspeech/qtspeech-5.15.2.ebuild b/dev-qt/qtspeech/qtspeech-5.15.2.ebuild deleted file mode 100644 index 89841a3c90dd..000000000000 --- a/dev-qt/qtspeech/qtspeech-5.15.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Text-to-speech library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~ppc64 x86" -fi - -# TODO: flite plugin - needs 2.0.0 (not yet in tree) -IUSE="" - -RDEPEND=" - >=app-accessibility/speech-dispatcher-0.8.7 - ~dev-qt/qtcore-${PV} -" -DEPEND="${RDEPEND}" diff --git a/dev-qt/qtspeech/qtspeech-6.7.0.ebuild b/dev-qt/qtspeech/qtspeech-6.7.0.ebuild new file mode 100644 index 000000000000..4a4f7916dee2 --- /dev/null +++ b/dev-qt/qtspeech/qtspeech-6.7.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# tests are kind of flaky, sometimes hang, and also fail with clang +# (not that it's unusable with clang) -- may be worth revisiting +# eventually given qtspeech is still somewhat new (added in 6.4.0) +QT6_RESTRICT_TESTS=1 + +inherit qt6-build + +DESCRIPTION="Text-to-speech library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 ~arm arm64 ~loong ~riscv ~x86" +fi + +IUSE="flite qml +speechd" +# can build with neither, but then it is just mock tts and may be confusing +REQUIRED_USE="|| ( flite speechd )" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtmultimedia-${PV}:6 + flite? ( app-accessibility/flite ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + speechd? ( app-accessibility/speech-dispatcher ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + $(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.7.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild new file mode 100644 index 000000000000..c012be997560 --- /dev/null +++ b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild @@ -0,0 +1,44 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# tests are kind of flaky, sometimes hang, and also fail with clang +# (not that it's unusable with clang) -- may be worth revisiting +# eventually given qtspeech is still somewhat new (added in 6.4.0) +QT6_RESTRICT_TESTS=1 + +inherit qt6-build + +DESCRIPTION="Text-to-speech library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +IUSE="flite qml +speechd" +# can build with neither, but then it is just mock tts and may be confusing +REQUIRED_USE="|| ( flite speechd )" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtmultimedia-${PV}:6 + flite? ( app-accessibility/flite ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + speechd? ( app-accessibility/speech-dispatcher ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + $(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..c012be997560 --- /dev/null +++ b/dev-qt/qtspeech/qtspeech-6.9999.ebuild @@ -0,0 +1,44 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# tests are kind of flaky, sometimes hang, and also fail with clang +# (not that it's unusable with clang) -- may be worth revisiting +# eventually given qtspeech is still somewhat new (added in 6.4.0) +QT6_RESTRICT_TESTS=1 + +inherit qt6-build + +DESCRIPTION="Text-to-speech library for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +IUSE="flite qml +speechd" +# can build with neither, but then it is just mock tts and may be confusing +REQUIRED_USE="|| ( flite speechd )" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6 + ~dev-qt/qtmultimedia-${PV}:6 + flite? ( app-accessibility/flite ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + speechd? ( app-accessibility/speech-dispatcher ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Qml) + $(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/qtsql/Manifest b/dev-qt/qtsql/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtsql/metadata.xml +++ b/dev-qt/qtsql/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtsql/qtsql-5.15.2.ebuild b/dev-qt/qtsql/qtsql-5.15.13.ebuild index f94643be7b4b..9c8476b0b1ae 100644 --- a/dev-qt/qtsql/qtsql-5.15.2.ebuild +++ b/dev-qt/qtsql/qtsql-5.15.13.ebuild @@ -1,28 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="SQL abstraction library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -SLOT=5/$(ver_cut 1-3) # bug 639140 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi +SLOT=5/${QT5_PV} # bug 639140 IUSE="freetds mysql oci8 odbc postgres +sqlite" - REQUIRED_USE=" || ( freetds mysql oci8 odbc postgres sqlite ) " DEPEND=" - ~dev-qt/qtcore-${PV}:5= + =dev-qt/qtcore-${QT5_PV}*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) @@ -41,8 +39,6 @@ QT5_GENTOO_PRIVATE_CONFIG=( :sql ) -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 - src_configure() { local myconf=( $(qt_use freetds sql-tds plugin) @@ -51,7 +47,7 @@ src_configure() { $(qt_use odbc sql-odbc plugin) $(qt_use postgres sql-psql plugin) $(qt_use sqlite sql-sqlite plugin) - $(usex sqlite -system-sqlite '') + $(usev sqlite -system-sqlite) ) use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)") diff --git a/dev-qt/qtstyleplugins/metadata.xml b/dev-qt/qtstyleplugins/metadata.xml index 92ab4b14710b..6498a5bbb7e6 100644 --- a/dev-qt/qtstyleplugins/metadata.xml +++ b/dev-qt/qtstyleplugins/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>chewi@gentoo.org</email> diff --git a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311-r1.ebuild b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311-r1.ebuild index d92dec7cb9c1..e22f656abe1d 100644 --- a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311-r1.ebuild +++ b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ HOMEPAGE="https://code.qt.io/cgit/qt/qtstyleplugins.git/" SRC_URI="https://github.com/qt/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="5" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND=" dev-qt/qtcore:5= diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index 84e4dea0c65d..1eda40ace8d4 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1 +1,3 @@ -DIST qtsvg-everywhere-src-5.15.2.tar.xz 1886268 BLAKE2B fee60a9d769e4c8962d084e98cd4c1a958ba926c8b4482f5b60b596a34944576cddfb46c4e04bd4a67cba7dfbdc7e29e61d8b5025cc7d2a1ae063f81eb31a114 SHA512 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730 +DIST qtsvg-5.15.13-gentoo-kde-1.tar.xz 3552 BLAKE2B e2b8644f6c259ef90ec2ad110a447ad7c34e8c7612ef889a5514e1decde35746cc5083297fc91d1e307ba6f9e25965a97b8e8e416ef8cf6af0b420ffc4866481 SHA512 d4ed5c86f9799b1d0461e5e4fdaa5979a598e80579f1fed61323c83592292a1ccc4cfabdfed83514dbdd93ef4415fefa8b6c8bd7946d46ddb9388644ffcd5d26 +DIST qtsvg-everywhere-opensource-src-5.15.13.tar.xz 1890468 BLAKE2B 72d20df0c00c128822389ab7ad8a2573aa376ba71f8a6f6780c19f0080db8d96ec5fe4c28de64b8e2f740ddf16c9652bbef4c651e18e1a0400529f35c0593b7f SHA512 17d13fdeec439c02e7b7e478527376da2d4efd65e019fb18822d3d7883cbf129eea2661c19e931e59280c3bda7233fa6cfd84c4d76365abc63814a80e99f2a65 +DIST qtsvg-everywhere-src-6.7.0.tar.xz 1790244 BLAKE2B 586d5cd8f5a0d276f837dad1a330778b2e3bec1433d14015569947e964f779dcd24c22f54f536d3808d6c4c1ac8de308e1b5430a2a15725934dc67bb2e35cdb1 SHA512 b68e4e235f1a6b0ddbb130fbc06aa7ac06f074c5d33f588dd7049b5986ae070e1e4e976f22fba2bef81adc3beac8c4564a01c818b3594e06ab36d9939ce0e7b3 diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml index 32568f62fb8e..7dc6a408ba26 100644 --- a/dev-qt/qtsvg/metadata.xml +++ b/dev-qt/qtsvg/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.13.ebuild b/dev-qt/qtsvg/qtsvg-5.15.13.ebuild new file mode 100644 index 000000000000..dd66d0447f8c --- /dev/null +++ b/dev-qt/qtsvg/qtsvg-5.15.13.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +inherit qt5-build + +DESCRIPTION="SVG rendering library for the Qt5 framework" + +IUSE="" + +RDEPEND=" + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtwidgets-${QT5_PV}* + sys-libs/zlib:= +" +DEPEND="${RDEPEND} + test? ( =dev-qt/qtxml-${QT5_PV}* ) +" diff --git a/dev-qt/qtsvg/qtsvg-5.15.2.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2.ebuild deleted file mode 100644 index a93ff6224076..000000000000 --- a/dev-qt/qtsvg/qtsvg-5.15.2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="SVG rendering library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -RDEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtwidgets-${PV} - sys-libs/zlib:= -" -DEPEND="${RDEPEND} - test? ( ~dev-qt/qtxml-${PV} ) -" diff --git a/dev-qt/qtsvg/qtsvg-6.7.0.ebuild b/dev-qt/qtsvg/qtsvg-6.7.0.ebuild new file mode 100644 index 000000000000..777ffe0ec0a8 --- /dev/null +++ b/dev-qt/qtsvg/qtsvg-6.7.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2024 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 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] + sys-libs/zlib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild new file mode 100644 index 000000000000..566af04442ed --- /dev/null +++ b/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +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..566af04442ed --- /dev/null +++ b/dev-qt/qtsvg/qtsvg-6.9999.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,widgets] + sys-libs/zlib:= +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qttest/Manifest +++ b/dev-qt/qttest/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qttest/metadata.xml +++ b/dev-qt/qttest/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qttest/qttest-5.15.13.ebuild b/dev-qt/qttest/qttest-5.15.13.ebuild new file mode 100644 index 000000000000..4ffe5ec8e862 --- /dev/null +++ b/dev-qt/qttest/qttest-5.15.13.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +QT5_MODULE="qtbase" +VIRTUALX_REQUIRED="test" +inherit qt5-build + +DESCRIPTION="Unit testing library for the Qt5 framework" + +IUSE="" + +RDEPEND="=dev-qt/qtcore-${QT5_PV}*:5=" +DEPEND="${RDEPEND} + test? ( + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtxml-${QT5_PV}* + ) +" + +QT5_TARGET_SUBDIRS=( + src/testlib +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :testlib +) diff --git a/dev-qt/qttest/qttest-5.15.2.ebuild b/dev-qt/qttest/qttest-5.15.2.ebuild deleted file mode 100644 index dc827fd108a5..000000000000 --- a/dev-qt/qttest/qttest-5.15.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -VIRTUALX_REQUIRED="test" -inherit qt5-build - -DESCRIPTION="Unit testing library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -RDEPEND=" - ~dev-qt/qtcore-${PV}:5= -" -DEPEND="${RDEPEND} - test? ( - ~dev-qt/qtgui-${PV} - ~dev-qt/qtxml-${PV} - ) -" - -QT5_TARGET_SUBDIRS=( - src/testlib -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :testlib -) - -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest new file mode 100644 index 000000000000..114064d3219e --- /dev/null +++ b/dev-qt/qttools/Manifest @@ -0,0 +1 @@ +DIST qttools-everywhere-src-6.7.0.tar.xz 9012572 BLAKE2B 12bfc43d390c40faafdf825d333348fb1672eb52c3f1e47ea0362542712dfac56fa3b07f01a2bc196872a04e9cf1a101ea2feb4ed6b744a70c75b67111ec806e SHA512 8d478568d8e7ffc40af8099e95f2b37913c05490cc127d559c13ed3cba75bf8cca06ad3afce65649186a3e52442f8e0f820a2ac6b655ec0e2b808e6df834d560 diff --git a/dev-qt/qttools/metadata.xml b/dev-qt/qttools/metadata.xml new file mode 100644 index 000000000000..80f6a033c31d --- /dev/null +++ b/dev-qt/qttools/metadata.xml @@ -0,0 +1,33 @@ +<?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="assistant">Build Qt Assistant and the QtHelp module</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 (GUI requires USE=widgets)</flag> + <flag name="pixeltool">Build Qt Pixeltool</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="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> + 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/qttools/qttools-6.7.0.ebuild b/dev-qt/qttools/qttools-6.7.0.ebuild new file mode 100644 index 000000000000..dee5e7804862 --- /dev/null +++ b/dev-qt/qttools/qttools-6.7.0.ebuild @@ -0,0 +1,154 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum +LLVM_OPTIONAL=1 + +# behaves very badly when qttools is not already installed, also +# other issues to handle (clang tests flaky depending on version, +# and 3rdparty/ tries to FetchContent gtest) +QT6_RESTRICT_TESTS=1 + +inherit desktop llvm-r1 optfeature qt6-build + +DESCRIPTION="Qt Tools Collection" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE=" + +assistant clang designer distancefieldgenerator gles2-only + +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner + qtdiag qtplugininfo vulkan +widgets zstd +" +# 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 ) + clang? ( ${LLVM_REQUIRED_USE} ) + designer? ( qml widgets ) + distancefieldgenerator? ( qml widgets ) + pixeltool? ( widgets ) + qdoc? ( clang qml ) +" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,widgets?] + assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) + clang? ( + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= + ') + ) + designer? ( + ~dev-qt/qtbase-${PV}:6[xml,zstd=] + zstd? ( app-arch/zstd:= ) + ) + 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} + qtdiag? ( + vulkan? ( dev-util/vulkan-headers ) + ) +" + +pkg_setup() { + use clang && llvm-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + # prevent the clang test as it can abort due to bug #916098 + $(cmake_use_find_package clang WrapLibClang) + $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package widgets Qt6Widgets) + $(qt_feature assistant) + $(qt_feature clang) + $(qt_feature designer) + $(qt_feature distancefieldgenerator) + $(qt_feature linguist) + $(qt_feature pixeltool) + $(qt_feature qdbus) + $(qt_feature qdoc) + $(qt_feature qtattributionsscanner) + $(qt_feature qtdiag) + $(qt_feature qtplugininfo) + + # TODO?: package litehtml, but support for latest releases seem + # to lag behind and bundled may work out better for now + # https://github.com/litehtml/litehtml/issues/266 + $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON) + + $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + if use widgets; then #914766 + use designer || use distancefieldgenerator || use pixeltool && + newicon src/designer/src/designer/images/designer.png designer6.png + + if use assistant; then + make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ + 'Qt;Development;Documentation' \ + 'Comment=Tool for viewing online documentation in Qt help file format' + newicon src/assistant/assistant/images/assistant-128.png assistant6.png + fi + + if use designer; then + make_desktop_entry designer6 'Qt 6 Designer' designer6 \ + 'Qt;Development;GUIDesigner' \ + 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' + fi + + if use distancefieldgenerator; then + # no icon, sharing with designer which fits letter-wise + make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for pregenerating the font cache of Qt applications' + fi + + if use linguist; then + make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ + 'Qt;Development;Translation' \ + 'Comment=Tool for translating Qt applications' + newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png + fi + + if use pixeltool; then + # no icon, not fitting but share with designer for now + make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for zooming in the desktop area pointed by the cursor' + fi + + if use qdbus; then + make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ + 'Qt;Development' \ + 'Comment=Tool that lets introspect D-Bus objects and messages' + newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png + fi + + # hack: make_destop_entry does not support overriding DESCRIPTION + find "${ED}" -type f -name "*.desktop" \ + -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die + fi +} + +pkg_postinst() { + use assistant && + optfeature "Qt documentation viewable in assistant" \ + 'dev-qt/qt-docs:6[qch]' #602296 +} diff --git a/dev-qt/qttools/qttools-6.7.9999.ebuild b/dev-qt/qttools/qttools-6.7.9999.ebuild new file mode 100644 index 000000000000..fd8e80ea6380 --- /dev/null +++ b/dev-qt/qttools/qttools-6.7.9999.ebuild @@ -0,0 +1,154 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum +LLVM_OPTIONAL=1 + +# behaves very badly when qttools is not already installed, also +# other issues to handle (clang tests flaky depending on version, +# and 3rdparty/ tries to FetchContent gtest) +QT6_RESTRICT_TESTS=1 + +inherit desktop llvm-r1 optfeature qt6-build + +DESCRIPTION="Qt Tools Collection" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE=" + +assistant clang designer distancefieldgenerator gles2-only + +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner + qtdiag qtplugininfo vulkan +widgets zstd +" +# 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 ) + clang? ( ${LLVM_REQUIRED_USE} ) + designer? ( qml widgets ) + distancefieldgenerator? ( qml widgets ) + pixeltool? ( widgets ) + qdoc? ( clang qml ) +" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,widgets?] + assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) + clang? ( + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= + ') + ) + designer? ( + ~dev-qt/qtbase-${PV}:6[xml,zstd=] + zstd? ( app-arch/zstd:= ) + ) + 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} + qtdiag? ( + vulkan? ( dev-util/vulkan-headers ) + ) +" + +pkg_setup() { + use clang && llvm-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + # prevent the clang test as it can abort due to bug #916098 + $(cmake_use_find_package clang WrapLibClang) + $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package widgets Qt6Widgets) + $(qt_feature assistant) + $(qt_feature clang) + $(qt_feature designer) + $(qt_feature distancefieldgenerator) + $(qt_feature linguist) + $(qt_feature pixeltool) + $(qt_feature qdbus) + $(qt_feature qdoc) + $(qt_feature qtattributionsscanner) + $(qt_feature qtdiag) + $(qt_feature qtplugininfo) + + # TODO?: package litehtml, but support for latest releases seem + # to lag behind and bundled may work out better for now + # https://github.com/litehtml/litehtml/issues/266 + $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON) + + $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + if use widgets; then #914766 + use designer || use distancefieldgenerator || use pixeltool && + newicon src/designer/src/designer/images/designer.png designer6.png + + if use assistant; then + make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ + 'Qt;Development;Documentation' \ + 'Comment=Tool for viewing online documentation in Qt help file format' + newicon src/assistant/assistant/images/assistant-128.png assistant6.png + fi + + if use designer; then + make_desktop_entry designer6 'Qt 6 Designer' designer6 \ + 'Qt;Development;GUIDesigner' \ + 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' + fi + + if use distancefieldgenerator; then + # no icon, sharing with designer which fits letter-wise + make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for pregenerating the font cache of Qt applications' + fi + + if use linguist; then + make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ + 'Qt;Development;Translation' \ + 'Comment=Tool for translating Qt applications' + newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png + fi + + if use pixeltool; then + # no icon, not fitting but share with designer for now + make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for zooming in the desktop area pointed by the cursor' + fi + + if use qdbus; then + make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ + 'Qt;Development' \ + 'Comment=Tool that lets introspect D-Bus objects and messages' + newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png + fi + + # hack: make_destop_entry does not support overriding DESCRIPTION + find "${ED}" -type f -name "*.desktop" \ + -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die + fi +} + +pkg_postinst() { + use assistant && + optfeature "Qt documentation viewable in assistant" \ + 'dev-qt/qt-docs:6[qch]' #602296 +} diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild new file mode 100644 index 000000000000..fd8e80ea6380 --- /dev/null +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -0,0 +1,154 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum +LLVM_OPTIONAL=1 + +# behaves very badly when qttools is not already installed, also +# other issues to handle (clang tests flaky depending on version, +# and 3rdparty/ tries to FetchContent gtest) +QT6_RESTRICT_TESTS=1 + +inherit desktop llvm-r1 optfeature qt6-build + +DESCRIPTION="Qt Tools Collection" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE=" + +assistant clang designer distancefieldgenerator gles2-only + +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner + qtdiag qtplugininfo vulkan +widgets zstd +" +# 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 ) + clang? ( ${LLVM_REQUIRED_USE} ) + designer? ( qml widgets ) + distancefieldgenerator? ( qml widgets ) + pixeltool? ( widgets ) + qdoc? ( clang qml ) +" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[network,widgets?] + assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) + clang? ( + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= + ') + ) + designer? ( + ~dev-qt/qtbase-${PV}:6[xml,zstd=] + zstd? ( app-arch/zstd:= ) + ) + 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} + qtdiag? ( + vulkan? ( dev-util/vulkan-headers ) + ) +" + +pkg_setup() { + use clang && llvm-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + # prevent the clang test as it can abort due to bug #916098 + $(cmake_use_find_package clang WrapLibClang) + $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package widgets Qt6Widgets) + $(qt_feature assistant) + $(qt_feature clang) + $(qt_feature designer) + $(qt_feature distancefieldgenerator) + $(qt_feature linguist) + $(qt_feature pixeltool) + $(qt_feature qdbus) + $(qt_feature qdoc) + $(qt_feature qtattributionsscanner) + $(qt_feature qtdiag) + $(qt_feature qtplugininfo) + + # TODO?: package litehtml, but support for latest releases seem + # to lag behind and bundled may work out better for now + # https://github.com/litehtml/litehtml/issues/266 + $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON) + + $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + if use widgets; then #914766 + use designer || use distancefieldgenerator || use pixeltool && + newicon src/designer/src/designer/images/designer.png designer6.png + + if use assistant; then + make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ + 'Qt;Development;Documentation' \ + 'Comment=Tool for viewing online documentation in Qt help file format' + newicon src/assistant/assistant/images/assistant-128.png assistant6.png + fi + + if use designer; then + make_desktop_entry designer6 'Qt 6 Designer' designer6 \ + 'Qt;Development;GUIDesigner' \ + 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' + fi + + if use distancefieldgenerator; then + # no icon, sharing with designer which fits letter-wise + make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for pregenerating the font cache of Qt applications' + fi + + if use linguist; then + make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ + 'Qt;Development;Translation' \ + 'Comment=Tool for translating Qt applications' + newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png + fi + + if use pixeltool; then + # no icon, not fitting but share with designer for now + make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for zooming in the desktop area pointed by the cursor' + fi + + if use qdbus; then + make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ + 'Qt;Development' \ + 'Comment=Tool that lets introspect D-Bus objects and messages' + newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png + fi + + # hack: make_destop_entry does not support overriding DESCRIPTION + find "${ED}" -type f -name "*.desktop" \ + -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die + fi +} + +pkg_postinst() { + use assistant && + optfeature "Qt documentation viewable in assistant" \ + 'dev-qt/qt-docs:6[qch]' #602296 +} diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest index d37d2b5437c1..180620b35c69 100644 --- a/dev-qt/qttranslations/Manifest +++ b/dev-qt/qttranslations/Manifest @@ -1 +1,2 @@ -DIST qttranslations-everywhere-src-5.15.2.tar.xz 1419504 BLAKE2B 3dd5a007bb42492e8a0e81004c99aaf10d97d3c7a77e952240d1d15c607cf34a246271776ff3bf01ad77fcbfb3966366131f23cba162414b02bbfd6da85505b1 SHA512 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe +DIST qttranslations-everywhere-opensource-src-5.15.13.tar.xz 1635960 BLAKE2B 6542480dfe0c62fd36e67ee8f9bd8e2358057c6010f661a1f0e2ad05156e6fed0a013f8ed5a6de71b87e7e4917cb0e84a6f15021865440a5e58a8d58f438e81e SHA512 5404c98ba6303986da0ffc5f715cf7024b724183e6f30b15bc9825cac2d1715239a4479093cb46239cceaa0a7468dd05e190cd0a6911b22f3628ff57ff3d8c57 +DIST qttranslations-everywhere-src-6.7.0.tar.xz 1475980 BLAKE2B c5bff0466e77ad87001ee5f995b7f254d2320631767fed556f4d4dbb426b33528b92b5c485da7153ddd68e542eceb48f92f3cf959bba35916f9b4250d0987128 SHA512 12efb8591a066c8adf9c460e85553924ea99337dc80052745a8f46b6cc7c7d7ce3804477867f977db80628dd14b65d31d911805fed4c30c468c52fe439ee8f2a diff --git a/dev-qt/qttranslations/metadata.xml b/dev-qt/qttranslations/metadata.xml index 32568f62fb8e..62cfd452bccc 100644 --- a/dev-qt/qttranslations/metadata.xml +++ b/dev-qt/qttranslations/metadata.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <stabilize-allarches/> <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-5.15.13.ebuild b/dev-qt/qttranslations/qttranslations-5.15.13.ebuild new file mode 100644 index 000000000000..06dc79da720c --- /dev/null +++ b/dev-qt/qttranslations/qttranslations-5.15.13.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +inherit qt5-build + +DESCRIPTION="Translation files for the Qt5 framework" + +IUSE="" + +DEPEND="=dev-qt/qtcore-${QT5_PV}*" +BDEPEND="=dev-qt/linguist-tools-${QT5_PV}*" diff --git a/dev-qt/qttranslations/qttranslations-5.15.2.ebuild b/dev-qt/qttranslations/qttranslations-5.15.2.ebuild deleted file mode 100644 index f7dd842fe29d..000000000000 --- a/dev-qt/qttranslations/qttranslations-5.15.2.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Translation files for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/linguist-tools-${PV} - ~dev-qt/qtcore-${PV} -" -RDEPEND="" diff --git a/dev-qt/qttranslations/qttranslations-6.7.0.ebuild b/dev-qt/qttranslations/qttranslations-6.7.0.ebuild new file mode 100644 index 000000000000..ff98c041ab71 --- /dev/null +++ b/dev-qt/qttranslations/qttranslations-6.7.0.ebuild @@ -0,0 +1,16 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT6_RESTRICT_TESTS=1 # no tests +inherit qt6-build + +DESCRIPTION="Translation files for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DEPEND="~dev-qt/qtbase-${PV}:6" +BDEPEND="~dev-qt/qttools-${PV}:6[linguist]" diff --git a/dev-qt/qttranslations/qttranslations-6.7.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.7.9999.ebuild new file mode 100644 index 000000000000..4957b280c2a2 --- /dev/null +++ b/dev-qt/qttranslations/qttranslations-6.7.9999.ebuild @@ -0,0 +1,16 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT6_RESTRICT_TESTS=1 # no tests +inherit qt6-build + +DESCRIPTION="Translation files for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +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..4957b280c2a2 --- /dev/null +++ b/dev-qt/qttranslations/qttranslations-6.9999.ebuild @@ -0,0 +1,16 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT6_RESTRICT_TESTS=1 # no tests +inherit qt6-build + +DESCRIPTION="Translation files for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +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 963bafeb15dd..2d11854d0648 100644 --- a/dev-qt/qtvirtualkeyboard/Manifest +++ b/dev-qt/qtvirtualkeyboard/Manifest @@ -1 +1,2 @@ -DIST qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz 10955076 BLAKE2B 629068b92f58e825060410c84906edbcb9d83f942f1d4acfc1aab9404eb69e0ffeca0b5ca69a3d4b07033efb80ef161f23474e0a19ae6d9c4efb7698ba0a0d75 SHA512 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016 +DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.13.tar.xz 10959164 BLAKE2B 808c5f28f12d0210b94ee3c9f282c000c1787686e454c8cb8ef601dafe7c0d8579796b2322edb553a997d4a8f38c2603b5314f6839873b257930bd9aa3959222 SHA512 abe58c132c8bd23d29de1937e2f1fb6571aec829ce74f4904d322c4046d8c70b4b9b508930e4c681a8e30ff1d8a63c627cc3bec1560e83dada426c09d827ae29 +DIST qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz 3720012 BLAKE2B 5bb60703f88225e8d2b18323c394b3f863a2364c39023eacf33c49d9ab3e0f0966f1ff37a38dd44ef3497d5f446a25aba7731697fd572fa001258657af54b7a8 SHA512 0e33a9d962eed6a75bceb25ba666adff2ee0e3eea229540415777000fd60de290c4b56a07870239943e96da626d71e4e4770d46198b8bfe1fb5e03bee64740e9 diff --git a/dev-qt/qtvirtualkeyboard/metadata.xml b/dev-qt/qtvirtualkeyboard/metadata.xml index 1f6a41cfea6b..e84bfa0f97be 100644 --- a/dev-qt/qtvirtualkeyboard/metadata.xml +++ b/dev-qt/qtvirtualkeyboard/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.13.ebuild index db9bfdfb2ad0..4980321fc38e 100644 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2.ebuild +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.13.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +fi inherit qt5-build DESCRIPTION="Customizable input framework and virtual keyboard for Qt" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -fi - -# TODO: unbudle libraries for more layouts +# TODO: unbundle libraries for more layouts IUSE="handwriting +spell +X" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtsvg-${PV} + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtsvg-${QT5_PV}* spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= ) " @@ -26,9 +26,9 @@ RDEPEND="${DEPEND}" src_configure() { local myqmakeargs=( - $(usex handwriting CONFIG+=lipi-toolkit '') - $(usex spell '' CONFIG+=disable-hunspell) - $(usex X '' CONFIG+=disable-desktop) + $(usev handwriting CONFIG+=lipi-toolkit) + $(usev !spell CONFIG+=disable-hunspell) + $(usev !X CONFIG+=disable-desktop) CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \ lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \ lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \ @@ -38,6 +38,5 @@ src_configure() { lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \ lang-uk_UA lang-vi_VN" ) - qt5-build_src_configure } diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.0.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.0.ebuild new file mode 100644 index 000000000000..99630510bd24 --- /dev/null +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 2023-2024 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 ~arm ~loong ~riscv ~x86" +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() { + local CMAKE_SKIP_TESTS=( + # rarely randomly(?) fails even with -j1 + tst_layoutfilesystem + ) + + 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" + CMAKE_SKIP_TESTS+=( + tst_inputpanel + tst_inputpanelcontrols2 + ) + else + einfo "tst_inputpanel can take >5mins, not known to actually hang" + fi + + qt6-build_src_test +} diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.ebuild new file mode 100644 index 000000000000..098c09ea6c42 --- /dev/null +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.ebuild @@ -0,0 +1,51 @@ +# Copyright 2023-2024 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 ~arm ~loong ~riscv ~x86" +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() { + local CMAKE_SKIP_TESTS=( + # rarely randomly(?) fails even with -j1 + tst_layoutfilesystem + ) + + 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" + CMAKE_SKIP_TESTS+=( + tst_inputpanel + tst_inputpanelcontrols2 + ) + else + einfo "tst_inputpanel can take >5mins, not known to actually hang" + fi + + qt6-build_src_test +} diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild new file mode 100644 index 000000000000..098c09ea6c42 --- /dev/null +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.9999.ebuild @@ -0,0 +1,51 @@ +# Copyright 2023-2024 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 ~arm ~loong ~riscv ~x86" +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() { + local CMAKE_SKIP_TESTS=( + # rarely randomly(?) fails even with -j1 + tst_layoutfilesystem + ) + + 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" + CMAKE_SKIP_TESTS+=( + tst_inputpanel + tst_inputpanelcontrols2 + ) + else + einfo "tst_inputpanel can take >5mins, not known to actually hang" + fi + + qt6-build_src_test +} diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index d2833c8905df..b74c8f47c254 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1 +1,3 @@ -DIST qtwayland-everywhere-src-5.15.2.tar.xz 564884 BLAKE2B 472effd3e9f3fd5470e0449703a52d45f2fd823770880b5ad15d8bf99196eee5d8511ca2bc9e23df6e27c933551d1853928ba79b4b1e5fa6e53334c54c04a463 SHA512 e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c +DIST qtwayland-5.15.13-gentoo-kde-1.tar.xz 48696 BLAKE2B f0e06d19e44c261bbc5ae56ad8c1ede4479d9ebaaf04272307e5547ea55c5b525d8d78aa674e773fedad1c554b56878c9ac1392a148d4c7fed50470b6bdc5404 SHA512 cb687922c666a2ce0f16578aa732f805d8bf96de3b723946dfd8a0163ea88b17dd4c1628b1c7a65128d5da84c67daa69a691d07cb7f07deb22419c995a998c5d +DIST qtwayland-everywhere-opensource-src-5.15.13.tar.xz 569152 BLAKE2B 9e6ceb514b17ba7fa99d6263d5c84edf0f39c510a080bf607ba1e68dfacc2f0f509529d5e4fd61e04ed04a922c5f82b6a5aabbf5d78e487ca5c1cc1c86d13e19 SHA512 1f5b5e911ad9026d08260e5ce15aad5c9167726ce42db85634392f1e49d545ca5bcd4e44304f1ff633ffe110712a2b5dad87de6cd89eb3b7e6c657fe260e388d +DIST qtwayland-everywhere-src-6.7.0.tar.xz 1121748 BLAKE2B d42003056236b542a95484157bee3bf74a602882ac79dde02c74f762e3c07eec28405534df46cf5d4b8381d0f99cccfeeca10f614622bbb7b09ec81dbb6a06aa SHA512 cda0e0736f85656d05b2399970413ffc5082af4256c8b3087c3f1d06cad5ef5ad7cb8838513723569193df02cd3c3df3d5478d99464606c62c42629ef75c225f diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch deleted file mode 100644 index 0799cb1a2023..000000000000 --- a/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 735164b5c2a2637a8d53a8803a2401e4ef477ff0 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> -Date: Fri, 30 Oct 2020 16:55:30 +0200 -Subject: [PATCH] Scanner: Avoid accessing dangling pointers in destroy_func() - -Usually, the object associated with the resource gets destroyed in the -destroy_resource() function. - -Therefore, we need to double-check that the object is still alive before -trying to reset its m_resource. - -Pick-to: 5.15 -Change-Id: I26408228f58919db17eb29584a1cbd4a9427d25c -Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> ---- - src/qtwaylandscanner/qtwaylandscanner.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp -index 1a1f8bf16..450ef519d 100644 ---- a/src/qtwaylandscanner/qtwaylandscanner.cpp -+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp -@@ -814,7 +814,9 @@ bool Scanner::process() - printf(" if (Q_LIKELY(that)) {\n"); - printf(" that->m_resource_map.remove(resource->client(), resource);\n"); - printf(" that->%s_destroy_resource(resource);\n", interfaceNameStripped); -- printf(" if (that->m_resource == resource)\n"); -+ printf("\n"); -+ printf(" that = resource->%s_object;\n", interfaceNameStripped); -+ printf(" if (that && that->m_resource == resource)\n"); - printf(" that->m_resource = nullptr;\n"); - printf(" }\n"); - printf(" delete resource;\n"); --- -2.16.3 diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml index 85cb4f0e4bfa..1509a2e738a9 100644 --- a/dev-qt/qtwayland/metadata.xml +++ b/dev-qt/qtwayland/metadata.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="compositor">Enable support for the wayland compositor / server APIs</flag> + <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-5.15.13.ebuild b/dev-qt/qtwayland/qtwayland-5.15.13.ebuild new file mode 100644 index 000000000000..6a87c8a1a4e7 --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-5.15.13.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +inherit qt5-build + +DESCRIPTION="Wayland platform plugin for Qt" + +SLOT=5/${QT5_PV} # bug 815646 +IUSE="compositor vulkan" + +RDEPEND=" + dev-libs/wayland + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=] + media-libs/libglvnd + x11-libs/libxkbcommon + compositor? ( =dev-qt/qtdeclarative-${QT5_PV}*:5= ) +" +DEPEND="${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND="dev-util/wayland-scanner" + +src_configure() { + local myqmakeargs=( + -- + -no-feature-xcomposite-egl + -no-feature-xcomposite-glx + $(qt_use compositor feature-wayland-server) + $(qt_use compositor feature-wayland-dmabuf-server-buffer) + $(qt_use compositor feature-wayland-drm-egl-server-buffer) + $(qt_use compositor feature-wayland-shm-emulation-server-buffer) + ) + + use compositor && myqmakeargs+=( + $(qt_use vulkan feature-wayland-vulkan-server-buffer) + ) + + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die +} diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild deleted file mode 100644 index d042284d7177..000000000000 --- a/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Wayland platform plugin for Qt" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="vulkan X" - -DEPEND=" - >=dev-libs/wayland-1.6.0 - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=] - media-libs/mesa[egl] - >=x11-libs/libxkbcommon-0.2.0 - vulkan? ( dev-util/vulkan-headers ) - X? ( - ~dev-qt/qtgui-${PV}[-gles2-only] - x11-libs/libX11 - x11-libs/libXcomposite - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-qtwaylandscanner-avoid-dangling-pointers.patch ) - -src_configure() { - local myqmakeargs=( - -- - $(qt_use vulkan feature-wayland-vulkan-server-buffer) - $(qt_use X feature-xcomposite-egl) - $(qt_use X feature-xcomposite-glx) - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtwayland/qtwayland-6.7.0.ebuild b/dev-qt/qtwayland/qtwayland-6.7.0.ebuild new file mode 100644 index 000000000000..3512d39ebf39 --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-6.7.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 2021-2024 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 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="accessibility compositor qml vulkan" + +RDEPEND=" + dev-libs/wayland + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland] + media-libs/libglvnd + x11-libs/libxkbcommon + compositor? ( + 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 Qt6Quick) + $(qt_feature compositor wayland_server) + ) + + qt6-build_src_configure +} + +src_test() { + # users' session setting may break tst_clientextension (bug #927030) + unset DESKTOP_SESSION XDG_CURRENT_DESKTOP + unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION + + qt6-build_src_test +} diff --git a/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild new file mode 100644 index 000000000000..dc3ce8575fd3 --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild @@ -0,0 +1,55 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="accessibility compositor qml vulkan" + +RDEPEND=" + dev-libs/wayland + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland] + media-libs/libglvnd + x11-libs/libxkbcommon + compositor? ( + 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 Qt6Quick) + $(qt_feature compositor wayland_server) + ) + + qt6-build_src_configure +} + +src_test() { + # users' session setting may break tst_clientextension (bug #927030) + unset DESKTOP_SESSION XDG_CURRENT_DESKTOP + unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION + + qt6-build_src_test +} diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild new file mode 100644 index 000000000000..dc3ce8575fd3 --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild @@ -0,0 +1,55 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="accessibility compositor qml vulkan" + +RDEPEND=" + dev-libs/wayland + ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland] + media-libs/libglvnd + x11-libs/libxkbcommon + compositor? ( + 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 Qt6Quick) + $(qt_feature compositor wayland_server) + ) + + qt6-build_src_configure +} + +src_test() { + # users' session setting may break tst_clientextension (bug #927030) + unset DESKTOP_SESSION XDG_CURRENT_DESKTOP + unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION + + qt6-build_src_test +} diff --git a/dev-qt/qtwaylandscanner/Manifest b/dev-qt/qtwaylandscanner/Manifest new file mode 100644 index 000000000000..8edd3092a521 --- /dev/null +++ b/dev-qt/qtwaylandscanner/Manifest @@ -0,0 +1 @@ +DIST qtwayland-everywhere-opensource-src-5.15.13.tar.xz 569152 BLAKE2B 9e6ceb514b17ba7fa99d6263d5c84edf0f39c510a080bf607ba1e68dfacc2f0f509529d5e4fd61e04ed04a922c5f82b6a5aabbf5d78e487ca5c1cc1c86d13e19 SHA512 1f5b5e911ad9026d08260e5ce15aad5c9167726ce42db85634392f1e49d545ca5bcd4e44304f1ff633ffe110712a2b5dad87de6cd89eb3b7e6c657fe260e388d diff --git a/dev-qt/qtwaylandscanner/metadata.xml b/dev-qt/qtwaylandscanner/metadata.xml new file mode 100644 index 000000000000..a1a4e61d01d9 --- /dev/null +++ b/dev-qt/qtwaylandscanner/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugreports.qt.io/</bugs-to> + <doc>https://doc.qt.io/</doc> + </upstream> +</pkgmetadata> diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.13.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.13.ebuild new file mode 100644 index 000000000000..678752ce8612 --- /dev/null +++ b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.13.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT5_MODULE="qtwayland" +inherit qt5-build + +DESCRIPTION="Tool that generates certain boilerplate C++ code from Wayland protocol xml spec" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +DEPEND="=dev-qt/qtcore-${QT5_PV}*:5=" +RDEPEND="${DEPEND} + !<dev-qt/qtwayland-5.15.3:5 +" + +QT5_TARGET_SUBDIRS=( + src/qtwaylandscanner +) diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest index b1f08ab25706..5414ce3ec82a 100644 --- a/dev-qt/qtwebchannel/Manifest +++ b/dev-qt/qtwebchannel/Manifest @@ -1 +1,3 @@ -DIST qtwebchannel-everywhere-src-5.15.2.tar.xz 209208 BLAKE2B 486da1fb4dc8106343716536c69f9fe3251119ab844b36eace21ad1921840be3e0bb97db58d29738bb54a28d2ad85839bfa71a8832a9d84a40c32b0f285fc2e7 SHA512 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b +DIST qtwebchannel-5.15.13-gentoo-kde-1.tar.xz 5820 BLAKE2B 394d537ed9c49a7bfd55f4c8baa18c8ef033894baeafdd252c576d533115dfd02628cdcfe35ca7ad375f1a35afd2862a92643b595700468abf62a4f6a67b43b8 SHA512 6c903a078a28343f920f4f686e9ccc05df5128ad6b0fd68eebec0bbb34936a6cc91ae7b53d152ac1c96bf92dfb88fa88ab7150db5fc37ecb199c984e9d368c33 +DIST qtwebchannel-everywhere-opensource-src-5.15.13.tar.xz 212012 BLAKE2B 893fd5a0226539827a34eaf3608e3bcf9684567af4218fc8d7ef95a3342cfb49c2523900eaf756c8cf8329a69758c3c453beedc4cde3c58211254cd1b463f369 SHA512 f0c698aded46ae1f2932a79bdf9d5601466b7e88f6af96fe48d346144fd2e5bbaa81c7c6a82ed78fe8a0314218827704648741b0b47c0efefc31eb447643ad23 +DIST qtwebchannel-everywhere-src-6.7.0.tar.xz 206600 BLAKE2B eef2c791fd45d0467d6bd8a6bdb09a07ce1d37ee8463f17208bd6c9da52680192eab1a7a1ddf3f8ab82c0fcf39dc0557162126d1be75d32f56bbab4ffee6e7b5 SHA512 b32291c8051fc8917134a9804365c378cc41c25a64add9b1e055100b32cecb7c3a008a8bf7bb825ce9db68b8d9790a25620bf4e126feef47bfb8c07f45f0ae47 diff --git a/dev-qt/qtwebchannel/metadata.xml b/dev-qt/qtwebchannel/metadata.xml index d437181335d4..40635300f984 100644 --- a/dev-qt/qtwebchannel/metadata.xml +++ b/dev-qt/qtwebchannel/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.13.ebuild index 6654efdc2ee1..7b301c538628 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-5.15.2.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.13.ebuild @@ -1,20 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" +fi + inherit qt5-build DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" -fi - IUSE="qml" DEPEND=" - ~dev-qt/qtcore-${PV} - qml? ( ~dev-qt/qtdeclarative-${PV} ) + =dev-qt/qtcore-${QT5_PV}* + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.0-r1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.0-r1.ebuild new file mode 100644 index 000000000000..14c71fa0c22a --- /dev/null +++ b/dev-qt/qtwebchannel/qtwebchannel-6.7.0-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 2021-2024 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 ~arm arm64 ~loong ~ppc ~riscv ~x86" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692 + local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild new file mode 100644 index 000000000000..aef8086235b6 --- /dev/null +++ b/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild @@ -0,0 +1,27 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~riscv ~x86" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692 + 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..aef8086235b6 --- /dev/null +++ b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild @@ -0,0 +1,27 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~riscv ~x86" +fi + +IUSE="qml" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[concurrent] + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) +" +DEPEND="${RDEPEND}" + +src_configure() { + has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692 + 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 562f5ae1546c..e4df2266f64c 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,2 +1,5 @@ -DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654 -DIST qtwebengine-5.15.2_p20210625.tar.xz 320144708 BLAKE2B cd11e69a34ff0fa07d26262906a12304c39a12575024d61db18bc696284e9c5700090e5bfed217c89d2c8eac49b0ccb7d7ee0ba716ec3a81878de1301566884d SHA512 517a8cdaff684894456db8cfb5cfca412b8764e7035623d8190d9a06f6995742097a53eb67329d12bf8dc0a56372f7d09a54532ba804a5bff245ca8ef042a4e1 +DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9 SHA512 cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166 +DIST qtwebengine-5.15.13_p20240322.tar.xz 301394204 BLAKE2B f9bb5bb79edbe0bc862a718feb3b11a56d8c6d2eee1dd711c9b4460f64308fdfbaa4c3551eebad3af5844564a49703574a7fb9d74e15abd0a6aeb8c707a14059 SHA512 b1f459fbb3d21118043a53ce6e292c6a45f8512830f4dbf6982713970f980ccfb8c1ea1c1d7ce373991632de8c44b5053fa1ccb883e19cd8f35a961e67472f5a +DIST qtwebengine-6.7-patchset-6.tar.xz 8140 BLAKE2B 773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420 SHA512 4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff +DIST qtwebengine-6.7-patchset-7.tar.xz 9288 BLAKE2B 28eeee2481e78f3fbc7351dba0e70025e33c9ba78dcd67200a9762ee7c884d279253b1a4cb50652fcd41bbf64e11e6486b17759c0335636531a81022e5cf8aab SHA512 0d8583d50679d4609833540293eeab84507aa448c62c0fda62d99c03c7f60afa655f621938fc798a1443ad0a355442f5114714d692bb83aecac99021919a1baa +DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch deleted file mode 100644 index af602855b129..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/buildtools/config/common.pri 2020-02-28 22:21:09.341072620 +0200 -+++ b/src/buildtools/config/common.pri 2020-02-28 22:20:26.702399180 +0200 -@@ -25,6 +25,7 @@ - strip_absolute_paths_from_debug_symbols=false \ - toolkit_views=false \ - treat_warnings_as_errors=false \ -+ fatal_linker_warnings=false \ - use_allocator_shim=false \ - use_allocator=\"none\" \ - use_custom_libcxx=false \ diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch deleted file mode 100644 index 4fb19ccdd2e5..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 463f1234c57a36e78ff666bd55094a9d4e68f296 Mon Sep 17 00:00:00 2001 -From: q66 <daniel@octaforge.org> -Date: Sat, 18 Jan 2020 23:52:55 +0100 -Subject: [PATCH 1/3] Enable ppc64 builds - ---- - configure.pri | 1 + - mkspecs/features/functions.prf | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure.pri b/configure.pri -index 3a144e3f8..cabe8b24a 100644 ---- a/configure.pri 2021-02-24 10:45:58.000000000 +0100 -+++ - 2021-03-07 21:18:43.124754796 +0100 -@@ -144,6 +144,7 @@ - contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true) - contains(QT_ARCH, "mips"): return(true) - contains(QT_ARCH, "mips64"): return(true) -+ contains(QT_ARCH, "power64"): return(true) - qtLog("Architecture not supported.") - return(false) - } -diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf -index 512e2523b..e31123654 100644 ---- a/mkspecs/features/functions.prf 2021-02-24 10:45:58.000000000 +0100 -+++ - 2021-03-07 21:19:21.345036293 +0100 -@@ -107,6 +107,7 @@ - contains(qtArch, "mips"): return(mipsel) - contains(qtArch, "mips64"): return(mips64el) - contains(qtArch, "mips64el"): return(mips64el) -+ contains(qtArch, "power64"): return(ppc64) - return(unknown) - } - --- -2.26.0 - diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch deleted file mode 100644 index a6856975a663..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch +++ /dev/null @@ -1,192 +0,0 @@ -From b0a7f5691113534c2cf771f2dd3cece5e93bc7d4 Mon Sep 17 00:00:00 2001 -From: Frank Tang <ftang@chromium.org> -Date: Tue, 03 Nov 2020 23:20:37 -0800 -Subject: [PATCH] Update to ICU68-1 - -ICU68-1 change the output skeleton format. So we need to change -resolvedOptions code for 68 migration. - -Chromium roll -https://chromium-review.googlesource.com/c/chromium/src/+/2474093 - -Bug: v8:10945 -Change-Id: I3b2c7fbe8abb22df8fa51287c498ca3245b8c55b -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477431 -Commit-Queue: Frank Tang <ftang@chromium.org> -Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> -Reviewed-by: Shu-yu Guo <syg@chromium.org> -Cr-Commit-Position: refs/heads/master@{#70972} - -(ported to work with <ICU-68.1 and rebased chromium) ---- - -diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -index 45b0eab..d18b133 100644 ---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -@@ -389,17 +389,20 @@ Handle<String> CurrencySignString(Isolate* isolate, - Handle<String> UnitDisplayString(Isolate* isolate, - const icu::UnicodeString& skeleton) { - // Ex: skeleton as -- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name" -+ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name". -+ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-full-name" - if (skeleton.indexOf("unit-width-full-name") >= 0) { - return ReadOnlyRoots(isolate).long_string_handle(); - } - // Ex: skeleton as -- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow". -+ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow". -+ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-narrow". - if (skeleton.indexOf("unit-width-narrow") >= 0) { - return ReadOnlyRoots(isolate).narrow_string_handle(); - } - // Ex: skeleton as -- // "measure-unit/length-foot .### rounding-mode-half-up" -+ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up" -+ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up" - return ReadOnlyRoots(isolate).short_string_handle(); - } - -@@ -422,7 +425,8 @@ Notation NotationFromSkeleton(const icu::UnicodeString& skeleton) { - return Notation::COMPACT; - } - // Ex: skeleton as -- // "measure-unit/length-foot .### rounding-mode-half-up" -+ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up" -+ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up" - return Notation::STANDARD; - } - -@@ -562,14 +566,23 @@ namespace { - - // Ex: percent .### rounding-mode-half-up - // Special case for "percent" --// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .### --// rounding-mode-half-up" should return "kilometer-per-unit". --// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return --// "year". -+// <ICU-68.1: -+// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .### -+// rounding-mode-half-up" should return "kilometer-per-unit". -+// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return -+// >=ICU-68.1: -+// Ex: "unit/milliliter-per-acre .### rounding-mode-half-up" -+// should return "milliliter-per-acre". -+// Ex: "unit/year .### rounding-mode-half-up" should return -+// "year". - std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { - std::string str; - str = skeleton.toUTF8String<std::string>(str); -+#if U_ICU_VERSION_MAJOR_NUM < 68 - std::string search("measure-unit/"); -+#else -+ std::string search("unit/"); -+#endif - size_t begin = str.find(search); - if (begin == str.npos) { - // Special case for "percent". -@@ -578,20 +591,41 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { - } - return ""; - } -+#if U_ICU_VERSION_MAJOR_NUM < 68 - // Skip the type (ex: "length"). - // "measure-unit/length-kilometer per-measure-unit/duration-hour" - // b - begin = str.find("-", begin + search.size()); -+#else -+ // Ex: -+ // "unit/acre .### rounding-mode-half-up" -+ // b -+ // Ex: -+ // "unit/milliliter-per-acre .### rounding-mode-half-up" -+ // b -+ begin += search.size(); -+#endif - if (begin == str.npos) { - return ""; - } -+#if U_ICU_VERSION_MAJOR_NUM < 68 - begin++; // Skip the '-'. -+#endif - // Find the end of the subtype. - size_t end = str.find(" ", begin); -- // "measure-unit/length-kilometer per-measure-unit/duration-hour" -- // b e -+ // <ICU-68.1: -+ // "measure-unit/length-kilometer per-measure-unit/duration-hour" -+ // b e -+ // >=ICU-68.1: -+ // Ex: -+ // "unit/acre .### rounding-mode-half-up" -+ // b e -+ // Ex: -+ // "unit/milliliter-per-acre .### rounding-mode-half-up" -+ // b e - if (end == str.npos) { - end = str.size(); -+#if U_ICU_VERSION_MAJOR_NUM < 68 - return str.substr(begin, end - begin); - } - // "measure-unit/length-kilometer per-measure-unit/duration-hour" -@@ -625,17 +659,36 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { - // "measure-unit/length-kilometer per-measure-unit/duration-hour" - // [result ] b e - return result + "-per-" + str.substr(begin, end - begin); -+#else -+ } -+ return str.substr(begin, end - begin); -+#endif - } - - Style StyleFromSkeleton(const icu::UnicodeString& skeleton) { - if (skeleton.indexOf("currency/") >= 0) { - return Style::CURRENCY; - } -+#if U_ICU_VERSION_MAJOR_NUM < 68 - if (skeleton.indexOf("measure-unit/") >= 0) { - if (skeleton.indexOf("scale/100") >= 0 && - skeleton.indexOf("measure-unit/concentr-percent") >= 0) { -+#else -+ if (skeleton.indexOf("percent") >= 0) { -+ // percent precision-integer rounding-mode-half-up scale/100 -+ if (skeleton.indexOf("scale/100") >= 0) { -+#endif - return Style::PERCENT; -+#if U_ICU_VERSION_MAJOR_NUM >= 68 -+ } else { -+ return Style::UNIT; -+#endif - } -+#if U_ICU_VERSION_MAJOR_NUM >= 68 -+ } -+ // Before ICU68: "measure-unit/", since ICU68 "unit/" -+ if (skeleton.indexOf("unit/") >= 0) { -+#endif - return Style::UNIT; - } - return Style::DECIMAL; -diff --git a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc -index 267343aaae..64d56a1c12 100644 ---- a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc -+++ b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc -@@ -195,9 +195,18 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New( - } - } - -+#if U_ICU_VERSION_MAJOR_NUM < 68 - icu::DecimalFormat* decimal_format = - static_cast<icu::DecimalFormat*>(number_format); - decimal_format->setMinimumGroupingDigits(-2); -+#else -+ if (number_format->getDynamicClassID() == -+ icu::DecimalFormat::getStaticClassID()) { -+ icu::DecimalFormat* decimal_format = -+ static_cast<icu::DecimalFormat*>(number_format); -+ decimal_format->setMinimumGroupingDigits(-2); -+ } -+#endif - - // Change UDISPCTX_CAPITALIZATION_NONE to other values if - // ECMA402 later include option to change capitalization. diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch deleted file mode 100644 index c31e8970eaef..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch +++ /dev/null @@ -1,15 +0,0 @@ -generate_gni.sh: update_readme() runs git at the end of process, prevent it. - -Thanks-to: Georgy Yakovlev <gyakovlev@gentoo.org> - ---- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-07 12:51:49.438514897 +0100 -+++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-21 16:23:38.375724515 +0100 -@@ -519,8 +519,3 @@ - - gn format --in-place $BASE_DIR/BUILD.gn - gn format --in-place $BASE_DIR/libvpx_srcs.gni -- --cd $BASE_DIR/$LIBVPX_SRC_DIR --update_readme -- --cd $BASE_DIR diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch deleted file mode 100644 index cb90428e8d49..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de - return RestrictKillTarget(current_pid, sysno); - } - -+#if defined(__NR_newfstatat) -+ if (sysno == __NR_newfstatat) { -+ return RewriteFstatatSIGSYS(); -+ } -+#endif -+ -+#if defined(__NR_fstatat64) -+ if (sysno == __NR_fstatat64) { -+ return RewriteFstatatSIGSYS(); -+ } -+#endif -+ - if (SyscallSets::IsFileSystem(sysno) || - SyscallSets::IsCurrentDirectory(sysno)) { - return Error(fs_denied_errno); -diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc ---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc -+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc -@@ -6,6 +6,8 @@ - - #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h" - -+#include <errno.h> -+#include <fcntl.h> - #include <stddef.h> - #include <stdint.h> - #include <string.h> -@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct - return -ENOSYS; - } - -+intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args, -+ void* aux) { -+ switch (args.nr) { -+#if defined(__NR_newfstatat) -+ case __NR_newfstatat: -+#endif -+#if defined(__NR_fstatat64) -+ case __NR_fstatat64: -+#endif -+#if defined(__NR_newfstatat) || defined(__NR_fstatat64) -+ if (*reinterpret_cast<const char *>(args.args[1]) == '\0' -+ && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) { -+ return sandbox::sys_fstat64(static_cast<int>(args.args[0]), -+ reinterpret_cast<struct stat64 *>(args.args[2])); -+ } else { -+ errno = EACCES; -+ return -1; -+ } -+ break; -+#endif -+ } -+ -+ CrashSIGSYS_Handler(args, aux); -+ -+ // Should never be reached. -+ RAW_CHECK(false); -+ return -ENOSYS; -+} -+ - bpf_dsl::ResultExpr CrashSIGSYS() { - return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL); - } -@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS() - return bpf_dsl::Trap(SIGSYSSchedHandler, NULL); - } - -+bpf_dsl::ResultExpr RewriteFstatatSIGSYS() { -+ return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL); -+} -+ - void AllocateCrashKeys() { - #if !defined(OS_NACL_NONSFI) - if (seccomp_crash_key) -diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h ---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h -+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h -@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail - // sched_setparam(), sched_setscheduler() - SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args, - void* aux); -+// If the fstatat syscall is actually a disguised fstat, calls the regular fstat -+// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler. -+SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args, -+ void* aux); - - // Variants of the above functions for use with bpf_dsl. - SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS(); -@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash - SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex(); - SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace(); - SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS(); -+SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS(); - - // Allocates a crash key so that Seccomp information can be recorded. - void AllocateCrashKeys(); -diff -up b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc ---- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc -+++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc -@@ -261,4 +261,13 @@ int sys_sigaction(int signum, - - #endif // defined(MEMORY_SANITIZER) - -+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf) -+{ -+#if defined(__NR_fstat64) -+ return syscall(__NR_fstat64, fd, buf); -+#else -+ return syscall(__NR_fstat, fd, buf); -+#endif -+} -+ - } // namespace sandbox -diff -up b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h ---- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h -+++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h -@@ -17,6 +17,7 @@ struct sock_fprog; - struct rlimit64; - struct cap_hdr; - struct cap_data; -+struct stat64; - - namespace sandbox { - -@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig - const struct sigaction* act, - struct sigaction* oldact); - -+// Recent glibc rewrites fstat to fstatat. -+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf); -+ - } // namespace sandbox - - #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_ diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch new file mode 100644 index 000000000000..fdcc787971ca --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch @@ -0,0 +1,10 @@ +--- a/src/buildtools/gn.pro ++++ b/src/buildtools/gn.pro +@@ -25,6 +25,7 @@ + msvc:!clang_cl: gn_gen_args += --use-lto + + gn_configure = $$system_quote($$gn_bootstrap) $$gn_gen_args ++ gn_configure += --no-static-libstdc++ + macos { + gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" + } diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch deleted file mode 100644 index 0014ec135441..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp -index 013f1dfb2..3ce63c192 100644 ---- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp -+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp -@@ -9,6 +9,7 @@ - - #include "libANGLE/HandleAllocator.h" - -+#include <limits> - #include <algorithm> - #include <functional> - -diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -index be91def6b..73f202356 100644 ---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) { - } - - GType ax_platform_atk_hyperlink_get_type() { -- static volatile gsize type_volatile = 0; -+ static gsize type_volatile = 0; - - AXPlatformNodeAuraLinux::EnsureGTypeInit(); - -diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc -index 04125c6fd..6c64e5d8e 100644 ---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc -+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc -@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) { - GType GetType() { - AXPlatformNodeAuraLinux::EnsureGTypeInit(); - -- static volatile gsize type_volatile = 0; -+ static gsize type_volatile = 0; - if (g_once_init_enter(&type_volatile)) { - static const GTypeInfo type_info = { - sizeof(AXPlatformNodeAuraLinuxClass), // class_size -diff --git a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc -index c663a2074..38a342484 100644 ---- a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc -+++ b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc -@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) { - } - - GType GtkKeyBindingsHandler::HandlerGetType() { -- static volatile gsize type_id_volatile = 0; -+ static gsize type_id_volatile = 0; - if (g_once_init_enter(&type_id_volatile)) { - GType type_id = g_type_register_static_simple( - GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"), ---- a/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc -+++ b/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc -@@ -2,6 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include <cstddef> - #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" - - #include <stdint.h> -diff --git a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc -index 657a3c96b..ad641a082 100644 ---- a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc -+++ b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include <cstddef> -+ - #include "components/bookmarks/browser/base_bookmark_model_observer.h" - - namespace bookmarks { diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch new file mode 100644 index 000000000000..c5ae8cc17c5a --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch @@ -0,0 +1,96 @@ +Patch status: fixed in >=chromium-122.0.6200.0 + +https://bugs.gentoo.org/925486 +https://webrtc-review.googlesource.com/c/src/+/332240 +https://webrtc.googlesource.com/src/+/267f9bdd5 +From: Tommi <tommi@webrtc.org> +Date: Thu, 21 Dec 2023 14:08:26 +0100 +Subject: [PATCH] Update LegacyStatsCollector to conform with Wc++11-narrowing +--- a/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc ++++ b/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc +@@ -189,7 +189,8 @@ + {StatsReport::kStatsValueNamePreemptiveExpandRate, + info.preemptive_expand_rate}, +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, ++ static_cast<float>(info.total_output_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_output_duration}}; ++ static_cast<float>(info.total_output_duration)}}; + + const IntForAdd ints[] = { +@@ -245,7 +246,8 @@ + + const FloatForAdd floats[] = { +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, ++ static_cast<float>(info.total_input_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_input_duration}}; ++ static_cast<float>(info.total_input_duration)}}; + + RTC_DCHECK_GE(info.audio_level, 0); +@@ -341,5 +343,6 @@ + {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, + {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, +- {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, ++ {StatsReport::kStatsValueNameFramesDecoded, ++ static_cast<int>(info.frames_decoded)}, + }; + +@@ -385,13 +388,17 @@ + {StatsReport::kStatsValueNameFirsReceived, info.firs_received}, + {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height}, +- {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)}, ++ {StatsReport::kStatsValueNameFrameRateInput, ++ static_cast<int>(round(info.framerate_input))}, + {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent}, + {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width}, +- {StatsReport::kStatsValueNameNacksReceived, info.nacks_received}, ++ {StatsReport::kStatsValueNameNacksReceived, ++ static_cast<int>(info.nacks_received)}, + {StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, + {StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, + {StatsReport::kStatsValueNamePlisReceived, info.plis_received}, +- {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded}, +- {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent}, ++ {StatsReport::kStatsValueNameFramesEncoded, ++ static_cast<int>(info.frames_encoded)}, ++ {StatsReport::kStatsValueNameHugeFramesSent, ++ static_cast<int>(info.huge_frames_sent)}, + }; + +@@ -781,17 +788,23 @@ + + const Int64ForAdd int64s[] = { +- {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes}, +- {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes}, +- {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets}, +- {StatsReport::kStatsValueNameRtt, info.rtt}, ++ {StatsReport::kStatsValueNameBytesReceived, ++ static_cast<int64_t>(info.recv_total_bytes)}, ++ {StatsReport::kStatsValueNameBytesSent, ++ static_cast<int64_t>(info.sent_total_bytes)}, ++ {StatsReport::kStatsValueNamePacketsSent, ++ static_cast<int64_t>(info.sent_total_packets)}, ++ {StatsReport::kStatsValueNameRtt, static_cast<int64_t>(info.rtt)}, + {StatsReport::kStatsValueNameSendPacketsDiscarded, +- info.sent_discarded_packets}, ++ static_cast<int64_t>(info.sent_discarded_packets)}, + {StatsReport::kStatsValueNameSentPingRequestsTotal, +- info.sent_ping_requests_total}, ++ static_cast<int64_t>(info.sent_ping_requests_total)}, + {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse, +- info.sent_ping_requests_before_first_response}, +- {StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses}, +- {StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests}, +- {StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses}, ++ static_cast<int64_t>(info.sent_ping_requests_before_first_response)}, ++ {StatsReport::kStatsValueNameSentPingResponses, ++ static_cast<int64_t>(info.sent_ping_responses)}, ++ {StatsReport::kStatsValueNameRecvPingRequests, ++ static_cast<int64_t>(info.recv_ping_requests)}, ++ {StatsReport::kStatsValueNameRecvPingResponses, ++ static_cast<int64_t>(info.recv_ping_responses)}, + }; + for (const auto& i : int64s) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch new file mode 100644 index 000000000000..84dce821f80f --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch @@ -0,0 +1,12 @@ +TODO: merge with glx-headers patch in patchset, similar +issues that seem to stem from Qt's GLX restoration. + +https://bugs.gentoo.org/930107#c8 +--- a/src/3rdparty/chromium/ui/gl/gl_display.h ++++ b/src/3rdparty/chromium/ui/gl/gl_display.h +@@ -12,4 +12,5 @@ + + #include "ui/gl/gl_export.h" ++#include "ui/gl/gpu_preference.h" + + #if defined(USE_EGL) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch new file mode 100644 index 000000000000..2d12daccd224 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch @@ -0,0 +1,30 @@ +Patch status: pending being looked at upstream + +Issue[1][2][3] also exist in chromium itself[4], and unclear +why this started happening only with ninja-1.12.0 at the moment. + +Just a quickfix, likely not fully correct and seems there may +be further unresolved race issues. + +[1] https://bugs.gentoo.org/930107 +[2] https://bugreports.qt.io/browse/QTBUG-124375 +[3] https://github.com/ninja-build/ninja/issues/2417 +[4] https://bugs.gentoo.org/930112 +--- a/src/3rdparty/chromium/content/browser/BUILD.gn ++++ b/src/3rdparty/chromium/content/browser/BUILD.gn +@@ -198,2 +198,3 @@ + "//components/services/storage/public/mojom", ++ "//components/spellcheck:buildflags", + "//components/sqlite_proto", +--- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn ++++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn +@@ -22,2 +22,3 @@ + "//content/public/browser", ++ "//components/web_cache/public/mojom", + "//extensions/common", +--- a/src/core/configure/BUILD.root.gn.in ++++ b/src/core/configure/BUILD.root.gn.in +@@ -235,2 +235,3 @@ + deps = [ ++ "//chrome/app:generated_resources", + "//components/zoom", diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml index ea633503ac72..026c10e856ad 100644 --- a/dev-qt/qtwebengine/metadata.xml +++ b/dev-qt/qtwebengine/metadata.xml @@ -1,30 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> - <maintainer type="person"> - <description>ppc64 patchset maintainer</description> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> <use> - <flag name="designer">Install the QWebEngineView plugin used to add widgets in - <pkg>dev-qt/designer</pkg> forms that display web pages.</flag> - <flag name="geolocation">Enable physical position determination - via <pkg>dev-qt/qtpositioning</pkg></flag> + <flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag> <flag name="jumbo-build">Combine source files to speed up build process.</flag> - <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> - instead of bundled.</flag> - <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> - instead of bundled.</flag> + <flag name="pdfium">Build the QtPdf module based on chromium's PDFium library</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="webdriver">Build tool for automated testing (ChromeDriver equivalent)</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-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild index 96ad0847cb28..22bb5cdc0734 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python2_7 ) -QTVER=$(ver_cut 1-3) -inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build +PATCHSET="${PN}-5.15.13_p20240322-patchset" +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" +inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" HOMEPAGE="https://www.qt.io/" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" - if [[ ${PV} == ${QTVER}_p* ]]; then + KEYWORDS="amd64 arm64 ~x86" + if [[ ${PV} == ${QT5_PV}_p* ]]; then SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" S="${WORKDIR}/${P}" QT5_BUILD_DIR="${S}_build" @@ -26,10 +27,9 @@ else inherit git-r3 fi -# patchset based on https://github.com/chromium-ppc64le releases -SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" -IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets" REQUIRED_USE="designer? ( widgets )" RDEPEND=" @@ -42,12 +42,12 @@ RDEPEND=" dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= - ~dev-qt/qtcore-${QTVER} - ~dev-qt/qtdeclarative-${QTVER} - ~dev-qt/qtgui-${QTVER} - ~dev-qt/qtnetwork-${QTVER} - ~dev-qt/qtprintsupport-${QTVER} - ~dev-qt/qtwebchannel-${QTVER}[qml] + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}* + =dev-qt/qtprintsupport-${QT5_PV}* + =dev-qt/qtwebchannel-${QT5_PV}*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= @@ -56,7 +56,6 @@ RDEPEND=" media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= - media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils @@ -76,58 +75,76 @@ RDEPEND=" x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) - designer? ( ~dev-qt/designer-${QTVER} ) - geolocation? ( ~dev-qt/qtpositioning-${QTVER} ) + designer? ( =dev-qt/designer-${QT5_PV}* ) + geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* ) kerberos? ( virtual/krb5 ) - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( media-video/ffmpeg:0= ) + pulseaudio? ( media-libs/libpulse ) + screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( - ~dev-qt/qtdeclarative-${QTVER}[widgets] - ~dev-qt/qtwidgets-${QTVER} + =dev-qt/qtdeclarative-${QT5_PV}*[widgets] + =dev-qt/qtwidgets-${QT5_PV}* ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + media-libs/libglvnd +" BDEPEND="${PYTHON_DEPS} + app-alternatives/ninja dev-util/gperf - dev-util/ninja dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison - ppc64? ( >=dev-util/gn-0.1807 ) + sys-devel/flex " -PATCHES=( - "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446 - "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606 - "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix - "${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989 - "${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261 -) - -pkg_preinst() { - elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with" - elog "additional security fixes from newer versions. Extensive as it is, the" - elog "list of backports is impossible to evaluate, but always bound to be behind" - elog "Chromium's release schedule." - elog "In addition, various online services may deny service based on an outdated" - elog "user agent version (and/or other checks). Google is already known to do so." - elog - elog "tldr: Your web browsing experience will be compromised." -} +PATCHES=( "${WORKDIR}/${PATCHSET}" ) -src_unpack() { - # bug 307861 +qtwebengine_check-reqs() { + # bug #307861 eshopts_push -s extglob if is-flagq '-g?(gdb)?([1-9])'; then - ewarn ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." ewarn "You may experience really long compilation times and/or increased memory usage." ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." - ewarn fi eshopts_pop + [[ ${MERGE_TYPE} == binary ]] && return + + # (check-reqs added for bug #570534) + # + # Estimate the amount of RAM required + # Multiplier is *10 because Bash doesn't do floating point maths. + # Let's crudely assume ~2GB per compiler job for GCC. + local multiplier=20 + + # And call it ~1.5GB for Clang. + if tc-is-clang ; then + multiplier=15 + fi + + local CHECKREQS_DISK_BUILD="7G" + local CHECKREQS_DISK_USR="150M" + if ! has "distcc" ${FEATURES} ; then + # bug #830661 + # Not super realistic to come up with good estimates for distcc right now + local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G + fi + + check-reqs_${EBUILD_PHASE_FUNC} +} + +pkg_pretend() { + qtwebengine_check-reqs +} + +pkg_setup() { + qtwebengine_check-reqs + python-any-r1_pkg_setup +} + +src_unpack() { case ${QT5_BUILD_TYPE} in live) git-r3_src_unpack ;& release) default ;; @@ -135,14 +152,14 @@ src_unpack() { } src_prepare() { - if [[ ${PV} == ${QTVER}_p* ]]; then + if [[ ${PV} == ${QT5_PV}_p* ]]; then # This is made from git, and for some reason will fail w/o .git directories. mkdir -p .git src/3rdparty/chromium/.git || die - - # We need to make sure this integrates well into Qt 5.15.2 installation. - # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. - sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die fi + # We need to make sure this integrates well into Qt 5.15.3 installation. + # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. + # See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions + sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die # QTBUG-88657 - jumbo-build could still make trouble if ! use jumbo-build; then @@ -167,6 +184,13 @@ src_prepare() { done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) fi + # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++` + if tc-is-clang ; then + if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then + eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch" + fi + fi + qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri @@ -175,26 +199,11 @@ src_prepare() { qt_use_disable_mod widgets widgets src/src.pro qt5-build_src_prepare - - # we need to generate ppc64 stuff because upstream does not ship it yet - if use ppc64; then - einfo "Patching for ppc64le and generating build files" - eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" - pushd src/3rdparty/chromium > /dev/null || die - eapply -p0 "${WORKDIR}/${PN}-ppc64le" - popd > /dev/null || die - pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die - mkdir -vp source/config/linux/ppc64 || die - mkdir -p source/libvpx/test || die - touch source/libvpx/test/test.mk || die - ./generate_gni.sh || die - popd >/dev/null || die - fi } src_configure() { export NINJA_PATH=/usr/bin/ninja - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" local myqmakeargs=( -- @@ -202,13 +211,14 @@ src_configure() { -printing-and-pdf -system-opus -system-webp - $(usex alsa '-alsa' '-no-alsa') - $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs') - $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation') - $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos') - $(usex pulseaudio '-pulseaudio' '-no-pulseaudio') - $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg') - $(usex system-icu '-webengine-icu' '-no-webengine-icu') + $(qt_use alsa) + $(qt_use !bindist proprietary-codecs) + $(qt_use geolocation webengine-geolocation) + $(qt_use kerberos webengine-kerberos) + $(qt_use pulseaudio) + $(usex screencast -webengine-webrtc-pipewire '') + -qt-ffmpeg # bug 831487 + $(qt_use system-icu webengine-icu) ) qt5-build_src_configure } @@ -221,3 +231,14 @@ src_install() { die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" fi } + +pkg_preinst() { + elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144," + elog "with additional security fixes from newer versions. Extensive as it is, the" + elog "list of backports is impossible to evaluate, but always bound to be behind" + elog "Chromium's release schedule." + elog "In addition, various online services may deny service based on an outdated" + elog "user agent version (and/or other checks). Google is already known to do so." + elog + elog "tldr: Your web browsing experience will be compromised." +} diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild new file mode 100644 index 000000000000..997dbaf4ec5f --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild @@ -0,0 +1,324 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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.7-patchset-6.tar.xz +" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 arm64" +fi + +IUSE=" + accessibility +alsa bindist custom-cflags designer geolocation + +jumbo-build kerberos opengl pdfium pulseaudio qml screencast + +system-icu vaapi vulkan webdriver +widgets +" +REQUIRED_USE=" + designer? ( qml widgets ) +" + +# dlopen: krb5, libva, pciutils, udev +# gcc: for -latomic +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[accessibility=,gui,opengl=,vulkan?,widgets?] + ~dev-qt/qtdeclarative-${PV}:6[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/libwebp:= + media-libs/mesa[gbm(+)] + media-libs/openjpeg:2= + media-libs/opus + media-libs/tiff:= + sys-apps/dbus + sys-apps/pciutils + sys-devel/gcc:* + 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/libdrm + 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] ) + screencast? ( + dev-libs/glib:2 + media-video/pipewire:= + ) + system-icu? ( dev-libs/icu:= ) + vaapi? ( media-libs/libva:=[X] ) + !vaapi? ( media-libs/libvpx:= ) +" +DEPEND=" + ${RDEPEND} + media-libs/libglvnd + x11-base/xorg-proto + x11-libs/libxshmfence + screencast? ( media-libs/libepoxy[egl(+)] ) + pdfium? ( net-print/cups ) + test? ( + widgets? ( app-text/poppler[cxx(+)] ) + ) + vaapi? ( + vulkan? ( dev-util/vulkan-headers ) + ) +" +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 ]] || # too fragile for 6.9999, but keep for 6.x.9999 + PATCHES+=( "${WORKDIR}"/patches/chromium ) + +PATCHES+=( + # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.0-clang18.patch + "${FILESDIR}"/${PN}-6.7.0-ninja1.12.patch + "${FILESDIR}"/${PN}-6.7.0-displaykey-header.patch +) + +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 + ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which" + ewarn "is non-trivial with ${PN}. May experience extended compilation" + ewarn "times, increased disk/memory usage, and potentially link failure." + ewarn + ewarn "If run into issues, please try disabling before reporting a bug." + fi + + local CHECKREQS_DISK_BUILD=8G + local CHECKREQS_DISK_USR=360M + + 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=( + $(qt_feature pdfium qtpdf_build) + $(qt_feature qml qtpdf_quick_build) + $(qt_feature webdriver webenginedriver) + $(qt_feature widgets qtpdf_widgets_build) + $(usev pdfium -DQT_FEATURE_pdf_v8=ON) + + -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 vaapi webengine_vaapi) + $(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 + + # use bundled re2 to avoid complications, may revisit + # (see discussions in https://github.com/gentoo/gentoo/pull/32281) + -DQT_FEATURE_webengine_system_re2=OFF + + # bundled is currently required when using vaapi (forced regardless) + $(qt_feature !vaapi webengine_system_libvpx) + + # not necessary to pass these (default), but in case detection fails + $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ + freetype gbm glib harfbuzz lcms2 libevent libjpeg \ + libopenjpeg2 libpci libpng libtiff 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 + ) + + if use !custom-cflags; then + strip-flags # fragile + + if is-flagq '-g?(gdb)?([2-9])'; then #914475 + replace-flags '-g?(gdb)?([2-9])' -g1 + ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)" + fi + + # Built helpers segfault when using (at least) -march=armv8-a+pauth + # (bug #920555, #920568 -- suspected gcc bug). For now, filter all + # for simplicity. Override with USE=custom-cflags if wanted, please + # report if above -march works again so can cleanup. + use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*' + fi + + 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_compile() { + # tentatively work around a possible (rare) race condition (bug #921680) + cmake_build WebEngineCore_sync_all_public_headers + + cmake_src_compile +} + +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_qwebengineglobalsettings + tst_qwebengineview + # fails with offscreen rendering, may be worth retrying if the issue + # persist given these are rather major tests (or consider virtx) + tst_qmltests + tst_qwebenginepage + # certs verfication seems flaky and gives expiration warnings + tst_qwebengineclientcertificatestore + # test is misperformed when qtbase is built USE=-test? + tst_touchinput + # currently requires webenginedriver to be already installed + tst_webenginedriver + ) + + # 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 +} + +src_install() { + qt6-build_src_install + + [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472 + die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" + + if use test && use webdriver; then + rm -- "${D}${QT6_BINDIR}"/testbrowser || die + fi +} + +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.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild new file mode 100644 index 000000000000..6dc080fed1e4 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -0,0 +1,321 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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.7-patchset-7.tar.xz +" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm64" +fi + +IUSE=" + accessibility +alsa bindist custom-cflags designer geolocation + +jumbo-build kerberos opengl pdfium pulseaudio qml screencast + +system-icu vaapi vulkan webdriver +widgets +" +REQUIRED_USE=" + designer? ( qml widgets ) +" + +# dlopen: krb5, libva, pciutils, udev +# gcc: for -latomic +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[accessibility=,gui,opengl=,vulkan?,widgets?] + ~dev-qt/qtdeclarative-${PV}:6[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/libwebp:= + media-libs/mesa[gbm(+)] + media-libs/openjpeg:2= + media-libs/opus + media-libs/tiff:= + sys-apps/dbus + sys-apps/pciutils + sys-devel/gcc:* + 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/libdrm + 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] ) + screencast? ( + dev-libs/glib:2 + media-video/pipewire:= + ) + system-icu? ( dev-libs/icu:= ) + vaapi? ( media-libs/libva:=[X] ) + !vaapi? ( media-libs/libvpx:= ) +" +DEPEND=" + ${RDEPEND} + media-libs/libglvnd + x11-base/xorg-proto + x11-libs/libxshmfence + screencast? ( media-libs/libepoxy[egl(+)] ) + pdfium? ( net-print/cups ) + test? ( + widgets? ( app-text/poppler[cxx(+)] ) + ) + vaapi? ( + vulkan? ( dev-util/vulkan-headers ) + ) +" +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 ]] || # too fragile for 6.9999, but 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 + ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which" + ewarn "is non-trivial with ${PN}. May experience extended compilation" + ewarn "times, increased disk/memory usage, and potentially link failure." + ewarn + ewarn "If run into issues, please try disabling before reporting a bug." + fi + + local CHECKREQS_DISK_BUILD=8G + local CHECKREQS_DISK_USR=360M + + 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=( + $(qt_feature pdfium qtpdf_build) + $(qt_feature qml qtpdf_quick_build) + $(qt_feature webdriver webenginedriver) + $(qt_feature widgets qtpdf_widgets_build) + $(usev pdfium -DQT_FEATURE_pdf_v8=ON) + + -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 vaapi webengine_vaapi) + $(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 + + # use bundled re2 to avoid complications, may revisit + # (see discussions in https://github.com/gentoo/gentoo/pull/32281) + -DQT_FEATURE_webengine_system_re2=OFF + + # bundled is currently required when using vaapi (forced regardless) + $(qt_feature !vaapi webengine_system_libvpx) + + # not necessary to pass these (default), but in case detection fails + $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ + freetype gbm glib harfbuzz lcms2 libevent libjpeg \ + libopenjpeg2 libpci libpng libtiff 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 + ) + + if use !custom-cflags; then + strip-flags # fragile + + if is-flagq '-g?(gdb)?([2-9])'; then #914475 + replace-flags '-g?(gdb)?([2-9])' -g1 + ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)" + fi + + # Built helpers segfault when using (at least) -march=armv8-a+pauth + # (bug #920555, #920568 -- suspected gcc bug). For now, filter all + # for simplicity. Override with USE=custom-cflags if wanted, please + # report if above -march works again so can cleanup. + use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*' + fi + + 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_compile() { + # tentatively work around a possible (rare) race condition (bug #921680) + cmake_build WebEngineCore_sync_all_public_headers + + cmake_src_compile +} + +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_qwebengineglobalsettings + tst_qwebengineview + # fails with offscreen rendering, may be worth retrying if the issue + # persist given these are rather major tests (or consider virtx) + tst_qmltests + tst_qwebenginepage + # certs verfication seems flaky and gives expiration warnings + tst_qwebengineclientcertificatestore + # test is misperformed when qtbase is built USE=-test? + tst_touchinput + # currently requires webenginedriver to be already installed + tst_webenginedriver + ) + + # 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 +} + +src_install() { + qt6-build_src_install + + [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472 + die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" + + if use test && use webdriver; then + rm -- "${D}${QT6_BINDIR}"/testbrowser || die + fi +} + +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..6dc080fed1e4 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -0,0 +1,321 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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.7-patchset-7.tar.xz +" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm64" +fi + +IUSE=" + accessibility +alsa bindist custom-cflags designer geolocation + +jumbo-build kerberos opengl pdfium pulseaudio qml screencast + +system-icu vaapi vulkan webdriver +widgets +" +REQUIRED_USE=" + designer? ( qml widgets ) +" + +# dlopen: krb5, libva, pciutils, udev +# gcc: for -latomic +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[accessibility=,gui,opengl=,vulkan?,widgets?] + ~dev-qt/qtdeclarative-${PV}:6[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/libwebp:= + media-libs/mesa[gbm(+)] + media-libs/openjpeg:2= + media-libs/opus + media-libs/tiff:= + sys-apps/dbus + sys-apps/pciutils + sys-devel/gcc:* + 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/libdrm + 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] ) + screencast? ( + dev-libs/glib:2 + media-video/pipewire:= + ) + system-icu? ( dev-libs/icu:= ) + vaapi? ( media-libs/libva:=[X] ) + !vaapi? ( media-libs/libvpx:= ) +" +DEPEND=" + ${RDEPEND} + media-libs/libglvnd + x11-base/xorg-proto + x11-libs/libxshmfence + screencast? ( media-libs/libepoxy[egl(+)] ) + pdfium? ( net-print/cups ) + test? ( + widgets? ( app-text/poppler[cxx(+)] ) + ) + vaapi? ( + vulkan? ( dev-util/vulkan-headers ) + ) +" +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 ]] || # too fragile for 6.9999, but 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 + ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which" + ewarn "is non-trivial with ${PN}. May experience extended compilation" + ewarn "times, increased disk/memory usage, and potentially link failure." + ewarn + ewarn "If run into issues, please try disabling before reporting a bug." + fi + + local CHECKREQS_DISK_BUILD=8G + local CHECKREQS_DISK_USR=360M + + 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=( + $(qt_feature pdfium qtpdf_build) + $(qt_feature qml qtpdf_quick_build) + $(qt_feature webdriver webenginedriver) + $(qt_feature widgets qtpdf_widgets_build) + $(usev pdfium -DQT_FEATURE_pdf_v8=ON) + + -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 vaapi webengine_vaapi) + $(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 + + # use bundled re2 to avoid complications, may revisit + # (see discussions in https://github.com/gentoo/gentoo/pull/32281) + -DQT_FEATURE_webengine_system_re2=OFF + + # bundled is currently required when using vaapi (forced regardless) + $(qt_feature !vaapi webengine_system_libvpx) + + # not necessary to pass these (default), but in case detection fails + $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ + freetype gbm glib harfbuzz lcms2 libevent libjpeg \ + libopenjpeg2 libpci libpng libtiff 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 + ) + + if use !custom-cflags; then + strip-flags # fragile + + if is-flagq '-g?(gdb)?([2-9])'; then #914475 + replace-flags '-g?(gdb)?([2-9])' -g1 + ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)" + fi + + # Built helpers segfault when using (at least) -march=armv8-a+pauth + # (bug #920555, #920568 -- suspected gcc bug). For now, filter all + # for simplicity. Override with USE=custom-cflags if wanted, please + # report if above -march works again so can cleanup. + use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*' + fi + + 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_compile() { + # tentatively work around a possible (rare) race condition (bug #921680) + cmake_build WebEngineCore_sync_all_public_headers + + cmake_src_compile +} + +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_qwebengineglobalsettings + tst_qwebengineview + # fails with offscreen rendering, may be worth retrying if the issue + # persist given these are rather major tests (or consider virtx) + tst_qmltests + tst_qwebenginepage + # certs verfication seems flaky and gives expiration warnings + tst_qwebengineclientcertificatestore + # test is misperformed when qtbase is built USE=-test? + tst_touchinput + # currently requires webenginedriver to be already installed + tst_webenginedriver + ) + + # 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 +} + +src_install() { + qt6-build_src_install + + [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472 + die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" + + if use test && use webdriver; then + rm -- "${D}${QT6_BINDIR}"/testbrowser || die + fi +} + +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/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest deleted file mode 100644 index 7080d4f542b7..000000000000 --- a/dev-qt/qtwebkit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6 diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch deleted file mode 100644 index de3bbcfc3ef1..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev <mitya57@gmail.com> -Date: Tue, 4 Aug 2020 21:04:06 +0300 -Subject: [PATCH] Let Bison generate the header directly, to fix build with - Bison 3.7 - -Starting with Bison 3.7, the generated C++ file #include's the header -by default, instead of duplicating it. So we should not delete it. - -Remove the code to add #ifdef guards to the header, since Bison adds -them itself since version 2.6.3. ---- - Source/WebCore/css/makegrammar.pl | 21 +-------------------- - 1 file changed, 1 insertion(+), 20 deletions(-) - -diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl -index 5d63b08102eb..9435701c7061 100644 ---- a/Source/WebCore/css/makegrammar.pl -+++ b/Source/WebCore/css/makegrammar.pl -@@ -73,25 +73,6 @@ - } - - my $fileBase = File::Spec->join($outputDir, $filename); --my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); -+my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); - push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. - system(@bisonCommand) == 0 or die; -- --open HEADER, ">$fileBase.h" or die; --print HEADER << "EOF"; --#ifndef CSSGRAMMAR_H --#define CSSGRAMMAR_H --EOF -- --open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; --while (<HPP>) { -- print HEADER; --} --close HPP; -- --print HEADER "#endif\n"; --close HEADER; -- --unlink("$fileBase.cpp.h"); --unlink("$fileBase.hpp"); -- diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch deleted file mode 100644 index f377a311362c..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/qtwebkit/qtwebkit/pull/1058 - -From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fvogt@suse.de> -Date: Wed, 7 Apr 2021 13:38:09 +0200 -Subject: [PATCH] Remove invalid g_object declarations to fix build with glib - >= 2.68 - -g_object_ref_sink is defined as a macro meanwhile and so the build fails. -Just remove the declarations, glib.h is included anyway. ---- - Source/WTF/wtf/glib/GRefPtr.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h -index 06133d82cb35..d9a1d2f145f5 100644 ---- a/Source/WTF/wtf/glib/GRefPtr.h -+++ b/Source/WTF/wtf/glib/GRefPtr.h -@@ -29,9 +29,6 @@ - #include <algorithm> - #include <glib.h> - --extern "C" void g_object_unref(gpointer); --extern "C" gpointer g_object_ref_sink(gpointer); -- - namespace WTF { - - enum GRefPtrAdoptType { GRefPtrAdopt }; diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch deleted file mode 100644 index 7de72ea61aff..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- a/Source/WebCore/platform/text/icu/UTextProvider.h -+++ b/Source/WebCore/platform/text/icu/UTextProvider.h -@@ -80,12 +80,12 @@ - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits<int32_t>::max()); - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -94,12 +94,12 @@ - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits<int32_t>::max()); - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } ---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (index >= length && uText->chunkNativeLimit == length) { - // Off the end of the buffer, but we can't get it. - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); -- return FALSE; -+ return false; - } - } else { - if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (!index && !uText->chunkNativeStart) { - // Already at the beginning; can't go any farther. - uText->chunkOffset = 0; -- return FALSE; -+ return false; - } - } - -@@ -144,7 +144,7 @@ - - uText->nativeIndexingLimit = uText->chunkLength; - -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) -@@ -336,7 +336,7 @@ - static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -356,7 +356,7 @@ - ASSERT(newContext == UTextProviderContext::PriorContext); - textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) ---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -@@ -125,7 +125,7 @@ - static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -145,7 +145,7 @@ - ASSERT(newContext == UTextProviderContext::PriorContext); - textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -308,7 +308,7 @@ - m_converterICU = ucnv_open(m_canonicalConverterName, &err); - ASSERT(U_SUCCESS(err)); - if (m_converterICU) -- ucnv_setFallback(m_converterICU, TRUE); -+ ucnv_setFallback(m_converterICU, true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch deleted file mode 100644 index a3b677b779b1..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev <annulen@yandex.ru> -Date: Wed, 3 Jun 2020 15:01:42 +0300 -Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to - json.load() - -In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument -is not supported. - -Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9 ---- - Source/JavaScriptCore/generate-bytecode-files | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files -index c5dab429c7b0..af3431275ecf 100644 ---- a/Source/JavaScriptCore/generate-bytecode-files -+++ b/Source/JavaScriptCore/generate-bytecode-files -@@ -163,7 +163,7 @@ if __name__ == "__main__": - initBytecodesFile = openOrExit(initASMFileName, "w") - - try: -- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") -+ bytecodeSections = json.load(bytecodeFile) - except: - print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) - diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml deleted file mode 100644 index 05f4bb98e37c..000000000000 --- a/dev-qt/qtwebkit/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag> - <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag> - <flag name="hyphen">Enable hyphenation support via <pkg>dev-libs/hyphen</pkg></flag> - <flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag> - <flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag> - <flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag> - <flag name="qml">Build QML/QtQuick bindings</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>https://doc.qt.io/</doc> - </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/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild deleted file mode 100644 index f2e91b79caf5..000000000000 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999 ]]; then - EGIT_BRANCH="qtwebkit-5.212" - EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git" - inherit git-r3 -else - MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot - SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz" - KEYWORDS="amd64 arm arm64 ppc64 x86" - S="${WORKDIR}/${MY_P}" -fi -PYTHON_COMPAT=( python3_{7,8,9} ) -USE_RUBY="ruby25 ruby26 ruby27" -inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs - -DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" -HOMEPAGE="https://www.qt.io/" - -LICENSE="BSD LGPL-2+" -SLOT="5/5.212" -IUSE="geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" - -REQUIRED_USE=" - nsplugin? ( X ) - qml? ( opengl ) - ?? ( gstreamer multimedia ) -" - -# Dependencies found at Source/cmake/OptionsQt.cmake -QT_MIN_VER="5.12.3:5" -BDEPEND=" - ${PYTHON_DEPS} - ${RUBY_DEPS} - dev-lang/perl - dev-util/gperf - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig -" -DEPEND=" - dev-db/sqlite:3 - dev-libs/icu:= - dev-libs/libxml2 - dev-libs/libxslt - >=dev-qt/qtcore-${QT_MIN_VER} - >=dev-qt/qtgui-${QT_MIN_VER} - >=dev-qt/qtnetwork-${QT_MIN_VER} - >=dev-qt/qtwidgets-${QT_MIN_VER}= - media-libs/libpng:0= - media-libs/woff2 - virtual/jpeg:0 - geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0 - ) - hyphen? ( dev-libs/hyphen ) - multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) - opengl? ( - >=dev-qt/qtgui-${QT_MIN_VER}[gles2-only=] - >=dev-qt/qtopengl-${QT_MIN_VER}[gles2-only=] - ) - orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) - printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) - qml? ( - >=dev-qt/qtdeclarative-${QT_MIN_VER} - >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml] - ) - webp? ( media-libs/libwebp:= ) - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - ) -" -RDEPEND="${DEPEND}" - -CHECKREQS_DISK_BUILD="16G" # bug 417307 - -PATCHES=( - "${FILESDIR}/${P}-bison-3.7.patch" # bug 736499 - "${FILESDIR}/${P}-icu-68.patch" # bug 753260 - "${FILESDIR}/${P}-python-3.9.patch" # bug 766303 - "${FILESDIR}/${P}-glib-2.68.patch" # bug 777759 -) - -_check_reqs() { - if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then - einfo "Checking for sufficient disk space to build ${PN} with debugging flags" - check-reqs_$1 - fi -} - -pkg_pretend() { - _check_reqs pkg_pretend -} - -pkg_setup() { - _check_reqs pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - # Respect CC, otherwise fails on prefix, bug #395875 - tc-export CC - - # Multiple rendering bugs on youtube, github, etc without this, bug #547224 - append-flags $(test-flags -fno-strict-aliasing) - - local mycmakeargs=( - -DPORT=Qt - -DENABLE_API_TESTS=OFF - -DENABLE_TOOLS=OFF - -DENABLE_GEOLOCATION=$(usex geolocation) - -DUSE_GSTREAMER=$(usex gstreamer) - -DUSE_LIBHYPHEN=$(usex hyphen) - -DENABLE_JIT=$(usex jit) - -DUSE_QT_MULTIMEDIA=$(usex multimedia) - -DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_PRINT_SUPPORT=$(usex printsupport) - -DENABLE_DEVICE_ORIENTATION=$(usex orientation) - -DENABLE_WEBKIT2=$(usex qml) - $(cmake_use_find_package webp WebP) - -DENABLE_X11_TARGET=$(usex X) - ) - - if has_version "virtual/rubygems[ruby_targets_ruby27]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby27) ) - elif has_version "virtual/rubygems[ruby_targets_ruby26]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) ) - else - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # bug 572056 - if [[ ! -f ${ED}$(qt5_get_libdir)/libQt5WebKit.so ]]; then - eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." - die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' - fi -} diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest index dcfc0f25c2fe..eab32e5ec6ff 100644 --- a/dev-qt/qtwebsockets/Manifest +++ b/dev-qt/qtwebsockets/Manifest @@ -1 +1,3 @@ -DIST qtwebsockets-everywhere-src-5.15.2.tar.xz 259000 BLAKE2B 1bbc4d5451e70a94b6fb8377a60e43e2fa1aeb0d1224dd04486fcafd7821c3918a887297860e7cfcd18f3afd8dd02a903cf16fb69aeb48a52557af539c79458e SHA512 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4 +DIST qtwebsockets-5.15.13-gentoo-kde-1.tar.xz 1520 BLAKE2B aaa246f1f078562bcb66faff2ab94c95ce8e48c662a77be479cc5599e6dabe8fd4b574f1d9d911fffaf63c0a293de0cefc9f69323ab4963adde59a0ac9b6f785 SHA512 06185a20a116e293da6f237f5453a20a490d0aaaf71130e25eb442236b8e8d1ea6db70269fb53af6f353f7fb567d5fa3174b587bec9963cf61e16d3b62f3cafb +DIST qtwebsockets-everywhere-opensource-src-5.15.13.tar.xz 261832 BLAKE2B 78b00ad89271610b23bfdd2917b02dd542a51684dd76df7c649109a90469a5dad30a7335f8c426090f5ba4fcf9efcbdb26e63e73d6924edb8526c9556777ca91 SHA512 578ccdb69602f978b9a10c08045f3a6fd0fe2247c07703617c1a717dc8910b383bff4c1f6a8195643f0552cb707ece5eca4c7e7f4d90356c26a409a849200489 +DIST qtwebsockets-everywhere-src-6.7.0.tar.xz 454868 BLAKE2B bbebd778a9b95cd56730b48faafe14ce1935f8c5bc18b45079aedb9ff9deb37eabd455b56ed5e36c1fffef571a7b916efd2acbfc7019e04811f506c631bb3218 SHA512 a233700dbecc3c266e432e4d0b239891457dd96125fe0e115e16904e7bd038fd2f1ba74b05fa23b7b3752d5023a8af502436a80c430c1b974acb182487275641 diff --git a/dev-qt/qtwebsockets/metadata.xml b/dev-qt/qtwebsockets/metadata.xml index c33b152da0be..5e77c4d01262 100644 --- a/dev-qt/qtwebsockets/metadata.xml +++ b/dev-qt/qtwebsockets/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -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-5.15.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.13.ebuild index 7cc76b131249..219c9af3754e 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.13.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" +fi + inherit qt5-build DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework" -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86" -fi - IUSE="qml +ssl" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtnetwork-${PV}[ssl=] - qml? ( ~dev-qt/qtdeclarative-${PV} ) + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}*[ssl=] + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.0.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.0.ebuild new file mode 100644 index 000000000000..d6bee1dc669a --- /dev/null +++ b/dev-qt/qtwebsockets/qtwebsockets-6.7.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2024 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 ~arm arm64 ~loong ~ppc ~riscv ~x86" +fi + +IUSE="qml +ssl" + +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 Qt6Quick) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild new file mode 100644 index 000000000000..d777dc35a11b --- /dev/null +++ b/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~riscv ~x86" +fi + +IUSE="qml +ssl" + +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 Qt6Quick) + ) + + 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..d777dc35a11b --- /dev/null +++ b/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021-2024 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 ~arm ~arm64 ~loong ~ppc ~riscv ~x86" +fi + +IUSE="qml +ssl" + +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 Qt6Quick) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest index 9cf04c9ed782..5ffa37ffe3d1 100644 --- a/dev-qt/qtwebview/Manifest +++ b/dev-qt/qtwebview/Manifest @@ -1 +1,2 @@ -DIST qtwebview-everywhere-src-5.15.2.tar.xz 133428 BLAKE2B 64cc9ff6a14c9107eb1607cbf244d179fd78ab5fdc879cce85c5f8b85dd738452b681faf864bf0013d3c8614ab2bd593fbf5ddb603ee2d2a0e0f684f9a46a0e2 SHA512 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85 +DIST qtwebview-everywhere-opensource-src-5.15.13.tar.xz 136864 BLAKE2B ddd1abbda3a5d8383617b65636cde1d8ec42e2392927cf9e28b6ea16c00df2a07c7734a336ed4dc467c72ac332b0858845745f5e5a9ba5cbcc18ee196946f3d4 SHA512 886c46dfb2e66ceeeb423220b48e47bdc8968faf5b9553f9e206ddb84d201341c6ad49308740835de3f27960ef04276477df5a55faf9e3c4c68180ae96acbc6a +DIST qtwebview-everywhere-src-6.7.0.tar.xz 138160 BLAKE2B 362f34120258a560279d0be0406e3826eba71c5b44a494a731a3be0645e8ec01960685b6cf8cb9575fcaf56d5ad813eddae92c970426fc05b50d8bac5e749437 SHA512 d4559e2bd77a05c43271346236f3642b4f082beabe415f6a459cc3d3aee9b5750b4da2ae6e5c3ec1b571304918f5f39bea98cc46f96d606dd3acc53aa42c88a2 diff --git a/dev-qt/qtwebview/metadata.xml b/dev-qt/qtwebview/metadata.xml index 32568f62fb8e..5ad9551295b3 100644 --- a/dev-qt/qtwebview/metadata.xml +++ b/dev-qt/qtwebview/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> @@ -8,6 +8,7 @@ <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> + <remote-id type="github">qt/qtwebview</remote-id> </upstream> <slots> <subslots> diff --git a/dev-qt/qtwebview/qtwebview-5.15.2-r1.ebuild b/dev-qt/qtwebview/qtwebview-5.15.13.ebuild index d17dd95908f8..cc68815da63d 100644 --- a/dev-qt/qtwebview/qtwebview-5.15.2-r1.ebuild +++ b/dev-qt/qtwebview/qtwebview-5.15.13.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qt5-build DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="amd64 arm64 ~x86" fi IUSE="" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - =dev-qt/qtwebengine-${PV}*:5 + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtdeclarative-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + =dev-qt/qtwebengine-${QT5_PV}*:5 " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtwebview/qtwebview-6.7.0.ebuild b/dev-qt/qtwebview/qtwebview-6.7.0.ebuild new file mode 100644 index 000000000000..55069dbb40a2 --- /dev/null +++ b/dev-qt/qtwebview/qtwebview-6.7.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtwebengine-${PV}:6[qml] +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebview/qtwebview-6.7.9999.ebuild b/dev-qt/qtwebview/qtwebview-6.7.9999.ebuild new file mode 100644 index 000000000000..81210cfc2b80 --- /dev/null +++ b/dev-qt/qtwebview/qtwebview-6.7.9999.ebuild @@ -0,0 +1,19 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtwebengine-${PV}:6[qml] +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebview/qtwebview-6.9999.ebuild b/dev-qt/qtwebview/qtwebview-6.9999.ebuild new file mode 100644 index 000000000000..81210cfc2b80 --- /dev/null +++ b/dev-qt/qtwebview/qtwebview-6.9999.ebuild @@ -0,0 +1,19 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtwebengine-${PV}:6[qml] +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml index 115da8d2b577..cb9c6f8a8063 100644 --- a/dev-qt/qtwidgets/metadata.xml +++ b/dev-qt/qtwidgets/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.13.ebuild index 3332a278e385..bc60a7b408d3 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.15.13.ebuild @@ -1,34 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi # keep IUSE defaults in sync with qtgui -IUSE="gles2-only gtk +png +X" +IUSE="dbus gles2-only gtk +png +X" +REQUIRED_USE="gtk? ( dbus )" DEPEND=" - ~dev-qt/qtcore-${PV}:5= - ~dev-qt/qtgui-${PV}[gles2-only=,png=,X?] + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?] + dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) gtk? ( - ~dev-qt/qtgui-${PV}[dbus] - x11-libs/gtk+:3 + dev-libs/glib:2 + =dev-qt/qtgui-${QT5_PV}*:5=[dbus] + x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) " -RDEPEND="${DEPEND} - dev-qt/qtchooser -" +RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/tools/uic @@ -37,6 +38,7 @@ QT5_TARGET_SUBDIRS=( ) QT5_GENTOO_CONFIG=( + dbus:xdgdesktopportal: gtk:gtk3: ::widgets !:no-widgets: @@ -46,17 +48,16 @@ QT5_GENTOO_PRIVATE_CONFIG=( :widgets ) -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 - src_configure() { local myconf=( -opengl $(usex gles2-only es2 desktop) + $(usev dbus -dbus-linked) $(qt_use gtk) -gui $(qt_use png libpng system) -widgets $(qt_use X xcb) - $(usex X '-xcb-xlib -xkbcommon' '') + $(usev X '-xcb-xlib -xkbcommon') ) qt5-build_src_configure } diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest index 77d3a22a4566..90e354ff8e84 100644 --- a/dev-qt/qtx11extras/Manifest +++ b/dev-qt/qtx11extras/Manifest @@ -1 +1 @@ -DIST qtx11extras-everywhere-src-5.15.2.tar.xz 143972 BLAKE2B 7dfa2fcdad254280bb00f40722e5ba4736ed89a1dc6b3542738a0492fe74a5f0823aefc141938bd7b0e839c7ee0b72914030b368cf4e33101e1e056e4a8d2ca3 SHA512 beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9 +DIST qtx11extras-everywhere-opensource-src-5.15.13.tar.xz 146892 BLAKE2B 819299a2053b95d9b3c85add8690283f348f9c99cf7029a5c43d48d7341876c13817201817abfea586a56aa720687033d359467cf7018e8c57b9f0cdbb9718d8 SHA512 8fcaab6a1ba13798bb86c236102b2af932e46de25de3bddc11baff5175db65ab0bea123d5c8477fea36fe1075481c335dbf554165c22e43a3409706b5f330695 diff --git a/dev-qt/qtx11extras/metadata.xml b/dev-qt/qtx11extras/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtx11extras/metadata.xml +++ b/dev-qt/qtx11extras/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.13.ebuild index 40e88544ff0d..c967b890e41a 100644 --- a/dev-qt/qtx11extras/qtx11extras-5.15.2.ebuild +++ b/dev-qt/qtx11extras/qtx11extras-5.15.13.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qt5-build DESCRIPTION="Linux/X11-specific support library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi IUSE="" RDEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[X] + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}*[X] " DEPEND="${RDEPEND} - test? ( ~dev-qt/qtwidgets-${PV} ) + test? ( =dev-qt/qtwidgets-${QT5_PV}* ) " diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest index c298c0aa243b..945cf510181a 100644 --- a/dev-qt/qtxml/Manifest +++ b/dev-qt/qtxml/Manifest @@ -1,2 +1,3 @@ -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtxml/metadata.xml b/dev-qt/qtxml/metadata.xml index 32568f62fb8e..ae8aa9597f20 100644 --- a/dev-qt/qtxml/metadata.xml +++ b/dev-qt/qtxml/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtxml/qtxml-5.15.13.ebuild b/dev-qt/qtxml/qtxml-5.15.13.ebuild new file mode 100644 index 000000000000..5b41857cbc5a --- /dev/null +++ b/dev-qt/qtxml/qtxml-5.15.13.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework" + +IUSE="" + +RDEPEND="=dev-qt/qtcore-${QT5_PV}*:5=" +DEPEND="${RDEPEND} + test? ( =dev-qt/qtnetwork-${QT5_PV}* ) +" + +QT5_TARGET_SUBDIRS=( + src/xml +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :xml +) diff --git a/dev-qt/qtxml/qtxml-5.15.2.ebuild b/dev-qt/qtxml/qtxml-5.15.2.ebuild deleted file mode 100644 index 16d360c85c55..000000000000 --- a/dev-qt/qtxml/qtxml-5.15.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="" - -RDEPEND=" - ~dev-qt/qtcore-${PV}:5= -" -DEPEND="${RDEPEND} - test? ( ~dev-qt/qtnetwork-${PV} ) -" - -QT5_TARGET_SUBDIRS=( - src/xml -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :xml -) - -PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest index a0b8d8e7cdf9..589898ecda12 100644 --- a/dev-qt/qtxmlpatterns/Manifest +++ b/dev-qt/qtxmlpatterns/Manifest @@ -1 +1 @@ -DIST qtxmlpatterns-everywhere-src-5.15.2.tar.xz 5209380 BLAKE2B 35933ecc0b7eb6b7355e660aafc616e47a1358857f8f2b161454dcaf1f05cd0d536e27859e3380a8ac46da3b228c805ef25d267931eb71585e5f9974d3e5640f SHA512 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348 +DIST qtxmlpatterns-everywhere-opensource-src-5.15.13.tar.xz 5195744 BLAKE2B 7b8de631efa7d40a12577b343586896056ce5c0e5697b6ad9904697e5f5df250645490415e7600d3217e85834e5b521483e3046c75b28a107838346f9ec0bce3 SHA512 01a7e41c0fb8c97b72a503c5a8276f2a9744aac624be79c50d366a5229f91920d0827c36ee9e434c78ded4b1624c8491da08af36ccd9dedd59d0d0785a5bb776 diff --git a/dev-qt/qtxmlpatterns/metadata.xml b/dev-qt/qtxmlpatterns/metadata.xml index c89a0b8e8587..7907c83ef40e 100644 --- a/dev-qt/qtxmlpatterns/metadata.xml +++ b/dev-qt/qtxmlpatterns/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.13.ebuild index bb2ce6bf12a1..6d99a122aaa9 100644 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2.ebuild +++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.13.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qt5-build DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi IUSE="qml" DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtnetwork-${PV} - qml? ( ~dev-qt/qtdeclarative-${PV} ) + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtnetwork-${QT5_PV}* + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) " RDEPEND="${DEPEND} - dev-qt/qtchooser + !<dev-qt/qtchooser-66-r2 " src_prepare() { @@ -31,3 +31,9 @@ src_prepare() { qt5-build_src_prepare } + +src_install() { + qt5-build_src_install + qt5_symlink_binary_to_path xmlpatterns + qt5_symlink_binary_to_path xmlpatternsvalidator +} |