[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
This commit is contained in:
jvbsl 2023-08-02 18:25:48 +02:00 committed by GitHub
parent 06aa33211a
commit 2dc5c3206b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions

View File

@ -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)

View File

@ -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,

View File

@ -6642,7 +6642,7 @@
},
"qt5-base": {
"baseline": "5.15.10",
"port-version": 4
"port-version": 5
},
"qt5-canvas3d": {
"baseline": "0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "36129e539ff3df7757bf3074b977dd32d6e85926",
"version": "5.15.10",
"port-version": 5
},
{
"git-tree": "bd1318b6c207ed69b8a5c5ab75f143263b6bc522",
"version": "5.15.10",