From d7cbe486fc4f3cd58e4edcda52a5333fd029ca05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Oct 2023 19:12:13 +0200
Subject: [PATCH] qt6-base: update to 6.6.0.

---
 .../patches/{markdown-musl.patch => markdown.patch} | 13 +++++++------
 srcpkgs/qt6-base/template                           | 10 +++++-----
 2 files changed, 12 insertions(+), 11 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 5c16b3fbb3e..249dd8bf9d3 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 725edabdbdb..7dce54ae9c7 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 <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=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"
@@ -76,7 +76,7 @@ do_check() {
 	fi
 	if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 		# failing on i686, not checked on arm
-		failing_tests+=" tst_qvectorrnd"
+		failing_tests+=" tst_qvectorrnd tst_json tst_qvectornd tst_qdoublevalidator"
 	fi
 	local ctest_exclude="("
 	for failure in $failing_tests; do