From 4e28b36fc09d1502e635befee11661bf2c0f8a5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:33:26 +0000 Subject: [PATCH 1/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From fc307f6b6a6841af29af5644be75fbee949015bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:44:35 +0000 Subject: [PATCH 2/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 509207e900548687f0c5fe8743e6d05c24437266 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Thu, 11 Sep 2025 02:31:50 +0800 Subject: [PATCH 3/5] Update to 3.2.7 --- 1000-Remove-cmake-CPM.patch | 75 +++++++++++-------------------------- ada-url.spec | 21 ++++++++--- sources | 2 +- 3 files changed, 39 insertions(+), 59 deletions(-) diff --git a/1000-Remove-cmake-CPM.patch b/1000-Remove-cmake-CPM.patch index 6c1f9e8..431d63d 100644 --- a/1000-Remove-cmake-CPM.patch +++ b/1000-Remove-cmake-CPM.patch @@ -1,97 +1,66 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61900de4..b647de87 100644 +index f13601d1..fdbf5813 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,43 +28,23 @@ option(ADA_TESTING "Build tests" ${BUILD_TESTING}) +@@ -26,32 +26,17 @@ option(ADA_USE_SIMDUTF "Whether to use SIMDUTF for IDNA" OFF) # 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 -- if(Git_FOUND AND ADA_TESTING) + if(ADA_TESTING) - CPMAddPackage( - NAME GTest - GITHUB_REPOSITORY google/googletest -- VERSION 1.14.0 +- VERSION 1.15.2 - OPTIONS "BUILD_GMOCK OFF" "INSTALL_GTEST OFF" - ) -+ if(ADA_TESTING) -+ find_package(GTest) ++ find_package(GTest REQUIRED) endif() # We use simdjson in both the benchmarks and tests -- if(Git_FOUND AND (ADA_TESTING OR ADA_BENCHMARKS)) -- CPMAddPackage("gh:simdjson/simdjson@3.9.1") -+ if(ADA_TESTING OR ADA_BENCHMARKS) + if(ADA_TESTING OR ADA_BENCHMARKS) +- CPMAddPackage("gh:simdjson/simdjson@3.10.1") + find_package(simdjson REQUIRED) endif() # We use Google Benchmark, but it does not build under several 32-bit systems. -- if(Git_FOUND AND ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) + if(ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) - CPMAddPackage( - NAME benchmark - GITHUB_REPOSITORY google/benchmark -- GIT_TAG f91b6b4 +- VERSION 1.9.0 - OPTIONS "BENCHMARK_ENABLE_TESTING OFF" - "BENCHMARK_ENABLE_INSTALL OFF" - "BENCHMARK_ENABLE_WERROR OFF" - - ) -+ if(ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8)) + find_package(benchmark REQUIRED) endif() if (ADA_TESTING AND NOT EMSCRIPTEN) -- if(Git_FOUND) -- set(CTEST_TEST_TIMEOUT 5) -- message(STATUS "The tests are enabled.") -- add_subdirectory(tests) -- else() -- message(STATUS "The tests are disabled because git was not found.") -- endif() -+ set(CTEST_TEST_TIMEOUT 5) -+ message(STATUS "The tests are enabled.") -+ add_subdirectory(tests) - else() - if(is_top_project) - message(STATUS "The tests are disabled.") -@@ -72,12 +52,8 @@ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) - endif(ADA_TESTING AND NOT EMSCRIPTEN) - - If(ADA_BENCHMARKS AND NOT EMSCRIPTEN) -- if(Git_FOUND) -- message(STATUS "Ada benchmarks enabled.") -- add_subdirectory(benchmarks) -- else() -- message(STATUS "The benchmarks are disabled because git was not found.") -- endif() -+ message(STATUS "Ada benchmarks enabled.") -+ add_subdirectory(benchmarks) - else(ADA_BENCHMARKS AND NOT EMSCRIPTEN) - if(is_top_project) - message(STATUS "Ada benchmarks disabled. Set ADA_BENCHMARKS=ON to enable them.") -@@ -107,11 +83,7 @@ if(NOT ADA_COVERAGE AND NOT EMSCRIPTEN) +@@ -80,12 +65,7 @@ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) endif() - if(ADA_TOOLS) -- if(Git_FOUND) -- add_subdirectory(tools) -- else() -- message(STATUS "The tools are disabled because git was not found.") -- endif() -+ add_subdirectory(tools) + if(ADA_USE_SIMDUTF) +- CPMAddPackage( +- NAME simdutf +- GITHUB_REPOSITORY simdutf/simdutf +- VERSION 7.3.2 +- OPTIONS "SIMDUTF_TESTS OFF" "SIMDUTF_TOOLS OFF" +- ) ++ find_package(simdutf REQUIRED) endif() - install( + add_library(ada::ada ALIAS ada) diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt -index 9f0da167..96b9ea29 100644 +index 5e7ffe01..bcf606e7 100644 --- a/tools/cli/CMakeLists.txt +++ b/tools/cli/CMakeLists.txt -@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS) +@@ -37,12 +37,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("gh:fmtlib/fmt#11.0.2") -CPMAddPackage( - GITHUB_REPOSITORY jarro2783/cxxopts - VERSION 3.2.0 diff --git a/ada-url.spec b/ada-url.spec index 9efeca0..8505c5e 100644 --- a/ada-url.spec +++ b/ada-url.spec @@ -1,5 +1,11 @@ +# WARNING: do not enable testing for release builds! +# with ADA_TESTING, std_regex_provider will be enabled for testing purposes +# It is not recommended to enable this flag and use std::regex under +# production environments due to several security issues. +%bcond_with check + Name: ada-url -Version: 2.9.2 +Version: 3.2.7 %global forgeurl https://github.com/%{name}/ada %forgemeta @@ -19,9 +25,11 @@ BuildRequires: gcc-c++ BuildRequires: cmake(fmt) BuildRequires: cmake(cxxopts) +%if %{with check} BuildRequires: cmake(GTest) -BuildRequires: cmake(benchmark) +%endif BuildRequires: cmake(simdjson) +BuildRequires: cmake(simdutf) BuildRequires: doxygen @@ -62,9 +70,11 @@ the %{name} package. %build %cmake \ -%if 0%{?fedora} <= 39 - -DBUILD_TESTING:BOOL=OFF + -DADA_TOOLS:BOOL=ON \ +%if %{with check} + -DADA_TESTING:BOOL=ON \ %endif + -DADA_USE_SIMDUTF:BOOL=ON %cmake_build doxygen ./doxygen @@ -79,7 +89,7 @@ doxygen ./doxygen %files %license LICENSE-MIT LICENSE-APACHE %doc README.md docs/cli.md -%{_libdir}/libada.so.2* +%{_libdir}/libada.so.3* %files tools %{_bindir}/adaparse @@ -87,6 +97,7 @@ doxygen ./doxygen %files devel %{_libdir}/libada.so %{_libdir}/cmake/ada/ +%{_libdir}/pkgconfig/ada.pc %{_includedir}/ada/ %{_includedir}/ada.h %{_includedir}/ada_c.h diff --git a/sources b/sources index 9f60694..1598a75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ada-2.9.2.tar.gz) = bc876db537153d6b0599215ca8be8261bceca6d213fcc63af5fda13c1b32876496cb8d4e98c787f17317cf8ffd1940431551513807f1a18f9ce993fad35f5ec6 +SHA512 (ada-3.2.7.tar.gz) = 0363a75671ee98ad833211e0eb11a09048f0658cf55ec8f10a228224feb3519ac3fda4fe3cb6732137f0a0ec7e23329b12c50be32b0e68d7706a403f30620962 From 8cda490918f2c463938d7177cccd195ec16ba218 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sun, 28 Sep 2025 02:31:18 +0800 Subject: [PATCH 4/5] Update to 3.3.0 --- ada-url.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ada-url.spec b/ada-url.spec index 8505c5e..3d90572 100644 --- a/ada-url.spec +++ b/ada-url.spec @@ -5,7 +5,7 @@ %bcond_with check Name: ada-url -Version: 3.2.7 +Version: 3.3.0 %global forgeurl https://github.com/%{name}/ada %forgemeta diff --git a/sources b/sources index 1598a75..e65ae3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ada-3.2.7.tar.gz) = 0363a75671ee98ad833211e0eb11a09048f0658cf55ec8f10a228224feb3519ac3fda4fe3cb6732137f0a0ec7e23329b12c50be32b0e68d7706a403f30620962 +SHA512 (ada-3.3.0.tar.gz) = 728bf278fcac51a8ffdf5571cb486e789cd49511674c61e354c802bbfaeea64598fb22cd28ef4b02eacdd42c1c3437f40666ca8dba8097e0ecebbae1095de77f From ba26658251375b32e674759b75554ed4f1442019 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:26:01 +0000 Subject: [PATCH 5/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild