diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-08-03 07:57:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 16:57:14 -0700 |
| commit | a6ef376f0d757c8b695b12f53d573f99a524e594 (patch) | |
| tree | 35bb6ac04fea6e873aab395d80b71c187b69174c | |
| parent | 9db6c29de7076a01e7f6a39d8266e6e41de7cbef (diff) | |
| download | vcpkg-a6ef376f0d757c8b695b12f53d573f99a524e594.tar.gz vcpkg-a6ef376f0d757c8b695b12f53d573f99a524e594.zip | |
[Poco] update to 1.11.0 (#19040)
* [Poco] update to 1.11.0
* update version
* fix ci error
* update version
* Modernizes the port
* update poco
* update portfile.cmake
* update version
| -rw-r--r-- | ports/poco/arm64_pcre.patch | 22 | ||||
| -rw-r--r-- | ports/poco/fix-error-c3861.patch | 12 | ||||
| -rw-r--r-- | ports/poco/fix_dependency.patch | 33 | ||||
| -rw-r--r-- | ports/poco/portfile.cmake | 40 | ||||
| -rw-r--r-- | ports/poco/vcpkg.json | 11 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/p-/poco.json | 5 |
7 files changed, 77 insertions, 50 deletions
diff --git a/ports/poco/arm64_pcre.patch b/ports/poco/arm64_pcre.patch index faf8ce99c..75151dc34 100644 --- a/ports/poco/arm64_pcre.patch +++ b/ports/poco/arm64_pcre.patch @@ -1,8 +1,8 @@ diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h
-index 3f26008..d0bbd31 100644
+index 9a945f3..f5a9a7f 100644
--- a/Foundation/include/Poco/Platform.h
+++ b/Foundation/include/Poco/Platform.h
-@@ -193,7 +193,7 @@
+@@ -191,7 +191,7 @@
#else
#define POCO_ARCH_LITTLE_ENDIAN 1
#endif
@@ -12,7 +12,7 @@ index 3f26008..d0bbd31 100644 #if defined(__ARMEB__)
#define POCO_ARCH_BIG_ENDIAN 1
diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp
-index 4d655da..26567c8 100644
+index 1f51296..c67b71b 100644
--- a/Foundation/src/EventLogChannel.cpp
+++ b/Foundation/src/EventLogChannel.cpp
@@ -11,6 +11,7 @@
@@ -24,20 +24,20 @@ index 4d655da..26567c8 100644 #include "Poco/EventLogChannel.h"
#include "Poco/Message.h"
diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h
-index e2b6a06..1b045c1 100644
+index 4328344..5eeafcd 100644
--- a/Foundation/src/utils.h
+++ b/Foundation/src/utils.h
-@@ -54,7 +54,7 @@
- // disabled.)
- // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
+@@ -91,7 +91,7 @@ int main(int argc, char** argv) {
+ //
+ // If it prints "correct" then the architecture should be here, in the "correct" section.
#if defined(_M_X64) || defined(__x86_64__) || \
-- defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || \
+- defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
+ defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || defined(_M_ARM64) || \
- defined(__avr32__) || \
defined(__hppa__) || defined(__ia64__) || \
defined(__mips__) || \
+ defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
diff --git a/Net/src/Net.cpp b/Net/src/Net.cpp
-index e81b4b5..36ae436 100644
+index 1a75379..b4081fd 100644
--- a/Net/src/Net.cpp
+++ b/Net/src/Net.cpp
@@ -11,6 +11,7 @@
@@ -49,7 +49,7 @@ index e81b4b5..36ae436 100644 #include "Poco/Net/Net.h"
diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp
-index 4c2ad7d..cf1de17 100644
+index 7fd1a28..a07c5d2 100644
--- a/Util/src/WinRegistryKey.cpp
+++ b/Util/src/WinRegistryKey.cpp
@@ -11,6 +11,7 @@
diff --git a/ports/poco/fix-error-c3861.patch b/ports/poco/fix-error-c3861.patch new file mode 100644 index 000000000..85891622c --- /dev/null +++ b/ports/poco/fix-error-c3861.patch @@ -0,0 +1,12 @@ +diff --git a/XML/include/Poco/XML/ParserEngine.h b/XML/include/Poco/XML/ParserEngine.h
+index e0c8455..363654c 100644
+--- a/XML/include/Poco/XML/ParserEngine.h
++++ b/XML/include/Poco/XML/ParserEngine.h
+@@ -19,6 +19,7 @@
+
+ #include "Poco/XML/XML.h"
+ #if defined(POCO_UNBUNDLED)
++#include <expat_config.h>
+ #include <expat.h>
+ #else
+ #include "Poco/XML/expat.h"
diff --git a/ports/poco/fix_dependency.patch b/ports/poco/fix_dependency.patch index 8cb6ed483..2fd917aff 100644 --- a/ports/poco/fix_dependency.patch +++ b/ports/poco/fix_dependency.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b664afd..aafbf4a 100644 +index 4e05272..44dd7cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,8 +82,6 @@ option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF) @@ -44,7 +44,7 @@ index b664afd..aafbf4a 100644 endif() if(PostgreSQL_FOUND) -@@ -200,6 +193,9 @@ include(DefinePlatformSpecifc) +@@ -207,6 +200,9 @@ include(DefinePlatformSpecifc) # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file set(Poco_COMPONENTS "") @@ -54,7 +54,7 @@ index b664afd..aafbf4a 100644 if(ENABLE_TESTS) add_subdirectory(CppUnit) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) -@@ -327,8 +323,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) +@@ -339,8 +335,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) list(APPEND Poco_COMPONENTS "Redis") endif() @@ -68,7 +68,7 @@ index b664afd..aafbf4a 100644 list(APPEND Poco_COMPONENTS "PDF") endif() -@@ -457,15 +456,6 @@ install( +@@ -478,15 +477,6 @@ install( Devel ) @@ -110,6 +110,19 @@ index f71b145..7034974 100644 target_include_directories(DataMySQL PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h +index 6ddcd39..9e50803 100644 +--- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h ++++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h +@@ -57,8 +57,6 @@ + #endif + #if defined(LIBMARIADB) + #pragma comment(lib, "libmariadb") +- #else +- #pragma comment(lib, "libmysql") + #endif + #endif + diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt index b52e2c5..0dcfae2 100644 --- a/Data/SQLite/CMakeLists.txt @@ -229,15 +242,3 @@ index 173eacd..936edf4 100644 foreach(module ${Poco_FIND_COMPONENTS}) find_package(Poco${module} -diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h -index b533c9f..e2bb2d3 100644 ---- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h -+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h -@@ -54,7 +54,6 @@ - #if !defined(MySQL_EXPORTS) - #pragma comment(lib, "PocoDataMySQL" POCO_LIB_SUFFIX) - #endif -- #pragma comment(lib, "libmysql") - #endif - - diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 97a732ffb..4ac9a949d 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pocoproject/poco - REF 3fc3e5f5b8462f7666952b43381383a79b8b5d92 # poco-1.10.1-release - SHA512 4c53a24a2ab9c57f4bf94e233da65cbb144c101b7d8d422d7e687d6c90ce0b53cb7bcfae63205ff30cade0fd07319e44a32035c1b15637ea2958986efc4ad5df + REF f81a38057f1d240fe7b7a069612776f788bc88ea # poco-1.11.0-release + SHA512 c5f39aca8b5464959b9337b0cbd8ee86d81f195f5a5ba864692c71b2bdbffdecef0537b6e6a2d9f41829bcd58f78825b10565d0c4ee7b3c856a4886a9e328118 HEAD_REF master PATCHES # Fix embedded copy of pcre in static linking mode @@ -13,12 +13,14 @@ vcpkg_from_github( arm64_pcre.patch fix_dependency.patch fix-feature-sqlite3.patch + fix-error-c3861.patch ) file(REMOVE "${SOURCE_PATH}/Foundation/src/pcre.h") file(REMOVE "${SOURCE_PATH}/cmake/V39/FindEXPAT.cmake") file(REMOVE "${SOURCE_PATH}/cmake/V313/FindSQLite3.cmake") file(REMOVE "${SOURCE_PATH}/cmake/FindPCRE.cmake") +file(REMOVE "${SOURCE_PATH}/XML/src/expat_config.h") file(REMOVE "${SOURCE_PATH}/cmake/FindMySQL.cmake") # define Poco linkage type @@ -26,12 +28,13 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" POCO_STATIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" POCO_MT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - pdf ENABLE_PDF - netssl ENABLE_NETSSL - netssl ENABLE_NETSSL_WIN - netssl ENABLE_CRYPTO - sqlite3 ENABLE_DATA_SQLITE - postgresql ENABLE_DATA_POSTGRESQL + FEATURES + pdf ENABLE_PDF + netssl ENABLE_NETSSL + netssl ENABLE_NETSSL_WIN + netssl ENABLE_CRYPTO + sqlite3 ENABLE_DATA_SQLITE + postgresql ENABLE_DATA_POSTGRESQL ) if ("mysql" IN_LIST FEATURES OR "mariadb" IN_LIST FEATURES) @@ -40,9 +43,8 @@ else() set(POCO_USE_MYSQL OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} # force to use dependencies as external -DPOCO_UNBUNDLED=ON @@ -50,7 +52,6 @@ vcpkg_configure_cmake( -DPOCO_STATIC=${POCO_STATIC} -DPOCO_MT=${POCO_MT} -DENABLE_TESTS=OFF - -DENABLE_SAMPLES=OFF # Allow enabling and disabling components # POCO_ENABLE_SQL_ODBC, POCO_ENABLE_SQL_MYSQL and POCO_ENABLE_SQL_POSTGRESQL are # defined on the fly if the required librairies are present @@ -74,12 +75,12 @@ vcpkg_configure_cmake( -DENABLE_DATA_MYSQL=${POCO_USE_MYSQL} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Move apps to the tools folder -vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec arc AUTO_CLEAN) # Copy additional include files not part of any libraries if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL") @@ -100,11 +101,12 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/SQLite") endif() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Poco) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Poco) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json index e310417a2..0f6f37ab5 100644 --- a/ports/poco/vcpkg.json +++ b/ports/poco/vcpkg.json @@ -1,13 +1,20 @@ { "name": "poco", - "version-semver": "1.10.1", - "port-version": 5, + "version-semver": "1.11.0", "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", "supports": "!uwp", "dependencies": [ "expat", "pcre", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 4aec399c0..ebf427171 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4969,8 +4969,8 @@ "port-version": 0 }, "poco": { - "baseline": "1.10.1", - "port-version": 5 + "baseline": "1.11.0", + "port-version": 0 }, "podofo": { "baseline": "0.9.7", diff --git a/versions/p-/poco.json b/versions/p-/poco.json index d5cc773d1..c66b34c0a 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e8f4d5c1548d23526e05b069ee626d7d7f9a4399", + "version-semver": "1.11.0", + "port-version": 0 + }, + { "git-tree": "e9c709300900158cdfcad75965e85b04413c8d5b", "version-semver": "1.10.1", "port-version": 5 |
