diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-03-25 03:57:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 12:57:51 -0700 |
| commit | a5ac469043cbb9feeb7e1238cb73afc80ecc9fdb (patch) | |
| tree | 411a717fa2b849535acf12e71713719357f2b0fa | |
| parent | bce563ed584e207fdc614f665176daf9194d5fd7 (diff) | |
| download | vcpkg-a5ac469043cbb9feeb7e1238cb73afc80ecc9fdb.tar.gz vcpkg-a5ac469043cbb9feeb7e1238cb73afc80ecc9fdb.zip | |
[poco] Fix feature sqlite3 (#16549)
* [poco] Fix feature sqlite3
* Update versions
* Add dependencies
* Update versions/p-/poco.json
| -rw-r--r-- | ports/poco/CONTROL | 31 | ||||
| -rw-r--r-- | ports/poco/fix-feature-sqlite3.patch | 13 | ||||
| -rw-r--r-- | ports/poco/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/poco/vcpkg.json | 51 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/p-/poco.json | 5 |
6 files changed, 71 insertions, 32 deletions
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL deleted file mode 100644 index f0e093987..000000000 --- a/ports/poco/CONTROL +++ /dev/null @@ -1,31 +0,0 @@ -Source: poco -Version: 1.10.1 -Port-Version: 3 -Build-Depends: expat, pcre, zlib -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 - -Feature: mysql -Build-Depends: libmysql -Description: Mysql support for POCO - -Feature: mariadb -Build-Depends: libmariadb -Description: MariaDB support for POCO - -Feature: postgresql -Build-Depends: libpqxx -Description: PostgreSQL support for POCO - -Feature: sqlite3 -Build-Depends: sqlite3 -Description: Sqlite3 support for POCO - -Feature: netssl -Build-Depends: openssl -Description: NetSSL support for POCO - -Feature: pdf -Build-Depends: libharu -Description: Haru support for POCO
\ No newline at end of file diff --git a/ports/poco/fix-feature-sqlite3.patch b/ports/poco/fix-feature-sqlite3.patch new file mode 100644 index 000000000..1786c1f22 --- /dev/null +++ b/ports/poco/fix-feature-sqlite3.patch @@ -0,0 +1,13 @@ +diff --git a/Data/SQLite/cmake/PocoDataSQLiteConfig.cmake b/Data/SQLite/cmake/PocoDataSQLiteConfig.cmake +index 5478bab..c5d6d6d 100644 +--- a/Data/SQLite/cmake/PocoDataSQLiteConfig.cmake ++++ b/Data/SQLite/cmake/PocoDataSQLiteConfig.cmake +@@ -5,7 +5,7 @@ if(@POCO_UNBUNDLED@) + if(CMAKE_VERSION VERSION_LESS "3.14") + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/V313") + endif() +- find_dependency(SQLite3 REQUIRED) ++ find_dependency(unofficial-sqlite3 REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoDataSQLiteTargets.cmake") diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 27187cf08..97a732ffb 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( # Add the support of arm64-windows arm64_pcre.patch fix_dependency.patch + fix-feature-sqlite3.patch ) file(REMOVE "${SOURCE_PATH}/Foundation/src/pcre.h") diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json new file mode 100644 index 000000000..cf06a3484 --- /dev/null +++ b/ports/poco/vcpkg.json @@ -0,0 +1,51 @@ +{ + "name": "poco", + "version-semver": "1.10.1", + "port-version": 4, + "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", + "zlib" + ], + "features": { + "mariadb": { + "description": "MariaDB support for POCO", + "dependencies": [ + "libmariadb" + ] + }, + "mysql": { + "description": "Mysql support for POCO", + "dependencies": [ + "libmysql" + ] + }, + "netssl": { + "description": "NetSSL support for POCO", + "dependencies": [ + "openssl" + ] + }, + "pdf": { + "description": "Haru support for POCO", + "dependencies": [ + "libharu" + ] + }, + "postgresql": { + "description": "PostgreSQL support for POCO", + "dependencies": [ + "libpqxx" + ] + }, + "sqlite3": { + "description": "Sqlite3 support for POCO", + "dependencies": [ + "sqlite3" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index acb6e667b..07f1a4b4b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4710,7 +4710,7 @@ }, "poco": { "baseline": "1.10.1", - "port-version": 3 + "port-version": 4 }, "podofo": { "baseline": "0.9.6", diff --git a/versions/p-/poco.json b/versions/p-/poco.json index 2d40ac34e..8a5812e1a 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e5bc44534a1611fd4c61e92eb0e747d038225f02", + "version-semver": "1.10.1", + "port-version": 4 + }, + { "git-tree": "cfe171c7ba27d9319ec61d5972aa249df4d025b8", "version-string": "1.10.1", "port-version": 3 |
