From 2dc5c3206b342dfbd694bf9c509adbe0ae69bbcf Mon Sep 17 00:00:00 2001
From: jvbsl <jvsbl@gmx.de>
Date: Wed, 2 Aug 2023 18:25:48 +0200
Subject: [PATCH] [qt5-base] Fix for feature postgresqlplugin on Windows
 (#32880)

* Fix qt5-base[postgresqlplugin] build on Windows

* Update qt5-base port version

* Try sha suggested by remote build
---
 ports/qt5-base/portfile.cmake | 4 ++--
 ports/qt5-base/vcpkg.json     | 2 +-
 versions/baseline.json        | 2 +-
 versions/q-/qt5-base.json     | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 45fce5acd9..261b59f98d 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -270,8 +270,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
             "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ${ADDITIONAL_WINDOWS_LIBS}"
         )
     if(WITH_PGSQL_PLUGIN)
-        list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ADDITIONAL_WINDOWS_LIBS}")
-        list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ADDITIONAL_WINDOWS_LIBS}")
+        list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ADDITIONAL_WINDOWS_LIBS} -lwldap32")
+        list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ADDITIONAL_WINDOWS_LIBS} -lwldap32")
     endif()
 elseif(VCPKG_TARGET_IS_LINUX)
     list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -xcb -linuxfb)
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index cc615e2975..d17dbb435c 100644
--- a/ports/qt5-base/vcpkg.json
+++ b/ports/qt5-base/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-base",
   "version": "5.15.10",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index 620f8ab25f..8327329b17 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6642,7 +6642,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.10",
-      "port-version": 4
+      "port-version": 5
     },
     "qt5-canvas3d": {
       "baseline": "0",
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index 7b7987b38e..7574e8826e 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "36129e539ff3df7757bf3074b977dd32d6e85926",
+      "version": "5.15.10",
+      "port-version": 5
+    },
     {
       "git-tree": "bd1318b6c207ed69b8a5c5ab75f143263b6bc522",
       "version": "5.15.10",