3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 12:28:14 +08:00
Code Issues Projects Releases Wiki Activity

[poco] Update and improve patches. (#27999)

Browse Source 
* [poco] Update and improve patches.

* update version

* update patch

* vdb
This commit is contained in:
Frank 2022-11-30 04:08:08 +08:00 committed by GitHub
parent 1de5f73060
commit 6d6910d8cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ports/poco/0003-fix-dependency.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c552091..f05f50c 100644
index c552091..8842c76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,8 +90,6 @@ option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF)
@ -11,13 +11,15 @@ index c552091..f05f50c 100644
endif()
if(OPENSSL_FOUND)
@@ -123,22 +121,20 @@ endif()
@@ -121,24 +119,19 @@ else()
option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF)
endif()
if(ENABLE_DATA_MYSQL)
find_package(MySQL REQUIRED)
-if(ENABLE_DATA_MYSQL)
- find_package(MySQL REQUIRED)
-else()
- find_package(MySQL)
endif()
-endif()
+option(ENABLE_DATA "Enable Data" OFF)
+option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF)
@ -42,7 +44,7 @@ index c552091..f05f50c 100644
endif()
if(PostgreSQL_FOUND)
@@ -223,6 +219,9 @@ include(DefinePlatformSpecifc)
@@ -223,6 +216,9 @@ include(DefinePlatformSpecifc)
# Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file
set(Poco_COMPONENTS "")
@ -52,7 +54,7 @@ index c552091..f05f50c 100644
if(ENABLE_TESTS)
add_subdirectory(CppUnit)
set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE)
@@ -351,8 +350,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Prometheus AND ENABLE_PROMETHEUS)
@@ -351,8 +347,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Prometheus AND ENABLE_PROMETHEUS)
list(APPEND Poco_COMPONENTS "Prometheus")
endif()
@ -66,7 +68,7 @@ index c552091..f05f50c 100644
list(APPEND Poco_COMPONENTS "PDF")
endif()
@@ -492,15 +494,6 @@ install(
@@ -492,15 +491,6 @@ install(
Devel
)
@ -83,7 +85,7 @@ index c552091..f05f50c 100644
message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}")
if(BUILD_SHARED_LIBS)
diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt
index 0772af6..692fd2f 100644
index 0772af6..ec82d76 100644
--- a/Data/CMakeLists.txt
+++ b/Data/CMakeLists.txt
@@ -45,7 +45,7 @@ else(ENABLE_DATA_SQLITE)
@ -91,18 +93,15 @@ index 0772af6..692fd2f 100644
endif()
-if(MYSQL_FOUND AND ENABLE_DATA_MYSQL)
+if((MYSQL_FOUND OR unofficial-libmariadb_FOUND) AND ENABLE_DATA_MYSQL)
+if((unofficial-libmysql_FOUND OR unofficial-libmariadb_FOUND) AND ENABLE_DATA_MYSQL)
message(STATUS "MySQL Support Enabled")
add_subdirectory(MySQL)
else()
diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt
index ce411cf..2791523 100644
index ce411cf..5a30b7c 100644
--- a/Data/MySQL/CMakeLists.txt
+++ b/Data/MySQL/CMakeLists.txt
@@ -18,10 +18,10 @@ set_target_properties(DataMySQL
PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoDataMySQL
@@ -21,7 +21,7 @@ set_target_properties(DataMySQL
DEFINE_SYMBOL MySQL_EXPORTS
)
@ -147,7 +146,7 @@ index 3a176d7..d8055cb 100644
POCO_UNBUNDLED
SQLITE_THREADSAFE=1
diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt
index 4fbf06f..793285a 100644
index 123657a..9856c55 100644
--- a/XML/CMakeLists.txt
+++ b/XML/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
@ -182,16 +181,15 @@ index ef58207..4ed94ec 100644
include("${CMAKE_CURRENT_LIST_DIR}/PocoXMLTargets.cmake")
diff --git a/cmake/PocoConfig.cmake.in b/cmake/PocoConfig.cmake.in
index 173eacd..4864b32 100644
index 173eacd..90f68fc 100644
--- a/cmake/PocoConfig.cmake.in
+++ b/cmake/PocoConfig.cmake.in
@@ -8,6 +8,13 @@ if (NOT Poco_FIND_COMPONENTS)
@@ -8,6 +8,12 @@ if (NOT Poco_FIND_COMPONENTS)
return()
endif()
+include(CMakeFindDependencyMacro)
+find_dependency(ZLIB REQUIRED)
+#find_dependency(unofficial-pcre REQUIRED)
+if(Poco_FIND_REQUIRED_XML)
+ find_dependency(expat CONFIG REQUIRED)
+endif()
@ -199,7 +197,7 @@ index 173eacd..4864b32 100644
set(_Poco_FIND_PARTS_REQUIRED)
if (Poco_FIND_REQUIRED)
set(_Poco_FIND_PARTS_REQUIRED REQUIRED)
@@ -23,7 +30,7 @@ set(_Poco_NOTFOUND_MESSAGE)
@@ -23,7 +29,7 @@ set(_Poco_NOTFOUND_MESSAGE)
# Let components find each other, but don't overwrite CMAKE_PREFIX_PATH
set(_Poco_CMAKE_PREFIX_PATH_old ${CMAKE_PREFIX_PATH})

13
ports/poco/0006-fix-install-data-mysql.patch
View File

@ -1,13 +0,0 @@
diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt
index 9d0a85c..4f1ae21 100644
--- a/Data/CMakeLists.txt
+++ b/Data/CMakeLists.txt
@@ -45,7 +45,7 @@ else(ENABLE_DATA_SQLITE)
message(STATUS "SQLite Support Disabled")
endif()
-if((MYSQL_FOUND OR unofficial-libmariadb_FOUND) AND ENABLE_DATA_MYSQL)
+if((unofficial-libmysql_FOUND OR unofficial-libmariadb_FOUND) AND ENABLE_DATA_MYSQL)
message(STATUS "MySQL Support Enabled")
add_subdirectory(MySQL)
else()

18
ports/poco/0007-find-pcre2.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f05f50c..bb7a94c 100644
index 8842c76..b887168 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -494,6 +494,11 @@ install(
@@ -491,6 +491,11 @@ install(
Devel
)
@ -15,7 +15,7 @@ index f05f50c..bb7a94c 100644
message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}")
if(BUILD_SHARED_LIBS)
diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
index 226dadb..25ff2c1 100644
index 226dadb..a3765a7 100644
--- a/Foundation/CMakeLists.txt
+++ b/Foundation/CMakeLists.txt
@@ -35,8 +35,11 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc)
@ -92,15 +92,3 @@ index e730f32..6e10df2 100644
set(PCRE2_INCLUDE_DIRS ${PCRE2_INCLUDE_DIR})
set(PCRE2_DEFINITIONS ${PC_PCRE2_CFLAGS_OTHER})
endif()
diff --git a/cmake/PocoConfig.cmake.in b/cmake/PocoConfig.cmake.in
index 4864b32..90f68fc 100644
--- a/cmake/PocoConfig.cmake.in
+++ b/cmake/PocoConfig.cmake.in
@@ -10,7 +10,6 @@ endif()
include(CMakeFindDependencyMacro)
find_dependency(ZLIB REQUIRED)
-#find_dependency(unofficial-pcre REQUIRED)
if(Poco_FIND_REQUIRED_XML)
find_dependency(expat CONFIG REQUIRED)
endif()

1
ports/poco/portfile.cmake
View File

@ -12,7 +12,6 @@ vcpkg_from_github(
0003-fix-dependency.patch
0004-fix-feature-sqlite3.patch
0005-fix-error-c3861.patch
0006-fix-install-data-mysql.patch
0007-find-pcre2.patch
)

2
ports/poco/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "poco",
"version": "1.12.4",
"port-version": 2,
"port-version": 3,
"description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.",
"homepage": "https://github.com/pocoproject/poco",
"license": "BSL-1.0",

2
versions/baseline.json
View File

@ -5862,7 +5862,7 @@
},
"poco": {
"baseline": "1.12.4",
"port-version": 2
"port-version": 3
},
"podofo": {
"baseline": "0.9.8",

5
versions/p-/poco.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6d2166180316a03fcbef817dc1bb6c1573fb9f32",
"version": "1.12.4",
"port-version": 3
},
{
"git-tree": "97204cd392ddc9b7c7b415e7cb18667c71e12869",
"version": "1.12.4",