From 52cb57e8adf3460f9ed1d9a163967a68b7cc0c32 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Tue, 7 Dec 2021 06:12:51 +0100
Subject: [PATCH] [qt5-declarative] no absolute paths (#21859)

---
 ports/qt5-base/cmake/qt_submodule_installation.cmake | 8 ++++++--
 ports/qt5-base/vcpkg.json                            | 2 +-
 ports/qt5-declarative/portfile.cmake                 | 3 ++-
 ports/qt5-declarative/vcpkg.json                     | 4 ++--
 versions/baseline.json                               | 4 ++--
 versions/q-/qt5-base.json                            | 5 +++++
 versions/q-/qt5-declarative.json                     | 5 +++++
 7 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ports/qt5-base/cmake/qt_submodule_installation.cmake b/ports/qt5-base/cmake/qt_submodule_installation.cmake
index 197c0ace48..19c0b4ef42 100644
--- a/ports/qt5-base/cmake/qt_submodule_installation.cmake
+++ b/ports/qt5-base/cmake/qt_submodule_installation.cmake
@@ -1,11 +1,15 @@
 
 
 function(qt_submodule_installation)
-    qt_download_submodule(OUT_SOURCE_PATH TARGET_SOURCE_PATH ${ARGV})
+    cmake_parse_arguments(_csc "" "OUT_SOURCE_PATH" "" ${ARGN})
+    qt_download_submodule(OUT_SOURCE_PATH TARGET_SOURCE_PATH ${_csc_UNPARSED_ARGUMENTS})
     if(QT_UPDATE_VERSION)
         SET(VCPKG_POLICY_EMPTY_PACKAGE enabled PARENT_SCOPE)
     else()
-        qt_build_submodule(${TARGET_SOURCE_PATH} ${ARGV})
+        qt_build_submodule(${TARGET_SOURCE_PATH} ${_csc_UNPARSED_ARGUMENTS})
         qt_install_copyright(${TARGET_SOURCE_PATH})
     endif()
+    if(DEFINED _csc_OUT_SOURCE_PATH)
+        set(${_csc_OUT_SOURCE_PATH} ${TARGET_SOURCE_PATH} PARENT_SCOPE)
+    endif()
 endfunction()
\ No newline at end of file
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index a8e22ebd1d..7922d61208 100644
--- a/ports/qt5-base/vcpkg.json
+++ b/ports/qt5-base/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-base",
   "version-semver": "5.15.2",
-  "port-version": 16,
+  "port-version": 17,
   "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake
index 8b4ab0e9ab..a528d7f3e7 100644
--- a/ports/qt5-declarative/portfile.cmake
+++ b/ports/qt5-declarative/portfile.cmake
@@ -1,2 +1,3 @@
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation(PATCHES limits_include.patch)
+qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH PATCHES limits_include.patch)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/5.15.2/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "")
\ No newline at end of file
diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json
index 9ac0dead3c..3a5477c4a1 100644
--- a/ports/qt5-declarative/vcpkg.json
+++ b/ports/qt5-declarative/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-declarative",
-  "version-string": "5.15.2",
-  "port-version": 2,
+  "version": "5.15.2",
+  "port-version": 3,
   "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.",
   "dependencies": [
     {
diff --git a/versions/baseline.json b/versions/baseline.json
index 6df560edb5..b98fc0fe54 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5526,7 +5526,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.2",
-      "port-version": 16
+      "port-version": 17
     },
     "qt5-canvas3d": {
       "baseline": "0",
@@ -5546,7 +5546,7 @@
     },
     "qt5-declarative": {
       "baseline": "5.15.2",
-      "port-version": 2
+      "port-version": 3
     },
     "qt5-doc": {
       "baseline": "5.15.2",
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index 5a7c19ab85..d192f255ac 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f8fbecca6183036771dc794859432a2a84435abb",
+      "version-semver": "5.15.2",
+      "port-version": 17
+    },
     {
       "git-tree": "5f510633de982d6e75e3d1170af23feedf208166",
       "version-semver": "5.15.2",
diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json
index 8877e0bae9..dd12f79f23 100644
--- a/versions/q-/qt5-declarative.json
+++ b/versions/q-/qt5-declarative.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "670f3d6bfa437ca047f1d1644743e2f2012524c8",
+      "version": "5.15.2",
+      "port-version": 3
+    },
     {
       "git-tree": "0cef09afb36f9debf22319dc4adccf478c611885",
       "version-string": "5.15.2",