From a7a0aaf26506df644d3bb74862e182c355f8cc40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Fri, 10 Dec 2021 06:20:48 +0800
Subject: [PATCH] [qt5-base] Fix the incompatibility between configuration
 script and --x-buildtrees (#21657)

* [qt5-base] Fix the incompatibility between configuration script and --x-buildtrees

* version

* Update ports/qt5-base/cmake/configure_qt.cmake

* Update ports/qt5-base/cmake/configure_qt.cmake

* version

* Re-fix expr

* version

* Update ports/qt5-base/cmake/configure_qt.cmake

Co-authored-by: Billy O'Neal <bion@microsoft.com>

* Update versions/q-/qt5-base.json

* update regex expression

* version

Co-authored-by: Billy O'Neal <bion@microsoft.com>
---
 ports/qt5-base/cmake/configure_qt.cmake | 2 +-
 ports/qt5-base/vcpkg.json               | 2 +-
 versions/baseline.json                  | 2 +-
 versions/q-/qt5-base.json               | 5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/qt5-base/cmake/configure_qt.cmake b/ports/qt5-base/cmake/configure_qt.cmake
index ea62b744a2..ff2c8bc320 100644
--- a/ports/qt5-base/cmake/configure_qt.cmake
+++ b/ports/qt5-base/cmake/configure_qt.cmake
@@ -142,7 +142,7 @@ function(configure_qt)
         string(REPLACE "${CMAKE_CURRENT_INSTALLED_DIR_PATH}" "\${CURRENT_INSTALLED_DIR}" _contents ${_contents})
         #string(REPLACE "HostPrefix=\${CURRENT_PACKAGES_DIR}" "HostPrefix=\${CURRENT_INSTALLED_DIR}" _contents ${_contents})
         string(REPLACE "[EffectivePaths]\nPrefix=..\n" "" _contents ${_contents})
-        string(REPLACE "[EffectiveSourcePaths]\nPrefix=${_csc_SOURCE_PATH}\n" "" _contents ${_contents})
+        string(REGEX REPLACE "\\[EffectiveSourcePaths\\]\r?\nPrefix=[^\r\n]+\r?\n" "" _contents ${_contents})
         string(REPLACE "Sysroot=\n" "" _contents ${_contents})
         string(REPLACE "SysrootifyPrefix=false\n" "" _contents ${_contents})
         file(WRITE "${CURRENT_PACKAGES_DIR}/tools/qt5/qt_${_build_type_${_buildname}}.conf" "${_contents}")     
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index 7922d61208..8a05321bcf 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": 17,
+  "port-version": 18,
   "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/versions/baseline.json b/versions/baseline.json
index 011a7c663a..f1faa62eb3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5526,7 +5526,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.2",
-      "port-version": 17
+      "port-version": 18
     },
     "qt5-canvas3d": {
       "baseline": "0",
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index d192f255ac..75a6d40b97 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5793fff5370499ba464430142f86b971a23dff25",
+      "version-semver": "5.15.2",
+      "port-version": 18
+    },
     {
       "git-tree": "f8fbecca6183036771dc794859432a2a84435abb",
       "version-semver": "5.15.2",