cmake: fix fuzztest patch

Author: Mizux

patches/fuzztest-2025-08-05.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e34de3..dbacb91 100644
+index f9f71df..321caf5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -13,7 +13,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
+@@ -28,7 +28,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
  elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
    set (COMPILER_CLANG 1)
  else ()
@@ -12,35 +12,34 @@ index 1e34de3..dbacb91 100644
 
  if (COMPILER_GCC AND (FUZZTEST_FUZZING_MODE OR (FUZZTEST_COMPATIBILITY_MODE STREQUAL "libfuzzer")))
 diff --git a/cmake/BuildDependencies.cmake b/cmake/BuildDependencies.cmake
-index 1f4f08d..cc4d0ba 100644
+index d8565c0..eb79f61 100644
 --- a/cmake/BuildDependencies.cmake
 +++ b/cmake/BuildDependencies.cmake
-@@ -3,20 +3,20 @@ cmake_minimum_required(VERSION 3.19)
+@@ -17,20 +17,20 @@ cmake_minimum_required(VERSION 3.19)
  include(FetchContent)
 
  set(absl_URL https://github.com/abseil/abseil-cpp.git)
--set(absl_TAG 20240116.0)
-+set(absl_TAG 20250512.0)
+-set(absl_TAG d04b964d82ed5146f7e5e34701a5ba69f9514c9a)
++set(absl_TAG 20250814.0)
 
  set(re2_URL https://github.com/google/re2.git)
--set(re2_TAG 2024-02-01)
-+set(re2_TAG 2024-07-02)
+ set(re2_TAG 2024-07-02)
 
  set(gtest_URL https://github.com/google/googletest.git)
--set(gtest_TAG v1.14.0)
+-set(gtest_TAG v1.16.0)
 +set(gtest_TAG v1.17.0)
 
  # From https://www.antlr.org/download.html
  set(antlr_cpp_URL https://www.antlr.org/download/antlr4-cpp-runtime-4.12.0-source.zip)
  set(antlr_cpp_MD5 acf7371bd7562188712751266d8a7b90)
 
  set(proto_URL https://github.com/protocolbuffers/protobuf.git)
--set(proto_TAG v28.2)
+-set(proto_TAG v30.2)
 +set(proto_TAG v31.1)
 
  set(nlohmann_json_URL https://github.com/nlohmann/json.git)
- set(nlohmann_json_TAG v3.11.2)
-@@ -27,7 +27,7 @@ if(POLICY CMP0135)
+ set(nlohmann_json_TAG v3.11.3)
+@@ -44,7 +44,7 @@ if(POLICY CMP0135)
  endif()
 
  FetchContent_Declare(
@@ -49,7 +48,7 @@ index 1f4f08d..cc4d0ba 100644
    GIT_REPOSITORY ${absl_URL}
    GIT_TAG        ${absl_TAG}
  )
-@@ -68,7 +68,7 @@ endif ()
+@@ -93,7 +93,7 @@ endif ()
 
  set(ABSL_PROPAGATE_CXX_STD ON)
  set(ABSL_ENABLE_INSTALL ON)
@@ -58,19 +57,11 @@ index 1f4f08d..cc4d0ba 100644
 
  set(RE2_BUILD_TESTING OFF)
  FetchContent_MakeAvailable(re2)
-@@ -76,6 +76,7 @@ FetchContent_MakeAvailable(re2)
- set(GTEST_HAS_ABSL ON)
- FetchContent_MakeAvailable(googletest)
- 
-+set(ANTLR_BUILD_CPP_TESTS OFF)
- FetchContent_MakeAvailable(antlr_cpp)
- 
- if (FUZZTEST_BUILD_TESTING)
 diff --git a/cmake/FuzzTestHelpers.cmake b/cmake/FuzzTestHelpers.cmake
-index b907ff8..bcd3328 100644
+index 2869a77..8462fdd 100644
 --- a/cmake/FuzzTestHelpers.cmake
 +++ b/cmake/FuzzTestHelpers.cmake
-@@ -100,6 +100,13 @@ function(fuzztest_cc_library)
+@@ -114,6 +114,13 @@ function(fuzztest_cc_library)
        ${FUZZTEST_CC_LIB_LINKOPTS}
        ${FUZZTEST_DEFAULT_LINKOPTS}
      )
@@ -84,96 +75,6 @@ index b907ff8..bcd3328 100644
 
      set_property(
        TARGET ${_NAME}
-diff --git a/fuzztest/CMakeLists.txt b/fuzztest/CMakeLists.txt
-index 3d41c8b..7e4dc30 100644
---- a/fuzztest/CMakeLists.txt
-+++ b/fuzztest/CMakeLists.txt
-@@ -122,41 +122,43 @@ fuzztest_cc_library(
-     GTest::gtest
- )
- 
--fuzztest_cc_library(
--  NAME
--    llvm_fuzzer_main
--  SRCS
--    "llvm_fuzzer_main.cc"
--  DEPS
--    fuzztest::init_fuzztest
--    absl::flags
--    absl::flags_parse
--    GTest::gtest
--)
-+if (FUZZTEST_BUILD_TESTING)
-+  fuzztest_cc_library(
-+    NAME
-+      llvm_fuzzer_main
-+    SRCS
-+      "llvm_fuzzer_main.cc"
-+    DEPS
-+      fuzztest::init_fuzztest
-+      absl::flags
-+      absl::flags_parse
-+      GTest::gtest
-+  )
- 
--fuzztest_cc_library(
--  NAME
--    llvm_fuzzer_wrapper
--  SRCS
--    "llvm_fuzzer_wrapper.cc"
--  DEPS
--    fuzztest::coverage
--    fuzztest::domain_core
--    fuzztest::fuzztest
--    fuzztest::io
--    fuzztest::llvm_fuzzer_main
--    fuzztest::logging
--    absl::core_headers
--    absl::flags
--    absl::log
--    absl::no_destructor
--    absl::random_random
--    absl::random_bit_gen_ref
--    absl::strings
--    absl::string_view
--    absl::synchronization
--    re2::re2
--)
-+  fuzztest_cc_library(
-+    NAME
-+      llvm_fuzzer_wrapper
-+    SRCS
-+      "llvm_fuzzer_wrapper.cc"
-+    DEPS
-+      fuzztest::coverage
-+      fuzztest::domain_core
-+      fuzztest::fuzztest
-+      fuzztest::io
-+      fuzztest::llvm_fuzzer_main
-+      fuzztest::logging
-+      absl::core_headers
-+      absl::flags
-+      absl::log
-+      absl::no_destructor
-+      absl::random_random
-+      absl::random_bit_gen_ref
-+      absl::strings
-+      absl::string_view
-+      absl::synchronization
-+      re2::re2
-+  )
-+endif()
- 
- ################################################################################
- # Internal
-@@ -484,6 +486,7 @@ fuzztest_cc_library(
-     "internal/logging.cc"
-   DEPS
-     absl::strings
-+    absl::synchronization
- )
- 
- fuzztest_cc_library(
 diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
 index 79ada1a..124c76b 100644
 --- a/tools/CMakeLists.txt