From c06bd98761278e924ec281e1c07d318e4b1563d3 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:11:59 +0200 Subject: [PATCH 01/29] telegram-desktop: rebuild against qt6-6.6.0 --- srcpkgs/telegram-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 26a167befd980..5b093861e96e8 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop version=4.10.1 -revision=2 +revision=3 build_style=cmake build_helper="qemu gir" configure_args="-DTDESKTOP_API_ID=209235 From dda29f0d33aa0279513276760b8dc1462e9aeff9 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:03 +0200 Subject: [PATCH 02/29] qt6-3d: update to 6.6.0. --- srcpkgs/qt6-3d/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template index ee29286e0409b..e20bcf8ad42fd 100644 --- a/srcpkgs/qt6-3d/template +++ b/srcpkgs/qt6-3d/template @@ -1,6 +1,6 @@ # Template file for 'qt6-3d' pkgname=qt6-3d -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools" @@ -10,7 +10,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz" -checksum=21f064db21ad1bfc5547fd4e8cba09acc8c187de58d7eee206f6549ab9e2f910 +checksum=0da87a46217f4d72f6d0de9768605d5325ef3d093f73a5e0d73dd88e99c1fc2a qt6-3d-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 32f1efefcbf1328f4cf0823011dc0c6598a86480 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:13 +0200 Subject: [PATCH 03/29] qt6-base: update to 6.6.0. --- .../patches/{markdown-musl.patch => markdown.patch} | 13 +++++++------ srcpkgs/qt6-base/template | 8 ++++---- 2 files changed, 11 insertions(+), 10 deletions(-) rename srcpkgs/qt6-base/patches/{markdown-musl.patch => markdown.patch} (56%) diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown.patch similarity index 56% rename from srcpkgs/qt6-base/patches/markdown-musl.patch rename to srcpkgs/qt6-base/patches/markdown.patch index 5c16b3fbb3ea5..249dd8bf9d351 100644 --- a/srcpkgs/qt6-base/patches/markdown-musl.patch +++ b/srcpkgs/qt6-base/patches/markdown.patch @@ -1,12 +1,13 @@ ---- qt6-base-6.4.2.orig/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp -+++ qt6-base-6.4.2/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp -@@ -204,9 +204,11 @@ void tst_QTextMarkdownImporter::lists_da +--- qt6-base-6.6.0/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp 2023-09-13 18:02:48.000000000 +0200 ++++ - 2023-10-13 20:01:07.568899554 +0200 +@@ -223,10 +223,12 @@ QTest::newRow("numeric lists nested in empty lists") - << "- \n 1. a\n 2. b\n- c\n 1.\n + d\n" << 4 << false + << "- \n 1. a\n 2. b\n- c\n 1.\n + d\n" << 0 << 1 << 4 << false << "- \n 1. a\n 2. b\n- c 1. + d\n"; -+#ifdef __GLIC__ ++#if 0 QTest::newRow("styled spans in list items") - << "1. normal text\n2. **bold** text\n3. `code` in the item\n4. *italic* text\n5. _underlined_ text\n" << 5 << false + << "1. normal text\n2. **bold** text\n3. `code` in the item\n4. *italic* text\n5. _underlined_ text\n" + << 0 << 1 << 5 << false << "1. normal text\n2. **bold** text\n3. `code` in the item\n4. *italic* text\n5. _underlined_ text\n"; +#endif } diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index 725edabdbdb3f..db4d309b5f700 100644 --- a/srcpkgs/qt6-base/template +++ b/srcpkgs/qt6-base/template @@ -1,7 +1,7 @@ # Template file for 'qt6-base' pkgname=qt6-base -version=6.5.2 -revision=2 +version=6.6.0 +revision=1 build_style=cmake configure_args="-DINSTALL_DATADIR=share/qt6 -DINSTALL_ARCHDATADIR=lib${XBPS_TARGET_WORDSIZE}/qt6 @@ -32,7 +32,7 @@ maintainer="John " license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz" -checksum=3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269 +checksum=039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e python_version=3 if [ "$CROSS_BUILD" ]; then @@ -65,7 +65,7 @@ do_check() { tst_qx11info tst_qcomplextext tst_qaddpreroutine tst_qtextcursor test_widgets_app_deployment tst_qnetworkinterface - tst_qgraphicsproxywidget" + tst_qgraphicsproxywidget tst_qdnslookup" # Unknown platform linux-g++ :/ failing_tests+=" mockplugins test_import_plugins test_static_resources test_generating_cpp_exports" From d25ed27ae6aff39e78c3ca64cbc22d94c8f9a172 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:15 +0200 Subject: [PATCH 04/29] qt6-charts: update to 6.6.0. --- srcpkgs/qt6-charts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template index 7270ab315f948..4cd9fd60ed022 100644 --- a/srcpkgs/qt6-charts/template +++ b/srcpkgs/qt6-charts/template @@ -1,6 +1,6 @@ # Template file for 'qt6-charts' pkgname=qt6-charts -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools" @@ -10,10 +10,10 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz" -checksum=775af7be019cca698b27e5acffbc2def8f7a5b8f06f5c6db2a7015d578a6ad2d +checksum=e6beabcdc70c7719818459d2b2db63d7b0b5adc5572b8802368b698f64292cf5 pre_check() { - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" } post_install() { From 42a852bad4b2d141f122e0146a315a1c835dfd27 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:17 +0200 Subject: [PATCH 05/29] qt6-connectivity: update to 6.6.0. --- srcpkgs/qt6-connectivity/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template index 820d8bcf7acf5..312291704dde2 100644 --- a/srcpkgs/qt6-connectivity/template +++ b/srcpkgs/qt6-connectivity/template @@ -1,6 +1,6 @@ # Template file for 'qt6-connectivity' pkgname=qt6-connectivity -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools" @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtconnectivity-everywhere-src-${version}.tar.xz" -checksum=db2e4922352d253cafbb8f21eeca58da269c19e0e6d614420af19a7cd35fdc99 +checksum=1c29c26247c28ef19b9ca87c38b4d61a1f94ee9021897962e0d5ba215f1c4010 qt6-connectivity-devel_package() { depends="${sourcepkg}>=${version}_${revision} From 93902756f2b6df5c81acedf5bff9cb3c75c20499 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:24 +0200 Subject: [PATCH 06/29] qt6-declarative: update to 6.6.0. --- srcpkgs/qt6-declarative/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template index 5c013c1238aed..32dfcb1fee8e7 100644 --- a/srcpkgs/qt6-declarative/template +++ b/srcpkgs/qt6-declarative/template @@ -1,6 +1,6 @@ # Template file for 'qt6-declarative' pkgname=qt6-declarative -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake configure_args="-DQT_BUILD_TESTS=ON" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz" -checksum=f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719 +checksum=1b539bb0a918c8f0307fd07bd4ef0334bf7f8934bbc2eabfc04c433a7d7fa331 replaces="qt6-quickcontrols2>=0" if [ "$CROSS_BUILD" ]; then @@ -26,23 +26,25 @@ fi do_check() { cd build - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" - export QT_BUILD_BIN_PATH=${wrksrc}/build/lib/qt6/bin - export QT_BUILD_LIBEXEC_PATH=${wrksrc}/build/lib/qt6/libexec + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" + export QT_BUILD_BIN_PATH=${wrksrc}/build/lib${XBPS_TARGET_WORDSIZE}/qt6/bin + export QT_BUILD_LIBEXEC_PATH=${wrksrc}/build/lib${XBPS_TARGET_WORDSIZE}/qt6/libexec local broken="tst_qqmllocale|text|tst_qquickwidget" # requires qt6-declarative installed broken+="|module_includes|cmake_tooling_imports|empty_qmldir" broken+="|qtquickcompiler|qmlquery" # Need to investigate broken+="|tst_qqmldebugjs|tst_qqmljsscope" - broken+="|tst_qqmlpreview|tst_qmllint" + broken+="|tst_qqmlpreview|tst_qmllint|tst_material" # can't find the source broken+="|tst_qmltc_qprocess" broken+="|tst_qquickfiledialogimpl" broken+="|tst_qquickfolderdialogimpl" broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin" # unknown - broken+="|tst_qmldomitem|tst_dom_all" + broken+="|tst_qmldomitem|tst_dom_alli" + # cmake + broken+="|test_qml_app_deployment|cmake_test_common_import_path" ctest -E "($broken)" } From 3f4d5005cdaf05ef559db3c6191423b80e26934c Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:26 +0200 Subject: [PATCH 07/29] qt6-imageformats: update to 6.6.0. --- srcpkgs/qt6-imageformats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template index a8bebf3de84de..f550107e80d0e 100644 --- a/srcpkgs/qt6-imageformats/template +++ b/srcpkgs/qt6-imageformats/template @@ -1,6 +1,6 @@ # Template file for 'qt6-imageformats' pkgname=qt6-imageformats -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base" @@ -10,4 +10,4 @@ maintainer="John " license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz" -checksum=aae0c08924c6a5e47f9d57e031673d611ffff7aab2bee2e1cc460471ecac6743 +checksum=e1542cb50176e237809895c6549598c08587c63703d100be54ac2d806834e384 From a959e2458e409db41fc8d633ea59c3c239f251ce Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:29 +0200 Subject: [PATCH 08/29] qt6-location: update to 6.6.0. --- srcpkgs/qt6-location/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template index 4133428d06a92..985a82408e5e5 100644 --- a/srcpkgs/qt6-location/template +++ b/srcpkgs/qt6-location/template @@ -1,7 +1,7 @@ # Template file for 'qt6-location' pkgname=qt6-location -version=6.5.2 -revision=3 +version=6.6.0 +revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" makedepends="qt6-serialport-devel qt6-declarative-devel qt6-position-devel" @@ -10,10 +10,10 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlocation-everywhere-src-${version}.tar.xz" -checksum=891d7d64c26617bf1993a6d8b3d206ec9ce5b0a5396146f691b11d895fd86dfb +checksum=f5968be76108bf22af334b403027cf0a859284cb824250e728bb8daca2d70794 pre_check() { - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" } post_install() { From bc066c31ab20260edf32f699d4a93339dad7fcf6 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:30 +0200 Subject: [PATCH 09/29] qt6-lottie: update to 6.6.0. --- srcpkgs/qt6-lottie/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template index f14c7b1ae8eb4..f5d8c3636e891 100644 --- a/srcpkgs/qt6-lottie/template +++ b/srcpkgs/qt6-lottie/template @@ -1,6 +1,6 @@ # Template file for 'qt6-lottie' pkgname=qt6-lottie -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -10,14 +10,14 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz" -checksum=003adc5cf0d50b32d00a09d66ba6332db22191fb0999f51e032f02a21474e89b +checksum=1d98b45107a4b9a6337bc7ac37b9e54cdaa68110f814d93eecc8fbf8d338f84f if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" fi pre_check() { - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" } post_install() { From 4621e5f462f7fcaeebb4ee997d35bbf7eeae235b Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:33 +0200 Subject: [PATCH 10/29] qt6-multimedia: update to 6.6.0. --- srcpkgs/qt6-multimedia/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template index 2cf997b227a45..41db90ad0fbb3 100644 --- a/srcpkgs/qt6-multimedia/template +++ b/srcpkgs/qt6-multimedia/template @@ -1,6 +1,6 @@ # Template file for 'qt6-multimedia' pkgname=qt6-multimedia -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake configure_args="-DQT_FEATURE_gstreamer=ON" @@ -12,7 +12,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtmultimedia-everywhere-src-${version}.tar.xz" -checksum=948f00aa679e92839a2a71bd07245a92cc849af486607417ee4c334b2b998975 +checksum=ba4b236ca3ec118841b7f5ba87797e24a8c5cbef9ba973fe219fbfc310d38782 if [ "$XBPS_MACHINE" = "i686" ]; then CXXFLAGS="-DPFFFT_SIMD_DISABLE=1" From 92ace76fa5f770d0b9480938d8dd78e3ffe9bd50 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:34 +0200 Subject: [PATCH 11/29] qt6-networkauth: update to 6.6.0. --- srcpkgs/qt6-networkauth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template index 3c842ae0ceb6d..1bbd6b9780347 100644 --- a/srcpkgs/qt6-networkauth/template +++ b/srcpkgs/qt6-networkauth/template @@ -1,6 +1,6 @@ # Template file for 'qt6-networkauth' pkgname=qt6-networkauth -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz" -checksum=4ecc4b560ac24c29086550972d634a4e1a1a58936b6186a24dd131f8079c283c +checksum=20d5c0746c00eb3333f17c9869296d0acd0eed93518ea2734b98405cc6cc8830 if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" From 1515fb665e3a091c47700ee28b25402fcffc22e5 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:36 +0200 Subject: [PATCH 12/29] qt6-position: update to 6.6.0. --- srcpkgs/qt6-position/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt6-position/template b/srcpkgs/qt6-position/template index c847a6f2a7c6c..32c4093e1645d 100644 --- a/srcpkgs/qt6-position/template +++ b/srcpkgs/qt6-position/template @@ -1,7 +1,7 @@ # Template file for 'qt6-position' pkgname=qt6-position -version=6.5.2 -revision=2 +version=6.6.0 +revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" makedepends="qt6-serialport-devel qt6-declarative-devel" @@ -10,10 +10,10 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz" -checksum=70493f03748d1c5b1577e4c011c0af9bcaffcdc6c5e519362605b01f917614fa +checksum=8d6520fa3c759ed33eaea7cb1aa7e1e7ec999f828e496a6c592847d61f0fa539 pre_check() { - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" } post_install() { From a17feadabee20330d0c975508e13839dc8c96af6 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:40 +0200 Subject: [PATCH 13/29] qt6-qt5compat: update to 6.6.0. --- srcpkgs/qt6-qt5compat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template index 877c37a29baee..5724b0f8a0f17 100644 --- a/srcpkgs/qt6-qt5compat/template +++ b/srcpkgs/qt6-qt5compat/template @@ -1,6 +1,6 @@ # Template file for 'qt6-qt5compat' pkgname=qt6-qt5compat -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake configure_args="-DQT_FEATURE_textcodec=ON -DQT_FEATURE_codecs=ON @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz" -checksum=b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4 +checksum=3d85edb66126f712266dcbfc6cd00383d46cc6d66c8b84607ca21e2bc71a8fca if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" From c5407e7fd485eb11e36ab8a3c713a8beb978fb18 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:55 +0200 Subject: [PATCH 14/29] qt6-quick3d: update to 6.6.0. --- srcpkgs/qt6-quick3d/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template index 58c62e0eef486..cf5b03d802461 100644 --- a/srcpkgs/qt6-quick3d/template +++ b/srcpkgs/qt6-quick3d/template @@ -1,6 +1,6 @@ # Template file for 'qt6-quick3d' pkgname=qt6-quick3d -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools qt6-shadertools" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz" -checksum=75e0a35d9419e8b2ae98c950056b55f2377e4b559aafbe00a9c8d150c5db00da +checksum=37ab3eb394e49d6c2b03c4da0c7f782c255dff294e73946369dd2e059a837aba subpackages="qt6-quick3d-tools qt6-quick3d-devel" if [ "$CROSS_BUILD" ]; then From 1c82f8b0278527b74ccc8d9810b306e500cbc518 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:56 +0200 Subject: [PATCH 15/29] qt6-quicktimeline: update to 6.6.0. --- srcpkgs/qt6-quicktimeline/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template index 6feebe14556a2..fcb2ec7ef59e9 100644 --- a/srcpkgs/qt6-quicktimeline/template +++ b/srcpkgs/qt6-quicktimeline/template @@ -1,6 +1,6 @@ # Template file for 'qt6-quicktimeline' pkgname=qt6-quicktimeline -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -10,14 +10,14 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz" -checksum=c945ae905dc1542967c7f9bea826022235bc179c2ed59142c029336c03f015ba +checksum=079e51d4572aed992731628b269f9c3f9c61a6c379bae6c354c949a6d89bb590 if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" fi pre_check() { - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" } post_install() { From f4c00df7a8fbe3981b457a6f79c4ca551ee2a542 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:58 +0200 Subject: [PATCH 16/29] qt6-remoteobjects: update to 6.6.0. --- srcpkgs/qt6-remoteobjects/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template index 73932d36687c6..51de5ebd7ab99 100644 --- a/srcpkgs/qt6-remoteobjects/template +++ b/srcpkgs/qt6-remoteobjects/template @@ -1,10 +1,10 @@ # Template file for 'qt6-remoteobjects' pkgname=qt6-remoteobjects -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools pkg-config" -makedepends="qt6-declarative-devel" +makedepends="qt6-declarative-devel qt6-connectivity-devel" # Not a strict dependency, but it's 2022, everyone should use TLS depends="qt6-plugin-tls-openssl" checkdepends="$depends" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtremoteobjects-everywhere-src-${version}.tar.xz" -checksum=c0f41f1f79eff28303ecd68dc064a4d8f92b35f3ddc06d78909b142bc0d4494c +checksum=261194e35bb9420225f095c58a5a549686797a3d2b7ea6f0d582d7d681f1f76b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt6-remoteobjects" @@ -21,7 +21,7 @@ if [ "$CROSS_BUILD" ]; then fi pre_check() { - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" } post_install() { From 0e1d82dbe334ee641f1662b8c62f93a2f42f59ba Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:12:59 +0200 Subject: [PATCH 17/29] qt6-scxml: update to 6.6.0. --- srcpkgs/qt6-scxml/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template index 3ab12c6c4fb4f..1aaca906de21f 100644 --- a/srcpkgs/qt6-scxml/template +++ b/srcpkgs/qt6-scxml/template @@ -1,6 +1,6 @@ # Template file for 'qt6-scxml' pkgname=qt6-scxml -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz" -checksum=a830f2ec750913a70f854e487b1b44d1ec3a48eb21253f414a1990f8cf4dbdcb +checksum=57ecd0db5d8b063d0334c4b21461585b4904d4884c88de125bd72e967e8a1043 subpackages="qt6-scxml-tools qt6-scxml-devel" if [ "$CROSS_BUILD" ]; then @@ -19,7 +19,7 @@ if [ "$CROSS_BUILD" ]; then fi pre_check() { - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" } post_install() { From a31b2064b7dac8a607fb5fa7257ce1882404c799 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:13:01 +0200 Subject: [PATCH 18/29] qt6-sensors: update to 6.6.0. --- srcpkgs/qt6-sensors/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template index 8a4bfb0ca28ff..d835f29ca091b 100644 --- a/srcpkgs/qt6-sensors/template +++ b/srcpkgs/qt6-sensors/template @@ -1,6 +1,6 @@ # Template file for 'qt6-sensors' pkgname=qt6-sensors -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools pkg-config" @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsensors-everywhere-src-${version}.tar.xz" -checksum=4006bd7cfbb4302a887bda82b7fe3c31633626363a5e6ba9730bdb4fa8ab2aa6 +checksum=28f0be5d4eac103ba3bb660ea61806d0e193c1fab949d1c95f2cb7cb39d84498 post_install() { rm -rf ${DESTDIR}/usr/tests From 1a0cd2a2c5c297d96f97295c449a4b0beabcc817 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:13:03 +0200 Subject: [PATCH 19/29] qt6-serialport: update to 6.6.0. --- srcpkgs/qt6-serialport/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template index 5cc4704e2d6b5..5c802fe7a6e26 100644 --- a/srcpkgs/qt6-serialport/template +++ b/srcpkgs/qt6-serialport/template @@ -1,6 +1,6 @@ # Template file for 'qt6-serialport' pkgname=qt6-serialport -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base pkg-config" @@ -10,7 +10,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtserialport-everywhere-src-${version}.tar.xz" -checksum=063c54169aea6b303183b434637ad050e9f67d7f22bb3eff1ede1905eb2ccc9e +checksum=ecfcbbf1c47a67ff599a409bf7682fed416f797860c01c934f5a78c336da4065 qt6-serialport-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" From 65c99d0c1d78f0ee775cb620f17c47f8237bef55 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:13:04 +0200 Subject: [PATCH 20/29] qt6-shadertools: update to 6.6.0. --- srcpkgs/qt6-shadertools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template index 46f3c3ef6c7bd..815bfca3047f7 100644 --- a/srcpkgs/qt6-shadertools/template +++ b/srcpkgs/qt6-shadertools/template @@ -1,6 +1,6 @@ # Template file for 'qt6-shadertools' pkgname=qt6-shadertools -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz" -checksum=ca3fb0db8576c59b9c38bb4b271cc6e10aebeb54e2121f429f4ee80671fc0a3d +checksum=3690327dc550144b8102be2bb7f6dc995ccbe3584041094ad021a83737ef9875 if [ "$CROSS_BUILD" ]; then configure_args="-DQT_FORCE_BUILD_TOOLS=true" From eaa7bd9b3adad2581cb9729cc33e0988cc8d7cae Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:13:06 +0200 Subject: [PATCH 21/29] qt6-svg: update to 6.6.0. --- srcpkgs/qt6-svg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template index 4c3efefd4573f..8f545f8a309b7 100644 --- a/srcpkgs/qt6-svg/template +++ b/srcpkgs/qt6-svg/template @@ -1,6 +1,6 @@ # Template file for 'qt6-svg' pkgname=qt6-svg -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="qt6-base perl" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz" -checksum=48b4cc1093af2e0ab3bea30f60651bddd877a2335d16e7207879a2e9e81963a3 +checksum=33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" From dcaa1b9d98709985c904db791eacec06e4367093 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:13:09 +0200 Subject: [PATCH 22/29] qt6-tools: update to 6.6.0. --- srcpkgs/qt6-tools/patches/pie.patch | 14 +++++++------- srcpkgs/qt6-tools/template | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/qt6-tools/patches/pie.patch b/srcpkgs/qt6-tools/patches/pie.patch index f7a133710c9be..485c93fc8303a 100644 --- a/srcpkgs/qt6-tools/patches/pie.patch +++ b/srcpkgs/qt6-tools/patches/pie.patch @@ -1,5 +1,5 @@ ---- a/src/linguist/lupdate/CMakeLists.txt 2023-03-28 16:23:12.000000000 +0200 -+++ - 2023-04-03 20:56:23.919801770 +0200 +--- a/src/linguist/lupdate/CMakeLists.txt 2023-10-03 20:26:34.000000000 +0200 ++++ - 2023-10-13 22:42:43.023536533 +0200 @@ -95,11 +95,11 @@ WrapLibClang::WrapLibClang ) @@ -17,14 +17,14 @@ qt_internal_extend_target(${target_name} CONDITION MSVC DEFINES _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING) ---- a/src/qdoc/CMakeLists.txt 2023-03-28 16:23:12.000000000 +0200 -+++ - 2023-04-03 20:56:53.148131457 +0200 -@@ -98,7 +98,7 @@ +--- a/src/qdoc/qdoc/CMakeLists.txt 2023-10-03 20:26:34.000000000 +0200 ++++ - 2023-10-13 22:43:26.354327742 +0200 +@@ -100,7 +100,7 @@ # If libclangTooling.a is not built with -fPIE enabled we cannot link it to qdoc. # TODO: Re-enable PIE once clang is built with PIE in provisioning. -set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE) +#set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE) - qt_internal_extend_target(${target_name} CONDITION TARGET Qt::QmlPrivate - LIBRARIES + qt_internal_extend_target(${target_name} CONDITION (WIN32 AND ICC) OR MSVC + LINK_OPTIONS diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template index 21a5ddb83f971..907d4a8e4017a 100644 --- a/srcpkgs/qt6-tools/template +++ b/srcpkgs/qt6-tools/template @@ -1,6 +1,6 @@ # Template file for 'qt6-tools' pkgname=qt6-tools -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON @@ -16,7 +16,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz" -checksum=551ffb22751d8fd4d88e9ebd55b9131f4ca55341ee497fdbbba4da8d10d94341 +checksum=4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99 if [ "$CROSS_BUILD" ]; then configure_args+=" -DQT_FORCE_BUILD_TOOLS=TRUE" From fb9d96e54e4c100483b23f873b4718f6c0428c9e Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:13:10 +0200 Subject: [PATCH 23/29] qt6-translations: update to 6.6.0. --- srcpkgs/qt6-translations/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template index cc12b14f4dd81..85f83d0a4879c 100644 --- a/srcpkgs/qt6-translations/template +++ b/srcpkgs/qt6-translations/template @@ -1,6 +1,6 @@ # Template file for 'qt6-translations' pkgname=qt6-translations -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="qt6-base qt6-tools perl" @@ -10,4 +10,4 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttranslations-everywhere-src-${version}.tar.xz" -checksum=337c45637e757e754c2f0ea65c20de3e6e53a841dda1253db15baa622515beeb +checksum=a0d89a236f64b810eb0fe4ae1e90db22b0e86263521b35f89e69f1392815078c From 029d43bcbf533b261480fc31900db10e8e6b668d Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:13:13 +0200 Subject: [PATCH 24/29] qt6-virtualkeyboard: update to 6.6.0. --- srcpkgs/qt6-virtualkeyboard/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template index 283a03676f686..f30ef911b7046 100644 --- a/srcpkgs/qt6-virtualkeyboard/template +++ b/srcpkgs/qt6-virtualkeyboard/template @@ -1,6 +1,6 @@ # Template file for 'qt6-virtualkeyboard' pkgname=qt6-virtualkeyboard -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl pkg-config qt6-declarative-host-tools" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtvirtualkeyboard-everywhere-src-${version}.tar.xz" -checksum=0570e0387e22a526b8ff735355ca8f09347501b71f7ae2166b60a81a40626269 +checksum=2784db43f514bfd3a2ce0e79e0096deea95a3866254d376a9134bc512bfa777b if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" @@ -18,8 +18,8 @@ fi do_check() { cd build - QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" \ - ctest -E 'tst_(inputpanel|styles)' + export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml:$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" + ctest -E 'tst_(inputpanel|styles)' # styles overwrites QML2_IMPORT_PATH # inputpanel hangs } From 70fd87e4968b45d9f3150c605a93cb5ee440c483 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:13:14 +0200 Subject: [PATCH 25/29] qt6-wayland: update to 6.6.0. --- srcpkgs/qt6-wayland/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template index ddca41da92e01..684abf4dc8a10 100644 --- a/srcpkgs/qt6-wayland/template +++ b/srcpkgs/qt6-wayland/template @@ -1,6 +1,6 @@ # Template file for 'qt6-wayland' pkgname=qt6-wayland -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="qt6-base perl pkg-config wayland-devel qt6-declarative-host-tools" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwayland-everywhere-src-${version}.tar.xz" -checksum=3020be86fb7fd0abb8509906ca6583cadcaee168159abceaeb5b3e9d42563c9a +checksum=30c3d82d85d050c83370710a26d12c802199c51eba5c2726e9d6243edd03b7e8 subpackages="qt6-wayland-tools qt6-wayland-devel" From a519691f92e72a1a5a3b62a28c7e75b84c6aa5d2 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:13:16 +0200 Subject: [PATCH 26/29] qt6-webchannel: update to 6.6.0. --- common/shlibs | 1 + srcpkgs/qt6-webchannel/patches/test.patch | 11 +++++++++++ srcpkgs/qt6-webchannel/template | 10 ++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/qt6-webchannel/patches/test.patch diff --git a/common/shlibs b/common/shlibs index 67e0812c68e19..fde052089aec6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2047,6 +2047,7 @@ libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1 +libQt6WebChannelQuick.so.6 qt6-webchannel-6.6.0_1 libQt6Positioning.so.6 qt6-position-6.5.2_1 libQt6PositioningQuick.so.6 qt6-position-6.5.2_1 libQt6Location.so.6 qt6-location-6.5.2_2 diff --git a/srcpkgs/qt6-webchannel/patches/test.patch b/srcpkgs/qt6-webchannel/patches/test.patch new file mode 100644 index 0000000000000..0b0b36b774756 --- /dev/null +++ b/srcpkgs/qt6-webchannel/patches/test.patch @@ -0,0 +1,11 @@ +--- qt6-webchannel-6.6.0/tests/auto/cmake/CMakeLists.txt 2023-10-03 21:09:44.000000000 +0200 ++++ - 2023-10-13 22:38:26.259148142 +0200 +@@ -13,7 +13,7 @@ + project(webchannel_cmake_tests) + enable_testing() + +-set(required_packages Core WebChannel) ++set(required_packages Core) + + # Setup the test when called as a completely standalone project. + if(TARGET Qt6::Core) diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template index a1ee8200e01c1..1718abb31b7e0 100644 --- a/srcpkgs/qt6-webchannel/template +++ b/srcpkgs/qt6-webchannel/template @@ -1,6 +1,6 @@ # Template file for 'qt6-webchannel' pkgname=qt6-webchannel -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -10,10 +10,12 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebchannel-everywhere-src-${version}.tar.xz" -checksum=c188d9fa6e535b850b574fa9e47c6089555b8df1fe041dcb13aeeca336b78e63 +checksum=fddcb38e6d5843f9c7570654f1a12aaf0086e5a01f7bf3cf170064fcc5a3f51c -pre_check() { - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +do_check() { + cd build + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" + ctest -E module_includes } post_install() { From b9c1d3ba5f001eeb8c3543e21314e6cb465f0466 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:14:34 +0200 Subject: [PATCH 27/29] qt6-webengine: update to 6.6.0. --- .../patches/0007-riscv-sandbox.patch | 21 +----- .../0113-chromium-pthread-stacksize.patch | 16 ---- .../patches/0114-do-not-narrow-int.patch | 53 ------------- ...5-chromium-no-canonicalize-file-name.patch | 12 --- .../patches/0117-chromium-musl-resolver.patch | 34 --------- .../0119-chromium-musl-stack-utils.patch | 20 ----- .../patches/0121-chromium-musl-stat.patch | 12 --- .../0123-chromium-musl-no-execinfo.patch | 75 ------------------- .../0125-chromium-remove-strip_binary.patch | 32 -------- ...-build-examples.patch => 0998-cross.patch} | 12 +-- .../patches/0999-python3.12.patch | 20 +++++ ...tial-migration-from-imp-to-importlib.patch | 36 +++++++++ srcpkgs/qt6-webengine/template | 14 +++- 13 files changed, 76 insertions(+), 281 deletions(-) delete mode 100644 srcpkgs/qt6-webengine/patches/0113-chromium-pthread-stacksize.patch delete mode 100644 srcpkgs/qt6-webengine/patches/0114-do-not-narrow-int.patch delete mode 100644 srcpkgs/qt6-webengine/patches/0115-chromium-no-canonicalize-file-name.patch delete mode 100644 srcpkgs/qt6-webengine/patches/0119-chromium-musl-stack-utils.patch delete mode 100644 srcpkgs/qt6-webengine/patches/0121-chromium-musl-stat.patch delete mode 100644 srcpkgs/qt6-webengine/patches/0123-chromium-musl-no-execinfo.patch delete mode 100644 srcpkgs/qt6-webengine/patches/0125-chromium-remove-strip_binary.patch rename srcpkgs/qt6-webengine/patches/{0900-cross-build-examples.patch => 0998-cross.patch} (54%) create mode 100644 srcpkgs/qt6-webengine/patches/0999-python3.12.patch create mode 100644 srcpkgs/qt6-webengine/patches/Partial-migration-from-imp-to-importlib.patch diff --git a/srcpkgs/qt6-webengine/patches/0007-riscv-sandbox.patch b/srcpkgs/qt6-webengine/patches/0007-riscv-sandbox.patch index 098bd95a8de6e..c04eb47a01361 100644 --- a/srcpkgs/qt6-webengine/patches/0007-riscv-sandbox.patch +++ b/srcpkgs/qt6-webengine/patches/0007-riscv-sandbox.patch @@ -133,10 +133,10 @@ Index: chromium-107.0.5304.87/sandbox/linux/seccomp-bpf-helpers/syscall_paramete !defined(PTRACE_GET_THREAD_AREA) // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA. -@@ -443,7 +444,7 @@ ResultExpr RestrictPtrace() { +@@ -442,7 +442,7 @@ #endif return Switch(request) - .CASES(( + .Cases({ -#if !defined(__aarch64__) +#if !defined(__aarch64__) && !defined(__riscv) PTRACE_GETREGS, PTRACE_GETFPREGS, PTRACE_GET_THREAD_AREA, @@ -242,23 +242,6 @@ Index: chromium-107.0.5304.87/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc case __NR_epoll_create: case __NR_epoll_wait: #endif -@@ -483,14 +483,14 @@ bool SyscallSets::IsAllowedEpoll(int sys - - bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { - switch (sysno) { --#if !defined(__aarch64__) -+#if !defined(__aarch64__) && !defined(__riscv) - case __NR_pipe: - #endif - case __NR_pipe2: - return true; - default: - #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ -- defined(__aarch64__) -+ defined(__aarch64__) || defined(__riscv) - case __NR_socketpair: // We will want to inspect its argument. - #endif - return false; @@ -500,7 +500,7 @@ bool SyscallSets::IsAllowedGetOrModifySo bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) { switch (sysno) { diff --git a/srcpkgs/qt6-webengine/patches/0113-chromium-pthread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0113-chromium-pthread-stacksize.patch deleted file mode 100644 index 384fd0af186dd..0000000000000 --- a/srcpkgs/qt6-webengine/patches/0113-chromium-pthread-stacksize.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/base/threading/platform_thread_linux.cc -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/base/threading/platform_thread_linux.cc -@@ -437,8 +437,13 @@ void TerminateOnThread() {} - - size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { - #if !defined(THREAD_SANITIZER) -+#if defined(__GLIBC__) - return 0; - #else -+ // musl libcs default is too small, use 8mb like glibc -+ return (1 << 23); -+#endif -+#else - // ThreadSanitizer bloats the stack heavily. Evidence has been that the - // default stack size isn't enough for some browser tests. - return 2 * (1 << 23); // 2 times 8192K (the default stack size on Linux). diff --git a/srcpkgs/qt6-webengine/patches/0114-do-not-narrow-int.patch b/srcpkgs/qt6-webengine/patches/0114-do-not-narrow-int.patch deleted file mode 100644 index 2cd6a07382acb..0000000000000 --- a/srcpkgs/qt6-webengine/patches/0114-do-not-narrow-int.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/base/files/file_util_linux.cc -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/base/files/file_util_linux.cc -@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p - - // Not all possible |statfs_buf.f_type| values are in linux/magic.h. - // Missing values are copied from the statfs man page. -- switch (statfs_buf.f_type) { -+ switch (static_cast(statfs_buf.f_type)) { - case 0: - *type = FILE_SYSTEM_0; - break; - case EXT2_SUPER_MAGIC: // Also ext3 and ext4 - case MSDOS_SUPER_MAGIC: - case REISERFS_SUPER_MAGIC: -- case static_cast(BTRFS_SUPER_MAGIC): -+ case BTRFS_SUPER_MAGIC: - case 0x5346544E: // NTFS - case 0x58465342: // XFS - case 0x3153464A: // JFS -@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p - *type = FILE_SYSTEM_NFS; - break; - case SMB_SUPER_MAGIC: -- case static_cast(0xFF534D42): // CIFS -+ case 0xFF534D42: // CIFS - *type = FILE_SYSTEM_SMB; - break; - case CODA_SUPER_MAGIC: - *type = FILE_SYSTEM_CODA; - break; -- case static_cast(HUGETLBFS_MAGIC): -- case static_cast(RAMFS_MAGIC): -+ case HUGETLBFS_MAGIC: -+ case RAMFS_MAGIC: - case TMPFS_MAGIC: - *type = FILE_SYSTEM_MEMORY; - break; ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/base/system/sys_info_posix.cc -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/base/system/sys_info_posix.cc -@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base:: - if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0) - return false; - -- switch (stats.f_type) { -+ switch (static_cast(stats.f_type)) { - case TMPFS_MAGIC: -- case static_cast(HUGETLBFS_MAGIC): -- case static_cast(RAMFS_MAGIC): -+ case HUGETLBFS_MAGIC: -+ case RAMFS_MAGIC: - return true; - } - return false; diff --git a/srcpkgs/qt6-webengine/patches/0115-chromium-no-canonicalize-file-name.patch b/srcpkgs/qt6-webengine/patches/0115-chromium-no-canonicalize-file-name.patch deleted file mode 100644 index 556784b013de1..0000000000000 --- a/srcpkgs/qt6-webengine/patches/0115-chromium-no-canonicalize-file-name.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/third_party/nasm/config/config-linux.h -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/third_party/nasm/config/config-linux.h -@@ -139,7 +139,9 @@ - #define HAVE_ACCESS 1 - - /* Define to 1 if you have the `canonicalize_file_name' function. */ -+#ifdef __GLIBC__ - #define HAVE_CANONICALIZE_FILE_NAME 1 -+#endif - - /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */ - /* #undef HAVE_CPU_TO_LE16 */ diff --git a/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch index 5f090c810579e..9eea278db3932 100644 --- a/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch +++ b/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch @@ -27,37 +27,3 @@ } bool ScopedResState::IsValid() const { ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/dns/dns_reloader.cc -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/dns/dns_reloader.cc -@@ -7,7 +7,8 @@ - #include "build/build_config.h" - - #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ -- !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) -+ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) && \ -+ !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)) - - #include - ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/dns/host_resolver_system_task.cc -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/dns/host_resolver_system_task.cc -@@ -310,8 +310,7 @@ - } - - void EnsureSystemHostResolverCallReady() { --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ -- !BUILDFLAG(IS_ANDROID) -+#if defined(__GLIBC__) - EnsureDnsReloaderInit(); - #elif BUILDFLAG(IS_WIN) - EnsureWinsockInit(); -@@ -192,7 +192,8 @@ int SystemHostResolverCall(const std::st - base::BlockingType::WILL_BLOCK); - - #if BUILDFLAG(IS_POSIX) && \ -- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID)) -+ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID) || \ -+ (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))) - DnsReloaderMaybeReload(); - #endif - auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network); diff --git a/srcpkgs/qt6-webengine/patches/0119-chromium-musl-stack-utils.patch b/srcpkgs/qt6-webengine/patches/0119-chromium-musl-stack-utils.patch deleted file mode 100644 index 548a1dec76b44..0000000000000 --- a/srcpkgs/qt6-webengine/patches/0119-chromium-musl-stack-utils.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() { - // FIXME: On Mac OSX and Linux, this method cannot estimate stack size - // correctly for the main thread. - --#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ - BUILDFLAG(IS_FUCHSIA) - // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of blink_unittests). -@@ -97,7 +97,7 @@ size_t GetUnderestimatedStackSize() { - } - - void* GetStackStart() { --#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ - BUILDFLAG(IS_FUCHSIA) - pthread_attr_t attr; - int error; diff --git a/srcpkgs/qt6-webengine/patches/0121-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0121-chromium-musl-stat.patch deleted file mode 100644 index 8c8c4b863b646..0000000000000 --- a/srcpkgs/qt6-webengine/patches/0121-chromium-musl-stat.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/base/files/file.h -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/base/files/file.h -@@ -19,7 +19,8 @@ - #include "build/build_config.h" - - #if BUILDFLAG(IS_BSD) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_NACL) || \ -- BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21) -+ BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21) || \ -+ (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)) - struct stat; - namespace base { - typedef struct stat stat_wrapper_t; diff --git a/srcpkgs/qt6-webengine/patches/0123-chromium-musl-no-execinfo.patch b/srcpkgs/qt6-webengine/patches/0123-chromium-musl-no-execinfo.patch deleted file mode 100644 index 25fae7bde1125..0000000000000 --- a/srcpkgs/qt6-webengine/patches/0123-chromium-musl-no-execinfo.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/base/debug/stack_trace_posix.cc -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/base/debug/stack_trace_posix.cc -@@ -30,7 +30,7 @@ - #if !defined(USE_SYMBOLIZE) - #include - #endif --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - #include - #endif - -@@ -97,7 +97,7 @@ void DemangleSymbols(std::string* text) - // Note: code in this function is NOT async-signal safe (std::string uses - // malloc internally). - --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - std::string::size_type search_from = 0; - while (search_from < text->size()) { - // Look for the start of a mangled symbol, from search_from. -@@ -144,7 +144,7 @@ class BacktraceOutputHandler { - virtual ~BacktraceOutputHandler() = default; - }; - --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - void OutputPointer(void* pointer, BacktraceOutputHandler* handler) { - // This should be more than enough to store a 64-bit number in hex: - // 16 hex digits + 1 for null-terminator. -@@ -868,7 +868,7 @@ size_t CollectStackTrace(void** trace, s - // If we do not have unwind tables, then try tracing using frame pointers. - return base::debug::TraceStackFramePointers(const_cast(trace), - count, 0); --#elif !defined(__UCLIBC__) && !defined(_AIX) -+#elif defined(__GLIBC__) && !defined(_AIX) - // Though the backtrace API man page does not list any possible negative - // return values, we take no chance. - return base::saturated_cast(backtrace(trace, count)); -@@ -881,13 +881,13 @@ void StackTrace::PrintWithPrefix(const c - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. - --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - PrintBacktraceOutputHandler handler; - ProcessBacktrace(trace_, count_, prefix_string, &handler); - #endif - } - --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - void StackTrace::OutputToStreamWithPrefix(std::ostream* os, - const char* prefix_string) const { - StreamBacktraceOutputHandler handler(os); ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/v8/src/codegen/external-reference-table.cc -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/v8/src/codegen/external-reference-table.cc -@@ -12,7 +12,9 @@ - - #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) - #define SYMBOLIZE_FUNCTION -+#if defined(__GLIBC__) - #include -+#endif - - #include - -@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat - } - - const char* ExternalReferenceTable::ResolveSymbol(void* address) { --#ifdef SYMBOLIZE_FUNCTION -+#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__) - char** names = backtrace_symbols(&address, 1); - const char* name = names[0]; - // The array of names is malloc'ed. However, each name string is static diff --git a/srcpkgs/qt6-webengine/patches/0125-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0125-chromium-remove-strip_binary.patch deleted file mode 100644 index 115e4492a2be2..0000000000000 --- a/srcpkgs/qt6-webengine/patches/0125-chromium-remove-strip_binary.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn -+++ qt6-webengine-6.4.2/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn -@@ -335,11 +335,7 @@ source_set("lib") { - } - } - --if (is_linux) { -- chromedriver_output = "chromedriver.unstripped" --} else { -- chromedriver_output = "chromedriver" --} -+chromedriver_output = "chromedriver" - - executable("$chromedriver_output") { - testonly = true -@@ -361,16 +357,6 @@ executable("$chromedriver_output") { - } - } - --if (is_linux) { -- strip_binary("chromedriver") { -- testonly = true -- binary_input = "$root_out_dir/$chromedriver_output" -- symbol_output = "$root_out_dir/chromedriver.debug" -- stripped_binary_output = "$root_out_dir/chromedriver" -- deps = [ ":$chromedriver_output" ] -- } --} -- - python_library("chromedriver_py_tests") { - testonly = true - deps = [ diff --git a/srcpkgs/qt6-webengine/patches/0900-cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/0998-cross.patch similarity index 54% rename from srcpkgs/qt6-webengine/patches/0900-cross-build-examples.patch rename to srcpkgs/qt6-webengine/patches/0998-cross.patch index 6978f08757e82..9e62be4b4c64d 100644 --- a/srcpkgs/qt6-webengine/patches/0900-cross-build-examples.patch +++ b/srcpkgs/qt6-webengine/patches/0998-cross.patch @@ -1,16 +1,18 @@ ---- qt6-webengine-6.4.2.orig/examples/CMakeLists.txt -+++ qt6-webengine-6.4.2/examples/CMakeLists.txt -@@ -4,7 +4,6 @@ +--- a/examples/CMakeLists.txt 2023-10-03 21:49:54.000000000 +0200 ++++ - 2023-10-27 11:12:01.573293042 +0200 +@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) qt_examples_build_begin(EXTERNAL_BUILD) --if(NOT CMAKE_CROSSCOMPILING AND Qt6Core_VERSION VERSION_GREATER_EQUAL "6.5") #QTBUG-86533 +-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533 ++#if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533 if(TARGET Qt::WebEngineCore) add_subdirectory(webenginequick) endif() -@@ -17,5 +16,4 @@ +@@ -17,5 +17,5 @@ if(TARGET Qt::PdfWidgets) add_subdirectory(pdfwidgets) endif() -endif() ++#endif() qt_examples_build_end() diff --git a/srcpkgs/qt6-webengine/patches/0999-python3.12.patch b/srcpkgs/qt6-webengine/patches/0999-python3.12.patch new file mode 100644 index 0000000000000..40d4010c82688 --- /dev/null +++ b/srcpkgs/qt6-webengine/patches/0999-python3.12.patch @@ -0,0 +1,20 @@ +--- a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py 2023-10-03 21:49:54.000000000 +0200 ++++ - 2023-10-13 23:26:56.151025878 +0200 +@@ -3,7 +3,6 @@ + # found in the LICENSE file. + + import errno +-import imp + import os.path + import sys + +--- a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py 2023-10-03 21:49:54.000000000 +0200 ++++ - 2023-10-13 23:28:56.391987051 +0200 +@@ -2,7 +2,6 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-import imp + import os.path + import sys + diff --git a/srcpkgs/qt6-webengine/patches/Partial-migration-from-imp-to-importlib.patch b/srcpkgs/qt6-webengine/patches/Partial-migration-from-imp-to-importlib.patch new file mode 100644 index 0000000000000..46cc88f9bf177 --- /dev/null +++ b/srcpkgs/qt6-webengine/patches/Partial-migration-from-imp-to-importlib.patch @@ -0,0 +1,36 @@ +From cbf5f7ad619a967bd54482e1d1df36d80b28145a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Thu, 13 Jul 2023 12:18:00 +0200 +Subject: [PATCH] Partial migration from imp to importlib + +--- + .../resources/protobufs/binary_proto_generator.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py +index 2a1802d..ba67251 100755 +--- a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py ++++ b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py +@@ -9,7 +9,7 @@ + """ + from __future__ import print_function + import abc +-import imp ++from importlib import util + import optparse + import os + import re +@@ -68,7 +68,9 @@ class GoogleProtobufModuleImporter: + raise ImportError(fullname) + + filepath = self._fullname_to_filepath(fullname) +- return imp.load_source(fullname, filepath) ++ spec = util.spec_from_file_location(fullname, filepath) ++ loaded = util.module_from_spec(spec) ++ return spec.loader.exec_module(loaded) + + class BinaryProtoGenerator: + +-- +2.41.0 + diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template index a92b06c6f0cca..894201ca4f0e1 100644 --- a/srcpkgs/qt6-webengine/template +++ b/srcpkgs/qt6-webengine/template @@ -1,7 +1,7 @@ # Template file for 'qt6-webengine' pkgname=qt6-webengine -version=6.5.2 -revision=3 +version=6.6.0 +revision=1 build_style=cmake configure_args=" -DQT_FEATURE_webengine_system_ffmpeg=ON @@ -33,7 +33,7 @@ maintainer="John " license="GPL-3.0-only, GPL-2.0-only, LGPL-3.0-only, BSD-3-Clause" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebengine-everywhere-src-${version}.tar.xz" -checksum=e7c9438b56f502b44b4e376b92ed80f1db7c2c3881d68d319b0677afd5701d9f +checksum=d5dc9ff05a2c57adbf99cbf0c7cb6f19527f67216caf627b0cc160a1d253b780 if [ "$XBPS_LIBC" = "musl" ]; then hostmakedepends+=" musl-legacy-compat" @@ -128,6 +128,14 @@ _wrap_ninja() { } pre_configure() { + rm src/3rdparty/chromium/third_party/six/src/six.py + rm src/3rdparty/chromium/third_party/catapult/third_party/six/six.py + rm src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/third_party/six/six.py + + ln -s ${py3_sitelib}/six.py src/3rdparty/chromium/third_party/six/src/six.py + ln -s ${py3_sitelib}/six.py src/3rdparty/chromium/third_party/catapult/third_party/six/six.py + ln -s ${py3_sitelib}/six.py src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/third_party/six/six.py + _bootstrap_gn # _unbundle_libs _wrap_ninja From 7c299cad6f9aa23565260992e92db1b326beec60 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:14:36 +0200 Subject: [PATCH 28/29] qt6-websockets: update to 6.6.0. --- srcpkgs/qt6-websockets/patches/test.patch | 11 +++++++++++ srcpkgs/qt6-websockets/template | 10 ++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/qt6-websockets/patches/test.patch diff --git a/srcpkgs/qt6-websockets/patches/test.patch b/srcpkgs/qt6-websockets/patches/test.patch new file mode 100644 index 0000000000000..68b5bc57e40e9 --- /dev/null +++ b/srcpkgs/qt6-websockets/patches/test.patch @@ -0,0 +1,11 @@ +--- a/tests/auto/cmake/CMakeLists.txt 2023-10-03 20:26:29.000000000 +0200 ++++ - 2023-10-13 22:27:12.100304684 +0200 +@@ -13,7 +13,7 @@ + project(websockets_cmake_tests) + enable_testing() + +-set(required_packages Core WebSockets) ++set(required_packages Core) + + # Setup the test when called as a completely standalone project. + if(TARGET Qt6::Core) diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template index 5566e63911579..176315c28772a 100644 --- a/srcpkgs/qt6-websockets/template +++ b/srcpkgs/qt6-websockets/template @@ -1,6 +1,6 @@ # Template file for 'qt6-websockets' pkgname=qt6-websockets -version=6.5.2 +version=6.6.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -12,10 +12,12 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebsockets-everywhere-src-${version}.tar.xz" -checksum=204bd7b0dffb54c934abc6cf0eb5e3016f11b3c9721a67b4875a6b21bb8b5c76 +checksum=2e05b15c0c6e82c484cf3a4a39a3e3e484a6c8f72bc31ee5cf615d52d07df30e -pre_check() { - export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +do_check() { + cd build + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" + ctest -E "module_includes" } post_install() { From e54510345738d0faadf9be64e37a1946e27ecc66 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 24 Oct 2023 14:12:03 +0200 Subject: [PATCH 29/29] New package: qt6-speech-6.6.0 closes #46866 --- srcpkgs/qt6-speech-devel | 1 + srcpkgs/qt6-speech-plugin-flite | 1 + srcpkgs/qt6-speech-plugin-mock | 1 + srcpkgs/qt6-speech-plugin-speechd | 1 + srcpkgs/qt6-speech/template | 63 +++++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+) create mode 120000 srcpkgs/qt6-speech-devel create mode 120000 srcpkgs/qt6-speech-plugin-flite create mode 120000 srcpkgs/qt6-speech-plugin-mock create mode 120000 srcpkgs/qt6-speech-plugin-speechd create mode 100644 srcpkgs/qt6-speech/template diff --git a/srcpkgs/qt6-speech-devel b/srcpkgs/qt6-speech-devel new file mode 120000 index 0000000000000..995d6b2a31d72 --- /dev/null +++ b/srcpkgs/qt6-speech-devel @@ -0,0 +1 @@ +qt6-speech \ No newline at end of file diff --git a/srcpkgs/qt6-speech-plugin-flite b/srcpkgs/qt6-speech-plugin-flite new file mode 120000 index 0000000000000..995d6b2a31d72 --- /dev/null +++ b/srcpkgs/qt6-speech-plugin-flite @@ -0,0 +1 @@ +qt6-speech \ No newline at end of file diff --git a/srcpkgs/qt6-speech-plugin-mock b/srcpkgs/qt6-speech-plugin-mock new file mode 120000 index 0000000000000..995d6b2a31d72 --- /dev/null +++ b/srcpkgs/qt6-speech-plugin-mock @@ -0,0 +1 @@ +qt6-speech \ No newline at end of file diff --git a/srcpkgs/qt6-speech-plugin-speechd b/srcpkgs/qt6-speech-plugin-speechd new file mode 120000 index 0000000000000..995d6b2a31d72 --- /dev/null +++ b/srcpkgs/qt6-speech-plugin-speechd @@ -0,0 +1 @@ +qt6-speech \ No newline at end of file diff --git a/srcpkgs/qt6-speech/template b/srcpkgs/qt6-speech/template new file mode 100644 index 0000000000000..1de53baf53779 --- /dev/null +++ b/srcpkgs/qt6-speech/template @@ -0,0 +1,63 @@ +# Template file for 'qt6-speech' +pkgname=qt6-speech +version=6.6.0 +revision=1 +build_style=cmake +hostmakedepends="perl pkg-config qt6-declarative-host-tools" +makedepends="qt6-base-devel qt6-multimedia-devel qt6-declarative-devel + flite-devel speech-dispatcher-devel alsa-lib-devel" +short_desc="Cross-platform application and UI framework (QT6) - Speech component" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://www.qt.io" +distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtspeech-everywhere-src-${version}.tar.xz" +checksum=969bdbff826808f0cfd80e8f2e357f00174489f30d9f895390cf59814abe9f9c + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args="-DQT_BUILD_TESTS=ON" +fi + +pre_check() { + export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" +} + +post_install() { + rm -rf "${DESTDIR}"/usr/tests +} + +qt6-speech-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/qt6/metatypes + vmove usr/lib/pkgconfig + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + vmove usr/lib/qt6/modules + vmove usr/lib/cmake + } +} + +qt6-speech-plugin-flite_package() { + short_desc+=" - Flite Plugin" + pkg_install() { + vmove usr/lib/qt6/plugins/texttospeech/libqtexttospeech_flite.so + } +} + +qt6-speech-plugin-speechd_package() { + short_desc+=" - Speech dispatcher Plugin" + pkg_install() { + vmove usr/lib/qt6/plugins/texttospeech/libqtexttospeech_speechd.so + } +} + + +qt6-speech-plugin-mock_package() { + short_desc+=" - Mock Plugin" + pkg_install() { + vmove usr/lib/qt6/plugins/texttospeech/libqtexttospeech_mock.so + } +}