diff --git a/ports/ada-url/no-cpm.patch b/ports/ada-url/no-cpm.patch index e35487e2271a04..afac8efbb1ec68 100644 --- a/ports/ada-url/no-cpm.patch +++ b/ports/ada-url/no-cpm.patch @@ -1,31 +1,30 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b206edb6..1db4099d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,7 +30,6 @@ option(ADA_TESTING "Build tests" ${BUILD_TESTING}) - # errors due to CPM, so this is here to support disabling all the testing - # and tooling for ada if one only wishes to use the ada library. - if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) -- include(cmake/CPM.cmake) - # CPM requires git as an implicit dependency - find_package(Git QUIET) - # We use googletest in the tests -diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt -index ff57220b..a6d90f29 100644 ---- a/tools/cli/CMakeLists.txt -+++ b/tools/cli/CMakeLists.txt -@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS) - "$" # <--this is in-file - "$") # <--this is out-file path - endif() --CPMAddPackage("gh:fmtlib/fmt#10.2.1") --CPMAddPackage( -- GITHUB_REPOSITORY jarro2783/cxxopts -- VERSION 3.2.0 -- OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES" --) -+find_package(fmt CONFIG REQUIRED) -+find_package(cxxopts CONFIG REQUIRED) - target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt) - - if(MSVC OR MINGW) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1b55e39..23ce61f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake) + # errors due to CPM, so this is here to support disabling all the testing + # and tooling for ada if one only wishes to use the ada library. + if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) +- include(cmake/CPM.cmake) + # CPM requires git as an implicit dependency + # We use googletest in the tests + if(ADA_TESTING) +diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt +index 397b428..5860fd1 100644 +--- a/tools/cli/CMakeLists.txt ++++ b/tools/cli/CMakeLists.txt +@@ -8,12 +8,7 @@ if(MSVC AND BUILD_SHARED_LIBS) + "$" # <--this is in-file + "$") # <--this is out-file path + endif() +-CPMAddPackage("gh:fmtlib/fmt#11.0.2") +-CPMAddPackage( +- GITHUB_REPOSITORY jarro2783/cxxopts +- VERSION 3.2.0 +- OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES" +-) ++find_package(fmt CONFIG REQUIRED) + target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt) + + if(MSVC OR MINGW) diff --git a/ports/ada-url/portfile.cmake b/ports/ada-url/portfile.cmake index 431721cc4951c0..552e6207799e91 100644 --- a/ports/ada-url/portfile.cmake +++ b/ports/ada-url/portfile.cmake @@ -1,8 +1,12 @@ +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "Building ${PORT} requires a C++20 compliant compiler. GCC 12 and Clang 15 are known to work.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ada-url/ada REF "v${VERSION}" - SHA512 bc876db537153d6b0599215ca8be8261bceca6d213fcc63af5fda13c1b32876496cb8d4e98c787f17317cf8ffd1940431551513807f1a18f9ce993fad35f5ec6 + SHA512 f368bed0501b632e6031965e4cf7a56f6e3681f44e0245d57a2441f5a2a629b99d85f5e8252f701d31ab269f76f28e6e4ad74543d03fd3fd600429a88b951e81 HEAD_REF main PATCHES no-cpm.patch @@ -18,7 +22,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DADA_BENCHMARKS=OFF - -DBUILD_TESTING=OFF + -DADA_TESTING=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON ${FEATURE_OPTIONS} OPTIONS_DEBUG diff --git a/ports/ada-url/vcpkg.json b/ports/ada-url/vcpkg.json index fb09b307f9e96f..dad7baf3a3914c 100644 --- a/ports/ada-url/vcpkg.json +++ b/ports/ada-url/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ada-url", - "version": "2.9.2", + "version": "3.1.0", "description": "WHATWG-compliant and fast URL parser written in modern C++", "homepage": "https://ada-url.com/", - "license": "MIT", + "license": "MIT OR Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a70c5866a88546..b4f90dc7724ddd 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -42,6 +42,8 @@ ace:arm-neon-android=fail ace:arm64-android=fail ace:x64-android=fail +# ada-url requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. +ada-url:x64-linux=fail # Needs SDK (in ENV{ANDROID_HOME}) allegro5:arm-neon-android=fail allegro5:arm64-android=fail diff --git a/versions/a-/ada-url.json b/versions/a-/ada-url.json index 3986e198f4bcaa..0dec5ae8fe960e 100644 --- a/versions/a-/ada-url.json +++ b/versions/a-/ada-url.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3e8535729a05187fa28a6a7c560dbdb6cbe22fd0", + "version": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "cc5afce7ce2d8c4bc21ddc8022b84729739da079", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "ca729da9e664e3a59d88115c9e8a8d59b775801c", "version": "2.9.2", diff --git a/versions/baseline.json b/versions/baseline.json index b65ca1a3505cbe..23ec1843dc5582 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -37,7 +37,7 @@ "port-version": 17 }, "ada-url": { - "baseline": "2.9.2", + "baseline": "3.1.0", "port-version": 0 }, "ade": {