community/ada: upgrade to 2.3.1

This commit is contained in:
ptrcnull 2023-05-06 22:22:00 +02:00 committed by psykose
parent 235bbec03f
commit d94c35d3f0
2 changed files with 11 additions and 8 deletions

View File

@ -1,7 +1,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=ada pkgname=ada
pkgver=2.3.0 pkgver=2.3.1
pkgrel=0 pkgrel=0
pkgdesc="WHATWG-compliant and fast URL parser written in modern C++" pkgdesc="WHATWG-compliant and fast URL parser written in modern C++"
url="https://ada-url.github.io/ada" url="https://ada-url.github.io/ada"
@ -10,6 +10,7 @@ license="( Apache-2.0 OR MIT ) AND MPL-2.0"
makedepends=" makedepends="
cmake cmake
cxxopts-dev cxxopts-dev
gtest-dev
samurai samurai
" "
checkdepends="simdjson-dev" checkdepends="simdjson-dev"
@ -46,6 +47,6 @@ package() {
} }
sha512sums=" sha512sums="
76d16a38ce3822e57632232e2607bdc7812ca162dde39b6612ee1d7f91e919df391394a9d04644476886c2c52b1730001f9efc75f54e1c42cd69d0a41368bfee ada-2.3.0.tar.gz 1799e5877065bdc2d59325ef3eadd23eb7d9c5f68f72a4b1423ea410f98b66fa0ad3a56e419446e5d7e3851cb5d61894e1f693cab65b7865a182d1a91636b2d4 ada-2.3.1.tar.gz
eacfa386ccbfeaae60a4a64bf5f9107969f88970b2cef6760cbf531118052713e7b1fbc244f7d7e13c167f9ffd269d3409d7af650813c765b5835870c7aade0a use-system-simdjson-cxxopts.patch 3574006234403db9330a682c7486a178b2b9681eba5c053c84eac2e4706f1942aee6f532a78a6e81312326901f0f81ad3520ddd29bf7327223c2e30044b20694 use-system-simdjson-cxxopts.patch
" "

View File

@ -1,21 +1,23 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a45bab..9c26089 100644 index 32f92a4..9124315 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -24,13 +24,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake) @@ -24,14 +24,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake)
option(ADA_BENCHMARKS "Build benchmarks" OFF) option(ADA_BENCHMARKS "Build benchmarks" OFF)
-# We use Google Benchmark, but it does not build under several 32-bit systems. -# We use Google Benchmark, but it does not build under several 32-bit systems.
-if((BUILD_TESTING OR ADA_BENCHMARKS) AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) -if((BUILD_TESTING OR ADA_BENCHMARKS) AND (CMAKE_SIZEOF_VOID_P EQUAL 8))
- include(${PROJECT_SOURCE_DIR}/cmake/import.cmake) - include(${PROJECT_SOURCE_DIR}/cmake/import.cmake)
- import_dependency(simdjson simdjson/simdjson 0a3a00c95665cc1fda760e121ba8d442945ede13) - import_dependency(simdjson simdjson/simdjson 14d927128ba14e13913fc0e7c2cf538790bd1622)
- add_dependency(simdjson) - add_dependency(simdjson)
- import_dependency(gtest google/googletest 797b0ad2a3a45608ecf5c67e6e289d377a3521ca)
- add_dependency(gtest)
-endif() -endif()
- +find_package(GTest)
if (BUILD_TESTING) if (BUILD_TESTING)
message(STATUS "The tests are enabled.") message(STATUS "The tests are enabled.")
add_subdirectory(tests)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 4b99579..443a79d 100644 index 4b99579..443a79d 100644
--- a/tools/CMakeLists.txt --- a/tools/CMakeLists.txt