From b346720bd9e4855f91429f327dfb4acd5077bf27 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:58:32 +0200 Subject: [PATCH 01/22] qt6-3d: update to 6.2.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 dec8bdebf98f..3946df557887 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.1.1 +version=6.2.0 revision=1 wrksrc="qt3d-everywhere-src-${version}" build_style=cmake @@ -13,7 +13,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=66e25fcf0bd965374f9814ef8fb960ff7c0414ec9480dcdc57caad17f23ede08 +checksum=304352ae74fc8e7fe50a822413d69094efb25f15a2323e083a2a53dc5a43a6c6 qt6-3d-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 1a80d787770e59a178c45ae62997fd5a0755517c Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:58:41 +0200 Subject: [PATCH 02/22] qt6-base: update to 6.2.0. --- .../qt6-base/patches/musl-usr-path-hack.patch | 25 ++++++++++++++++ srcpkgs/qt6-base/template | 30 ++++++++++++++++--- srcpkgs/qt6-plugin-networkinformation | 1 + srcpkgs/qt6-plugin-tls-openssl | 1 + srcpkgs/qt6-plugin-tls-qcertonly | 1 + 5 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/qt6-base/patches/musl-usr-path-hack.patch create mode 120000 srcpkgs/qt6-plugin-networkinformation create mode 120000 srcpkgs/qt6-plugin-tls-openssl create mode 120000 srcpkgs/qt6-plugin-tls-qcertonly diff --git a/srcpkgs/qt6-base/patches/musl-usr-path-hack.patch b/srcpkgs/qt6-base/patches/musl-usr-path-hack.patch new file mode 100644 index 000000000000..a2ec7550e7bb --- /dev/null +++ b/srcpkgs/qt6-base/patches/musl-usr-path-hack.patch @@ -0,0 +1,25 @@ +Source: @Johnnynator +Upsteam: No +Subject: Musl always returns /lib/libQt6Core.so.6 for Dl_info.dli_fname. +This also happens sometimes with qtwebengine on glibc. +This breaks qt6-webengine's search path for translations. +Using realpath instead would probably be a more correct solution. + +--- +diff --git qtbasesrc/corelib/global/qlibraryinfo.cpp qtbasesrc/corelib/global/qlibraryinfo.cpp +index 8bcf67e73d..28d7355310 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -558,6 +558,12 @@ static QString getRelocatablePrefix() + int result = dladdr(reinterpret_cast(&QLibraryInfo::isDebugBuild), &info); + if (result > 0 && info.dli_fname) + prefixPath = prefixFromQtCoreLibraryHelper(QString::fromLocal8Bit(info.dli_fname)); ++#if 1 ++ QDir preDir(prefixPath); ++ if (preDir.isRoot()) { ++ prefixPath = QStringLiteral("/usr"); ++ } ++#endif + #elif defined(Q_OS_WIN) + HMODULE hModule = getWindowsModuleHandle(); + const int kBufferSize = 4096; diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index 0b3dd492fb1f..3c7ba930d920 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.1.1 -revision=2 +version=6.2.0 +revision=1 wrksrc="qtbase-everywhere-src-${version}" build_style=cmake configure_args="-DINSTALL_DATADIR=share/qt6 @@ -22,13 +22,14 @@ makedepends="zlib-devel libzstd-devel dbus-devel libpng-devel tslib-devel libinput-devel gtk+3-devel libmariadbclient-devel postgresql-libs-devel libatomic-devel unixodbc-devel cups-devel libproxy-devel brotli-devel - sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel" + sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel + libXevie-devel libXcursor-devel" short_desc="Cross-platform application and UI framework (QT6)" 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=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2 +checksum=fdfff0716d093bcb6bcd53746ce1d3c9701a6bf3326d47813866d43949b47769 python_version=3 if [ "$CROSS_BUILD" ]; then @@ -207,6 +208,27 @@ qt6-plugin-sqlite_package() { } } +qt6-plugin-tls-openssl_package() { + short_desc+=" - TLS plugin" + pkg_install() { + vmove usr/lib/qt6/plugins/tls/libqopensslbackend.so + } +} + +qt6-plugin-tls-qcertonly_package() { + short_desc+=" - TLS plugin" + pkg_install() { + vmove usr/lib/qt6/plugins/tls/libqcertonlybackend.so + } +} + +qt6-plugin-networkinformation() { + short_desc+=" - Networkinformation plugin" + pkg_install() { + vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so + } +} + qt6-base-devel_package() { short_desc+=" - Development files" depends="qt6-base>=${version}_${revision} diff --git a/srcpkgs/qt6-plugin-networkinformation b/srcpkgs/qt6-plugin-networkinformation new file mode 120000 index 000000000000..8ddee598d5ed --- /dev/null +++ b/srcpkgs/qt6-plugin-networkinformation @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-plugin-tls-openssl b/srcpkgs/qt6-plugin-tls-openssl new file mode 120000 index 000000000000..8ddee598d5ed --- /dev/null +++ b/srcpkgs/qt6-plugin-tls-openssl @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-plugin-tls-qcertonly b/srcpkgs/qt6-plugin-tls-qcertonly new file mode 120000 index 000000000000..8ddee598d5ed --- /dev/null +++ b/srcpkgs/qt6-plugin-tls-qcertonly @@ -0,0 +1 @@ +qt6-base \ No newline at end of file From 791bb33b476d78c19134786b849797448958edd6 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:58:45 +0200 Subject: [PATCH 03/22] qt6-charts: update to 6.2.0. --- srcpkgs/qt6-charts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template index 1645fe5b4507..88764df95f41 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.1.1 +version=6.2.0 revision=1 wrksrc="qtcharts-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ 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=a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a +checksum=9114d4e05e63f5b9d5f07d53d72bf2fbfb22ffae283cc98d3371d73f04b6f4fc qt6-charts-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From e166f4cafebcfa790450156c85fab8e5818aa11d Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:58:51 +0200 Subject: [PATCH 04/22] qt6-declarative: update to 6.2.0. --- common/shlibs | 8 ++++---- srcpkgs/qt6-declarative/template | 26 ++++++++++++++++++-------- srcpkgs/qt6-quickcontrols2-devel | 1 - srcpkgs/qt6-quickcontrols2/template | 27 --------------------------- srcpkgs/qt6-quickcontrols2/update | 1 - 5 files changed, 22 insertions(+), 41 deletions(-) delete mode 120000 srcpkgs/qt6-quickcontrols2-devel delete mode 100644 srcpkgs/qt6-quickcontrols2/template delete mode 100644 srcpkgs/qt6-quickcontrols2/update diff --git a/common/shlibs b/common/shlibs index c5e88324a924..44d61909c7b3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2010,7 +2010,7 @@ libQt6LabsSharedImage.so.6 qt6-declarative-6.1.0_1 libQt6LabsWavefrontMesh.so.6 qt6-declarative-6.1.0_1 libQt6QmlLocalStorage.so.6 qt6-declarative-6.1.0_1 libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1 -libQt6QuickTest.so.6 qt6-declarative-6.0.0_1 +libQt6QuickTest.so.6 qt6-declarative-devel-6.2.0beta4_1 libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1 libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1 libQt6Quick.so.6 qt6-declarative-6.0.0_1 @@ -2024,9 +2024,9 @@ libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1 libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1 -libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1 -libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1 -libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1 +libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1 +libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1 +libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1 libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1 diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template index a61861576499..40a3d9607a1e 100644 --- a/srcpkgs/qt6-declarative/template +++ b/srcpkgs/qt6-declarative/template @@ -1,20 +1,25 @@ # Template file for 'qt6-declarative' pkgname=qt6-declarative -version=6.1.1 +version=6.2.0 revision=1 wrksrc="qtdeclarative-everywhere-src-${version}" build_style=cmake -configure_args=" -DQT_HOST_PATH=/usr - -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" +configure_args=" -DQT_HOST_PATH=/usr" hostmakedepends="qt6-base-devel perl pkg-config wayland-devel - qt6-declarative-devel" + qt6-shadertools-devel" makedepends="qt6-base-devel Vulkan-Headers" short_desc="Cross-platform application and UI framework - Declarative" 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=805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2 +checksum=46737feceb9e54d63ad0c87a08d33f08ca58f4b8920ccefad8f1ebd64f0d1270 +replaces="qt6-quickcontrols2>=0" + +if [ "$CROSS_BUILD" ]; then + configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" + hostmakedepends+=" qt6-declarative-devel" +fi if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" @@ -34,9 +39,10 @@ qt6-declarative-tools_package() { short_desc+=" - tools" pkg_install() { vmove usr/lib/qt6/plugins/qmltooling - for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \ - qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \ - qmltestrunner qmltime qmltyperegistrar; do + for bin in qmlcachegen qmlimportscanner qmltyperegistrar; do + vmove usr/lib/qt6/libexec/$bin + done + for bin in qmlformat qmllint qmlpreview qmlprofiler; do vmove usr/lib/qt6/bin/$bin done } @@ -46,10 +52,14 @@ qt6-declarative-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1 qt6-declarative-tools>=${version}_${revision}" short_desc+=" - development files" + replaces="qt6-quickcontrols2-devel>=0" pkg_install() { vmove usr/include vmove usr/lib/cmake vmove usr/lib/qt6/mkspecs + vmove "usr/lib/libQt6QuickTest.so.*" + vmove usr/lib/qt6/qml/QtTest + vmove usr/lib/qt6/bin/qmltestrunner vmove "usr/lib/*.so" vmove "usr/lib/*.prl" } diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel deleted file mode 120000 index 280bc162057d..000000000000 --- a/srcpkgs/qt6-quickcontrols2-devel +++ /dev/null @@ -1 +0,0 @@ -qt6-quickcontrols2 \ No newline at end of file diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template deleted file mode 100644 index ab57102a19cf..000000000000 --- a/srcpkgs/qt6-quickcontrols2/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'qt6-quickcontrols2' -pkgname=qt6-quickcontrols2 -version=6.1.1 -revision=1 -wrksrc="qtquickcontrols2-everywhere-src-${version}" -build_style=cmake -configure_args="-DQT_HOST_PATH=/usr " -hostmakedepends="perl qt6-base-devel qt6-declarative-devel" -makedepends="qt6-base-devel qt6-declarative-devel" -short_desc="Cross-platform application and UI framework - quickcontrols2" -maintainer="John " -license="GPL-2.0-or-later, LGPL-3.0-or-later" -homepage="https://qt.io/" -distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz" -checksum=7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4 - -qt6-quickcontrols2-devel_package() { - depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/qt6/mkspecs - vmove "usr/lib/*.so" - vmove "usr/lib/*.prl" - } -} diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update deleted file mode 100644 index 844552465222..000000000000 --- a/srcpkgs/qt6-quickcontrols2/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="${pkgname/6-/}-everywhere-src" From 8672685f1107b8519063ff4fa7ad576f611c9382 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:58:53 +0200 Subject: [PATCH 05/22] qt6-imageformats: update to 6.2.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 45c34a253e53..fe5400ba7287 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.1.1 +version=6.2.0 revision=1 wrksrc="qtimageformats-everywhere-src-${version}" build_style=cmake @@ -12,4 +12,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=d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d +checksum=fdaa35536c3d0f8f5f313d0d52dedfbf6d8fcd81a82d6a56f473253f135072ad From 6ee22ac3f90358e2da63b938d14f079c40c2f4c9 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:58:56 +0200 Subject: [PATCH 06/22] qt6-lottie: update to 6.2.0. --- srcpkgs/qt6-lottie/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template index 775396bcac64..be9c41bf120c 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.1.1 +version=6.2.0 revision=1 wrksrc="qtlottie-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ 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=df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed +checksum=aa129261d409b5d935221acd6e38f56d68eac5e467a1990c96c654e81a2522ff if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From 6a5dcf7c4870c770556634de0b2f55d28e5574d9 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:58:58 +0200 Subject: [PATCH 07/22] qt6-networkauth: update to 6.2.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 8ffb44cad94a..bb3bc0fae104 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.1.1 +version=6.2.0 revision=1 wrksrc="qtnetworkauth-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,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=4e1b7f6584fe21e8a04ee6d9c5761e5858587e8bab01a522ee53f82dfd1efdd7 +checksum=e71504c8d6ae4cf4d573f1d91ff756f90f441e22b0af12eae2424f7e0c01d450 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From be23b9e2fbd0a1682c4602e85b54cd42fc1c2a15 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:59:02 +0200 Subject: [PATCH 08/22] qt6-qt5compat: update to 6.2.0. --- srcpkgs/qt6-qt5compat/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template index 06837849b3f1..fd3b0d42bc7e 100644 --- a/srcpkgs/qt6-qt5compat/template +++ b/srcpkgs/qt6-qt5compat/template @@ -1,18 +1,18 @@ # Template file for 'qt6-qt5compat' pkgname=qt6-qt5compat -version=6.1.1 -revision=2 +version=6.2.0 +revision=1 wrksrc="qt5compat-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr " -hostmakedepends="qt6-base-devel perl" -makedepends="qt6-base-devel" +configure_args="-DQT_HOST_PATH=/usr" +hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config" +makedepends="qt6-base-devel qt6-declarative-devel" short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component" 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=7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7 +checksum=c2e2f058ecee36a96c1b15937badeda9b7b03eb5278fa01af4ff386c4f1854fb if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From 13711e7ece44a513d20f58a5cc92652d818b3c16 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:59:12 +0200 Subject: [PATCH 09/22] qt6-quick3d: update to 6.2.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 d75bd8c086ca..1ef03c32b1cf 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.1.1 +version=6.2.0 revision=1 wrksrc="qtquick3d-everywhere-src-${version}" build_style=cmake @@ -13,7 +13,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=94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c +checksum=e8f8163237468e158ace7737d60a0a722209ffda444c57c786fc53db1af851e1 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then # possibly a qt6-shadertools bug, actually From e81e94f84f4953515901a7edc9c6dc2cfafb26b3 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:59:18 +0200 Subject: [PATCH 10/22] qt6-quicktimeline: update to 6.2.0. --- srcpkgs/qt6-quicktimeline/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template index e9c02e2440c2..4c0912d93347 100644 --- a/srcpkgs/qt6-quicktimeline/template +++ b/srcpkgs/qt6-quicktimeline/template @@ -1,8 +1,8 @@ # Template file for 'qt6-quicktimeline' pkgname=qt6-quicktimeline -version=6.1.1 +version=6.2.0 revision=1 -wrksrc="qtquicktimeline-everywhere-src-${version}" +wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}" build_style=cmake configure_args="-DQT_HOST_PATH=/usr " hostmakedepends="perl qt6-base-devel qt6-declarative-devel" @@ -11,8 +11,8 @@ short_desc="Cross-platform application and UI framework - quicktimeline" maintainer="John " license="GPL-3.0-or-later" homepage="https://qt.io/" -distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz" -checksum=40fb664eadf295001d2c49c333032406b6f45f14acddee7e72b8d6c5ea26a6a2 +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz" +checksum=67d644ad12df94e937bac3a1cb8a81a96213ec0102759a86c59ba7834ac90c8c if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From c31475ce8d5ec68ad7add51227e17ed19d3ae285 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:59:21 +0200 Subject: [PATCH 11/22] qt6-scxml: update to 6.2.0. --- srcpkgs/qt6-scxml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template index e3a594de99e3..36bc0fc689b2 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.1.1 +version=6.2.0 revision=1 wrksrc="qtscxml-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,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=ffeb650458bb60bb076ac3460588f77f7c841b4f4b1de706960b9b34984dc528 +checksum=90d4af011a17f04a003cbd453c7e0720787e6cdacb8dfce7167179c2cd7dc839 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From c4cfa9788f4091df783d9fb276ece8ffc02c6a0e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:59:23 +0200 Subject: [PATCH 12/22] qt6-shadertools: update to 6.2.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 9b55463602b7..9fc700d72927 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.1.1 +version=6.2.0 revision=1 wrksrc="qtshadertools-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,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=324a9f6f87d4e82c0b5f80e6301c7dbc47617dbe752f3e3726c141bd85855512 +checksum=5f66d43610a3a6739fc360d836a2c045135107c0ecd40eb3ed18ce5f3dd79c42 qt6-shadertools-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" From 37909efe4cc3a47ec751f05a520c9689b89e92f9 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:59:26 +0200 Subject: [PATCH 13/22] qt6-svg: update to 6.2.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 9042cc483ff9..81a0c5ad25c0 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.1.1 +version=6.2.0 revision=1 wrksrc="qtsvg-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,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=e2f62385c940de76dea480a2615c9b11dd2bf0cec2cc778096c0bebfa1ef15ec +checksum=af9eabefbb0dcb772f18fae4d2c39bcc23579a5dfff569c35ea7e497591db3d4 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From 5a6b1f819d1f90208a54b04fa0433daf711d3098 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:59:30 +0200 Subject: [PATCH 14/22] qt6-tools: update to 6.2.0. --- srcpkgs/qt6-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template index 16b20c72d05a..576a7aef7449 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.1.1 +version=6.2.0 revision=1 wrksrc="qttools-everywhere-src-${version}" build_style=cmake @@ -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/qttools-everywhere-src-${version}.tar.xz" -checksum=cba8d9a836e83b7a5e6d068239635b261f7ca4a059992b2b66cd546380091273 +checksum=a903d005f8ab39545aed88a13b04f13ddbbe073da7007203a91fb8b42b890057 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From 9f3b61dc8f8479a4a33e7f4983313e54ae9835bd Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:59:32 +0200 Subject: [PATCH 15/22] qt6-translations: update to 6.2.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 088d21f4bdc8..19d44548bc8f 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.1.1 +version=6.2.0 revision=1 wrksrc="qttranslations-everywhere-src-${version}" build_style=cmake @@ -12,4 +12,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=6cf3d191335a6b3a64864e7ba41819e7be461d1d2861d643babe836f81d4c393 +checksum=5b4ecb1ee35363444f03b1eb10637d79af1d19be5a5cc53657dc0925a78b2240 From 07387cafe5bd3a011f16ec1b56551c03de96c213 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:59:35 +0200 Subject: [PATCH 16/22] qt6-virtualkeyboard: update to 6.2.0. --- srcpkgs/qt6-virtualkeyboard/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template index 07c4a4475f2e..f5188228e6bd 100644 --- a/srcpkgs/qt6-virtualkeyboard/template +++ b/srcpkgs/qt6-virtualkeyboard/template @@ -1,20 +1,18 @@ # Template file for 'qt6-virtualkeyboard' pkgname=qt6-virtualkeyboard -version=6.1.1 +version=6.2.0 revision=1 wrksrc="qtvirtualkeyboard-everywhere-src-${version}" build_style=cmake configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl pkg-config qt6-declarative-devel" -makedepends="qt6-declarative-devel qt6-quickcontrols2-devel - qt6-svg-devel hunspell-devel" -depends="qt6-quickcontrols2" +makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel" short_desc="Cross-platform application and UI framework - virtualkeyboard" 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=246d1acdcd953819b09b1da22bd359335d145d8a3550d9e827dc1fd27b6bd3ff +checksum=1055e7fe1dfaecbfd4b69f40ec1135fda1980e6e21adbe757a8a4affbfb9bcee if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From 35b7db1fe2dc4232407bbf96c722f9505bf1c927 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 24 Jun 2021 20:59:37 +0200 Subject: [PATCH 17/22] qt6-wayland: update to 6.2.0. --- srcpkgs/qt6-wayland/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template index fff2a9b1e8e4..06b2cbbaa08c 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.1.1 +version=6.2.0 revision=1 wrksrc="qtwayland-everywhere-src-${version}" build_style=cmake @@ -15,7 +15,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=2cfb2b5403eb2037670549dd2d3968eaa30a9ce523dd08314c5bc677fdf27db6 +checksum=d6787fce74bde1a3386bcbe43c078c712471bab09f1946c40fc2327232d27d4c if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" @@ -33,7 +33,7 @@ qt6-wayland-devel_package() { vmove usr/include vmove usr/lib/cmake vmove usr/lib/qt6/mkspecs - vmove usr/lib/qt6/bin/qtwaylandscanner + vmove usr/lib/qt6/libexec/qtwaylandscanner vmove "usr/lib/*.so" vmove "usr/lib/*.prl" } From b52200d6b013a351089555e10b04e259e4d6dfe1 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 2 Oct 2021 18:59:44 +0200 Subject: [PATCH 18/22] double-conversion: update to 3.1.5. --- common/shlibs | 2 +- srcpkgs/double-conversion/template | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index 44d61909c7b3..7e5289f58f66 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2980,7 +2980,7 @@ libnss_libvirt_guest.so.2 libvirt-3.1.0_1 libvirt-admin.so.0 libvirt-3.1.0_1 libnss_libvirt.so.2 libvirt-3.1.0_1 libassimp.so.5 libassimp-5.0.0_1 -libdouble-conversion.so.1 double-conversion-2.0.1_1 +libdouble-conversion.so.3 double-conversion-3.1.5_1 libspectrum.so.8 libspectrum-1.2.2_1 libbearssl.so.0 bearssl-0.3_1 libXfont2.so.2 libXfont2-2.0.1_1 diff --git a/srcpkgs/double-conversion/template b/srcpkgs/double-conversion/template index e67aa3b7d01a..fa03b83c3a81 100644 --- a/srcpkgs/double-conversion/template +++ b/srcpkgs/double-conversion/template @@ -1,15 +1,16 @@ # Template file for 'double-conversion' pkgname=double-conversion -version=3.1.1 +version=3.1.5 revision=1 -build_style=scons +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON" short_desc="Efficient binary-decimal and decimal-binary routines for IEEE doubles" maintainer="Diogo Leal " license="BSD-3-Clause" homepage="https://github.com/google/double-conversion" changelog="https://raw.githubusercontent.com/google/double-conversion/master/Changelog" distfiles="https://github.com/google/double-conversion/archive/v${version}.tar.gz" -checksum=c49a6b3fa9c917f827b156c8e0799ece88ae50440487a99fc2f284cfd357a5b9 +checksum=a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13 post_install() { vlicense LICENSE @@ -19,9 +20,8 @@ double-conversion-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { - vmkdir usr/include/double-conversion - vcopy double-conversion/*.h usr/include/double-conversion/ - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove usr/include + vmove usr/lib/cmake + vmove "usr/lib/*.so" } } From 443d95d3aede3664f5f778e593b5828d2195ef82 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 2 Oct 2021 19:10:49 +0200 Subject: [PATCH 19/22] qt5: update to 5.15.3+20211001. --- srcpkgs/qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 790ccc808d9e..c1d822ef021d 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,6 +1,6 @@ # Template file for 'qt5' pkgname=qt5 -version=5.15.3+20210924 +version=5.15.3+20211001 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad # base repo: https://invent.kde.org/qt/qt/qt5 revision=1 @@ -27,7 +27,7 @@ homepage="https://qt.io/" # to keep the size smaller qtwebengine, qtwebview, qtdocgallery, qtactiveqt and qtpim # can be marked with the export-ignore attribute distfiles="https://void.johnnynator.dev/distfiles/qt5-${version}.tar.gz" -checksum=251dad114f9506bfb98fd96825ac8065a90a6932e9c847ddb9ce0887f19e7304 +checksum=6bff56434b4c2413ec0c9e57ffdcfed1f0966754d1ccf34dafe31840f4006c5a python_version=2 #unverified replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0 qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0" From 02921022e176dfb62cebdce1c73a91fb5747d858 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 2 Oct 2021 19:10:49 +0200 Subject: [PATCH 20/22] vtk: rebuild against double-conversion-3.1.5 --- srcpkgs/vtk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template index 4c1710087f83..8811247ae7e5 100644 --- a/srcpkgs/vtk/template +++ b/srcpkgs/vtk/template @@ -1,7 +1,7 @@ # Template file for 'vtk' pkgname=vtk version=9.0.1 -revision=5 +revision=6 wrksrc=VTK-${version} build_style=cmake # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON" From 4c9bf1ff877ed76e0c2da025418e1e6cf3e42dfc Mon Sep 17 00:00:00 2001 From: John Date: Sat, 2 Oct 2021 19:10:49 +0200 Subject: [PATCH 21/22] inkscape: rebuild against double-conversion-3.1.5 --- srcpkgs/inkscape/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 238426b17f97..f8b76d630bea 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=1.1 -revision=2 +revision=3 wrksrc="inkscape-${version}_2021-05-24_c4e8f9ed74" build_style=cmake # builds executables then runs checks From e2b99255e9001dbe00ebfe8da9718f2280cc6e83 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 2 Oct 2021 19:10:49 +0200 Subject: [PATCH 22/22] openscad: rebuild against double-conversion-3.1.5 --- srcpkgs/openscad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template index 693931379a26..60d45d60615f 100644 --- a/srcpkgs/openscad/template +++ b/srcpkgs/openscad/template @@ -1,7 +1,7 @@ # Template file for 'openscad' pkgname=openscad version=2021.01 -revision=1 +revision=2 build_style=qmake hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools" makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel