From cfaa391407913e65556ae219bd5728aa8026537a Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Thu, 28 Apr 2022 08:25:02 +0200 Subject: [PATCH] [qt5-base]: Fix build with "mysqlplugin" feature by linking to OpenSSL and zlib Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- 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 80c5996e59ac43..f686611f2f7264 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -279,8 +279,8 @@ if(VCPKG_TARGET_IS_WINDOWS) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") endif() if (WITH_MYSQL_PLUGIN) - list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE}") - list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG}") + list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ZLIB_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") + list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ZLIB_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") endif(WITH_MYSQL_PLUGIN) elseif(VCPKG_TARGET_IS_LINUX) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index c4b5d854b4881b..71b1b9488d70a6 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version": "5.15.3", - "port-version": 2, + "port-version": 3, "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 c2cc893f919c15..011328e0f7452f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5686,7 +5686,7 @@ }, "qt5-base": { "baseline": "5.15.3", - "port-version": 2 + "port-version": 3 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index a14cf4e64aa0ec..324f49b931495d 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7518c5eeb84d3bbfaaa88cb19795b693fd0923f7", + "version": "5.15.3", + "port-version": 3 + }, { "git-tree": "abaaa592badf33576f197d915ed1f4ddd91d0931", "version": "5.15.3",