qt6-declarative: update to 6.7.2.

srcpkgs/qt6-declarative-private-devel

@@ -0,0 +1 @@
+qt6-declarative

srcpkgs/qt6-declarative/patches/bin-qml-location.patch

@@ -1,5 +1,5 @@
---- qt6-declarative-6.4.2.orig/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
 @@ -71,6 +71,9 @@ private:
          m_currentOutputLine = 0;
  
@@ -10,8 +10,8 @@
          auto services = QQmlDebugTranslationServiceImpl::s_key;
          auto extraArgs = testFile(QMLFILE);
          auto block = true;
---- qt6-declarative-6.4.2.orig/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
 @@ -47,7 +47,11 @@ tst_QQmlInspector::tst_QQmlInspector()
  QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
                                                                  bool restrictServices)
@@ -25,9 +25,9 @@
                                    restrictServices ? QStringLiteral("QmlInspector") : QString(),
                                    testFile(qmlFile), true);
  }
---- qt6-declarative-6.4.2.orig/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
-@@ -179,10 +179,18 @@ private:
+@@ -181,10 +181,18 @@ private:
          CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
      };
  
@@ -47,8 +47,8 @@
      void checkProcessTerminated();
      void checkTraceReceived();
      void checkJsHeap();
---- qt6-declarative-6.4.2.orig/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
 @@ -85,8 +85,12 @@ void tst_QQmlDebuggingEnabler::qmlscene(
      QFETCH(bool, blockMode);
      QFETCH(QStringList, services);
@@ -64,8 +64,8 @@
      m_process->setMaximumBindErrors(1);
      m_process->start(QStringList()
                       << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
---- qt6-declarative-6.4.2.orig/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
 @@ -66,7 +66,11 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
  QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
                                                              bool restrictServices)
@@ -79,11 +79,11 @@
                                    restrictServices ? QStringLiteral("EngineControl") : QString(),
                                    testFile(file), true);
  }
---- qt6-declarative-6.4.2.orig/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
 @@ -70,8 +70,11 @@ tst_QQmlEngineDebugInspectorIntegration:
  
- QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::runAndConnect(bool restrictServices)
  {
 -    return QQmlDebugTest::connectTo(
 -                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
@@ -95,8 +95,8 @@
                  restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
                  testFile("qtquick2.qml"), true);
  }
---- qt6-declarative-6.4.2.orig/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
 @@ -56,7 +56,11 @@ tst_QQmlPreview::tst_QQmlPreview()
  
  QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
@@ -110,9 +110,9 @@
                                    QStringLiteral("QmlPreview"), testFile(qmlFile), true);
  }
  
---- qt6-declarative-6.4.2.orig/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
-@@ -65,6 +65,9 @@ void TestQmlformat::initTestCase()
+@@ -74,6 +74,9 @@ void TestQmlformat::initTestCase()
  {
      QQmlDataTest::initTestCase();
      m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
@@ -122,8 +122,8 @@
  #ifdef Q_OS_WIN
      m_qmlformatPath += QLatin1String(".exe");
  #endif
---- qt6-declarative-6.4.2.orig/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
 @@ -42,6 +42,9 @@ void TestQmlimportscanner::initTestCase(
      QQmlDataTest::initTestCase();
      m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
@@ -134,9 +134,9 @@
  #ifdef Q_OS_WIN
      m_qmlimportscannerPath += QLatin1String(".exe");
  #endif
---- qt6-declarative-6.4.2.orig/tests/auto/qml/qmllint/tst_qmllint.cpp
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
-@@ -159,10 +159,18 @@ void TestQmllint::initTestCase()
+@@ -170,10 +170,18 @@ void TestQmllint::initTestCase()
  {
      QQmlDataTest::initTestCase();
      m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
@@ -155,8 +155,8 @@
  #ifdef Q_OS_WIN
      m_qmllintPath += QLatin1String(".exe");
      m_qmljsrootgenPath += QLatin1String(".exe");
---- qt6-declarative-6.4.2.orig/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
-+++ qt6-declarative-6.4.2/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
  
  void tst_QDebugMessageService::retrieveDebugOutput()
@@ -170,8 +170,8 @@
                                      QString(), testFile(QMLFILE), true), ConnectSuccess);
  
      QTRY_VERIFY(m_client->logBuffer.size() >= 2);
---- qt6-declarative-6.4.2.orig/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
 @@ -38,6 +38,9 @@ void tst_qmlplugindump::initTestCase()
  {
      QQmlDataTest::initTestCase();
@@ -182,8 +182,8 @@
  
  #if defined(Q_OS_WIN)
      qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
---- qt6-declarative-6.4.2.orig/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
-+++ qt6-declarative-6.4.2/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
++++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
 @@ -163,11 +163,18 @@ void tst_QQmlDebugJS::initTestCase()
      QQmlDebugTest::initTestCase();
  }
@@ -195,7 +195,7 @@
 +        return QString(build_bin_path) + "/qmlscene";
 +    return QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
 +}
- QQmlDebugTest::ConnectResult tst_QQmlDebugJS::init(bool qmlscene, const QString &qmlFile,
+ QQmlDebugTest::ConnectResult tst_QQmlDebugJS::runAndConnect(bool qmlscene, const QString &qmlFile,
                                                     bool blockMode, bool restrictServices)
  {
      const QString executable = qmlscene

srcpkgs/qt6-declarative/template

@@ -1,17 +1,20 @@
 # Template file for 'qt6-declarative'
+#
+# On update, rebuild pkgs with qt6-declarative-private-devel
 pkgname=qt6-declarative
-version=6.6.0
+version=6.7.2
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DQT_BUILD_TESTS=ON"
 hostmakedepends="qt6-base perl pkg-config wayland-devel qt6-shadertools python3"
-makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel qt6-languageserver-devel"
+makedepends="qt6-base-private-devel Vulkan-Headers qt6-shadertools-devel
+ qt6-languageserver-private-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 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=1b539bb0a918c8f0307fd07bd4ef0334bf7f8934bbc2eabfc04c433a7d7fa331
+checksum=4c29cba1af8c42d425d8eb6e01bad24cb80f4b983d71eef566a0542dfdb9b999
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
@@ -24,6 +27,9 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+subpackages="qt6-quick-test qt6-declarative-host-tools qt6-declarative-tools
+ qt6-declarative-private-devel qt6-declarative-devel"
+
 do_check() {
 	cd build
 	export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml"
@@ -93,6 +99,20 @@ qt6-declarative-host-tools_package() {
 	}
 }
 
+qt6-declarative-private-devel_package() {
+	depends="qt6-declarative-devel>=${version}_${revision}"
+	short_desc+=" - private development files"
+	pkg_install() {
+		for dir in $(cd ${DESTDIR} && find usr/include -type d -name private); do
+			vmove "$dir"
+		done
+		vmove "usr/lib/cmake/*Private"
+		vmove "usr/lib/qt6/metatypes/*private_*_metatypes.json"
+		vmove "usr/lib/qt6/mkspecs/modules/*_private.pri"
+		vmove "usr/lib/qt6/modules/*Private.json"
+	}
+}
+
 qt6-declarative-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
 	 qt6-declarative-host-tools>=${version}_${revision}"
@@ -107,11 +127,6 @@ qt6-declarative-devel_package() {
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.prl"
 		vmove usr/lib/qt6/modules
-		for _f in ${DESTDIR}/usr/lib/cmake/*; do
+		vmove usr/lib/cmake
-			case "$_f" in
-			*Tools) ;;
-			*)	vmove "usr/lib/cmake/${_f##*/}" ;;
-			esac
-		done
 	}
 }