Upgrade Abseil to 20240722.0

With the new LTS version of Abseil, remove the patch to workaround issues with CMake 3.30.0.
mudge · Aug 1, 2024 · 829a288 · 829a288
1 parent a8e44eb
commit 829a288
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 36 deletions.
diff --git a/Rakefile b/Rakefile
@@ -16,9 +16,6 @@ re2_archive = File.join("ports/archives", File.basename(re2_recipe.files[0][:url
 
 re2_gemspec.files << abseil_archive
 re2_gemspec.files << re2_archive
-Dir[File.join("patches/**/*.patch")].each do |patch|
-  re2_gemspec.files << patch
-end
 
 cross_platforms = %w[
   aarch64-linux
@@ -42,7 +39,7 @@ Rake::ExtensionTask.new('re2', re2_gemspec) do |e|
   e.config_options << '--disable-system-libraries'
   e.cross_platform = cross_platforms
   e.cross_compiling do |spec|
-    spec.files.reject! { |path| File.fnmatch?('ports/*', path) || File.fnmatch?('patches/*', path) }
+    spec.files.reject! { |path| File.fnmatch?('ports/*', path) }
     spec.dependencies.reject! { |dep| dep.name == 'mini_portile2' }
   end
 end

diff --git a/dependencies.yml b/dependencies.yml
@@ -3,5 +3,5 @@ libre2:
   version: '2024-07-02'
   sha256: eb2df807c781601c14a260a507a5bb4509be1ee626024cb45acbd57cb9d4032b
 abseil:
-  version: '20240116.2'
-  sha256: 733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc
+  version: '20240722.0'
+  sha256: f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3
diff --git a/ext/re2/recipes.rb b/ext/re2/recipes.rb
@@ -20,7 +20,6 @@ def load_recipes
       url: "https://github.com/abseil/abseil-cpp/archive/refs/tags/#{recipe.version}.tar.gz",
       sha256: dependencies['abseil']['sha256']
     }]
-    recipe.patch_files = Dir[File.join(PACKAGE_ROOT_DIR, "patches/abseil/*.patch")].sort
   end
 
   re2_recipe = build_recipe('libre2', dependencies['libre2']['version']) do |recipe|

diff --git a/patches/abseil/0001-Avoid-export-of-testonly-target-absl-test_allocator-.patch b/patches/abseil/0001-Avoid-export-of-testonly-target-absl-test_allocator-.patch