From 71d56feb91fe78eed880c1363e6a761febb3e7c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Feb 2025 12:01:31 +0100
Subject: [PATCH] qt6-declarative: update to 6.8.2.

---
 .../patches/bin-qml-location.patch            | 45 ++++++++++---------
 .../patches/test_generate_qmlls_ini.patch     | 11 +++++
 srcpkgs/qt6-declarative/template              |  4 +-
 3 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/test_generate_qmlls_ini.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
index 84f6dfbe663..7f0de28587e 100644
--- a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -134,27 +134,6 @@
  #ifdef Q_OS_WIN
      m_qmlimportscannerPath += QLatin1String(".exe");
  #endif
---- a/tests/auto/qml/qmllint/tst_qmllint.cpp
-+++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
-@@ -170,10 +170,18 @@ void TestQmllint::initTestCase()
- {
-     QQmlDataTest::initTestCase();
-     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
-+    char *build_bin = getenv("QT_BUILD_BIN_PATH");
-+    if (build_bin && *build_bin)
-+        m_qmllintPath = QLatin1String(build_bin) + "/qmllint";
-     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
-             + QLatin1String("/qmljsrootgen");
-     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
-             + QLatin1String("/qmltyperegistrar");
-+    char *build_libexec = getenv("QT_BUILD_LIBEXEC_PATH");
-+    if (build_libexec && *build_libexec) {
-+        m_qmljsrootgenPath = QLatin1String(build_libexec) + "/qmljsrootgen";
-+        m_qmltyperegistrarPath = QLatin1String(build_libexec) + "/qmltypesregistrar";
-+    }
- #ifdef Q_OS_WIN
-     m_qmllintPath += QLatin1String(".exe");
-     m_qmljsrootgenPath += QLatin1String(".exe");
 --- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
 +++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
 @@ -118,7 +118,11 @@ tst_QDebugMessageService::tst_QDebugMess
@@ -204,3 +183,27 @@
              : debugJsServerPath("qqmldebugjs");
      return QQmlDebugTest::connectTo(
                  executable, restrictServices ? QStringLiteral("V8Debugger") : QString(),
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp.orig	2025-02-23 13:31:55.799663378 +0100
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp	2025-02-23 13:34:17.539682211 +0100
+@@ -194,6 +194,9 @@
+ {
+     QQmlDataTest::initTestCase();
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
++    char *build_bin = getenv("QT_BUILD_BIN_PATH");
++    if (build_bin && *build_bin)
++        m_qmllintPath = QLatin1String(build_bin) + "/qmllint";
+ 
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+--- a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp	2025-01-24 07:04:38.000000000 +0100
++++ -	2025-02-23 13:38:39.915208747 +0100
+@@ -29,6 +29,9 @@
+ 
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
++    char *build_libexec = getenv("QT_BUILD_LIBEXEC_PATH");
++    if (build_libexec && *build_libexec)
++        m_qmljsrootgenPath = QLatin1String(build_libexec) + "/qmljsrootgen";
+ 
+ #ifdef Q_OS_WIN
+     m_qmljsrootgenPath += QLatin1String(".exe");
diff --git a/srcpkgs/qt6-declarative/patches/test_generate_qmlls_ini.patch b/srcpkgs/qt6-declarative/patches/test_generate_qmlls_ini.patch
new file mode 100644
index 00000000000..c6d8c1b3d91
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/test_generate_qmlls_ini.patch
@@ -0,0 +1,11 @@
+--- tests/auto/cmake/test_generate_qmlls_ini/main.cpp	2025-02-23 14:05:00.700920877 +0100
++++ -	2025-02-23 14:07:13.399639405 +0100
+@@ -42,7 +42,7 @@
+ )"_s;
+ 
+     const QString &docPath = QLibraryInfo::path(QLibraryInfo::DocumentationPath);
+-    const QString defaultImportPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
++    const QString defaultImportPath = qgetenv("QML2_IMPORT_PATH") + ":" + QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
+     {
+         auto file = QFile(source.absoluteFilePath(qmllsIniName));
+         QVERIFY(file.exists());
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index df8ed168b89..3d3393f1279 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -2,7 +2,7 @@
 #
 # On update, rebuild pkgs with qt6-declarative-private-devel
 pkgname=qt6-declarative
-version=6.8.1
+version=6.8.2
 revision=1
 build_style=cmake
 configure_args="-DQT_BUILD_TESTS=ON"
@@ -14,7 +14,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/qtdeclarative-everywhere-src-${version}.tar.xz"
-checksum=95d15d5c1b6adcedb1df6485219ad13b8dc1bb5168b5151f2f1f7246a4c039fc
+checksum=144d876adc8bb55909735143e678d1e24eadcd0a380a0186792d88b731346d56
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then