From c60787fb57ae85f3186883a274b9bc192ba62834 Mon Sep 17 00:00:00 2001 From: Pierre Bourgin Date: Mon, 24 May 2021 13:09:43 +0200 Subject: [PATCH 01/20] New package: libb2 0.98.1 --- common/shlibs | 1 + srcpkgs/libb2-devel | 1 + srcpkgs/libb2/template | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 120000 srcpkgs/libb2-devel create mode 100644 srcpkgs/libb2/template diff --git a/common/shlibs b/common/shlibs index 91221e6cff7a..da642c43b2f5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -48,6 +48,7 @@ libpcprofile.so glibc-2.32_1 libcidn.so.1 glibc-2.32_1 libmvec.so.1 glibc-2.32_1 libz.so.1 zlib-1.2.3_1 +libb2.so.1 libb2-0.98.1_1 libbz2.so.1 bzip2-1.0.5_1 libarchive.so.13 libarchive-3.5.1_2 libcc1.so.0 gcc-6.2.1_1 diff --git a/srcpkgs/libb2-devel b/srcpkgs/libb2-devel new file mode 120000 index 000000000000..47abfe4da640 --- /dev/null +++ b/srcpkgs/libb2-devel @@ -0,0 +1 @@ +libb2 \ No newline at end of file diff --git a/srcpkgs/libb2/template b/srcpkgs/libb2/template new file mode 100644 index 000000000000..8f9552a88753 --- /dev/null +++ b/srcpkgs/libb2/template @@ -0,0 +1,26 @@ +# Template file for 'libb2' +pkgname=libb2 +version=0.98.1 +revision=1 +build_style=gnu-configure +hostmakedepends="automake libtool pkg-config" +short_desc="BLAKE2 cryptographic hash function" +maintainer="Pierre Bourgin " +license="CC0-1.0" +homepage="https://www.blake2.net/" +distfiles="https://github.com/BLAKE2/libb2/archive/v${version}.tar.gz" +checksum=10053dbc2fa342516b780a6bbf6e7b2a2360b8d49c5ac426936bf3df82526732 + +pre_configure() { + autoreconf -fi +} + +libb2-devel_package() { + depends="${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 713af8e2cc6e58945dfe2e701d2377af79b79848 Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 24 May 2021 16:07:20 +0200 Subject: [PATCH 02/20] qt6-base: rebuild with lib blake2 --- srcpkgs/qt6-base/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index d03dfe7a2129..e0928aee666b 100644 --- a/srcpkgs/qt6-base/template +++ b/srcpkgs/qt6-base/template @@ -22,7 +22,7 @@ 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" + sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-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" From 936fcffc6114fa03158216205df45314ddabf1da Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:15 +0200 Subject: [PATCH 03/20] qt6-3d: update to 6.1.1. --- 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 101a56552999..dec8bdebf98f 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.0 +version=6.1.1 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=af48f674883de91a5bcb11caefda0e130b9c8c65dce474c47550dc2fdd3a5660 +checksum=66e25fcf0bd965374f9814ef8fb960ff7c0414ec9480dcdc57caad17f23ede08 qt6-3d-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From ce6dd97842ad2416470f05a080144444cf341d87 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:23 +0200 Subject: [PATCH 04/20] qt6-base: update to 6.1.1. --- srcpkgs/qt6-base/patches/add-the-D.patch | 15 -------- srcpkgs/qt6-base/template | 48 ++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 18 deletions(-) delete mode 100644 srcpkgs/qt6-base/patches/add-the-D.patch diff --git a/srcpkgs/qt6-base/patches/add-the-D.patch b/srcpkgs/qt6-base/patches/add-the-D.patch deleted file mode 100644 index 94d2fc030304..000000000000 --- a/srcpkgs/qt6-base/patches/add-the-D.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- cmake/FindWrapAtomic.cmake 2021-04-30 11:31:33.000000000 +0200 -+++ - 2021-05-06 15:56:49.553742705 +0200 -@@ -31,9 +31,9 @@ - check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC) - if(NOT HAVE_STDATOMIC) -- set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}") -- set(CMAKE_REQUIRE_LIBRARIES "atomic") -+ set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}") -+ set(CMAKE_REQUIRED_LIBRARIES "atomic") - check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB) -- set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}") -+ set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}") - endif() - - add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED) diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index e0928aee666b..f166deea9529 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.0 -revision=2 +version=6.1.1 +revision=1 wrksrc="qtbase-everywhere-src-${version}" build_style=cmake configure_args="-DINSTALL_DATADIR=share/qt6 @@ -28,7 +28,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=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4 +checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2 python_version=3 if [ "$CROSS_BUILD" ]; then @@ -37,6 +37,48 @@ if [ "$CROSS_BUILD" ]; then -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" fi +# It is currently expected that quite a few patches do fail +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQT_BUILD_TESTS=ON" +fi + +do_check() { + cd build + local failing_tests="tst_selftests tst_qmake tst_moc + tst_rcc tst_qfile tst_qstandardpaths + tst_qtemporarydir tst_qtemporaryfile tst_qdir + tst_qpluginloader tst_qlibrary tst_qtextstream + tst_qdate tst_qdatetime tst_qtimezone + test_umbrella_config test_wrap_cpp_and_resources + test_dependent_modules test_needsquoting_dirname + test_add_resource_options test_wrap_cpp_options + test_platform_defs_include test_qtmainwin_library + test_dbus_module test_multiple_find_package + test_add_resources_delayed_file + test_add_binary_resources_delayed_file + test_private_includes test_private_targets + test_testlib_definitions test_json_plugin_includes + test_testlib_no_link_gui test_testlib_no_link_widgets + module_includes test_concurrent_module test_opengl_lib + test_interface test_interface_link_libraries + test_moc_macro_target test_add_big_resource + test_versionless_targets test_add_resources_binary_generated + test_plugin_flavor_static test_plugin_flavor_shared + test_plugin_flavor_derived_from_qt_type + tst_qaddpreroutine tst_qfont tst_qfontdatabase + tst_qfontmetrics tst_qglyphrun tst_qrawfont + tst_qtextdocumentlayout tst_qopenglconfig + tst_qopengl tst_qdnslookup tst_qfiledialog + tst_qgraphicsview tst_qapplication tst_qfontcombobox + tst_qlineedit tst_qmenubar tst_qopenglwidget" + local ctest_exclude="(" + for failure in $failing_tests; do + ctest_exclude+="$failure|" + done + ctest_exclude="${ctest_exclude%|})" + ctest -E "$ctest_exclude" +} + qt6-gui_package() { short_desc+=" - Gui" pkg_install() { From 5183023b1945d8a3f5b6b6e8616554e8b2701398 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:26 +0200 Subject: [PATCH 05/20] qt6-charts: update to 6.1.1. --- 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 d8dee490199e..1645fe5b4507 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.0 +version=6.1.1 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=8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd +checksum=a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a qt6-charts-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 6f31f97485f4b1ce5e155c9697d4b38374a951fa Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:31 +0200 Subject: [PATCH 06/20] qt6-declarative: update to 6.1.1. --- srcpkgs/qt6-declarative/template | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template index 6da38cd33432..7449dd9579d8 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.1.0 +version=6.1.1 revision=1 wrksrc="qtdeclarative-everywhere-src-${version}" build_style=cmake @@ -14,7 +14,15 @@ 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=e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda +checksum=805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQT_BUILD_TESTS=ON" +fi + +pre_check() { + export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +} qt6-declarative-tools_package() { depends="${sourcepkg}>=${version}_${revision}" From f3b7e61b4dea5e9359648f0855212b153ea7273a Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:33 +0200 Subject: [PATCH 07/20] qt6-imageformats: update to 6.1.1. --- 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 80c457245cfd..45c34a253e53 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.0 +version=6.1.1 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=34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a +checksum=d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d From 6f627f132c0c90f647a652d9238eca9a2059f299 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:35 +0200 Subject: [PATCH 08/20] qt6-lottie: update to 6.1.1. --- srcpkgs/qt6-lottie/template | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template index 21ad418162bb..775396bcac64 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.0 +version=6.1.1 revision=1 wrksrc="qtlottie-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,15 @@ 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=3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8 +checksum=df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQT_BUILD_TESTS=ON" +fi + +pre_check() { + export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +} qt6-lottie-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 2d52f0c525bb42b5983d28c22d8c0101dd64bed8 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:37 +0200 Subject: [PATCH 09/20] qt6-networkauth: update to 6.1.1. --- srcpkgs/qt6-networkauth/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template index b70fcc828fb8..8ffb44cad94a 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.0 +version=6.1.1 revision=1 wrksrc="qtnetworkauth-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,11 @@ 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=bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3 +checksum=4e1b7f6584fe21e8a04ee6d9c5761e5858587e8bab01a522ee53f82dfd1efdd7 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQT_BUILD_TESTS=ON" +fi qt6-networkauth-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 07a43ae4d4254bfe49f7a8564a5747baa96ef426 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:40 +0200 Subject: [PATCH 10/20] qt6-qt5compat: update to 6.1.1. --- srcpkgs/qt6-qt5compat/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template index 0fd536dc4075..d64b37bff575 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.1.0 +version=6.1.1 revision=1 wrksrc="qt5compat-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,11 @@ 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=c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c +checksum=7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQT_BUILD_TESTS=ON" +fi qt6-qt5compat-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" From 6432361a8d490a3388764fddb6a6320a54427ce3 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:48 +0200 Subject: [PATCH 11/20] qt6-quick3d: update to 6.1.1. --- 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 3aa6d675b24c..d75bd8c086ca 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.0 +version=6.1.1 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=ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268 +checksum=94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then # possibly a qt6-shadertools bug, actually From 60b601de2a5731f18b2092eecea46587e5996da7 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:51 +0200 Subject: [PATCH 12/20] qt6-quickcontrols2: update to 6.1.1. --- srcpkgs/qt6-quickcontrols2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template index 51e8315b5aea..ab57102a19cf 100644 --- a/srcpkgs/qt6-quickcontrols2/template +++ b/srcpkgs/qt6-quickcontrols2/template @@ -1,6 +1,6 @@ # Template file for 'qt6-quickcontrols2' pkgname=qt6-quickcontrols2 -version=6.1.0 +version=6.1.1 revision=1 wrksrc="qtquickcontrols2-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ 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=784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59 +checksum=7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4 qt6-quickcontrols2-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" From 0fc55df1a0a64c5d50da304d07d937974147e9b5 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:53 +0200 Subject: [PATCH 13/20] qt6-quicktimeline: update to 6.1.1. --- srcpkgs/qt6-quicktimeline/template | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template index eb30cc7b6ddb..e9c02e2440c2 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.1.0 +version=6.1.1 revision=1 wrksrc="qtquicktimeline-everywhere-src-${version}" build_style=cmake @@ -12,4 +12,16 @@ 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=ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e +checksum=40fb664eadf295001d2c49c333032406b6f45f14acddee7e72b8d6c5ea26a6a2 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQT_BUILD_TESTS=ON" +fi + +pre_check() { + export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +} + +do_check() { + : # ignores QML2_IMPORT_PATH somewhere, misses test data in cwd +} From b4628c89ee573eb280d6cbde4c01d3dc212b4fb9 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:56 +0200 Subject: [PATCH 14/20] qt6-scxml: update to 6.1.1. --- srcpkgs/qt6-scxml/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template index b0e60b492782..e3a594de99e3 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.0 +version=6.1.1 revision=1 wrksrc="qtscxml-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,11 @@ 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=c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea +checksum=ffeb650458bb60bb076ac3460588f77f7c841b4f4b1de706960b9b34984dc528 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQT_BUILD_TESTS=ON" +fi qt6-scxml-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 6195bbbed8d051df6a77faffce0a3024666e3701 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:53:58 +0200 Subject: [PATCH 15/20] qt6-shadertools: update to 6.1.1. --- 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 5c27d3fab884..9b55463602b7 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.0 +version=6.1.1 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=e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1 +checksum=324a9f6f87d4e82c0b5f80e6301c7dbc47617dbe752f3e3726c141bd85855512 qt6-shadertools-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" From 114eb382a59354c4e877595ccfc0c4b23155c94f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:54:00 +0200 Subject: [PATCH 16/20] qt6-svg: update to 6.1.1. --- 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 936d831fcd4e..a44ef126e8c8 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.0 +version=6.1.1 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=5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719 +checksum=e2f62385c940de76dea480a2615c9b11dd2bf0cec2cc778096c0bebfa1ef15ec qt6-svg-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" From 71e1dce02b321da11a32cbbe710e84a3e69192cd Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:54:03 +0200 Subject: [PATCH 17/20] qt6-tools: update to 6.1.1. --- srcpkgs/qt6-tools/template | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template index 8d2d8e3f2419..16b20c72d05a 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.0 +version=6.1.1 revision=1 wrksrc="qttools-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,18 @@ 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=6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e +checksum=cba8d9a836e83b7a5e6d068239635b261f7ca4a059992b2b66cd546380091273 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQT_BUILD_TESTS=ON" +fi + +do_check() { + cd build + # Some of these tests expect that qt6-tools is already + # installed in /usr/lib/qt6 + ctest -E 'tst_(lrelease|lconvert|lupdate|qtattributionsscanner|qhelpcontentmodel|qhelpenginecore|qhelpgenerator|qhelpindexmode)' +} qt6-tools-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" From d60a8c9627581b1c4e1d2ec88980a8224145c830 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:54:05 +0200 Subject: [PATCH 18/20] qt6-translations: update to 6.1.1. --- 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 16a3a190fe7e..088d21f4bdc8 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.0 +version=6.1.1 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=2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073 +checksum=6cf3d191335a6b3a64864e7ba41819e7be461d1d2861d643babe836f81d4c393 From 54573ec06f656e155331f45733fddd95427c6c5f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:54:08 +0200 Subject: [PATCH 19/20] qt6-virtualkeyboard: update to 6.1.1. --- srcpkgs/qt6-virtualkeyboard/template | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template index 6488e9c5c80c..07c4a4475f2e 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.1.0 +version=6.1.1 revision=1 wrksrc="qtvirtualkeyboard-everywhere-src-${version}" build_style=cmake @@ -14,7 +14,19 @@ 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=595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01 +checksum=246d1acdcd953819b09b1da22bd359335d145d8a3550d9e827dc1fd27b6bd3ff + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQT_BUILD_TESTS=ON" +fi + +do_check() { + cd build + QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" \ + ctest -E 'tst_(inputpanel|styles)' + # styles overwrites QML2_IMPORT_PATH + # inputpanel hangs +} qt6-virtualkeyboard-devel_package() { depends="${sourcepkg}>=${version}_${revision} $makedepends" From 31e998b99778b3e82a8e45d229b1050eff576971 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Jun 2021 17:54:10 +0200 Subject: [PATCH 20/20] qt6-wayland: update to 6.1.1. --- srcpkgs/qt6-wayland/template | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template index 43194ae66ad8..fff2a9b1e8e4 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.0 +version=6.1.1 revision=1 wrksrc="qtwayland-everywhere-src-${version}" build_style=cmake @@ -9,12 +9,22 @@ hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel" # XXX: Qml as optional dep makedepends="qt6-base-devel wayland-devel libxkbcommon-devel libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel" +checkdepends="dbus mesa-dri" short_desc="Cross-platform application and UI framework - Wayland" 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=d67e8ffe4014a66b5864acf358a392149555db2adac1b9802a6650a59a70ad97 +checksum=2cfb2b5403eb2037670549dd2d3968eaa30a9ce523dd08314c5bc677fdf27db6 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQT_BUILD_TESTS=ON" +fi + +do_check() { + cd build + dbus-run-session ctest -E 'tst_seatv4' +} qt6-wayland-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"