From 528f9eff5e6cda8406ceb90821fef75faf64a59b Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 24 May 2021 16:07:20 +0200
Subject: [PATCH] qt6-base: update to 6.1.1.

closes #31084
---
 srcpkgs/qt6-base/patches/add-the-D.patch | 15 -------
 srcpkgs/qt6-base/template                | 51 ++++++++++++++++++++++--
 2 files changed, 47 insertions(+), 19 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 94d2fc03030..00000000000
--- 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 d03dfe7a212..bb043213a36 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
@@ -22,13 +22,13 @@ 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 <me@johnnynator.dev>"
 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,49 @@ 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_QTBUG-63422
+		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
+		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	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() {