From cd77648091a006135a380760dc000cdae7bc2a05 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 21:20:10 +0000
Subject: [PATCH 01/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index bf79095..8c934b9 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20220623.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -99,6 +99,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20220623.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Sep 02 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.1-2
 - Update to 20220623.1 (close RHBZ#2123181)
 

From 570816731a09e471666a7f64d2cf0901b50c0838 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 18 Jan 2023 21:37:01 -0500
Subject: [PATCH 02/41] Work around static assertion failures in tests with GCC
 13

---
 abseil-cpp-20220623.1-gcc13.patch | 26 ++++++++++++++++++++++++++
 abseil-cpp.spec                   |  5 +++++
 2 files changed, 31 insertions(+)
 create mode 100644 abseil-cpp-20220623.1-gcc13.patch

diff --git a/abseil-cpp-20220623.1-gcc13.patch b/abseil-cpp-20220623.1-gcc13.patch
new file mode 100644
index 0000000..09438b8
--- /dev/null
+++ b/abseil-cpp-20220623.1-gcc13.patch
@@ -0,0 +1,26 @@
+diff -Naur abseil-cpp-20220623.1-original/absl/memory/memory_test.cc abseil-cpp-20220623.1/absl/memory/memory_test.cc
+--- abseil-cpp-20220623.1-original/absl/memory/memory_test.cc	2022-08-31 13:15:21.000000000 -0400
++++ abseil-cpp-20220623.1/absl/memory/memory_test.cc	2023-01-18 21:30:33.460050217 -0500
+@@ -505,14 +505,14 @@
+ };
+ 
+ TEST(AllocatorTraits, Rebind) {
+-  EXPECT_TRUE(
+-      (std::is_same<Rebound<int>,
+-                    typename absl::allocator_traits<
+-                        AllocWithRebind>::template rebind_alloc<int>>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<absl::allocator_traits<Rebound<int>>,
+-                    typename absl::allocator_traits<
+-                        AllocWithRebind>::template rebind_traits<int>>::value));
++  // EXPECT_TRUE(
++  //     (std::is_same<Rebound<int>,
++  //                   typename absl::allocator_traits<
++  //                       AllocWithRebind>::template rebind_alloc<int>>::value));
++  //EXPECT_TRUE(
++  //    (std::is_same<absl::allocator_traits<Rebound<int>>,
++  //                  typename absl::allocator_traits<
++  //                      AllocWithRebind>::template rebind_traits<int>>::value));
+ 
+   EXPECT_TRUE(
+       (std::is_same<AllocWithoutRebind<double, char>,
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 8c934b9..cb5295c 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -28,6 +28,11 @@ Source0:        https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-
 #
 # Fixes RHBZ#2108658.
 Patch:          https://github.com/abseil/abseil-cpp/commit/09e96049995584c3489e4bd1467313e3e85af99c.patch
+# Comment out two static assertions in the tests that fail with GCC 13.
+#   Reported upstream:
+# Static assertion failures compiling AllocatorTraits.Rebind test (GCC 13)
+# https://github.com/abseil/abseil-cpp/issues/1366
+Patch:          abseil-cpp-20220623.1-gcc13.patch
 
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster

From 1197352945822c91c948811a4d8f42c084d583e7 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 20 Jan 2023 21:13:23 -0500
Subject: [PATCH 03/41] Revert "Work around static assertion failures in tests
 with GCC 13"

This reverts commit 570816731a09e471666a7f64d2cf0901b50c0838.

A fix for the underlying issue will be backported instead.
---
 abseil-cpp-20220623.1-gcc13.patch | 26 --------------------------
 abseil-cpp.spec                   |  5 -----
 2 files changed, 31 deletions(-)
 delete mode 100644 abseil-cpp-20220623.1-gcc13.patch

diff --git a/abseil-cpp-20220623.1-gcc13.patch b/abseil-cpp-20220623.1-gcc13.patch
deleted file mode 100644
index 09438b8..0000000
--- a/abseil-cpp-20220623.1-gcc13.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur abseil-cpp-20220623.1-original/absl/memory/memory_test.cc abseil-cpp-20220623.1/absl/memory/memory_test.cc
---- abseil-cpp-20220623.1-original/absl/memory/memory_test.cc	2022-08-31 13:15:21.000000000 -0400
-+++ abseil-cpp-20220623.1/absl/memory/memory_test.cc	2023-01-18 21:30:33.460050217 -0500
-@@ -505,14 +505,14 @@
- };
- 
- TEST(AllocatorTraits, Rebind) {
--  EXPECT_TRUE(
--      (std::is_same<Rebound<int>,
--                    typename absl::allocator_traits<
--                        AllocWithRebind>::template rebind_alloc<int>>::value));
--  EXPECT_TRUE(
--      (std::is_same<absl::allocator_traits<Rebound<int>>,
--                    typename absl::allocator_traits<
--                        AllocWithRebind>::template rebind_traits<int>>::value));
-+  // EXPECT_TRUE(
-+  //     (std::is_same<Rebound<int>,
-+  //                   typename absl::allocator_traits<
-+  //                       AllocWithRebind>::template rebind_alloc<int>>::value));
-+  //EXPECT_TRUE(
-+  //    (std::is_same<absl::allocator_traits<Rebound<int>>,
-+  //                  typename absl::allocator_traits<
-+  //                      AllocWithRebind>::template rebind_traits<int>>::value));
- 
-   EXPECT_TRUE(
-       (std::is_same<AllocWithoutRebind<double, char>,
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index cb5295c..8c934b9 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -28,11 +28,6 @@ Source0:        https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-
 #
 # Fixes RHBZ#2108658.
 Patch:          https://github.com/abseil/abseil-cpp/commit/09e96049995584c3489e4bd1467313e3e85af99c.patch
-# Comment out two static assertions in the tests that fail with GCC 13.
-#   Reported upstream:
-# Static assertion failures compiling AllocatorTraits.Rebind test (GCC 13)
-# https://github.com/abseil/abseil-cpp/issues/1366
-Patch:          abseil-cpp-20220623.1-gcc13.patch
 
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster

From 33850f5add8288632cc86fb5c183f9d36ce696b7 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 20 Jan 2023 21:16:35 -0500
Subject: [PATCH 04/41] Backport upstream commit 4eef161 for GCC 13

---
 ...cator_traits-and-absl-pointer_traits.patch | 760 ++++++++++++++++++
 abseil-cpp.spec                               |  12 +-
 2 files changed, 771 insertions(+), 1 deletion(-)
 create mode 100644 0001-Update-absl-allocator_traits-and-absl-pointer_traits.patch

diff --git a/0001-Update-absl-allocator_traits-and-absl-pointer_traits.patch b/0001-Update-absl-allocator_traits-and-absl-pointer_traits.patch
new file mode 100644
index 0000000..17466fd
--- /dev/null
+++ b/0001-Update-absl-allocator_traits-and-absl-pointer_traits.patch
@@ -0,0 +1,760 @@
+From 5c77799d5dfcd9c4736621ad9b5fd5da611e6518 Mon Sep 17 00:00:00 2001
+From: Derek Mauro <dmauro@google.com>
+Date: Fri, 20 Jan 2023 15:12:54 -0800
+Subject: [PATCH] Update absl::allocator_traits and absl::pointer_traits to
+ always use std::allocator_traits and std::pointer traits.
+
+Note that the reason given in the comments for these implementations was
+incorrect. Both of these exist in C++11, but not all compilers had
+working implementations, so Abseil backfiled them. All supported compilers
+now have working implementations.
+
+https://en.cppreference.com/w/cpp/memory/allocator_traits
+https://en.cppreference.com/w/cpp/memory/pointer_traits
+
+Documentation has been updated to recommend the std:: spellings.
+
+Fixes #1366
+
+PiperOrigin-RevId: 503532746
+Change-Id: Ia437f65a4c752581195dc582a41831b479d096c6
+---
+ absl/memory/memory.h       | 371 ++-----------------------------------
+ absl/memory/memory_test.cc | 332 ---------------------------------
+ 2 files changed, 20 insertions(+), 683 deletions(-)
+
+diff --git a/absl/memory/memory.h b/absl/memory/memory.h
+index d6332606..2b99c190 100644
+--- a/absl/memory/memory.h
++++ b/absl/memory/memory.h
+@@ -248,6 +248,26 @@ std::weak_ptr<T> WeakenPtr(const std::shared_ptr<T>& ptr) {
+   return std::weak_ptr<T>(ptr);
+ }
+ 
++// -----------------------------------------------------------------------------
++// Class Template: pointer_traits
++// -----------------------------------------------------------------------------
++//
++// Historical note: Abseil once provided an implementation of
++// `std::pointer_traits` for platforms that had not yet provided it. Those
++// platforms are no longer supported. New code should simply use
++// `std::pointer_traits`.
++using std::pointer_traits;
++
++// -----------------------------------------------------------------------------
++// Class Template: allocator_traits
++// -----------------------------------------------------------------------------
++//
++// Historical note: Abseil once provided an implementation of
++// `std::allocator_traits` for platforms that had not yet provided it. Those
++// platforms are no longer supported. New code should simply use
++// `std::allocator_traits`.
++using std::allocator_traits;
++
+ namespace memory_internal {
+ 
+ // ExtractOr<E, O, D>::type evaluates to E<O> if possible. Otherwise, D.
+@@ -265,357 +285,6 @@ struct ExtractOr<Extract, Obj, Default, void_t<Extract<Obj>>> {
+ template <template <typename> class Extract, typename Obj, typename Default>
+ using ExtractOrT = typename ExtractOr<Extract, Obj, Default, void>::type;
+ 
+-// Extractors for the features of allocators.
+-template <typename T>
+-using GetPointer = typename T::pointer;
+-
+-template <typename T>
+-using GetConstPointer = typename T::const_pointer;
+-
+-template <typename T>
+-using GetVoidPointer = typename T::void_pointer;
+-
+-template <typename T>
+-using GetConstVoidPointer = typename T::const_void_pointer;
+-
+-template <typename T>
+-using GetDifferenceType = typename T::difference_type;
+-
+-template <typename T>
+-using GetSizeType = typename T::size_type;
+-
+-template <typename T>
+-using GetPropagateOnContainerCopyAssignment =
+-    typename T::propagate_on_container_copy_assignment;
+-
+-template <typename T>
+-using GetPropagateOnContainerMoveAssignment =
+-    typename T::propagate_on_container_move_assignment;
+-
+-template <typename T>
+-using GetPropagateOnContainerSwap = typename T::propagate_on_container_swap;
+-
+-template <typename T>
+-using GetIsAlwaysEqual = typename T::is_always_equal;
+-
+-template <typename T>
+-struct GetFirstArg;
+-
+-template <template <typename...> class Class, typename T, typename... Args>
+-struct GetFirstArg<Class<T, Args...>> {
+-  using type = T;
+-};
+-
+-template <typename Ptr, typename = void>
+-struct ElementType {
+-  using type = typename GetFirstArg<Ptr>::type;
+-};
+-
+-template <typename T>
+-struct ElementType<T, void_t<typename T::element_type>> {
+-  using type = typename T::element_type;
+-};
+-
+-template <typename T, typename U>
+-struct RebindFirstArg;
+-
+-template <template <typename...> class Class, typename T, typename... Args,
+-          typename U>
+-struct RebindFirstArg<Class<T, Args...>, U> {
+-  using type = Class<U, Args...>;
+-};
+-
+-template <typename T, typename U, typename = void>
+-struct RebindPtr {
+-  using type = typename RebindFirstArg<T, U>::type;
+-};
+-
+-template <typename T, typename U>
+-struct RebindPtr<T, U, void_t<typename T::template rebind<U>>> {
+-  using type = typename T::template rebind<U>;
+-};
+-
+-template <typename T, typename U>
+-constexpr bool HasRebindAlloc(...) {
+-  return false;
+-}
+-
+-template <typename T, typename U>
+-constexpr bool HasRebindAlloc(typename T::template rebind<U>::other*) {
+-  return true;
+-}
+-
+-template <typename T, typename U, bool = HasRebindAlloc<T, U>(nullptr)>
+-struct RebindAlloc {
+-  using type = typename RebindFirstArg<T, U>::type;
+-};
+-
+-template <typename T, typename U>
+-struct RebindAlloc<T, U, true> {
+-  using type = typename T::template rebind<U>::other;
+-};
+-
+-}  // namespace memory_internal
+-
+-// -----------------------------------------------------------------------------
+-// Class Template: pointer_traits
+-// -----------------------------------------------------------------------------
+-//
+-// An implementation of C++11's std::pointer_traits.
+-//
+-// Provided for portability on toolchains that have a working C++11 compiler,
+-// but the standard library is lacking in C++11 support. For example, some
+-// version of the Android NDK.
+-//
+-
+-template <typename Ptr>
+-struct pointer_traits {
+-  using pointer = Ptr;
+-
+-  // element_type:
+-  // Ptr::element_type if present. Otherwise T if Ptr is a template
+-  // instantiation Template<T, Args...>
+-  using element_type = typename memory_internal::ElementType<Ptr>::type;
+-
+-  // difference_type:
+-  // Ptr::difference_type if present, otherwise std::ptrdiff_t
+-  using difference_type =
+-      memory_internal::ExtractOrT<memory_internal::GetDifferenceType, Ptr,
+-                                  std::ptrdiff_t>;
+-
+-  // rebind:
+-  // Ptr::rebind<U> if exists, otherwise Template<U, Args...> if Ptr is a
+-  // template instantiation Template<T, Args...>
+-  template <typename U>
+-  using rebind = typename memory_internal::RebindPtr<Ptr, U>::type;
+-
+-  // pointer_to:
+-  // Calls Ptr::pointer_to(r)
+-  static pointer pointer_to(element_type& r) {  // NOLINT(runtime/references)
+-    return Ptr::pointer_to(r);
+-  }
+-};
+-
+-// Specialization for T*.
+-template <typename T>
+-struct pointer_traits<T*> {
+-  using pointer = T*;
+-  using element_type = T;
+-  using difference_type = std::ptrdiff_t;
+-
+-  template <typename U>
+-  using rebind = U*;
+-
+-  // pointer_to:
+-  // Calls std::addressof(r)
+-  static pointer pointer_to(
+-      element_type& r) noexcept {  // NOLINT(runtime/references)
+-    return std::addressof(r);
+-  }
+-};
+-
+-// -----------------------------------------------------------------------------
+-// Class Template: allocator_traits
+-// -----------------------------------------------------------------------------
+-//
+-// A C++11 compatible implementation of C++17's std::allocator_traits.
+-//
+-#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+-using std::allocator_traits;
+-#else  // __cplusplus >= 201703L
+-template <typename Alloc>
+-struct allocator_traits {
+-  using allocator_type = Alloc;
+-
+-  // value_type:
+-  // Alloc::value_type
+-  using value_type = typename Alloc::value_type;
+-
+-  // pointer:
+-  // Alloc::pointer if present, otherwise value_type*
+-  using pointer = memory_internal::ExtractOrT<memory_internal::GetPointer,
+-                                              Alloc, value_type*>;
+-
+-  // const_pointer:
+-  // Alloc::const_pointer if present, otherwise
+-  // absl::pointer_traits<pointer>::rebind<const value_type>
+-  using const_pointer =
+-      memory_internal::ExtractOrT<memory_internal::GetConstPointer, Alloc,
+-                                  typename absl::pointer_traits<pointer>::
+-                                      template rebind<const value_type>>;
+-
+-  // void_pointer:
+-  // Alloc::void_pointer if present, otherwise
+-  // absl::pointer_traits<pointer>::rebind<void>
+-  using void_pointer = memory_internal::ExtractOrT<
+-      memory_internal::GetVoidPointer, Alloc,
+-      typename absl::pointer_traits<pointer>::template rebind<void>>;
+-
+-  // const_void_pointer:
+-  // Alloc::const_void_pointer if present, otherwise
+-  // absl::pointer_traits<pointer>::rebind<const void>
+-  using const_void_pointer = memory_internal::ExtractOrT<
+-      memory_internal::GetConstVoidPointer, Alloc,
+-      typename absl::pointer_traits<pointer>::template rebind<const void>>;
+-
+-  // difference_type:
+-  // Alloc::difference_type if present, otherwise
+-  // absl::pointer_traits<pointer>::difference_type
+-  using difference_type = memory_internal::ExtractOrT<
+-      memory_internal::GetDifferenceType, Alloc,
+-      typename absl::pointer_traits<pointer>::difference_type>;
+-
+-  // size_type:
+-  // Alloc::size_type if present, otherwise
+-  // std::make_unsigned<difference_type>::type
+-  using size_type = memory_internal::ExtractOrT<
+-      memory_internal::GetSizeType, Alloc,
+-      typename std::make_unsigned<difference_type>::type>;
+-
+-  // propagate_on_container_copy_assignment:
+-  // Alloc::propagate_on_container_copy_assignment if present, otherwise
+-  // std::false_type
+-  using propagate_on_container_copy_assignment = memory_internal::ExtractOrT<
+-      memory_internal::GetPropagateOnContainerCopyAssignment, Alloc,
+-      std::false_type>;
+-
+-  // propagate_on_container_move_assignment:
+-  // Alloc::propagate_on_container_move_assignment if present, otherwise
+-  // std::false_type
+-  using propagate_on_container_move_assignment = memory_internal::ExtractOrT<
+-      memory_internal::GetPropagateOnContainerMoveAssignment, Alloc,
+-      std::false_type>;
+-
+-  // propagate_on_container_swap:
+-  // Alloc::propagate_on_container_swap if present, otherwise std::false_type
+-  using propagate_on_container_swap =
+-      memory_internal::ExtractOrT<memory_internal::GetPropagateOnContainerSwap,
+-                                  Alloc, std::false_type>;
+-
+-  // is_always_equal:
+-  // Alloc::is_always_equal if present, otherwise std::is_empty<Alloc>::type
+-  using is_always_equal =
+-      memory_internal::ExtractOrT<memory_internal::GetIsAlwaysEqual, Alloc,
+-                                  typename std::is_empty<Alloc>::type>;
+-
+-  // rebind_alloc:
+-  // Alloc::rebind<T>::other if present, otherwise Alloc<T, Args> if this Alloc
+-  // is Alloc<U, Args>
+-  template <typename T>
+-  using rebind_alloc = typename memory_internal::RebindAlloc<Alloc, T>::type;
+-
+-  // rebind_traits:
+-  // absl::allocator_traits<rebind_alloc<T>>
+-  template <typename T>
+-  using rebind_traits = absl::allocator_traits<rebind_alloc<T>>;
+-
+-  // allocate(Alloc& a, size_type n):
+-  // Calls a.allocate(n)
+-  static pointer allocate(Alloc& a,  // NOLINT(runtime/references)
+-                          size_type n) {
+-    return a.allocate(n);
+-  }
+-
+-  // allocate(Alloc& a, size_type n, const_void_pointer hint):
+-  // Calls a.allocate(n, hint) if possible.
+-  // If not possible, calls a.allocate(n)
+-  static pointer allocate(Alloc& a, size_type n,  // NOLINT(runtime/references)
+-                          const_void_pointer hint) {
+-    return allocate_impl(0, a, n, hint);
+-  }
+-
+-  // deallocate(Alloc& a, pointer p, size_type n):
+-  // Calls a.deallocate(p, n)
+-  static void deallocate(Alloc& a, pointer p,  // NOLINT(runtime/references)
+-                         size_type n) {
+-    a.deallocate(p, n);
+-  }
+-
+-  // construct(Alloc& a, T* p, Args&&... args):
+-  // Calls a.construct(p, std::forward<Args>(args)...) if possible.
+-  // If not possible, calls
+-  //   ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...)
+-  template <typename T, typename... Args>
+-  static void construct(Alloc& a, T* p,  // NOLINT(runtime/references)
+-                        Args&&... args) {
+-    construct_impl(0, a, p, std::forward<Args>(args)...);
+-  }
+-
+-  // destroy(Alloc& a, T* p):
+-  // Calls a.destroy(p) if possible. If not possible, calls p->~T().
+-  template <typename T>
+-  static void destroy(Alloc& a, T* p) {  // NOLINT(runtime/references)
+-    destroy_impl(0, a, p);
+-  }
+-
+-  // max_size(const Alloc& a):
+-  // Returns a.max_size() if possible. If not possible, returns
+-  //   std::numeric_limits<size_type>::max() / sizeof(value_type)
+-  static size_type max_size(const Alloc& a) { return max_size_impl(0, a); }
+-
+-  // select_on_container_copy_construction(const Alloc& a):
+-  // Returns a.select_on_container_copy_construction() if possible.
+-  // If not possible, returns a.
+-  static Alloc select_on_container_copy_construction(const Alloc& a) {
+-    return select_on_container_copy_construction_impl(0, a);
+-  }
+-
+- private:
+-  template <typename A>
+-  static auto allocate_impl(int, A& a,  // NOLINT(runtime/references)
+-                            size_type n, const_void_pointer hint)
+-      -> decltype(a.allocate(n, hint)) {
+-    return a.allocate(n, hint);
+-  }
+-  static pointer allocate_impl(char, Alloc& a,  // NOLINT(runtime/references)
+-                               size_type n, const_void_pointer) {
+-    return a.allocate(n);
+-  }
+-
+-  template <typename A, typename... Args>
+-  static auto construct_impl(int, A& a,  // NOLINT(runtime/references)
+-                             Args&&... args)
+-      -> decltype(a.construct(std::forward<Args>(args)...)) {
+-    a.construct(std::forward<Args>(args)...);
+-  }
+-
+-  template <typename T, typename... Args>
+-  static void construct_impl(char, Alloc&, T* p, Args&&... args) {
+-    ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...);
+-  }
+-
+-  template <typename A, typename T>
+-  static auto destroy_impl(int, A& a,  // NOLINT(runtime/references)
+-                           T* p) -> decltype(a.destroy(p)) {
+-    a.destroy(p);
+-  }
+-  template <typename T>
+-  static void destroy_impl(char, Alloc&, T* p) {
+-    p->~T();
+-  }
+-
+-  template <typename A>
+-  static auto max_size_impl(int, const A& a) -> decltype(a.max_size()) {
+-    return a.max_size();
+-  }
+-  static size_type max_size_impl(char, const Alloc&) {
+-    return (std::numeric_limits<size_type>::max)() / sizeof(value_type);
+-  }
+-
+-  template <typename A>
+-  static auto select_on_container_copy_construction_impl(int, const A& a)
+-      -> decltype(a.select_on_container_copy_construction()) {
+-    return a.select_on_container_copy_construction();
+-  }
+-  static Alloc select_on_container_copy_construction_impl(char,
+-                                                          const Alloc& a) {
+-    return a;
+-  }
+-};
+-#endif  // __cplusplus >= 201703L
+-
+-namespace memory_internal {
+-
+ // This template alias transforms Alloc::is_nothrow into a metafunction with
+ // Alloc as a parameter so it can be used with ExtractOrT<>.
+ template <typename Alloc>
+diff --git a/absl/memory/memory_test.cc b/absl/memory/memory_test.cc
+index 5d5719b3..b62c48f9 100644
+--- a/absl/memory/memory_test.cc
++++ b/absl/memory/memory_test.cc
+@@ -287,338 +287,6 @@ TEST(RawPtrTest, NotAPointer) {
+ }
+ */
+ 
+-template <typename T>
+-struct SmartPointer {
+-  using difference_type = char;
+-};
+-
+-struct PointerWith {
+-  using element_type = int32_t;
+-  using difference_type = int16_t;
+-  template <typename U>
+-  using rebind = SmartPointer<U>;
+-
+-  static PointerWith pointer_to(
+-      element_type& r) {  // NOLINT(runtime/references)
+-    return PointerWith{&r};
+-  }
+-
+-  element_type* ptr;
+-};
+-
+-template <typename... Args>
+-struct PointerWithout {};
+-
+-TEST(PointerTraits, Types) {
+-  using TraitsWith = absl::pointer_traits<PointerWith>;
+-  EXPECT_TRUE((std::is_same<TraitsWith::pointer, PointerWith>::value));
+-  EXPECT_TRUE((std::is_same<TraitsWith::element_type, int32_t>::value));
+-  EXPECT_TRUE((std::is_same<TraitsWith::difference_type, int16_t>::value));
+-  EXPECT_TRUE((
+-      std::is_same<TraitsWith::rebind<int64_t>, SmartPointer<int64_t>>::value));
+-
+-  using TraitsWithout = absl::pointer_traits<PointerWithout<double, int>>;
+-  EXPECT_TRUE((std::is_same<TraitsWithout::pointer,
+-                            PointerWithout<double, int>>::value));
+-  EXPECT_TRUE((std::is_same<TraitsWithout::element_type, double>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<TraitsWithout ::difference_type, std::ptrdiff_t>::value));
+-  EXPECT_TRUE((std::is_same<TraitsWithout::rebind<int64_t>,
+-                            PointerWithout<int64_t, int>>::value));
+-
+-  using TraitsRawPtr = absl::pointer_traits<char*>;
+-  EXPECT_TRUE((std::is_same<TraitsRawPtr::pointer, char*>::value));
+-  EXPECT_TRUE((std::is_same<TraitsRawPtr::element_type, char>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<TraitsRawPtr::difference_type, std::ptrdiff_t>::value));
+-  EXPECT_TRUE((std::is_same<TraitsRawPtr::rebind<int64_t>, int64_t*>::value));
+-}
+-
+-TEST(PointerTraits, Functions) {
+-  int i;
+-  EXPECT_EQ(&i, absl::pointer_traits<PointerWith>::pointer_to(i).ptr);
+-  EXPECT_EQ(&i, absl::pointer_traits<int*>::pointer_to(i));
+-}
+-
+-TEST(AllocatorTraits, Typedefs) {
+-  struct A {
+-    struct value_type {};
+-  };
+-  EXPECT_TRUE((
+-      std::is_same<A,
+-                   typename absl::allocator_traits<A>::allocator_type>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<A::value_type,
+-                    typename absl::allocator_traits<A>::value_type>::value));
+-
+-  struct X {};
+-  struct HasPointer {
+-    using value_type = X;
+-    using pointer = SmartPointer<X>;
+-  };
+-  EXPECT_TRUE((std::is_same<SmartPointer<X>, typename absl::allocator_traits<
+-                                                 HasPointer>::pointer>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<A::value_type*,
+-                    typename absl::allocator_traits<A>::pointer>::value));
+-
+-  EXPECT_TRUE(
+-      (std::is_same<
+-          SmartPointer<const X>,
+-          typename absl::allocator_traits<HasPointer>::const_pointer>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<const A::value_type*,
+-                    typename absl::allocator_traits<A>::const_pointer>::value));
+-
+-  struct HasVoidPointer {
+-    using value_type = X;
+-    struct void_pointer {};
+-  };
+-
+-  EXPECT_TRUE((std::is_same<HasVoidPointer::void_pointer,
+-                            typename absl::allocator_traits<
+-                                HasVoidPointer>::void_pointer>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<SmartPointer<void>, typename absl::allocator_traits<
+-                                            HasPointer>::void_pointer>::value));
+-
+-  struct HasConstVoidPointer {
+-    using value_type = X;
+-    struct const_void_pointer {};
+-  };
+-
+-  EXPECT_TRUE(
+-      (std::is_same<HasConstVoidPointer::const_void_pointer,
+-                    typename absl::allocator_traits<
+-                        HasConstVoidPointer>::const_void_pointer>::value));
+-  EXPECT_TRUE((std::is_same<SmartPointer<const void>,
+-                            typename absl::allocator_traits<
+-                                HasPointer>::const_void_pointer>::value));
+-
+-  struct HasDifferenceType {
+-    using value_type = X;
+-    using difference_type = int;
+-  };
+-  EXPECT_TRUE(
+-      (std::is_same<int, typename absl::allocator_traits<
+-                             HasDifferenceType>::difference_type>::value));
+-  EXPECT_TRUE((std::is_same<char, typename absl::allocator_traits<
+-                                      HasPointer>::difference_type>::value));
+-
+-  struct HasSizeType {
+-    using value_type = X;
+-    using size_type = unsigned int;
+-  };
+-  EXPECT_TRUE((std::is_same<unsigned int, typename absl::allocator_traits<
+-                                              HasSizeType>::size_type>::value));
+-  EXPECT_TRUE((std::is_same<unsigned char, typename absl::allocator_traits<
+-                                               HasPointer>::size_type>::value));
+-
+-  struct HasPropagateOnCopy {
+-    using value_type = X;
+-    struct propagate_on_container_copy_assignment {};
+-  };
+-
+-  EXPECT_TRUE(
+-      (std::is_same<HasPropagateOnCopy::propagate_on_container_copy_assignment,
+-                    typename absl::allocator_traits<HasPropagateOnCopy>::
+-                        propagate_on_container_copy_assignment>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<std::false_type,
+-                    typename absl::allocator_traits<
+-                        A>::propagate_on_container_copy_assignment>::value));
+-
+-  struct HasPropagateOnMove {
+-    using value_type = X;
+-    struct propagate_on_container_move_assignment {};
+-  };
+-
+-  EXPECT_TRUE(
+-      (std::is_same<HasPropagateOnMove::propagate_on_container_move_assignment,
+-                    typename absl::allocator_traits<HasPropagateOnMove>::
+-                        propagate_on_container_move_assignment>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<std::false_type,
+-                    typename absl::allocator_traits<
+-                        A>::propagate_on_container_move_assignment>::value));
+-
+-  struct HasPropagateOnSwap {
+-    using value_type = X;
+-    struct propagate_on_container_swap {};
+-  };
+-
+-  EXPECT_TRUE(
+-      (std::is_same<HasPropagateOnSwap::propagate_on_container_swap,
+-                    typename absl::allocator_traits<HasPropagateOnSwap>::
+-                        propagate_on_container_swap>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<std::false_type, typename absl::allocator_traits<A>::
+-                                         propagate_on_container_swap>::value));
+-
+-  struct HasIsAlwaysEqual {
+-    using value_type = X;
+-    struct is_always_equal {};
+-  };
+-
+-  EXPECT_TRUE((std::is_same<HasIsAlwaysEqual::is_always_equal,
+-                            typename absl::allocator_traits<
+-                                HasIsAlwaysEqual>::is_always_equal>::value));
+-  EXPECT_TRUE((std::is_same<std::true_type, typename absl::allocator_traits<
+-                                                A>::is_always_equal>::value));
+-  struct NonEmpty {
+-    using value_type = X;
+-    int i;
+-  };
+-  EXPECT_TRUE(
+-      (std::is_same<std::false_type,
+-                    absl::allocator_traits<NonEmpty>::is_always_equal>::value));
+-}
+-
+-template <typename T>
+-struct AllocWithPrivateInheritance : private std::allocator<T> {
+-  using value_type = T;
+-};
+-
+-TEST(AllocatorTraits, RebindWithPrivateInheritance) {
+-  // Regression test for some versions of gcc that do not like the sfinae we
+-  // used in combination with private inheritance.
+-  EXPECT_TRUE(
+-      (std::is_same<AllocWithPrivateInheritance<int>,
+-                    absl::allocator_traits<AllocWithPrivateInheritance<char>>::
+-                        rebind_alloc<int>>::value));
+-}
+-
+-template <typename T>
+-struct Rebound {};
+-
+-struct AllocWithRebind {
+-  using value_type = int;
+-  template <typename T>
+-  struct rebind {
+-    using other = Rebound<T>;
+-  };
+-};
+-
+-template <typename T, typename U>
+-struct AllocWithoutRebind {
+-  using value_type = int;
+-};
+-
+-TEST(AllocatorTraits, Rebind) {
+-  EXPECT_TRUE(
+-      (std::is_same<Rebound<int>,
+-                    typename absl::allocator_traits<
+-                        AllocWithRebind>::template rebind_alloc<int>>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<absl::allocator_traits<Rebound<int>>,
+-                    typename absl::allocator_traits<
+-                        AllocWithRebind>::template rebind_traits<int>>::value));
+-
+-  EXPECT_TRUE(
+-      (std::is_same<AllocWithoutRebind<double, char>,
+-                    typename absl::allocator_traits<AllocWithoutRebind<
+-                        int, char>>::template rebind_alloc<double>>::value));
+-  EXPECT_TRUE(
+-      (std::is_same<absl::allocator_traits<AllocWithoutRebind<double, char>>,
+-                    typename absl::allocator_traits<AllocWithoutRebind<
+-                        int, char>>::template rebind_traits<double>>::value));
+-}
+-
+-struct TestValue {
+-  TestValue() {}
+-  explicit TestValue(int* trace) : trace(trace) { ++*trace; }
+-  ~TestValue() {
+-    if (trace) --*trace;
+-  }
+-  int* trace = nullptr;
+-};
+-
+-struct MinimalMockAllocator {
+-  MinimalMockAllocator() : value(0) {}
+-  explicit MinimalMockAllocator(int value) : value(value) {}
+-  MinimalMockAllocator(const MinimalMockAllocator& other)
+-      : value(other.value) {}
+-  using value_type = TestValue;
+-  MOCK_METHOD(value_type*, allocate, (size_t));
+-  MOCK_METHOD(void, deallocate, (value_type*, size_t));
+-
+-  int value;
+-};
+-
+-TEST(AllocatorTraits, FunctionsMinimal) {
+-  int trace = 0;
+-  int hint;
+-  alignas(TestValue) char buffer[sizeof(TestValue)];
+-  auto* x = reinterpret_cast<TestValue*>(buffer);
+-  MinimalMockAllocator mock;
+-  using Traits = absl::allocator_traits<MinimalMockAllocator>;
+-  EXPECT_CALL(mock, allocate(7)).WillRepeatedly(Return(x));
+-  EXPECT_CALL(mock, deallocate(x, 7));
+-
+-  EXPECT_EQ(x, Traits::allocate(mock, 7));
+-  static_cast<void>(Traits::allocate(mock, 7, static_cast<const void*>(&hint)));
+-  EXPECT_EQ(x, Traits::allocate(mock, 7, static_cast<const void*>(&hint)));
+-  Traits::deallocate(mock, x, 7);
+-
+-  EXPECT_EQ(0, trace);
+-  Traits::construct(mock, x, &trace);
+-  EXPECT_EQ(1, trace);
+-  Traits::destroy(mock, x);
+-  EXPECT_EQ(0, trace);
+-
+-  EXPECT_EQ(std::numeric_limits<size_t>::max() / sizeof(TestValue),
+-            Traits::max_size(mock));
+-
+-  EXPECT_EQ(0, mock.value);
+-  EXPECT_EQ(0, Traits::select_on_container_copy_construction(mock).value);
+-}
+-
+-struct FullMockAllocator {
+-  FullMockAllocator() : value(0) {}
+-  explicit FullMockAllocator(int value) : value(value) {}
+-  FullMockAllocator(const FullMockAllocator& other) : value(other.value) {}
+-  using value_type = TestValue;
+-  MOCK_METHOD(value_type*, allocate, (size_t));
+-  MOCK_METHOD(value_type*, allocate, (size_t, const void*));
+-  MOCK_METHOD(void, construct, (value_type*, int*));
+-  MOCK_METHOD(void, destroy, (value_type*));
+-  MOCK_METHOD(size_t, max_size, (),
+-              (const));
+-  MOCK_METHOD(FullMockAllocator, select_on_container_copy_construction, (),
+-              (const));
+-
+-  int value;
+-};
+-
+-TEST(AllocatorTraits, FunctionsFull) {
+-  int trace = 0;
+-  int hint;
+-  TestValue x(&trace), y;
+-  FullMockAllocator mock;
+-  using Traits = absl::allocator_traits<FullMockAllocator>;
+-  EXPECT_CALL(mock, allocate(7)).WillRepeatedly(Return(&x));
+-  EXPECT_CALL(mock, allocate(13, &hint)).WillRepeatedly(Return(&y));
+-  EXPECT_CALL(mock, construct(&x, &trace));
+-  EXPECT_CALL(mock, destroy(&x));
+-  EXPECT_CALL(mock, max_size()).WillRepeatedly(Return(17));
+-  EXPECT_CALL(mock, select_on_container_copy_construction())
+-      .WillRepeatedly(Return(FullMockAllocator(23)));
+-
+-  EXPECT_EQ(&x, Traits::allocate(mock, 7));
+-  EXPECT_EQ(&y, Traits::allocate(mock, 13, static_cast<const void*>(&hint)));
+-
+-  EXPECT_EQ(1, trace);
+-  Traits::construct(mock, &x, &trace);
+-  EXPECT_EQ(1, trace);
+-  Traits::destroy(mock, &x);
+-  EXPECT_EQ(1, trace);
+-
+-  EXPECT_EQ(17, Traits::max_size(mock));
+-
+-  EXPECT_EQ(0, mock.value);
+-  EXPECT_EQ(23, Traits::select_on_container_copy_construction(mock).value);
+-}
+-
+ TEST(AllocatorNoThrowTest, DefaultAllocator) {
+ #if defined(ABSL_ALLOCATOR_NOTHROW) && ABSL_ALLOCATOR_NOTHROW
+   EXPECT_TRUE(absl::default_allocator_is_nothrow::value);
+-- 
+2.39.0
+
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 8c934b9..d471e1e 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20220623.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -29,6 +29,13 @@ Source0:        https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-
 # Fixes RHBZ#2108658.
 Patch:          https://github.com/abseil/abseil-cpp/commit/09e96049995584c3489e4bd1467313e3e85af99c.patch
 
+# Backport upstream commit 4eef16170014f75f4291ae335a271900f89eaedf by
+# cherry-picking and rebasing onto 20220623.1; fixes:
+#
+# Static assertion failures compiling AllocatorTraits.Rebind test (GCC 13)
+# https://github.com/abseil/abseil-cpp/issues/1366
+Patch:          0001-Update-absl-allocator_traits-and-absl-pointer_traits.patch
+
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster
 BuildRequires:  ninja-build
@@ -99,6 +106,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Jan 21 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.1-4
+- Backport upstream commit 4eef161 for GCC 13
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20220623.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From e2ad089b322257efbc4719c60b51fa0b6bedc6dd Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Sat, 21 Jan 2023 10:57:59 -0500
Subject: [PATCH 05/41] Update to 20230125.1 (close RHBZ#2162638)

- Document CCTZ bundling
- Add a spec-file note about public-domain license text
---
 .gitignore                                    |   1 +
 ...cator_traits-and-absl-pointer_traits.patch | 760 ------------------
 ...6049995584c3489e4bd1467313e3e85af99c.patch |  22 -
 abseil-cpp.spec                               |  45 +-
 sources                                       |   2 +-
 5 files changed, 28 insertions(+), 802 deletions(-)
 delete mode 100644 0001-Update-absl-allocator_traits-and-absl-pointer_traits.patch
 delete mode 100644 09e96049995584c3489e4bd1467313e3e85af99c.patch

diff --git a/.gitignore b/.gitignore
index 3f8e405..8ccb117 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /abseil-cpp-20211102.0.tar.gz
 /abseil-cpp-20220623.0.tar.gz
 /abseil-cpp-20220623.1.tar.gz
+/abseil-cpp-20230125.1.tar.gz
diff --git a/0001-Update-absl-allocator_traits-and-absl-pointer_traits.patch b/0001-Update-absl-allocator_traits-and-absl-pointer_traits.patch
deleted file mode 100644
index 17466fd..0000000
--- a/0001-Update-absl-allocator_traits-and-absl-pointer_traits.patch
+++ /dev/null
@@ -1,760 +0,0 @@
-From 5c77799d5dfcd9c4736621ad9b5fd5da611e6518 Mon Sep 17 00:00:00 2001
-From: Derek Mauro <dmauro@google.com>
-Date: Fri, 20 Jan 2023 15:12:54 -0800
-Subject: [PATCH] Update absl::allocator_traits and absl::pointer_traits to
- always use std::allocator_traits and std::pointer traits.
-
-Note that the reason given in the comments for these implementations was
-incorrect. Both of these exist in C++11, but not all compilers had
-working implementations, so Abseil backfiled them. All supported compilers
-now have working implementations.
-
-https://en.cppreference.com/w/cpp/memory/allocator_traits
-https://en.cppreference.com/w/cpp/memory/pointer_traits
-
-Documentation has been updated to recommend the std:: spellings.
-
-Fixes #1366
-
-PiperOrigin-RevId: 503532746
-Change-Id: Ia437f65a4c752581195dc582a41831b479d096c6
----
- absl/memory/memory.h       | 371 ++-----------------------------------
- absl/memory/memory_test.cc | 332 ---------------------------------
- 2 files changed, 20 insertions(+), 683 deletions(-)
-
-diff --git a/absl/memory/memory.h b/absl/memory/memory.h
-index d6332606..2b99c190 100644
---- a/absl/memory/memory.h
-+++ b/absl/memory/memory.h
-@@ -248,6 +248,26 @@ std::weak_ptr<T> WeakenPtr(const std::shared_ptr<T>& ptr) {
-   return std::weak_ptr<T>(ptr);
- }
- 
-+// -----------------------------------------------------------------------------
-+// Class Template: pointer_traits
-+// -----------------------------------------------------------------------------
-+//
-+// Historical note: Abseil once provided an implementation of
-+// `std::pointer_traits` for platforms that had not yet provided it. Those
-+// platforms are no longer supported. New code should simply use
-+// `std::pointer_traits`.
-+using std::pointer_traits;
-+
-+// -----------------------------------------------------------------------------
-+// Class Template: allocator_traits
-+// -----------------------------------------------------------------------------
-+//
-+// Historical note: Abseil once provided an implementation of
-+// `std::allocator_traits` for platforms that had not yet provided it. Those
-+// platforms are no longer supported. New code should simply use
-+// `std::allocator_traits`.
-+using std::allocator_traits;
-+
- namespace memory_internal {
- 
- // ExtractOr<E, O, D>::type evaluates to E<O> if possible. Otherwise, D.
-@@ -265,357 +285,6 @@ struct ExtractOr<Extract, Obj, Default, void_t<Extract<Obj>>> {
- template <template <typename> class Extract, typename Obj, typename Default>
- using ExtractOrT = typename ExtractOr<Extract, Obj, Default, void>::type;
- 
--// Extractors for the features of allocators.
--template <typename T>
--using GetPointer = typename T::pointer;
--
--template <typename T>
--using GetConstPointer = typename T::const_pointer;
--
--template <typename T>
--using GetVoidPointer = typename T::void_pointer;
--
--template <typename T>
--using GetConstVoidPointer = typename T::const_void_pointer;
--
--template <typename T>
--using GetDifferenceType = typename T::difference_type;
--
--template <typename T>
--using GetSizeType = typename T::size_type;
--
--template <typename T>
--using GetPropagateOnContainerCopyAssignment =
--    typename T::propagate_on_container_copy_assignment;
--
--template <typename T>
--using GetPropagateOnContainerMoveAssignment =
--    typename T::propagate_on_container_move_assignment;
--
--template <typename T>
--using GetPropagateOnContainerSwap = typename T::propagate_on_container_swap;
--
--template <typename T>
--using GetIsAlwaysEqual = typename T::is_always_equal;
--
--template <typename T>
--struct GetFirstArg;
--
--template <template <typename...> class Class, typename T, typename... Args>
--struct GetFirstArg<Class<T, Args...>> {
--  using type = T;
--};
--
--template <typename Ptr, typename = void>
--struct ElementType {
--  using type = typename GetFirstArg<Ptr>::type;
--};
--
--template <typename T>
--struct ElementType<T, void_t<typename T::element_type>> {
--  using type = typename T::element_type;
--};
--
--template <typename T, typename U>
--struct RebindFirstArg;
--
--template <template <typename...> class Class, typename T, typename... Args,
--          typename U>
--struct RebindFirstArg<Class<T, Args...>, U> {
--  using type = Class<U, Args...>;
--};
--
--template <typename T, typename U, typename = void>
--struct RebindPtr {
--  using type = typename RebindFirstArg<T, U>::type;
--};
--
--template <typename T, typename U>
--struct RebindPtr<T, U, void_t<typename T::template rebind<U>>> {
--  using type = typename T::template rebind<U>;
--};
--
--template <typename T, typename U>
--constexpr bool HasRebindAlloc(...) {
--  return false;
--}
--
--template <typename T, typename U>
--constexpr bool HasRebindAlloc(typename T::template rebind<U>::other*) {
--  return true;
--}
--
--template <typename T, typename U, bool = HasRebindAlloc<T, U>(nullptr)>
--struct RebindAlloc {
--  using type = typename RebindFirstArg<T, U>::type;
--};
--
--template <typename T, typename U>
--struct RebindAlloc<T, U, true> {
--  using type = typename T::template rebind<U>::other;
--};
--
--}  // namespace memory_internal
--
--// -----------------------------------------------------------------------------
--// Class Template: pointer_traits
--// -----------------------------------------------------------------------------
--//
--// An implementation of C++11's std::pointer_traits.
--//
--// Provided for portability on toolchains that have a working C++11 compiler,
--// but the standard library is lacking in C++11 support. For example, some
--// version of the Android NDK.
--//
--
--template <typename Ptr>
--struct pointer_traits {
--  using pointer = Ptr;
--
--  // element_type:
--  // Ptr::element_type if present. Otherwise T if Ptr is a template
--  // instantiation Template<T, Args...>
--  using element_type = typename memory_internal::ElementType<Ptr>::type;
--
--  // difference_type:
--  // Ptr::difference_type if present, otherwise std::ptrdiff_t
--  using difference_type =
--      memory_internal::ExtractOrT<memory_internal::GetDifferenceType, Ptr,
--                                  std::ptrdiff_t>;
--
--  // rebind:
--  // Ptr::rebind<U> if exists, otherwise Template<U, Args...> if Ptr is a
--  // template instantiation Template<T, Args...>
--  template <typename U>
--  using rebind = typename memory_internal::RebindPtr<Ptr, U>::type;
--
--  // pointer_to:
--  // Calls Ptr::pointer_to(r)
--  static pointer pointer_to(element_type& r) {  // NOLINT(runtime/references)
--    return Ptr::pointer_to(r);
--  }
--};
--
--// Specialization for T*.
--template <typename T>
--struct pointer_traits<T*> {
--  using pointer = T*;
--  using element_type = T;
--  using difference_type = std::ptrdiff_t;
--
--  template <typename U>
--  using rebind = U*;
--
--  // pointer_to:
--  // Calls std::addressof(r)
--  static pointer pointer_to(
--      element_type& r) noexcept {  // NOLINT(runtime/references)
--    return std::addressof(r);
--  }
--};
--
--// -----------------------------------------------------------------------------
--// Class Template: allocator_traits
--// -----------------------------------------------------------------------------
--//
--// A C++11 compatible implementation of C++17's std::allocator_traits.
--//
--#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
--using std::allocator_traits;
--#else  // __cplusplus >= 201703L
--template <typename Alloc>
--struct allocator_traits {
--  using allocator_type = Alloc;
--
--  // value_type:
--  // Alloc::value_type
--  using value_type = typename Alloc::value_type;
--
--  // pointer:
--  // Alloc::pointer if present, otherwise value_type*
--  using pointer = memory_internal::ExtractOrT<memory_internal::GetPointer,
--                                              Alloc, value_type*>;
--
--  // const_pointer:
--  // Alloc::const_pointer if present, otherwise
--  // absl::pointer_traits<pointer>::rebind<const value_type>
--  using const_pointer =
--      memory_internal::ExtractOrT<memory_internal::GetConstPointer, Alloc,
--                                  typename absl::pointer_traits<pointer>::
--                                      template rebind<const value_type>>;
--
--  // void_pointer:
--  // Alloc::void_pointer if present, otherwise
--  // absl::pointer_traits<pointer>::rebind<void>
--  using void_pointer = memory_internal::ExtractOrT<
--      memory_internal::GetVoidPointer, Alloc,
--      typename absl::pointer_traits<pointer>::template rebind<void>>;
--
--  // const_void_pointer:
--  // Alloc::const_void_pointer if present, otherwise
--  // absl::pointer_traits<pointer>::rebind<const void>
--  using const_void_pointer = memory_internal::ExtractOrT<
--      memory_internal::GetConstVoidPointer, Alloc,
--      typename absl::pointer_traits<pointer>::template rebind<const void>>;
--
--  // difference_type:
--  // Alloc::difference_type if present, otherwise
--  // absl::pointer_traits<pointer>::difference_type
--  using difference_type = memory_internal::ExtractOrT<
--      memory_internal::GetDifferenceType, Alloc,
--      typename absl::pointer_traits<pointer>::difference_type>;
--
--  // size_type:
--  // Alloc::size_type if present, otherwise
--  // std::make_unsigned<difference_type>::type
--  using size_type = memory_internal::ExtractOrT<
--      memory_internal::GetSizeType, Alloc,
--      typename std::make_unsigned<difference_type>::type>;
--
--  // propagate_on_container_copy_assignment:
--  // Alloc::propagate_on_container_copy_assignment if present, otherwise
--  // std::false_type
--  using propagate_on_container_copy_assignment = memory_internal::ExtractOrT<
--      memory_internal::GetPropagateOnContainerCopyAssignment, Alloc,
--      std::false_type>;
--
--  // propagate_on_container_move_assignment:
--  // Alloc::propagate_on_container_move_assignment if present, otherwise
--  // std::false_type
--  using propagate_on_container_move_assignment = memory_internal::ExtractOrT<
--      memory_internal::GetPropagateOnContainerMoveAssignment, Alloc,
--      std::false_type>;
--
--  // propagate_on_container_swap:
--  // Alloc::propagate_on_container_swap if present, otherwise std::false_type
--  using propagate_on_container_swap =
--      memory_internal::ExtractOrT<memory_internal::GetPropagateOnContainerSwap,
--                                  Alloc, std::false_type>;
--
--  // is_always_equal:
--  // Alloc::is_always_equal if present, otherwise std::is_empty<Alloc>::type
--  using is_always_equal =
--      memory_internal::ExtractOrT<memory_internal::GetIsAlwaysEqual, Alloc,
--                                  typename std::is_empty<Alloc>::type>;
--
--  // rebind_alloc:
--  // Alloc::rebind<T>::other if present, otherwise Alloc<T, Args> if this Alloc
--  // is Alloc<U, Args>
--  template <typename T>
--  using rebind_alloc = typename memory_internal::RebindAlloc<Alloc, T>::type;
--
--  // rebind_traits:
--  // absl::allocator_traits<rebind_alloc<T>>
--  template <typename T>
--  using rebind_traits = absl::allocator_traits<rebind_alloc<T>>;
--
--  // allocate(Alloc& a, size_type n):
--  // Calls a.allocate(n)
--  static pointer allocate(Alloc& a,  // NOLINT(runtime/references)
--                          size_type n) {
--    return a.allocate(n);
--  }
--
--  // allocate(Alloc& a, size_type n, const_void_pointer hint):
--  // Calls a.allocate(n, hint) if possible.
--  // If not possible, calls a.allocate(n)
--  static pointer allocate(Alloc& a, size_type n,  // NOLINT(runtime/references)
--                          const_void_pointer hint) {
--    return allocate_impl(0, a, n, hint);
--  }
--
--  // deallocate(Alloc& a, pointer p, size_type n):
--  // Calls a.deallocate(p, n)
--  static void deallocate(Alloc& a, pointer p,  // NOLINT(runtime/references)
--                         size_type n) {
--    a.deallocate(p, n);
--  }
--
--  // construct(Alloc& a, T* p, Args&&... args):
--  // Calls a.construct(p, std::forward<Args>(args)...) if possible.
--  // If not possible, calls
--  //   ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...)
--  template <typename T, typename... Args>
--  static void construct(Alloc& a, T* p,  // NOLINT(runtime/references)
--                        Args&&... args) {
--    construct_impl(0, a, p, std::forward<Args>(args)...);
--  }
--
--  // destroy(Alloc& a, T* p):
--  // Calls a.destroy(p) if possible. If not possible, calls p->~T().
--  template <typename T>
--  static void destroy(Alloc& a, T* p) {  // NOLINT(runtime/references)
--    destroy_impl(0, a, p);
--  }
--
--  // max_size(const Alloc& a):
--  // Returns a.max_size() if possible. If not possible, returns
--  //   std::numeric_limits<size_type>::max() / sizeof(value_type)
--  static size_type max_size(const Alloc& a) { return max_size_impl(0, a); }
--
--  // select_on_container_copy_construction(const Alloc& a):
--  // Returns a.select_on_container_copy_construction() if possible.
--  // If not possible, returns a.
--  static Alloc select_on_container_copy_construction(const Alloc& a) {
--    return select_on_container_copy_construction_impl(0, a);
--  }
--
-- private:
--  template <typename A>
--  static auto allocate_impl(int, A& a,  // NOLINT(runtime/references)
--                            size_type n, const_void_pointer hint)
--      -> decltype(a.allocate(n, hint)) {
--    return a.allocate(n, hint);
--  }
--  static pointer allocate_impl(char, Alloc& a,  // NOLINT(runtime/references)
--                               size_type n, const_void_pointer) {
--    return a.allocate(n);
--  }
--
--  template <typename A, typename... Args>
--  static auto construct_impl(int, A& a,  // NOLINT(runtime/references)
--                             Args&&... args)
--      -> decltype(a.construct(std::forward<Args>(args)...)) {
--    a.construct(std::forward<Args>(args)...);
--  }
--
--  template <typename T, typename... Args>
--  static void construct_impl(char, Alloc&, T* p, Args&&... args) {
--    ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...);
--  }
--
--  template <typename A, typename T>
--  static auto destroy_impl(int, A& a,  // NOLINT(runtime/references)
--                           T* p) -> decltype(a.destroy(p)) {
--    a.destroy(p);
--  }
--  template <typename T>
--  static void destroy_impl(char, Alloc&, T* p) {
--    p->~T();
--  }
--
--  template <typename A>
--  static auto max_size_impl(int, const A& a) -> decltype(a.max_size()) {
--    return a.max_size();
--  }
--  static size_type max_size_impl(char, const Alloc&) {
--    return (std::numeric_limits<size_type>::max)() / sizeof(value_type);
--  }
--
--  template <typename A>
--  static auto select_on_container_copy_construction_impl(int, const A& a)
--      -> decltype(a.select_on_container_copy_construction()) {
--    return a.select_on_container_copy_construction();
--  }
--  static Alloc select_on_container_copy_construction_impl(char,
--                                                          const Alloc& a) {
--    return a;
--  }
--};
--#endif  // __cplusplus >= 201703L
--
--namespace memory_internal {
--
- // This template alias transforms Alloc::is_nothrow into a metafunction with
- // Alloc as a parameter so it can be used with ExtractOrT<>.
- template <typename Alloc>
-diff --git a/absl/memory/memory_test.cc b/absl/memory/memory_test.cc
-index 5d5719b3..b62c48f9 100644
---- a/absl/memory/memory_test.cc
-+++ b/absl/memory/memory_test.cc
-@@ -287,338 +287,6 @@ TEST(RawPtrTest, NotAPointer) {
- }
- */
- 
--template <typename T>
--struct SmartPointer {
--  using difference_type = char;
--};
--
--struct PointerWith {
--  using element_type = int32_t;
--  using difference_type = int16_t;
--  template <typename U>
--  using rebind = SmartPointer<U>;
--
--  static PointerWith pointer_to(
--      element_type& r) {  // NOLINT(runtime/references)
--    return PointerWith{&r};
--  }
--
--  element_type* ptr;
--};
--
--template <typename... Args>
--struct PointerWithout {};
--
--TEST(PointerTraits, Types) {
--  using TraitsWith = absl::pointer_traits<PointerWith>;
--  EXPECT_TRUE((std::is_same<TraitsWith::pointer, PointerWith>::value));
--  EXPECT_TRUE((std::is_same<TraitsWith::element_type, int32_t>::value));
--  EXPECT_TRUE((std::is_same<TraitsWith::difference_type, int16_t>::value));
--  EXPECT_TRUE((
--      std::is_same<TraitsWith::rebind<int64_t>, SmartPointer<int64_t>>::value));
--
--  using TraitsWithout = absl::pointer_traits<PointerWithout<double, int>>;
--  EXPECT_TRUE((std::is_same<TraitsWithout::pointer,
--                            PointerWithout<double, int>>::value));
--  EXPECT_TRUE((std::is_same<TraitsWithout::element_type, double>::value));
--  EXPECT_TRUE(
--      (std::is_same<TraitsWithout ::difference_type, std::ptrdiff_t>::value));
--  EXPECT_TRUE((std::is_same<TraitsWithout::rebind<int64_t>,
--                            PointerWithout<int64_t, int>>::value));
--
--  using TraitsRawPtr = absl::pointer_traits<char*>;
--  EXPECT_TRUE((std::is_same<TraitsRawPtr::pointer, char*>::value));
--  EXPECT_TRUE((std::is_same<TraitsRawPtr::element_type, char>::value));
--  EXPECT_TRUE(
--      (std::is_same<TraitsRawPtr::difference_type, std::ptrdiff_t>::value));
--  EXPECT_TRUE((std::is_same<TraitsRawPtr::rebind<int64_t>, int64_t*>::value));
--}
--
--TEST(PointerTraits, Functions) {
--  int i;
--  EXPECT_EQ(&i, absl::pointer_traits<PointerWith>::pointer_to(i).ptr);
--  EXPECT_EQ(&i, absl::pointer_traits<int*>::pointer_to(i));
--}
--
--TEST(AllocatorTraits, Typedefs) {
--  struct A {
--    struct value_type {};
--  };
--  EXPECT_TRUE((
--      std::is_same<A,
--                   typename absl::allocator_traits<A>::allocator_type>::value));
--  EXPECT_TRUE(
--      (std::is_same<A::value_type,
--                    typename absl::allocator_traits<A>::value_type>::value));
--
--  struct X {};
--  struct HasPointer {
--    using value_type = X;
--    using pointer = SmartPointer<X>;
--  };
--  EXPECT_TRUE((std::is_same<SmartPointer<X>, typename absl::allocator_traits<
--                                                 HasPointer>::pointer>::value));
--  EXPECT_TRUE(
--      (std::is_same<A::value_type*,
--                    typename absl::allocator_traits<A>::pointer>::value));
--
--  EXPECT_TRUE(
--      (std::is_same<
--          SmartPointer<const X>,
--          typename absl::allocator_traits<HasPointer>::const_pointer>::value));
--  EXPECT_TRUE(
--      (std::is_same<const A::value_type*,
--                    typename absl::allocator_traits<A>::const_pointer>::value));
--
--  struct HasVoidPointer {
--    using value_type = X;
--    struct void_pointer {};
--  };
--
--  EXPECT_TRUE((std::is_same<HasVoidPointer::void_pointer,
--                            typename absl::allocator_traits<
--                                HasVoidPointer>::void_pointer>::value));
--  EXPECT_TRUE(
--      (std::is_same<SmartPointer<void>, typename absl::allocator_traits<
--                                            HasPointer>::void_pointer>::value));
--
--  struct HasConstVoidPointer {
--    using value_type = X;
--    struct const_void_pointer {};
--  };
--
--  EXPECT_TRUE(
--      (std::is_same<HasConstVoidPointer::const_void_pointer,
--                    typename absl::allocator_traits<
--                        HasConstVoidPointer>::const_void_pointer>::value));
--  EXPECT_TRUE((std::is_same<SmartPointer<const void>,
--                            typename absl::allocator_traits<
--                                HasPointer>::const_void_pointer>::value));
--
--  struct HasDifferenceType {
--    using value_type = X;
--    using difference_type = int;
--  };
--  EXPECT_TRUE(
--      (std::is_same<int, typename absl::allocator_traits<
--                             HasDifferenceType>::difference_type>::value));
--  EXPECT_TRUE((std::is_same<char, typename absl::allocator_traits<
--                                      HasPointer>::difference_type>::value));
--
--  struct HasSizeType {
--    using value_type = X;
--    using size_type = unsigned int;
--  };
--  EXPECT_TRUE((std::is_same<unsigned int, typename absl::allocator_traits<
--                                              HasSizeType>::size_type>::value));
--  EXPECT_TRUE((std::is_same<unsigned char, typename absl::allocator_traits<
--                                               HasPointer>::size_type>::value));
--
--  struct HasPropagateOnCopy {
--    using value_type = X;
--    struct propagate_on_container_copy_assignment {};
--  };
--
--  EXPECT_TRUE(
--      (std::is_same<HasPropagateOnCopy::propagate_on_container_copy_assignment,
--                    typename absl::allocator_traits<HasPropagateOnCopy>::
--                        propagate_on_container_copy_assignment>::value));
--  EXPECT_TRUE(
--      (std::is_same<std::false_type,
--                    typename absl::allocator_traits<
--                        A>::propagate_on_container_copy_assignment>::value));
--
--  struct HasPropagateOnMove {
--    using value_type = X;
--    struct propagate_on_container_move_assignment {};
--  };
--
--  EXPECT_TRUE(
--      (std::is_same<HasPropagateOnMove::propagate_on_container_move_assignment,
--                    typename absl::allocator_traits<HasPropagateOnMove>::
--                        propagate_on_container_move_assignment>::value));
--  EXPECT_TRUE(
--      (std::is_same<std::false_type,
--                    typename absl::allocator_traits<
--                        A>::propagate_on_container_move_assignment>::value));
--
--  struct HasPropagateOnSwap {
--    using value_type = X;
--    struct propagate_on_container_swap {};
--  };
--
--  EXPECT_TRUE(
--      (std::is_same<HasPropagateOnSwap::propagate_on_container_swap,
--                    typename absl::allocator_traits<HasPropagateOnSwap>::
--                        propagate_on_container_swap>::value));
--  EXPECT_TRUE(
--      (std::is_same<std::false_type, typename absl::allocator_traits<A>::
--                                         propagate_on_container_swap>::value));
--
--  struct HasIsAlwaysEqual {
--    using value_type = X;
--    struct is_always_equal {};
--  };
--
--  EXPECT_TRUE((std::is_same<HasIsAlwaysEqual::is_always_equal,
--                            typename absl::allocator_traits<
--                                HasIsAlwaysEqual>::is_always_equal>::value));
--  EXPECT_TRUE((std::is_same<std::true_type, typename absl::allocator_traits<
--                                                A>::is_always_equal>::value));
--  struct NonEmpty {
--    using value_type = X;
--    int i;
--  };
--  EXPECT_TRUE(
--      (std::is_same<std::false_type,
--                    absl::allocator_traits<NonEmpty>::is_always_equal>::value));
--}
--
--template <typename T>
--struct AllocWithPrivateInheritance : private std::allocator<T> {
--  using value_type = T;
--};
--
--TEST(AllocatorTraits, RebindWithPrivateInheritance) {
--  // Regression test for some versions of gcc that do not like the sfinae we
--  // used in combination with private inheritance.
--  EXPECT_TRUE(
--      (std::is_same<AllocWithPrivateInheritance<int>,
--                    absl::allocator_traits<AllocWithPrivateInheritance<char>>::
--                        rebind_alloc<int>>::value));
--}
--
--template <typename T>
--struct Rebound {};
--
--struct AllocWithRebind {
--  using value_type = int;
--  template <typename T>
--  struct rebind {
--    using other = Rebound<T>;
--  };
--};
--
--template <typename T, typename U>
--struct AllocWithoutRebind {
--  using value_type = int;
--};
--
--TEST(AllocatorTraits, Rebind) {
--  EXPECT_TRUE(
--      (std::is_same<Rebound<int>,
--                    typename absl::allocator_traits<
--                        AllocWithRebind>::template rebind_alloc<int>>::value));
--  EXPECT_TRUE(
--      (std::is_same<absl::allocator_traits<Rebound<int>>,
--                    typename absl::allocator_traits<
--                        AllocWithRebind>::template rebind_traits<int>>::value));
--
--  EXPECT_TRUE(
--      (std::is_same<AllocWithoutRebind<double, char>,
--                    typename absl::allocator_traits<AllocWithoutRebind<
--                        int, char>>::template rebind_alloc<double>>::value));
--  EXPECT_TRUE(
--      (std::is_same<absl::allocator_traits<AllocWithoutRebind<double, char>>,
--                    typename absl::allocator_traits<AllocWithoutRebind<
--                        int, char>>::template rebind_traits<double>>::value));
--}
--
--struct TestValue {
--  TestValue() {}
--  explicit TestValue(int* trace) : trace(trace) { ++*trace; }
--  ~TestValue() {
--    if (trace) --*trace;
--  }
--  int* trace = nullptr;
--};
--
--struct MinimalMockAllocator {
--  MinimalMockAllocator() : value(0) {}
--  explicit MinimalMockAllocator(int value) : value(value) {}
--  MinimalMockAllocator(const MinimalMockAllocator& other)
--      : value(other.value) {}
--  using value_type = TestValue;
--  MOCK_METHOD(value_type*, allocate, (size_t));
--  MOCK_METHOD(void, deallocate, (value_type*, size_t));
--
--  int value;
--};
--
--TEST(AllocatorTraits, FunctionsMinimal) {
--  int trace = 0;
--  int hint;
--  alignas(TestValue) char buffer[sizeof(TestValue)];
--  auto* x = reinterpret_cast<TestValue*>(buffer);
--  MinimalMockAllocator mock;
--  using Traits = absl::allocator_traits<MinimalMockAllocator>;
--  EXPECT_CALL(mock, allocate(7)).WillRepeatedly(Return(x));
--  EXPECT_CALL(mock, deallocate(x, 7));
--
--  EXPECT_EQ(x, Traits::allocate(mock, 7));
--  static_cast<void>(Traits::allocate(mock, 7, static_cast<const void*>(&hint)));
--  EXPECT_EQ(x, Traits::allocate(mock, 7, static_cast<const void*>(&hint)));
--  Traits::deallocate(mock, x, 7);
--
--  EXPECT_EQ(0, trace);
--  Traits::construct(mock, x, &trace);
--  EXPECT_EQ(1, trace);
--  Traits::destroy(mock, x);
--  EXPECT_EQ(0, trace);
--
--  EXPECT_EQ(std::numeric_limits<size_t>::max() / sizeof(TestValue),
--            Traits::max_size(mock));
--
--  EXPECT_EQ(0, mock.value);
--  EXPECT_EQ(0, Traits::select_on_container_copy_construction(mock).value);
--}
--
--struct FullMockAllocator {
--  FullMockAllocator() : value(0) {}
--  explicit FullMockAllocator(int value) : value(value) {}
--  FullMockAllocator(const FullMockAllocator& other) : value(other.value) {}
--  using value_type = TestValue;
--  MOCK_METHOD(value_type*, allocate, (size_t));
--  MOCK_METHOD(value_type*, allocate, (size_t, const void*));
--  MOCK_METHOD(void, construct, (value_type*, int*));
--  MOCK_METHOD(void, destroy, (value_type*));
--  MOCK_METHOD(size_t, max_size, (),
--              (const));
--  MOCK_METHOD(FullMockAllocator, select_on_container_copy_construction, (),
--              (const));
--
--  int value;
--};
--
--TEST(AllocatorTraits, FunctionsFull) {
--  int trace = 0;
--  int hint;
--  TestValue x(&trace), y;
--  FullMockAllocator mock;
--  using Traits = absl::allocator_traits<FullMockAllocator>;
--  EXPECT_CALL(mock, allocate(7)).WillRepeatedly(Return(&x));
--  EXPECT_CALL(mock, allocate(13, &hint)).WillRepeatedly(Return(&y));
--  EXPECT_CALL(mock, construct(&x, &trace));
--  EXPECT_CALL(mock, destroy(&x));
--  EXPECT_CALL(mock, max_size()).WillRepeatedly(Return(17));
--  EXPECT_CALL(mock, select_on_container_copy_construction())
--      .WillRepeatedly(Return(FullMockAllocator(23)));
--
--  EXPECT_EQ(&x, Traits::allocate(mock, 7));
--  EXPECT_EQ(&y, Traits::allocate(mock, 13, static_cast<const void*>(&hint)));
--
--  EXPECT_EQ(1, trace);
--  Traits::construct(mock, &x, &trace);
--  EXPECT_EQ(1, trace);
--  Traits::destroy(mock, &x);
--  EXPECT_EQ(1, trace);
--
--  EXPECT_EQ(17, Traits::max_size(mock));
--
--  EXPECT_EQ(0, mock.value);
--  EXPECT_EQ(23, Traits::select_on_container_copy_construction(mock).value);
--}
--
- TEST(AllocatorNoThrowTest, DefaultAllocator) {
- #if defined(ABSL_ALLOCATOR_NOTHROW) && ABSL_ALLOCATOR_NOTHROW
-   EXPECT_TRUE(absl::default_allocator_is_nothrow::value);
--- 
-2.39.0
-
diff --git a/09e96049995584c3489e4bd1467313e3e85af99c.patch b/09e96049995584c3489e4bd1467313e3e85af99c.patch
deleted file mode 100644
index d6b1325..0000000
--- a/09e96049995584c3489e4bd1467313e3e85af99c.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 09e96049995584c3489e4bd1467313e3e85af99c Mon Sep 17 00:00:00 2001
-From: Bruno Pitrus <brunopitrus@hotmail.com>
-Date: Mon, 11 Jul 2022 18:27:39 +0200
-Subject: [PATCH] Do not leak -maes -msse4.1 into pkgconfig
-
----
- CMake/AbseilHelpers.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
-index ebe9ddc87..9cd87c513 100644
---- a/CMake/AbseilHelpers.cmake
-+++ b/CMake/AbseilHelpers.cmake
-@@ -166,6 +166,8 @@ function(absl_cc_library)
-           set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
-         elseif(${cflag} MATCHES "^(-W|/w[1234eo])")
-           # Don't impose our warnings on others.
-+        elseif(${cflag} MATCHES "^-m")
-+          # Don't impose CPU instruction requirements on others, as the code performs feature detection on runtime.
-         else()
-           set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
-         endif()
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index d471e1e..92b12d2 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -1,9 +1,9 @@
 # Installed library version
-%global lib_version 2206.0.0
+%global lib_version 2301.0.0
 
 Name:           abseil-cpp
-Version:        20220623.1
-Release:        4%{?dist}
+Version:        20230125.1
+Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -16,26 +16,14 @@ Summary:        C++ Common Libraries
 #         # 2009-05-17 by Arthur David Olson.
 #       absl/time/internal/cctz/testdata/zoneinfo/zone1970.tab
 #         # This file is in the public domain.
+#     Public-domain license text for these files was added to the
+#     public-domain-text.txt file in fedora-license-data in commit
+#     538bc87d5e3c1cb08e81d690ce4122e1273dc9cd
+#     (https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/205).
 License:        Apache-2.0 AND LicenseRef-Fedora-Public-Domain
 URL:            https://abseil.io
 Source0:        https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
 
-# Backport upstream commit 09e96049995584c3489e4bd1467313e3e85af99c, which
-# corresponds to:
-#
-# Do not leak -maes -msse4.1 into pkgconfig
-# https://github.com/abseil/abseil-cpp/pull/1216
-#
-# Fixes RHBZ#2108658.
-Patch:          https://github.com/abseil/abseil-cpp/commit/09e96049995584c3489e4bd1467313e3e85af99c.patch
-
-# Backport upstream commit 4eef16170014f75f4291ae335a271900f89eaedf by
-# cherry-picking and rebasing onto 20220623.1; fixes:
-#
-# Static assertion failures compiling AllocatorTraits.Rebind test (GCC 13)
-# https://github.com/abseil/abseil-cpp/issues/1366
-Patch:          0001-Update-absl-allocator_traits-and-absl-pointer_traits.patch
-
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster
 BuildRequires:  ninja-build
@@ -44,6 +32,18 @@ BuildRequires:  gcc-c++
 BuildRequires:  gmock-devel
 BuildRequires:  gtest-devel
 
+# The contents of absl/time/internal/cctz are derived from
+# https://github.com/google/cctz (https://src.fedoraproject.org/rpms/cctz), but
+# have been forked with Abseil-specific changes. It is not obvious from which
+# particular version of CCTZ these sources are derived. Upstream was asked
+# about a path to supporting a system copy as required by bundling guidelines:
+#   Please comment on CCTZ bundling
+#   https://github.com/abseil/abseil-cpp/discussions/1415
+# They refused, for the time being, as follows:
+#   “[…] we have no plans to change this decision, but we reserve the right to
+#   change our minds.”
+Provides:       bundled(cctz)
+
 %ifarch s390x
 # Symbolize.SymbolizeWithMultipleMaps fails in absl_symbolize_test on s390x
 # with LTO
@@ -70,6 +70,10 @@ and we now want to provide those resources to the C++ community as a whole.
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
+# Some of the headers from CCTZ are part of the -devel subpackage. See the
+# corresponding virtual Provides in the base package for full details.
+Provides:       bundled(cctz)
+
 %description devel
 Development headers for %{name}
 
@@ -106,6 +110,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Feb 23 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.1-1
+- Update to 20230125.1 (close RHBZ#2162638)
+
 * Sat Jan 21 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.1-4
 - Backport upstream commit 4eef161 for GCC 13
 
diff --git a/sources b/sources
index e1007ba..f9389f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20220623.1.tar.gz) = ab4fccd9a2bfa0c5ad4b56c8e8f8b7ec7a8eca8b6cc6959802acadd1da785e1feb078c6ac621808cd699c82717a9e637dc426d94b70a8db7f2a807059d41cbc2
+SHA512 (abseil-cpp-20230125.1.tar.gz) = 160764e2d10f1a5970b6ea7323868d231070c57b48fcc92e3614bca9d0e9ee0a571b66dfdc560934883de542f32dfbb1ba7b03c11bda8f03e63a5f31e273be6a

From e32733eef423e70ff9fe9d70bad869fd83da07cf Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 30 Mar 2023 08:12:06 -0400
Subject: [PATCH 06/41] Update to 20230125.2 (close RHBZ#2182229)

---
 .gitignore      | 1 +
 abseil-cpp.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ccb117..dc80c0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /abseil-cpp-20220623.0.tar.gz
 /abseil-cpp-20220623.1.tar.gz
 /abseil-cpp-20230125.1.tar.gz
+/abseil-cpp-20230125.2.tar.gz
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 92b12d2..264c75a 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -2,7 +2,7 @@
 %global lib_version 2301.0.0
 
 Name:           abseil-cpp
-Version:        20230125.1
+Version:        20230125.2
 Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
@@ -110,6 +110,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Mar 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.2-1
+- Update to 20230125.2 (close RHBZ#2182229)
+
 * Thu Feb 23 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.1-1
 - Update to 20230125.1 (close RHBZ#2162638)
 
diff --git a/sources b/sources
index f9389f4..292648a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20230125.1.tar.gz) = 160764e2d10f1a5970b6ea7323868d231070c57b48fcc92e3614bca9d0e9ee0a571b66dfdc560934883de542f32dfbb1ba7b03c11bda8f03e63a5f31e273be6a
+SHA512 (abseil-cpp-20230125.2.tar.gz) = b2ba5023610aacb680b22bef894372810e6e7df76e630e56ac2f4b9498f70a872171f4562f6560ab78e837437b7bcfd3c47bfc2a5bb7fb20f28ec490dc8ed61f

From 3632c58dccec694832e2ef6c6a422b71b27ec7d3 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 5 May 2023 08:45:20 -0400
Subject: [PATCH 07/41] Update to 20230125.3 (close RHBZ#2193306)

---
 .gitignore      | 1 +
 abseil-cpp.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc80c0e..757c00a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /abseil-cpp-20220623.1.tar.gz
 /abseil-cpp-20230125.1.tar.gz
 /abseil-cpp-20230125.2.tar.gz
+/abseil-cpp-20230125.3.tar.gz
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 264c75a..6e571a5 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -2,7 +2,7 @@
 %global lib_version 2301.0.0
 
 Name:           abseil-cpp
-Version:        20230125.2
+Version:        20230125.3
 Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
@@ -110,6 +110,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue May 09 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.3-1
+- Update to 20230125.3 (close RHBZ#2193306)
+
 * Thu Mar 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.2-1
 - Update to 20230125.2 (close RHBZ#2182229)
 
diff --git a/sources b/sources
index 292648a..e4bfe4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20230125.2.tar.gz) = b2ba5023610aacb680b22bef894372810e6e7df76e630e56ac2f4b9498f70a872171f4562f6560ab78e837437b7bcfd3c47bfc2a5bb7fb20f28ec490dc8ed61f
+SHA512 (abseil-cpp-20230125.3.tar.gz) = 50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70

From 064ccdb3871e38a11df4447c3a391a606ff6bf15 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 9 May 2023 10:53:21 -0400
Subject: [PATCH 08/41] Split installed TESTONLY libraries into a -testing
 subpackage

- Explicitly list all installed shared libraries

See: https://github.com/abseil/abseil-cpp/pull/1442
---
 abseil-cpp.spec | 127 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 123 insertions(+), 4 deletions(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 6e571a5..0f05235 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -66,9 +66,19 @@ Abseil is not meant to be a competitor to the standard library; we've just
 found that many of these utilities serve a purpose within our code base,
 and we now want to provide those resources to the C++ community as a whole.
 
+%package testing
+Summary:        Libraries needed for running tests on the installed %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+Provides:       bundled(cctz)
+
+%description testing
+%{summary}.
+
 %package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-testing%{?_isa} = %{version}-%{release}
 
 # Some of the headers from CCTZ are part of the -devel subpackage. See the
 # corresponding virtual Provides in the base package for full details.
@@ -101,17 +111,126 @@ Development headers for %{name}
 %files
 %license LICENSE
 %doc FAQ.md README.md UPGRADES.md
-%{_libdir}/libabsl_*.so.%{lib_version}
+# All shared libraries except installed TESTONLY libraries; see the %%files
+# list for the -testing subpackage for those.
+%{_libdir}/libabsl_bad_any_cast_impl.so.%{lib_version}
+%{_libdir}/libabsl_bad_optional_access.so.%{lib_version}
+%{_libdir}/libabsl_bad_variant_access.so.%{lib_version}
+%{_libdir}/libabsl_base.so.%{lib_version}
+%{_libdir}/libabsl_city.so.%{lib_version}
+%{_libdir}/libabsl_civil_time.so.%{lib_version}
+%{_libdir}/libabsl_cord.so.%{lib_version}
+%{_libdir}/libabsl_cord_internal.so.%{lib_version}
+%{_libdir}/libabsl_cordz_functions.so.%{lib_version}
+%{_libdir}/libabsl_cordz_handle.so.%{lib_version}
+%{_libdir}/libabsl_cordz_info.so.%{lib_version}
+%{_libdir}/libabsl_cordz_sample_token.so.%{lib_version}
+%{_libdir}/libabsl_crc32c.so.%{lib_version}
+%{_libdir}/libabsl_crc_cord_state.so.%{lib_version}
+%{_libdir}/libabsl_crc_cpu_detect.so.%{lib_version}
+%{_libdir}/libabsl_crc_internal.so.%{lib_version}
+%{_libdir}/libabsl_debugging_internal.so.%{lib_version}
+%{_libdir}/libabsl_demangle_internal.so.%{lib_version}
+%{_libdir}/libabsl_die_if_null.so.%{lib_version}
+%{_libdir}/libabsl_examine_stack.so.%{lib_version}
+%{_libdir}/libabsl_exponential_biased.so.%{lib_version}
+%{_libdir}/libabsl_failure_signal_handler.so.%{lib_version}
+%{_libdir}/libabsl_flags.so.%{lib_version}
+%{_libdir}/libabsl_flags_commandlineflag.so.%{lib_version}
+%{_libdir}/libabsl_flags_commandlineflag_internal.so.%{lib_version}
+%{_libdir}/libabsl_flags_config.so.%{lib_version}
+%{_libdir}/libabsl_flags_internal.so.%{lib_version}
+%{_libdir}/libabsl_flags_marshalling.so.%{lib_version}
+%{_libdir}/libabsl_flags_parse.so.%{lib_version}
+%{_libdir}/libabsl_flags_private_handle_accessor.so.%{lib_version}
+%{_libdir}/libabsl_flags_program_name.so.%{lib_version}
+%{_libdir}/libabsl_flags_reflection.so.%{lib_version}
+%{_libdir}/libabsl_flags_usage.so.%{lib_version}
+%{_libdir}/libabsl_flags_usage_internal.so.%{lib_version}
+%{_libdir}/libabsl_graphcycles_internal.so.%{lib_version}
+%{_libdir}/libabsl_hash.so.%{lib_version}
+%{_libdir}/libabsl_hashtablez_sampler.so.%{lib_version}
+%{_libdir}/libabsl_int128.so.%{lib_version}
+%{_libdir}/libabsl_leak_check.so.%{lib_version}
+%{_libdir}/libabsl_log_entry.so.%{lib_version}
+%{_libdir}/libabsl_log_flags.so.%{lib_version}
+%{_libdir}/libabsl_log_globals.so.%{lib_version}
+%{_libdir}/libabsl_log_initialize.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_check_op.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_conditions.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_format.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_globals.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_log_sink_set.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_message.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_nullguard.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_proto.so.%{lib_version}
+%{_libdir}/libabsl_log_severity.so.%{lib_version}
+%{_libdir}/libabsl_log_sink.so.%{lib_version}
+%{_libdir}/libabsl_low_level_hash.so.%{lib_version}
+%{_libdir}/libabsl_malloc_internal.so.%{lib_version}
+%{_libdir}/libabsl_periodic_sampler.so.%{lib_version}
+%{_libdir}/libabsl_random_distributions.so.%{lib_version}
+%{_libdir}/libabsl_random_internal_distribution_test_util.so.%{lib_version}
+%{_libdir}/libabsl_random_internal_platform.so.%{lib_version}
+%{_libdir}/libabsl_random_internal_pool_urbg.so.%{lib_version}
+%{_libdir}/libabsl_random_internal_randen.so.%{lib_version}
+%{_libdir}/libabsl_random_internal_randen_hwaes.so.%{lib_version}
+%{_libdir}/libabsl_random_internal_randen_hwaes_impl.so.%{lib_version}
+%{_libdir}/libabsl_random_internal_randen_slow.so.%{lib_version}
+%{_libdir}/libabsl_random_internal_seed_material.so.%{lib_version}
+%{_libdir}/libabsl_random_seed_gen_exception.so.%{lib_version}
+%{_libdir}/libabsl_random_seed_sequences.so.%{lib_version}
+%{_libdir}/libabsl_raw_hash_set.so.%{lib_version}
+%{_libdir}/libabsl_raw_logging_internal.so.%{lib_version}
+%{_libdir}/libabsl_scoped_set_env.so.%{lib_version}
+%{_libdir}/libabsl_spinlock_wait.so.%{lib_version}
+%{_libdir}/libabsl_stacktrace.so.%{lib_version}
+%{_libdir}/libabsl_status.so.%{lib_version}
+%{_libdir}/libabsl_statusor.so.%{lib_version}
+%{_libdir}/libabsl_str_format_internal.so.%{lib_version}
+%{_libdir}/libabsl_strerror.so.%{lib_version}
+%{_libdir}/libabsl_strings.so.%{lib_version}
+%{_libdir}/libabsl_strings_internal.so.%{lib_version}
+%{_libdir}/libabsl_symbolize.so.%{lib_version}
+%{_libdir}/libabsl_synchronization.so.%{lib_version}
+%{_libdir}/libabsl_throw_delegate.so.%{lib_version}
+%{_libdir}/libabsl_time.so.%{lib_version}
+%{_libdir}/libabsl_time_zone.so.%{lib_version}
+
+%files testing
+# TESTONLY libraries (that are actually installed):
+# absl/base/CMakeLists.txt
+%{_libdir}/libabsl_exception_safety_testing.so.%{lib_version}
+%{_libdir}/libabsl_atomic_hook_test_helper.so.%{lib_version}
+%{_libdir}/libabsl_spinlock_test_common.so.%{lib_version}
+# absl/container/CMakeLists.txt
+%{_libdir}/libabsl_test_instance_tracker.so.%{lib_version}
+%{_libdir}/libabsl_hash_generator_testing.so.%{lib_version}
+# absl/debugging/CMakeLists.txt
+%{_libdir}/libabsl_stack_consumption.so.%{lib_version}
+# absl/log/CMakeLists.txt
+%{_libdir}/libabsl_log_internal_test_actions.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_test_helpers.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_test_matchers.so.%{lib_version}
+%{_libdir}/libabsl_scoped_mock_log.so.%{lib_version}
+# absl/strings/CMakeLists.txt
+%{_libdir}/libabsl_pow10_helper.so.%{lib_version}
+# absl/synchronization/CMakeLists.txt
+%{_libdir}/libabsl_per_thread_sem_test_common.so.%{lib_version}
+# absl/time/CMakeLists.txt
+%{_libdir}/libabsl_time_internal_test_util.so.%{lib_version}
 
 %files devel
 %{_includedir}/absl
 %{_libdir}/libabsl_*.so
 %{_libdir}/cmake/absl
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
 * Tue May 09 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.3-1
 - Update to 20230125.3 (close RHBZ#2193306)
+- Split installed TESTONLY libraries into a -testing subpackage; explicitly
+  list all installed shared libraries
 
 * Thu Mar 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.2-1
 - Update to 20230125.2 (close RHBZ#2182229)

From 10ba60bff721595b3366c75bf6cd1c5f354faae6 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 9 May 2023 18:07:11 -0400
Subject: [PATCH 09/41] Explicitly enable the ABSL_BUILD_TEST_HELPERS CMake
 option

---
 abseil-cpp.spec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 0f05235..07f5ae0 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -91,12 +91,16 @@ Development headers for %{name}
 %autosetup -p1 -S gendiff
 
 %build
+# ABSL_BUILD_TEST_HELPERS is needed to build libraries for the -testing
+# subpackage when tests are not enabled. It is therefore redundant here, but we
+# still supply it to be more explicit.
 %cmake \
   -GNinja \
   -DABSL_USE_EXTERNAL_GOOGLETEST:BOOL=ON \
   -DABSL_FIND_GOOGLETEST:BOOL=ON \
   -DABSL_ENABLE_INSTALL:BOOL=ON \
   -DABSL_BUILD_TESTING:BOOL=ON \
+  -DABSL_BUILD_TEST_HELPERS:BOOL=ON \
   -DCMAKE_BUILD_TYPE:STRING=None \
   -DCMAKE_CXX_STANDARD:STRING=17
 %cmake_build
@@ -231,6 +235,7 @@ Development headers for %{name}
 - Update to 20230125.3 (close RHBZ#2193306)
 - Split installed TESTONLY libraries into a -testing subpackage; explicitly
   list all installed shared libraries
+- Explicitly enable the ABSL_BUILD_TEST_HELPERS CMake option
 
 * Thu Mar 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.2-1
 - Update to 20230125.2 (close RHBZ#2182229)

From 8f4c1ccfd8f0a42e2a3033b2e7b2a9558b33b866 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 12:50:16 +0000
Subject: [PATCH 10/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 07f5ae0..359c3de 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20230125.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -231,6 +231,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20230125.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Tue May 09 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.3-1
 - Update to 20230125.3 (close RHBZ#2193306)
 - Split installed TESTONLY libraries into a -testing subpackage; explicitly

From 6f91ede9ba59281899612f3a469ff485f3627a21 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 10 Aug 2023 14:29:51 -0400
Subject: [PATCH 11/41] Update to 20230802.0 (Abseil LTS branch, Aug 2023)

- Close RHBZ#2229015, fix RHBZ#2064025
---
 .gitignore      |  1 +
 abseil-cpp.spec | 11 ++++++++---
 sources         |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 757c00a..9560b32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /abseil-cpp-20230125.1.tar.gz
 /abseil-cpp-20230125.2.tar.gz
 /abseil-cpp-20230125.3.tar.gz
+/abseil-cpp-20230802.0.tar.gz
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 359c3de..0f784eb 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -1,9 +1,9 @@
 # Installed library version
-%global lib_version 2301.0.0
+%global lib_version 2308.0.0
 
 Name:           abseil-cpp
-Version:        20230125.3
-Release:        2%{?dist}
+Version:        20230802.0
+Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -155,6 +155,7 @@ Development headers for %{name}
 %{_libdir}/libabsl_hash.so.%{lib_version}
 %{_libdir}/libabsl_hashtablez_sampler.so.%{lib_version}
 %{_libdir}/libabsl_int128.so.%{lib_version}
+%{_libdir}/libabsl_kernel_timeout_internal.so.%{lib_version}
 %{_libdir}/libabsl_leak_check.so.%{lib_version}
 %{_libdir}/libabsl_log_entry.so.%{lib_version}
 %{_libdir}/libabsl_log_flags.so.%{lib_version}
@@ -195,6 +196,7 @@ Development headers for %{name}
 %{_libdir}/libabsl_strerror.so.%{lib_version}
 %{_libdir}/libabsl_strings.so.%{lib_version}
 %{_libdir}/libabsl_strings_internal.so.%{lib_version}
+%{_libdir}/libabsl_string_view.so.%{lib_version}
 %{_libdir}/libabsl_symbolize.so.%{lib_version}
 %{_libdir}/libabsl_synchronization.so.%{lib_version}
 %{_libdir}/libabsl_throw_delegate.so.%{lib_version}
@@ -231,6 +233,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Thu Aug 10 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.0-1
+- Update to 20230802.0 (Abseil LTS branch, Aug 2023): close RHBZ#2229015
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20230125.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index e4bfe4c..3c0fbfd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20230125.3.tar.gz) = 50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70
+SHA512 (abseil-cpp-20230802.0.tar.gz) = 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02

From f51fdd9a79be150668909740f851088ca13dece0 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 20 Sep 2023 07:26:55 -0400
Subject: [PATCH 12/41] Update to 20230802.1 (close RHBZ#2239814)

---
 .gitignore      | 1 +
 abseil-cpp.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9560b32..87fcea3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /abseil-cpp-20230125.2.tar.gz
 /abseil-cpp-20230125.3.tar.gz
 /abseil-cpp-20230802.0.tar.gz
+/abseil-cpp-20230802.1.tar.gz
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 0f784eb..be916d2 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -2,7 +2,7 @@
 %global lib_version 2308.0.0
 
 Name:           abseil-cpp
-Version:        20230802.0
+Version:        20230802.1
 Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
@@ -233,6 +233,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Wed Sep 20 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.1-1
+- Update to 20230802.1 (close RHBZ#2239814)
+
 * Thu Aug 10 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.0-1
 - Update to 20230802.0 (Abseil LTS branch, Aug 2023): close RHBZ#2229015
 
diff --git a/sources b/sources
index 3c0fbfd..15fee3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20230802.0.tar.gz) = 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02
+SHA512 (abseil-cpp-20230802.1.tar.gz) = 14390380655c41483a98487e3b012110dd8d1743fdd68d8cde7e0d7c2730312d564b15726d8c9d2fff237d2fce3983bbbb5213f59612c7c6feaeb402dff9609f

From bbab5c1d363684755789d70ab68d63dc6656b65d Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 30 Oct 2023 18:10:34 -0400
Subject: [PATCH 13/41] Rebuild for gtest 1.14.0


From b38e94481e31d24b437bc47d43312809b2138e37 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 31 Oct 2023 07:00:41 -0400
Subject: [PATCH 14/41] Rebuild for gtest 1.14.0

---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index be916d2..1d3adc1 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20230802.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -233,6 +233,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Tue Oct 31 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.1-2
+- Rebuild for gtest 1.14.0
+
 * Wed Sep 20 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.1-1
 - Update to 20230802.1 (close RHBZ#2239814)
 

From 133248c1fa71e8d7c1ba86f9020662df38e9a727 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 12:03:42 +0000
Subject: [PATCH 15/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 1d3adc1..557b656 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20230802.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -233,6 +233,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230802.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Tue Oct 31 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.1-2
 - Rebuild for gtest 1.14.0
 

From 32d65f92657466b6a526a213ee30082123c0c385 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 22:35:26 +0000
Subject: [PATCH 16/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 557b656..a6147f1 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20230802.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -233,6 +233,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230802.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230802.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 66b7bf6296f0b5b6031672d2ccf0e09eb5906bf3 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 17 Jan 2024 08:59:06 -0500
Subject: [PATCH 17/41] Update to 20240116.0 (close RHBZ#2258740)

---
 .gitignore      |  1 +
 abseil-cpp.spec | 12 ++++++++----
 sources         |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87fcea3..5749e5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /abseil-cpp-20230125.3.tar.gz
 /abseil-cpp-20230802.0.tar.gz
 /abseil-cpp-20230802.1.tar.gz
+/abseil-cpp-20240116.0.tar.gz
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index a6147f1..ff0b3f2 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -1,9 +1,9 @@
 # Installed library version
-%global lib_version 2308.0.0
+%global lib_version 2401.0.0
 
 Name:           abseil-cpp
-Version:        20230802.1
-Release:        4%{?dist}
+Version:        20240116.0
+Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -139,7 +139,6 @@ Development headers for %{name}
 %{_libdir}/libabsl_examine_stack.so.%{lib_version}
 %{_libdir}/libabsl_exponential_biased.so.%{lib_version}
 %{_libdir}/libabsl_failure_signal_handler.so.%{lib_version}
-%{_libdir}/libabsl_flags.so.%{lib_version}
 %{_libdir}/libabsl_flags_commandlineflag.so.%{lib_version}
 %{_libdir}/libabsl_flags_commandlineflag_internal.so.%{lib_version}
 %{_libdir}/libabsl_flags_config.so.%{lib_version}
@@ -163,6 +162,7 @@ Development headers for %{name}
 %{_libdir}/libabsl_log_initialize.so.%{lib_version}
 %{_libdir}/libabsl_log_internal_check_op.so.%{lib_version}
 %{_libdir}/libabsl_log_internal_conditions.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_fnmatch.so.%{lib_version}
 %{_libdir}/libabsl_log_internal_format.so.%{lib_version}
 %{_libdir}/libabsl_log_internal_globals.so.%{lib_version}
 %{_libdir}/libabsl_log_internal_log_sink_set.so.%{lib_version}
@@ -202,6 +202,7 @@ Development headers for %{name}
 %{_libdir}/libabsl_throw_delegate.so.%{lib_version}
 %{_libdir}/libabsl_time.so.%{lib_version}
 %{_libdir}/libabsl_time_zone.so.%{lib_version}
+%{_libdir}/libabsl_vlog_config_internal.so.%{lib_version}
 
 %files testing
 # TESTONLY libraries (that are actually installed):
@@ -233,6 +234,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Wed Jan 24 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.0-1
+- Update to 20240116.0
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230802.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 15fee3e..33f8f77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20230802.1.tar.gz) = 14390380655c41483a98487e3b012110dd8d1743fdd68d8cde7e0d7c2730312d564b15726d8c9d2fff237d2fce3983bbbb5213f59612c7c6feaeb402dff9609f
+SHA512 (abseil-cpp-20240116.0.tar.gz) = 018488e69cca472ef118631bd79bca4ef0cf1363432e79b81532942168d305511e4cdf4dc72611275e9a9de00cd71c0245be4ec287ff36147248e218218bf825

From ff11d26a0a61ff42c215a3e9f98e3f3765fb99cd Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 9 Apr 2024 10:52:17 -0400
Subject: [PATCH 18/41] Update to 20240116.2 (close RHBZ#2274172)

---
 .gitignore      | 1 +
 abseil-cpp.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5749e5b..18a3d5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /abseil-cpp-20230802.0.tar.gz
 /abseil-cpp-20230802.1.tar.gz
 /abseil-cpp-20240116.0.tar.gz
+/abseil-cpp-20240116.2.tar.gz
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index ff0b3f2..5873a80 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -2,7 +2,7 @@
 %global lib_version 2401.0.0
 
 Name:           abseil-cpp
-Version:        20240116.0
+Version:        20240116.2
 Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
@@ -234,6 +234,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Tue Apr 09 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.2-1
+- Update to 20240116.2 (close RHBZ#2274172)
+
 * Wed Jan 24 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.0-1
 - Update to 20240116.0
 
diff --git a/sources b/sources
index 33f8f77..1ee649b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20240116.0.tar.gz) = 018488e69cca472ef118631bd79bca4ef0cf1363432e79b81532942168d305511e4cdf4dc72611275e9a9de00cd71c0245be4ec287ff36147248e218218bf825
+SHA512 (abseil-cpp-20240116.2.tar.gz) = 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e

From 2f3f17bf9e67d07dc0065ff0381090132d6716a5 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@rivosinc.com>
Date: Wed, 29 May 2024 22:36:57 -0400
Subject: [PATCH 19/41] Disable NegativeNaN test on riscv64

Signed-off-by: Neil Hanlon <neil@shrug.pw>
---
 abseil-cpp.spec | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 5873a80..07d5a13 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20240116.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -90,6 +90,17 @@ Development headers for %{name}
 %prep
 %autosetup -p1 -S gendiff
 
+%ifarch riscv64
+# NOTE(davidlt): see https://github.com/WebAssembly/design/issues/646
+# [==========] 125 tests from 35 test suites ran. (3501 ms total)
+# [  PASSED  ] 124 tests.
+# [  FAILED  ] 1 test, listed below:
+# [  FAILED  ] FloatingPointLogFormatTest/0.NegativeNaN, where TypeParam = float
+#  1 FAILED TEST
+sed -r -i 's/\bNegativeNaN\b/DISABLED_&/' \
+    absl/log/log_format_test.cc
+%endif
+
 %build
 # ABSL_BUILD_TEST_HELPERS is needed to build libraries for the -testing
 # subpackage when tests are not enabled. It is therefore redundant here, but we
@@ -234,6 +245,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Wed May 29 2024 David Abdurachmanov <davidlt@rivosinc.com> - 20240116.2-2
+- Disable NegativeNaN test on riscv64
+
 * Tue Apr 09 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.2-1
 - Update to 20240116.2 (close RHBZ#2274172)
 

From dd755b6b6a8102f443671bf3dff65348666f189d Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 30 May 2024 09:53:10 -0400
Subject: [PATCH 20/41] Add upstream bug link for NegativeNaN test skip

---
 abseil-cpp.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 07d5a13..60341a9 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -91,6 +91,8 @@ Development headers for %{name}
 %autosetup -p1 -S gendiff
 
 %ifarch riscv64
+# [Bug]: NegativeNaN test fails on riscv64
+# https://github.com/abseil/abseil-cpp/issues/1684
 # NOTE(davidlt): see https://github.com/WebAssembly/design/issues/646
 # [==========] 125 tests from 35 test suites ran. (3501 ms total)
 # [  PASSED  ] 124 tests.

From 8c7c252cffbdbb3f3ed0e7dc5a285ede64679257 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 10 Jun 2024 13:47:14 -0400
Subject: [PATCH 21/41] Backport patch for RISC-V negative NaN issue

---
 ...f6cc87e7a21d92f9f96a72263a93d3929ec7.patch | 52 +++++++++++++++++++
 abseil-cpp.spec                               | 22 ++++----
 2 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100644 96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch

diff --git a/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch b/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch
new file mode 100644
index 0000000..3875985
--- /dev/null
+++ b/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch
@@ -0,0 +1,52 @@
+From 96cdf6cc87e7a21d92f9f96a72263a93d3929ec7 Mon Sep 17 00:00:00 2001
+From: Benjamin Barenblat <bbaren@google.com>
+Date: Mon, 10 Jun 2024 10:14:21 -0700
+Subject: [PATCH] Disable negative NaN float ostream format checking on RISC-V
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It’s not clear whether negative NaN floats are supposed to print as
+"-nan" or "nan" on RISC-V (https://cplusplus.github.io/LWG/issue4101).
+Until that’s resolved, don’t require that logging such a float with
+Abseil produce the same result as streaming it to an ostream does.
+
+Closes: https://github.com/abseil/abseil-cpp/issues/1684
+PiperOrigin-RevId: 641942176
+Change-Id: Iec7ef130cc15c114714f2d124cb37886b3c37ab4
+---
+ absl/log/log_format_test.cc | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/absl/log/log_format_test.cc b/absl/log/log_format_test.cc
+index dbad5d97615..8ca6df3e586 100644
+--- a/absl/log/log_format_test.cc
++++ b/absl/log/log_format_test.cc
+@@ -608,6 +608,19 @@ TYPED_TEST(FloatingPointLogFormatTest, NegativeNaN) {
+   auto comparison_stream = ComparisonStream();
+   comparison_stream << value;
+ 
++  // On RISC-V, don't expect that formatting -NaN produces the same string as
++  // streaming it. #ifdefing out just the relevant line breaks the MSVC build,
++  // so duplicate the entire EXPECT_CALL.
++#ifdef __riscv
++  EXPECT_CALL(
++      test_sink,
++      Send(AllOf(
++          TextMessage(AnyOf(Eq("-nan"), Eq("nan"), Eq("NaN"), Eq("-nan(ind)"))),
++          ENCODED_MESSAGE(
++              AnyOf(EqualsProto(R"pb(value { str: "-nan" })pb"),
++                    EqualsProto(R"pb(value { str: "nan" })pb"),
++                    EqualsProto(R"pb(value { str: "-nan(ind)" })pb"))))));
++#else
+   EXPECT_CALL(
+       test_sink,
+       Send(AllOf(
+@@ -617,6 +630,7 @@ TYPED_TEST(FloatingPointLogFormatTest, NegativeNaN) {
+               AnyOf(EqualsProto(R"pb(value { str: "-nan" })pb"),
+                     EqualsProto(R"pb(value { str: "nan" })pb"),
+                     EqualsProto(R"pb(value { str: "-nan(ind)" })pb"))))));
++#endif
+   test_sink.StartCapturingLogs();
+   LOG(INFO) << value;
+ }
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 60341a9..3cf5983 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -24,6 +24,15 @@ License:        Apache-2.0 AND LicenseRef-Fedora-Public-Domain
 URL:            https://abseil.io
 Source0:        https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
 
+# Disable negative NaN float ostream format checking on RISC-V
+# https://github.com/abseil/abseil-cpp/commit/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7
+#
+# Fixes:
+#
+# [Bug]: NegativeNaN test fails on riscv64
+# https://github.com/abseil/abseil-cpp/issues/1684
+Patch:          https://github.com/abseil/abseil-cpp/commit/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch
+
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster
 BuildRequires:  ninja-build
@@ -90,19 +99,6 @@ Development headers for %{name}
 %prep
 %autosetup -p1 -S gendiff
 
-%ifarch riscv64
-# [Bug]: NegativeNaN test fails on riscv64
-# https://github.com/abseil/abseil-cpp/issues/1684
-# NOTE(davidlt): see https://github.com/WebAssembly/design/issues/646
-# [==========] 125 tests from 35 test suites ran. (3501 ms total)
-# [  PASSED  ] 124 tests.
-# [  FAILED  ] 1 test, listed below:
-# [  FAILED  ] FloatingPointLogFormatTest/0.NegativeNaN, where TypeParam = float
-#  1 FAILED TEST
-sed -r -i 's/\bNegativeNaN\b/DISABLED_&/' \
-    absl/log/log_format_test.cc
-%endif
-
 %build
 # ABSL_BUILD_TEST_HELPERS is needed to build libraries for the -testing
 # subpackage when tests are not enabled. It is therefore redundant here, but we

From 75c58ab1c6403d1083be30babbc77aeecd1b29b0 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 3 Jul 2024 09:30:10 -0400
Subject: [PATCH 22/41] Rebuilt with upstream patch for NegativeNaN test
 failure on riscv64

---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 3cf5983..f36afa6 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20240116.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -243,6 +243,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Wed Jul 03 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.2-3
+- Rebuilt with upstream patch for NegativeNaN test failure on riscv64
+
 * Wed May 29 2024 David Abdurachmanov <davidlt@rivosinc.com> - 20240116.2-2
 - Disable NegativeNaN test on riscv64
 

From d96a8dec9b22763cd66c9bf2237a2f856199c79e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 16:31:39 +0000
Subject: [PATCH 23/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index f36afa6..1959a55 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20240116.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -243,6 +243,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20240116.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Wed Jul 03 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.2-3
 - Rebuilt with upstream patch for NegativeNaN test failure on riscv64
 

From 33a4b5c72869e2a763fd39e8a80cd57788bc0eda Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 2 Aug 2024 21:29:49 -0400
Subject: [PATCH 24/41] Update to 20240722.0 (close RHBZ#2302537)

---
 .gitignore                                    |  1 +
 ...f6cc87e7a21d92f9f96a72263a93d3929ec7.patch | 52 -------------------
 abseil-cpp.spec                               | 26 +++++-----
 sources                                       |  2 +-
 4 files changed, 15 insertions(+), 66 deletions(-)
 delete mode 100644 96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch

diff --git a/.gitignore b/.gitignore
index 18a3d5a..8bd189f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /abseil-cpp-20230802.1.tar.gz
 /abseil-cpp-20240116.0.tar.gz
 /abseil-cpp-20240116.2.tar.gz
+/abseil-cpp-20240722.0.tar.gz
diff --git a/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch b/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch
deleted file mode 100644
index 3875985..0000000
--- a/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 96cdf6cc87e7a21d92f9f96a72263a93d3929ec7 Mon Sep 17 00:00:00 2001
-From: Benjamin Barenblat <bbaren@google.com>
-Date: Mon, 10 Jun 2024 10:14:21 -0700
-Subject: [PATCH] Disable negative NaN float ostream format checking on RISC-V
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It’s not clear whether negative NaN floats are supposed to print as
-"-nan" or "nan" on RISC-V (https://cplusplus.github.io/LWG/issue4101).
-Until that’s resolved, don’t require that logging such a float with
-Abseil produce the same result as streaming it to an ostream does.
-
-Closes: https://github.com/abseil/abseil-cpp/issues/1684
-PiperOrigin-RevId: 641942176
-Change-Id: Iec7ef130cc15c114714f2d124cb37886b3c37ab4
----
- absl/log/log_format_test.cc | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/absl/log/log_format_test.cc b/absl/log/log_format_test.cc
-index dbad5d97615..8ca6df3e586 100644
---- a/absl/log/log_format_test.cc
-+++ b/absl/log/log_format_test.cc
-@@ -608,6 +608,19 @@ TYPED_TEST(FloatingPointLogFormatTest, NegativeNaN) {
-   auto comparison_stream = ComparisonStream();
-   comparison_stream << value;
- 
-+  // On RISC-V, don't expect that formatting -NaN produces the same string as
-+  // streaming it. #ifdefing out just the relevant line breaks the MSVC build,
-+  // so duplicate the entire EXPECT_CALL.
-+#ifdef __riscv
-+  EXPECT_CALL(
-+      test_sink,
-+      Send(AllOf(
-+          TextMessage(AnyOf(Eq("-nan"), Eq("nan"), Eq("NaN"), Eq("-nan(ind)"))),
-+          ENCODED_MESSAGE(
-+              AnyOf(EqualsProto(R"pb(value { str: "-nan" })pb"),
-+                    EqualsProto(R"pb(value { str: "nan" })pb"),
-+                    EqualsProto(R"pb(value { str: "-nan(ind)" })pb"))))));
-+#else
-   EXPECT_CALL(
-       test_sink,
-       Send(AllOf(
-@@ -617,6 +630,7 @@ TYPED_TEST(FloatingPointLogFormatTest, NegativeNaN) {
-               AnyOf(EqualsProto(R"pb(value { str: "-nan" })pb"),
-                     EqualsProto(R"pb(value { str: "nan" })pb"),
-                     EqualsProto(R"pb(value { str: "-nan(ind)" })pb"))))));
-+#endif
-   test_sink.StartCapturingLogs();
-   LOG(INFO) << value;
- }
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 1959a55..ae15245 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -1,9 +1,9 @@
 # Installed library version
-%global lib_version 2401.0.0
+%global lib_version 2407.0.0
 
 Name:           abseil-cpp
-Version:        20240116.2
-Release:        4%{?dist}
+Version:        20240722.0
+Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -22,16 +22,7 @@ Summary:        C++ Common Libraries
 #     (https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/205).
 License:        Apache-2.0 AND LicenseRef-Fedora-Public-Domain
 URL:            https://abseil.io
-Source0:        https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
-
-# Disable negative NaN float ostream format checking on RISC-V
-# https://github.com/abseil/abseil-cpp/commit/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7
-#
-# Fixes:
-#
-# [Bug]: NegativeNaN test fails on riscv64
-# https://github.com/abseil/abseil-cpp/issues/1684
-Patch:          https://github.com/abseil/abseil-cpp/commit/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch
+Source:         https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster
@@ -143,7 +134,9 @@ Development headers for %{name}
 %{_libdir}/libabsl_crc_cpu_detect.so.%{lib_version}
 %{_libdir}/libabsl_crc_internal.so.%{lib_version}
 %{_libdir}/libabsl_debugging_internal.so.%{lib_version}
+%{_libdir}/libabsl_decode_rust_punycode.so.%{lib_version}
 %{_libdir}/libabsl_demangle_internal.so.%{lib_version}
+%{_libdir}/libabsl_demangle_rust.so.%{lib_version}
 %{_libdir}/libabsl_die_if_null.so.%{lib_version}
 %{_libdir}/libabsl_examine_stack.so.%{lib_version}
 %{_libdir}/libabsl_exponential_biased.so.%{lib_version}
@@ -183,6 +176,7 @@ Development headers for %{name}
 %{_libdir}/libabsl_low_level_hash.so.%{lib_version}
 %{_libdir}/libabsl_malloc_internal.so.%{lib_version}
 %{_libdir}/libabsl_periodic_sampler.so.%{lib_version}
+%{_libdir}/libabsl_poison.so.%{lib_version}
 %{_libdir}/libabsl_random_distributions.so.%{lib_version}
 %{_libdir}/libabsl_random_internal_distribution_test_util.so.%{lib_version}
 %{_libdir}/libabsl_random_internal_platform.so.%{lib_version}
@@ -211,6 +205,7 @@ Development headers for %{name}
 %{_libdir}/libabsl_throw_delegate.so.%{lib_version}
 %{_libdir}/libabsl_time.so.%{lib_version}
 %{_libdir}/libabsl_time_zone.so.%{lib_version}
+%{_libdir}/libabsl_utf8_for_code_point.so.%{lib_version}
 %{_libdir}/libabsl_vlog_config_internal.so.%{lib_version}
 
 %files testing
@@ -229,6 +224,8 @@ Development headers for %{name}
 %{_libdir}/libabsl_log_internal_test_helpers.so.%{lib_version}
 %{_libdir}/libabsl_log_internal_test_matchers.so.%{lib_version}
 %{_libdir}/libabsl_scoped_mock_log.so.%{lib_version}
+# absl/status/CMakeLists.txt
+%{_libdir}/libabsl_status_matchers.so.%{lib_version}
 # absl/strings/CMakeLists.txt
 %{_libdir}/libabsl_pow10_helper.so.%{lib_version}
 # absl/synchronization/CMakeLists.txt
@@ -243,6 +240,9 @@ Development headers for %{name}
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Sat Aug 03 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-1
+- Update to 20240722.0 (close RHBZ#2302537)
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20240116.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
diff --git a/sources b/sources
index 1ee649b..842d69a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20240116.2.tar.gz) = 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e
+SHA512 (abseil-cpp-20240722.0.tar.gz) = bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31

From ca0a3d5d75f7bced0b59554225fa2b68686bace9 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 8 Jan 2025 11:11:07 -0500
Subject: [PATCH 25/41] Report and skip a test regression on ppc64le

---
 abseil-cpp.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index ae15245..14ab07c 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -110,7 +110,16 @@ Development headers for %{name}
 %cmake_install
 
 %check
-%ctest
+skips='^($.'
+%ifarch ppc64le
+# [Bug]: Flaky test failures in absl_failure_signal_handler_test on ppc64le in
+# Fedora
+# https://github.com/abseil/abseil-cpp/issues/1804
+skips="${skips}|absl_failure_signal_handler_test"
+%endif
+skips="${skips})$"
+
+%ctest --exclude-regex "${skips}"
 
 %files
 %license LICENSE

From 06fd1bd32e28fc2b339ff3bac0e54f39bc633eec Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 8 Jan 2025 15:29:22 -0500
Subject: [PATCH 26/41] Bump release and update changelog

---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 14ab07c..47ac21d 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20240722.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -249,6 +249,9 @@ skips="${skips})$"
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Wed Jan 08 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-2
+- Report and skip a test regression on ppc64le
+
 * Sat Aug 03 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-1
 - Update to 20240722.0 (close RHBZ#2302537)
 

From f73b91d9881768851d9b2eac67fba49510ed42d0 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 8 Jan 2025 07:19:27 -0500
Subject: [PATCH 27/41] Patch for GCC 15 (fix RHBZ#2336266)

---
 1739.patch      | 38 ++++++++++++++++++++++++++++++++++++++
 abseil-cpp.spec |  9 ++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 1739.patch

diff --git a/1739.patch b/1739.patch
new file mode 100644
index 0000000..ca0c47d
--- /dev/null
+++ b/1739.patch
@@ -0,0 +1,38 @@
+From faf1b03a591f06933da02976119da5743f428e4f Mon Sep 17 00:00:00 2001
+From: Christopher Fore <csfore@posteo.net>
+Date: Mon, 5 Aug 2024 10:48:19 -0400
+Subject: [PATCH] container/internal: Explicitly include <cstdint>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 15 will no longer include <cstdint> by default, resulting in build
+failures in projects that do not explicitly include it.
+
+Error:
+absl/container/internal/container_memory.h:66:27: error: ‘uintptr_t’ does not name a type
+   66 |   assert(reinterpret_cast<uintptr_t>(p) % Alignment == 0 &&
+      |                           ^~~~~~~~~
+absl/container/internal/container_memory.h:31:1: note: ‘uintptr_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
+   30 | #include "absl/utility/utility.h"
+  +++ |+#include <cstdint>
+   31 |
+
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+Signed-off-by: Christopher Fore <csfore@posteo.net>
+---
+ absl/container/internal/container_memory.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/absl/container/internal/container_memory.h b/absl/container/internal/container_memory.h
+index ba8e08a2d22..e7031797018 100644
+--- a/absl/container/internal/container_memory.h
++++ b/absl/container/internal/container_memory.h
+@@ -17,6 +17,7 @@
+ 
+ #include <cassert>
+ #include <cstddef>
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <new>
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 47ac21d..04c477c 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20240722.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -24,6 +24,10 @@ License:        Apache-2.0 AND LicenseRef-Fedora-Public-Domain
 URL:            https://abseil.io
 Source:         https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
 
+# container/internal: Explicitly include <cstdint>
+# https://github.com/abseil/abseil-cpp/pull/1739
+Patch:          https://github.com/abseil/abseil-cpp/pull/1739.patch
+
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster
 BuildRequires:  ninja-build
@@ -249,6 +253,9 @@ skips="${skips})$"
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Thu Jan 09 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-3
+- Patch for GCC 15 (fix RHBZ#2336266)
+
 * Wed Jan 08 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-2
 - Report and skip a test regression on ppc64le
 

From 0a5109b6ad16078ba6b498ac26712b2ab8b9c5fc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 10:29:40 +0000
Subject: [PATCH 28/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 04c477c..e5ec84d 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20240722.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -253,6 +253,9 @@ skips="${skips})$"
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20240722.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Thu Jan 09 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-3
 - Patch for GCC 15 (fix RHBZ#2336266)
 

From 3c0947e8e69758087959da3c0602d2ae7ee3ff60 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 22 Jan 2025 14:19:41 -0500
Subject: [PATCH 29/41] Rebuilt for gtest 1.15.2

---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index e5ec84d..fc21503 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20240722.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -253,6 +253,9 @@ skips="${skips})$"
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Wed Jan 22 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-5
+- Rebuilt for gtest 1.15.2
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20240722.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From a129e5dcf70c1e2b358fd80c85ee3bf0ad57723e Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 24 Jan 2025 07:44:33 -0500
Subject: [PATCH 30/41] Update to 20240722.1 (close RHBZ#2341808)

---
 .gitignore      | 1 +
 abseil-cpp.spec | 7 +++++--
 sources         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8bd189f..e659255 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /abseil-cpp-20240116.0.tar.gz
 /abseil-cpp-20240116.2.tar.gz
 /abseil-cpp-20240722.0.tar.gz
+/abseil-cpp-20240722.1.tar.gz
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index fc21503..5cb3b02 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -2,8 +2,8 @@
 %global lib_version 2407.0.0
 
 Name:           abseil-cpp
-Version:        20240722.0
-Release:        5%{?dist}
+Version:        20240722.1
+Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -253,6 +253,9 @@ skips="${skips})$"
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Fri Jan 24 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.1-1
+- Update to 20240722.1 (close RHBZ#2341808)
+
 * Wed Jan 22 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-5
 - Rebuilt for gtest 1.15.2
 
diff --git a/sources b/sources
index 842d69a..93f68f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20240722.0.tar.gz) = bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31
+SHA512 (abseil-cpp-20240722.1.tar.gz) = 6062a10220d1250127e2216cea65833f10f37459331254b59df437b5061af81a9645cab39479700cf1843ef7dee51fe125241b0ecb9f715705a45dce4ffae89e

From 0e3dfdaeae8335b19b9bcb625ea56d3a905f3dd6 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 4 Feb 2025 12:54:53 -0500
Subject: [PATCH 31/41] Update to 20250127.0 (close RHBZ#2343779)

---
 .gitignore                                    |  1 +
 1739.patch                                    | 38 -------------------
 abseil-cpp.spec                               | 21 +++++++---
 ...e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch | 26 +++++++++++++
 sources                                       |  2 +-
 5 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 1739.patch
 create mode 100644 f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch

diff --git a/.gitignore b/.gitignore
index e659255..6ec58d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /abseil-cpp-20240116.2.tar.gz
 /abseil-cpp-20240722.0.tar.gz
 /abseil-cpp-20240722.1.tar.gz
+/abseil-cpp-20250127.0.tar.gz
diff --git a/1739.patch b/1739.patch
deleted file mode 100644
index ca0c47d..0000000
--- a/1739.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From faf1b03a591f06933da02976119da5743f428e4f Mon Sep 17 00:00:00 2001
-From: Christopher Fore <csfore@posteo.net>
-Date: Mon, 5 Aug 2024 10:48:19 -0400
-Subject: [PATCH] container/internal: Explicitly include <cstdint>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 15 will no longer include <cstdint> by default, resulting in build
-failures in projects that do not explicitly include it.
-
-Error:
-absl/container/internal/container_memory.h:66:27: error: ‘uintptr_t’ does not name a type
-   66 |   assert(reinterpret_cast<uintptr_t>(p) % Alignment == 0 &&
-      |                           ^~~~~~~~~
-absl/container/internal/container_memory.h:31:1: note: ‘uintptr_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
-   30 | #include "absl/utility/utility.h"
-  +++ |+#include <cstdint>
-   31 |
-
-See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
-Signed-off-by: Christopher Fore <csfore@posteo.net>
----
- absl/container/internal/container_memory.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/absl/container/internal/container_memory.h b/absl/container/internal/container_memory.h
-index ba8e08a2d22..e7031797018 100644
---- a/absl/container/internal/container_memory.h
-+++ b/absl/container/internal/container_memory.h
-@@ -17,6 +17,7 @@
- 
- #include <cassert>
- #include <cstddef>
-+#include <cstdint>
- #include <cstring>
- #include <memory>
- #include <new>
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 5cb3b02..b7a5f0d 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -1,8 +1,8 @@
 # Installed library version
-%global lib_version 2407.0.0
+%global lib_version 2501.0.0
 
 Name:           abseil-cpp
-Version:        20240722.1
+Version:        20250127.0
 Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
@@ -24,9 +24,15 @@ License:        Apache-2.0 AND LicenseRef-Fedora-Public-Domain
 URL:            https://abseil.io
 Source:         https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
 
-# container/internal: Explicitly include <cstdint>
-# https://github.com/abseil/abseil-cpp/pull/1739
-Patch:          https://github.com/abseil/abseil-cpp/pull/1739.patch
+# Disable the DestroyedCallsFail test on GCC due to flakiness.
+# https://github.com/abseil/abseil-cpp/commit/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4
+#
+# Fixes:
+#
+# [Bug]: In 20250127.0, flaky failures of Table.DestroyedCallsFail fails in
+# absl_raw_hash_set_test
+# https://github.com/abseil/abseil-cpp/issues/1834
+Patch:          https://github.com/abseil/abseil-cpp/commit/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch
 
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster
@@ -184,6 +190,7 @@ skips="${skips})$"
 %{_libdir}/libabsl_log_internal_message.so.%{lib_version}
 %{_libdir}/libabsl_log_internal_nullguard.so.%{lib_version}
 %{_libdir}/libabsl_log_internal_proto.so.%{lib_version}
+%{_libdir}/libabsl_log_internal_structured_proto.so.%{lib_version}
 %{_libdir}/libabsl_log_severity.so.%{lib_version}
 %{_libdir}/libabsl_log_sink.so.%{lib_version}
 %{_libdir}/libabsl_low_level_hash.so.%{lib_version}
@@ -218,6 +225,7 @@ skips="${skips})$"
 %{_libdir}/libabsl_throw_delegate.so.%{lib_version}
 %{_libdir}/libabsl_time.so.%{lib_version}
 %{_libdir}/libabsl_time_zone.so.%{lib_version}
+%{_libdir}/libabsl_tracing_internal.so.%{lib_version}
 %{_libdir}/libabsl_utf8_for_code_point.so.%{lib_version}
 %{_libdir}/libabsl_vlog_config_internal.so.%{lib_version}
 
@@ -253,6 +261,9 @@ skips="${skips})$"
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Tue Feb 04 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250127.0-1
+- Update to 20250127.0 (close RHBZ#2343779)
+
 * Fri Jan 24 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.1-1
 - Update to 20240722.1 (close RHBZ#2341808)
 
diff --git a/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch b/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch
new file mode 100644
index 0000000..e0142b0
--- /dev/null
+++ b/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch
@@ -0,0 +1,26 @@
+From f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4 Mon Sep 17 00:00:00 2001
+From: Evan Brown <ezb@google.com>
+Date: Thu, 13 Feb 2025 16:11:49 -0800
+Subject: [PATCH] Disable the DestroyedCallsFail test on GCC due to flakiness.
+
+Fixes #1834.
+
+PiperOrigin-RevId: 726674816
+Change-Id: Icfbc73c8fac687819e9d94472a3071aa687f5c37
+---
+ absl/container/internal/raw_hash_set_test.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/absl/container/internal/raw_hash_set_test.cc b/absl/container/internal/raw_hash_set_test.cc
+index b03934dd4d6..e04add6efff 100644
+--- a/absl/container/internal/raw_hash_set_test.cc
++++ b/absl/container/internal/raw_hash_set_test.cc
+@@ -3782,6 +3782,8 @@ TEST(Table, ReentrantCallsFail) {
+ TEST(Table, DestroyedCallsFail) {
+ #ifdef NDEBUG
+   GTEST_SKIP() << "Destroyed checks only enabled in debug mode.";
++#elif !defined(__clang__) && defined(__GNUC__)
++  GTEST_SKIP() << "Flaky on GCC.";
+ #else
+   absl::optional<IntTable> t;
+   t.emplace({1});
diff --git a/sources b/sources
index 93f68f1..e661046 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20240722.1.tar.gz) = 6062a10220d1250127e2216cea65833f10f37459331254b59df437b5061af81a9645cab39479700cf1843ef7dee51fe125241b0ecb9f715705a45dce4ffae89e
+SHA512 (abseil-cpp-20250127.0.tar.gz) = 2a021faad807ee3e23548716ffa4785dc2409edbb4be676cc4bc01d47885760de340f0a4afdcbf0aaa835affd6d78f7bc319bbf7d337dbc30e7a559d0088e4bd

From 88208870694a0791679a848f67964a8d1fd834e5 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 19 Mar 2025 16:06:45 -0400
Subject: [PATCH 32/41] Update to 20250127.1 (close RHBZ#2353223)

---
 .gitignore      | 1 +
 abseil-cpp.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6ec58d5..7616849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /abseil-cpp-20240722.0.tar.gz
 /abseil-cpp-20240722.1.tar.gz
 /abseil-cpp-20250127.0.tar.gz
+/abseil-cpp-20250127.1.tar.gz
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index b7a5f0d..73bbe74 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -2,7 +2,7 @@
 %global lib_version 2501.0.0
 
 Name:           abseil-cpp
-Version:        20250127.0
+Version:        20250127.1
 Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
@@ -261,6 +261,9 @@ skips="${skips})$"
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Wed Mar 19 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250127.1-1
+- Update to 20250127.1 (close RHBZ#2353223)
+
 * Tue Feb 04 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250127.0-1
 - Update to 20250127.0 (close RHBZ#2343779)
 
diff --git a/sources b/sources
index e661046..b7b41ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20250127.0.tar.gz) = 2a021faad807ee3e23548716ffa4785dc2409edbb4be676cc4bc01d47885760de340f0a4afdcbf0aaa835affd6d78f7bc319bbf7d337dbc30e7a559d0088e4bd
+SHA512 (abseil-cpp-20250127.1.tar.gz) = 8312acf0ed74fa28c6397f3e41ada656dbd5ca2bf8db484319d74b144ad19c0ebdc77f7f03436be6c6ca1cde706b9055079233cf0d6b5ada4ca48406f8a55dd8

From b3c8ea51b1b74f91cff1f8a8160a399c18d7519b Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 14 May 2025 20:40:42 -0400
Subject: [PATCH 33/41] Update to 20250512.0 (close RHBZ#2366373)

---
 .gitignore                                    |  1 +
 ...race.FixupNoFixupEquivalence-on-i386.patch | 27 +++++++++++++++
 1888.patch                                    | 24 ++++++++++++++
 abseil-cpp.spec                               | 33 ++++++++++---------
 ...e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch | 26 ---------------
 sources                                       |  2 +-
 6 files changed, 70 insertions(+), 43 deletions(-)
 create mode 100644 0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch
 create mode 100644 1888.patch
 delete mode 100644 f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch

diff --git a/.gitignore b/.gitignore
index 7616849..1d9c899 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /abseil-cpp-20240722.1.tar.gz
 /abseil-cpp-20250127.0.tar.gz
 /abseil-cpp-20250127.1.tar.gz
+/abseil-cpp-20250512.0.tar.gz
diff --git a/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch b/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch
new file mode 100644
index 0000000..a3346ce
--- /dev/null
+++ b/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch
@@ -0,0 +1,27 @@
+From 27e209f0e0270d2c7b6e64eeb5ca5a63843970fd Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 15 May 2025 07:05:44 -0400
+Subject: [PATCH] Skip StackTrace.FixupNoFixupEquivalence on i386
+
+https://github.com/abseil/abseil-cpp/issues/1887
+---
+ absl/debugging/stacktrace_test.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/absl/debugging/stacktrace_test.cc b/absl/debugging/stacktrace_test.cc
+index e5565c1f..56cf3326 100644
+--- a/absl/debugging/stacktrace_test.cc
++++ b/absl/debugging/stacktrace_test.cc
+@@ -88,6 +88,9 @@ ABSL_ATTRIBUTE_NOINLINE static void FixupNoFixupEquivalenceNoInline() {
+ #if defined(__riscv)
+   GTEST_SKIP() << "Skipping test on RISC-V due to pre-existing failure";
+ #endif
++#if defined(__i386__)
++  GTEST_SKIP() << "https://github.com/abseil/abseil-cpp/issues/1887";
++#endif
+ 
+ #if ABSL_HAVE_ATTRIBUTE_WEAK
+   // This test is known not to pass on MSVC (due to weak symbols)
+-- 
+2.49.0
+
diff --git a/1888.patch b/1888.patch
new file mode 100644
index 0000000..719de6d
--- /dev/null
+++ b/1888.patch
@@ -0,0 +1,24 @@
+From 395acb74da05fa35d924059a170ebd8267356b65 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 15 May 2025 06:55:00 -0400
+Subject: [PATCH] Adjust Table.GrowExtremelyLargeTable to avoid OOM on i386
+
+---
+ absl/container/internal/raw_hash_set_test.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/absl/container/internal/raw_hash_set_test.cc b/absl/container/internal/raw_hash_set_test.cc
+index a5cbd44d3b2..2c55d0fc079 100644
+--- a/absl/container/internal/raw_hash_set_test.cc
++++ b/absl/container/internal/raw_hash_set_test.cc
+@@ -4267,8 +4267,8 @@ struct ConstUint8Hash {
+ // 5. Finally we will catch up and go to overflow codepath.
+ TEST(Table, GrowExtremelyLargeTable) {
+   constexpr size_t kTargetCapacity =
+-#if defined(__wasm__) || defined(__asmjs__)
+-      NextCapacity(ProbedItem4Bytes::kMaxNewCapacity);  // OOMs on WASM.
++#if defined(__wasm__) || defined(__asmjs__) || defined(__i386__)
++      NextCapacity(ProbedItem4Bytes::kMaxNewCapacity);  // OOMs on WASM, 32-bit.
+ #else
+       NextCapacity(ProbedItem8Bytes::kMaxNewCapacity);
+ #endif
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 73bbe74..b963581 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -1,8 +1,8 @@
 # Installed library version
-%global lib_version 2501.0.0
+%global lib_version 2505.0.0
 
 Name:           abseil-cpp
-Version:        20250127.1
+Version:        20250512.0
 Release:        1%{?dist}
 Summary:        C++ Common Libraries
 
@@ -24,15 +24,17 @@ License:        Apache-2.0 AND LicenseRef-Fedora-Public-Domain
 URL:            https://abseil.io
 Source:         https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
 
-# Disable the DestroyedCallsFail test on GCC due to flakiness.
-# https://github.com/abseil/abseil-cpp/commit/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4
-#
-# Fixes:
-#
-# [Bug]: In 20250127.0, flaky failures of Table.DestroyedCallsFail fails in
-# absl_raw_hash_set_test
-# https://github.com/abseil/abseil-cpp/issues/1834
-Patch:          https://github.com/abseil/abseil-cpp/commit/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch
+# Adjust Table.GrowExtremelyLargeTable to avoid OOM on i386
+# https://github.com/abseil/abseil-cpp/pull/1888
+# Partial fix for:
+# [Bug]: Test regressions in 20250512.0 on i686
+# https://github.com/abseil/abseil-cpp/issues/1887
+Patch:          https://github.com/abseil/abseil-cpp/pull/1888.patch
+
+# Skip StackTrace.FixupNoFixupEquivalence on i386
+# Downstream-only, because it does not address the root cause:
+# https://github.com/abseil/abseil-cpp/issues/1887
+Patch:          0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch
 
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster
@@ -136,9 +138,6 @@ skips="${skips})$"
 %doc FAQ.md README.md UPGRADES.md
 # All shared libraries except installed TESTONLY libraries; see the %%files
 # list for the -testing subpackage for those.
-%{_libdir}/libabsl_bad_any_cast_impl.so.%{lib_version}
-%{_libdir}/libabsl_bad_optional_access.so.%{lib_version}
-%{_libdir}/libabsl_bad_variant_access.so.%{lib_version}
 %{_libdir}/libabsl_base.so.%{lib_version}
 %{_libdir}/libabsl_city.so.%{lib_version}
 %{_libdir}/libabsl_civil_time.so.%{lib_version}
@@ -177,7 +176,6 @@ skips="${skips})$"
 %{_libdir}/libabsl_int128.so.%{lib_version}
 %{_libdir}/libabsl_kernel_timeout_internal.so.%{lib_version}
 %{_libdir}/libabsl_leak_check.so.%{lib_version}
-%{_libdir}/libabsl_log_entry.so.%{lib_version}
 %{_libdir}/libabsl_log_flags.so.%{lib_version}
 %{_libdir}/libabsl_log_globals.so.%{lib_version}
 %{_libdir}/libabsl_log_initialize.so.%{lib_version}
@@ -199,8 +197,8 @@ skips="${skips})$"
 %{_libdir}/libabsl_poison.so.%{lib_version}
 %{_libdir}/libabsl_random_distributions.so.%{lib_version}
 %{_libdir}/libabsl_random_internal_distribution_test_util.so.%{lib_version}
+%{_libdir}/libabsl_random_internal_entropy_pool.so.%{lib_version}
 %{_libdir}/libabsl_random_internal_platform.so.%{lib_version}
-%{_libdir}/libabsl_random_internal_pool_urbg.so.%{lib_version}
 %{_libdir}/libabsl_random_internal_randen.so.%{lib_version}
 %{_libdir}/libabsl_random_internal_randen_hwaes.so.%{lib_version}
 %{_libdir}/libabsl_random_internal_randen_hwaes_impl.so.%{lib_version}
@@ -261,6 +259,9 @@ skips="${skips})$"
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Thu May 15 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250512.0-1
+- Update to 20250512.0 (close RHBZ#2366373)
+
 * Wed Mar 19 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250127.1-1
 - Update to 20250127.1 (close RHBZ#2353223)
 
diff --git a/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch b/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch
deleted file mode 100644
index e0142b0..0000000
--- a/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4 Mon Sep 17 00:00:00 2001
-From: Evan Brown <ezb@google.com>
-Date: Thu, 13 Feb 2025 16:11:49 -0800
-Subject: [PATCH] Disable the DestroyedCallsFail test on GCC due to flakiness.
-
-Fixes #1834.
-
-PiperOrigin-RevId: 726674816
-Change-Id: Icfbc73c8fac687819e9d94472a3071aa687f5c37
----
- absl/container/internal/raw_hash_set_test.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/absl/container/internal/raw_hash_set_test.cc b/absl/container/internal/raw_hash_set_test.cc
-index b03934dd4d6..e04add6efff 100644
---- a/absl/container/internal/raw_hash_set_test.cc
-+++ b/absl/container/internal/raw_hash_set_test.cc
-@@ -3782,6 +3782,8 @@ TEST(Table, ReentrantCallsFail) {
- TEST(Table, DestroyedCallsFail) {
- #ifdef NDEBUG
-   GTEST_SKIP() << "Destroyed checks only enabled in debug mode.";
-+#elif !defined(__clang__) && defined(__GNUC__)
-+  GTEST_SKIP() << "Flaky on GCC.";
- #else
-   absl::optional<IntTable> t;
-   t.emplace({1});
diff --git a/sources b/sources
index b7b41ac..51b3a8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20250127.1.tar.gz) = 8312acf0ed74fa28c6397f3e41ada656dbd5ca2bf8db484319d74b144ad19c0ebdc77f7f03436be6c6ca1cde706b9055079233cf0d6b5ada4ca48406f8a55dd8
+SHA512 (abseil-cpp-20250512.0.tar.gz) = 92542db666e0c628cf56bf8ad09412af9c8b622e4f26e72d1e1b092ceec430a5c105f6561e2d9983af565f55da07f67e770cafe373b20cc4cb29a893a6a236fc

From c492497a4fe441b3b12202f2092a579b0978490e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 16:42:48 +0000
Subject: [PATCH 34/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 abseil-cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index b963581..6cc64ee 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20250512.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -259,6 +259,9 @@ skips="${skips})$"
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20250512.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu May 15 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250512.0-1
 - Update to 20250512.0 (close RHBZ#2366373)
 

From d3dff91b47a1cf3c4075aee4472e9ea3a7ca1566 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 15 Aug 2025 06:54:48 -0400
Subject: [PATCH 35/41] Convert to %autorelease and %autochangelog

[skip changelog]
---
 abseil-cpp.spec | 144 +-----------------------------------------------
 changelog       | 141 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+), 142 deletions(-)
 create mode 100644 changelog

diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 6cc64ee..0076cd8 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:           abseil-cpp
 Version:        20250512.0
-Release:        2%{?dist}
+Release:        %autorelease
 Summary:        C++ Common Libraries
 
 # The entire source is Apache-2.0, except:
@@ -259,144 +259,4 @@ skips="${skips})$"
 %{_libdir}/pkgconfig/absl_*.pc
 
 %changelog
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20250512.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu May 15 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250512.0-1
-- Update to 20250512.0 (close RHBZ#2366373)
-
-* Wed Mar 19 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250127.1-1
-- Update to 20250127.1 (close RHBZ#2353223)
-
-* Tue Feb 04 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250127.0-1
-- Update to 20250127.0 (close RHBZ#2343779)
-
-* Fri Jan 24 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.1-1
-- Update to 20240722.1 (close RHBZ#2341808)
-
-* Wed Jan 22 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-5
-- Rebuilt for gtest 1.15.2
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20240722.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jan 09 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-3
-- Patch for GCC 15 (fix RHBZ#2336266)
-
-* Wed Jan 08 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-2
-- Report and skip a test regression on ppc64le
-
-* Sat Aug 03 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-1
-- Update to 20240722.0 (close RHBZ#2302537)
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20240116.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jul 03 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.2-3
-- Rebuilt with upstream patch for NegativeNaN test failure on riscv64
-
-* Wed May 29 2024 David Abdurachmanov <davidlt@rivosinc.com> - 20240116.2-2
-- Disable NegativeNaN test on riscv64
-
-* Tue Apr 09 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.2-1
-- Update to 20240116.2 (close RHBZ#2274172)
-
-* Wed Jan 24 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.0-1
-- Update to 20240116.0
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230802.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230802.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Oct 31 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.1-2
-- Rebuild for gtest 1.14.0
-
-* Wed Sep 20 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.1-1
-- Update to 20230802.1 (close RHBZ#2239814)
-
-* Thu Aug 10 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.0-1
-- Update to 20230802.0 (Abseil LTS branch, Aug 2023): close RHBZ#2229015
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20230125.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue May 09 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.3-1
-- Update to 20230125.3 (close RHBZ#2193306)
-- Split installed TESTONLY libraries into a -testing subpackage; explicitly
-  list all installed shared libraries
-- Explicitly enable the ABSL_BUILD_TEST_HELPERS CMake option
-
-* Thu Mar 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.2-1
-- Update to 20230125.2 (close RHBZ#2182229)
-
-* Thu Feb 23 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.1-1
-- Update to 20230125.1 (close RHBZ#2162638)
-
-* Sat Jan 21 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.1-4
-- Backport upstream commit 4eef161 for GCC 13
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20220623.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Sep 02 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.1-2
-- Update to 20220623.1 (close RHBZ#2123181)
-
-* Sat Aug 13 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.0-1
-- Update to 20220623.0 (close RHBZ#2101021)
-- Update License to SPDX
-
-* Fri Jul 29 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20211102.0-4
-- Do not leak -maes -msse4.1 into pkgconfig (fix RHBZ#2108658)
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20211102.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Mar 15 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20211102.0-2
-- Disable LTO on s390x to work around test failure
-- Skip SysinfoTest.NominalCPUFrequency on all architectures; it fails
-  occasionally on aarch64, and upstream says we should not care
-
-* Fri Feb 18 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20211102.0-1
-- Update to 20211102.0 (close RHBZ#2019691)
-- Drop --output-on-failure, already in %%ctest expansion
-- On s390x, instead of ignoring all tests, skip only the single failing test
-- Use ninja backend for CMake: speeds up build with no downsides
-- Drop patch for armv7hl
-
-* Mon Jan 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20210324.2-4
-- Fix test failure (fix RHBZ#2045186)
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20210324.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210324.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri May 21 2021 Rich Mattes <richmattes@gmail.com> - 20210324.1-2
-- Update to release 20210324.2
-- Enable and run test suite
-
-* Mon Mar 08 2021 Rich Mattes <richmattes@gmail.com> - 20200923.3-1
-- Update to release 20200923.3
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200923.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Dec 19 2020 Rich Mattes <richmattes@gmail.com> - 20200923.2-1
-- Update to release 20200923.2
-- Rebuild to fix tagging in koji (rhbz#1885561)
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200225.2-4
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200225.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed May 27 2020 Rich Mattes <richmattes@gmail.com> - 20200225.2-2
-- Don't remove buildroot in install
-
-* Sun May 24 2020 Rich Mattes <richmattes@gmail.com> - 20200225.2-1
-- Initial package.
+%autochangelog
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..21dab46
--- /dev/null
+++ b/changelog
@@ -0,0 +1,141 @@
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20250512.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu May 15 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250512.0-1
+- Update to 20250512.0 (close RHBZ#2366373)
+
+* Wed Mar 19 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250127.1-1
+- Update to 20250127.1 (close RHBZ#2353223)
+
+* Tue Feb 04 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250127.0-1
+- Update to 20250127.0 (close RHBZ#2343779)
+
+* Fri Jan 24 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.1-1
+- Update to 20240722.1 (close RHBZ#2341808)
+
+* Wed Jan 22 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-5
+- Rebuilt for gtest 1.15.2
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20240722.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jan 09 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-3
+- Patch for GCC 15 (fix RHBZ#2336266)
+
+* Wed Jan 08 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-2
+- Report and skip a test regression on ppc64le
+
+* Sat Aug 03 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240722.0-1
+- Update to 20240722.0 (close RHBZ#2302537)
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20240116.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jul 03 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.2-3
+- Rebuilt with upstream patch for NegativeNaN test failure on riscv64
+
+* Wed May 29 2024 David Abdurachmanov <davidlt@rivosinc.com> - 20240116.2-2
+- Disable NegativeNaN test on riscv64
+
+* Tue Apr 09 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.2-1
+- Update to 20240116.2 (close RHBZ#2274172)
+
+* Wed Jan 24 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 20240116.0-1
+- Update to 20240116.0
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230802.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230802.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Oct 31 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.1-2
+- Rebuild for gtest 1.14.0
+
+* Wed Sep 20 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.1-1
+- Update to 20230802.1 (close RHBZ#2239814)
+
+* Thu Aug 10 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230802.0-1
+- Update to 20230802.0 (Abseil LTS branch, Aug 2023): close RHBZ#2229015
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20230125.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue May 09 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.3-1
+- Update to 20230125.3 (close RHBZ#2193306)
+- Split installed TESTONLY libraries into a -testing subpackage; explicitly
+  list all installed shared libraries
+- Explicitly enable the ABSL_BUILD_TEST_HELPERS CMake option
+
+* Thu Mar 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.2-1
+- Update to 20230125.2 (close RHBZ#2182229)
+
+* Thu Feb 23 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20230125.1-1
+- Update to 20230125.1 (close RHBZ#2162638)
+
+* Sat Jan 21 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.1-4
+- Backport upstream commit 4eef161 for GCC 13
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20220623.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Sep 02 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.1-2
+- Update to 20220623.1 (close RHBZ#2123181)
+
+* Sat Aug 13 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.0-1
+- Update to 20220623.0 (close RHBZ#2101021)
+- Update License to SPDX
+
+* Fri Jul 29 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20211102.0-4
+- Do not leak -maes -msse4.1 into pkgconfig (fix RHBZ#2108658)
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20211102.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Mar 15 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20211102.0-2
+- Disable LTO on s390x to work around test failure
+- Skip SysinfoTest.NominalCPUFrequency on all architectures; it fails
+  occasionally on aarch64, and upstream says we should not care
+
+* Fri Feb 18 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20211102.0-1
+- Update to 20211102.0 (close RHBZ#2019691)
+- Drop --output-on-failure, already in %%ctest expansion
+- On s390x, instead of ignoring all tests, skip only the single failing test
+- Use ninja backend for CMake: speeds up build with no downsides
+- Drop patch for armv7hl
+
+* Mon Jan 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20210324.2-4
+- Fix test failure (fix RHBZ#2045186)
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20210324.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210324.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May 21 2021 Rich Mattes <richmattes@gmail.com> - 20210324.1-2
+- Update to release 20210324.2
+- Enable and run test suite
+
+* Mon Mar 08 2021 Rich Mattes <richmattes@gmail.com> - 20200923.3-1
+- Update to release 20200923.3
+
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200923.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Dec 19 2020 Rich Mattes <richmattes@gmail.com> - 20200923.2-1
+- Update to release 20200923.2
+- Rebuild to fix tagging in koji (rhbz#1885561)
+
+* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200225.2-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200225.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed May 27 2020 Rich Mattes <richmattes@gmail.com> - 20200225.2-2
+- Don't remove buildroot in install
+
+* Sun May 24 2020 Rich Mattes <richmattes@gmail.com> - 20200225.2-1
+- Initial package.

From cd61e639b5653839c64a9bd0bb1378a8fa885e19 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 15 Aug 2025 06:50:15 -0400
Subject: [PATCH 36/41] Update to 20250512.1 (close RHBZ#2388710)

---
 .gitignore      | 1 +
 abseil-cpp.spec | 2 +-
 sources         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1d9c899..6c1d88b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /abseil-cpp-20250127.0.tar.gz
 /abseil-cpp-20250127.1.tar.gz
 /abseil-cpp-20250512.0.tar.gz
+/abseil-cpp-20250512.1.tar.gz
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 0076cd8..66a8958 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -2,7 +2,7 @@
 %global lib_version 2505.0.0
 
 Name:           abseil-cpp
-Version:        20250512.0
+Version:        20250512.1
 Release:        %autorelease
 Summary:        C++ Common Libraries
 
diff --git a/sources b/sources
index 51b3a8c..d12175c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20250512.0.tar.gz) = 92542db666e0c628cf56bf8ad09412af9c8b622e4f26e72d1e1b092ceec430a5c105f6561e2d9983af565f55da07f67e770cafe373b20cc4cb29a893a6a236fc
+SHA512 (abseil-cpp-20250512.1.tar.gz) = d3ba654ed7dd7b432494918b2de5d8e2b0ad1c42752c5d726f20d6fe2841828fb4e8beb853e3570a11efecef725029ce5ffa3ebc434efff007e7f60735eb9856

From b637f17a22b2e791ad10538fc63ec0e71dacec11 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 21 Aug 2025 08:03:49 -0400
Subject: [PATCH 37/41] Update to 20250814.0 (close RHBZ#2389295)

---
 .gitignore                                    |  1 +
 ...race.FixupNoFixupEquivalence-on-i386.patch | 27 -------------------
 1888.patch                                    | 24 -----------------
 abseil-cpp.spec                               | 24 +++++++----------
 sources                                       |  2 +-
 5 files changed, 11 insertions(+), 67 deletions(-)
 delete mode 100644 0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch
 delete mode 100644 1888.patch

diff --git a/.gitignore b/.gitignore
index 6c1d88b..15a7c9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /abseil-cpp-20250127.1.tar.gz
 /abseil-cpp-20250512.0.tar.gz
 /abseil-cpp-20250512.1.tar.gz
+/abseil-cpp-20250814.0.tar.gz
diff --git a/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch b/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch
deleted file mode 100644
index a3346ce..0000000
--- a/0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 27e209f0e0270d2c7b6e64eeb5ca5a63843970fd Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Thu, 15 May 2025 07:05:44 -0400
-Subject: [PATCH] Skip StackTrace.FixupNoFixupEquivalence on i386
-
-https://github.com/abseil/abseil-cpp/issues/1887
----
- absl/debugging/stacktrace_test.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/absl/debugging/stacktrace_test.cc b/absl/debugging/stacktrace_test.cc
-index e5565c1f..56cf3326 100644
---- a/absl/debugging/stacktrace_test.cc
-+++ b/absl/debugging/stacktrace_test.cc
-@@ -88,6 +88,9 @@ ABSL_ATTRIBUTE_NOINLINE static void FixupNoFixupEquivalenceNoInline() {
- #if defined(__riscv)
-   GTEST_SKIP() << "Skipping test on RISC-V due to pre-existing failure";
- #endif
-+#if defined(__i386__)
-+  GTEST_SKIP() << "https://github.com/abseil/abseil-cpp/issues/1887";
-+#endif
- 
- #if ABSL_HAVE_ATTRIBUTE_WEAK
-   // This test is known not to pass on MSVC (due to weak symbols)
--- 
-2.49.0
-
diff --git a/1888.patch b/1888.patch
deleted file mode 100644
index 719de6d..0000000
--- a/1888.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 395acb74da05fa35d924059a170ebd8267356b65 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Thu, 15 May 2025 06:55:00 -0400
-Subject: [PATCH] Adjust Table.GrowExtremelyLargeTable to avoid OOM on i386
-
----
- absl/container/internal/raw_hash_set_test.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/absl/container/internal/raw_hash_set_test.cc b/absl/container/internal/raw_hash_set_test.cc
-index a5cbd44d3b2..2c55d0fc079 100644
---- a/absl/container/internal/raw_hash_set_test.cc
-+++ b/absl/container/internal/raw_hash_set_test.cc
-@@ -4267,8 +4267,8 @@ struct ConstUint8Hash {
- // 5. Finally we will catch up and go to overflow codepath.
- TEST(Table, GrowExtremelyLargeTable) {
-   constexpr size_t kTargetCapacity =
--#if defined(__wasm__) || defined(__asmjs__)
--      NextCapacity(ProbedItem4Bytes::kMaxNewCapacity);  // OOMs on WASM.
-+#if defined(__wasm__) || defined(__asmjs__) || defined(__i386__)
-+      NextCapacity(ProbedItem4Bytes::kMaxNewCapacity);  // OOMs on WASM, 32-bit.
- #else
-       NextCapacity(ProbedItem8Bytes::kMaxNewCapacity);
- #endif
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 66a8958..c65e4d2 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -1,8 +1,8 @@
 # Installed library version
-%global lib_version 2505.0.0
+%global lib_version 2508.0.0
 
 Name:           abseil-cpp
-Version:        20250512.1
+Version:        20250814.0
 Release:        %autorelease
 Summary:        C++ Common Libraries
 
@@ -24,18 +24,6 @@ License:        Apache-2.0 AND LicenseRef-Fedora-Public-Domain
 URL:            https://abseil.io
 Source:         https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
 
-# Adjust Table.GrowExtremelyLargeTable to avoid OOM on i386
-# https://github.com/abseil/abseil-cpp/pull/1888
-# Partial fix for:
-# [Bug]: Test regressions in 20250512.0 on i686
-# https://github.com/abseil/abseil-cpp/issues/1887
-Patch:          https://github.com/abseil/abseil-cpp/pull/1888.patch
-
-# Skip StackTrace.FixupNoFixupEquivalence on i386
-# Downstream-only, because it does not address the root cause:
-# https://github.com/abseil/abseil-cpp/issues/1887
-Patch:          0001-Skip-StackTrace.FixupNoFixupEquivalence-on-i386.patch
-
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster
 BuildRequires:  ninja-build
@@ -128,6 +116,10 @@ skips='^($.'
 # Fedora
 # https://github.com/abseil/abseil-cpp/issues/1804
 skips="${skips}|absl_failure_signal_handler_test"
+# [Bug]: StackTrace.NestedSignal in absl_stacktrace_test fails on ppc64le since
+# 20250184.0
+# https://github.com/abseil/abseil-cpp/issues/1925
+skips="${skips}|absl_stacktrace_test"
 %endif
 skips="${skips})$"
 
@@ -173,9 +165,11 @@ skips="${skips})$"
 %{_libdir}/libabsl_graphcycles_internal.so.%{lib_version}
 %{_libdir}/libabsl_hash.so.%{lib_version}
 %{_libdir}/libabsl_hashtablez_sampler.so.%{lib_version}
+%{_libdir}/libabsl_hashtable_profiler.so.%{lib_version}
 %{_libdir}/libabsl_int128.so.%{lib_version}
 %{_libdir}/libabsl_kernel_timeout_internal.so.%{lib_version}
 %{_libdir}/libabsl_leak_check.so.%{lib_version}
+%{_libdir}/libabsl_log_entry.so.%{lib_version}
 %{_libdir}/libabsl_log_flags.so.%{lib_version}
 %{_libdir}/libabsl_log_globals.so.%{lib_version}
 %{_libdir}/libabsl_log_initialize.so.%{lib_version}
@@ -191,10 +185,10 @@ skips="${skips})$"
 %{_libdir}/libabsl_log_internal_structured_proto.so.%{lib_version}
 %{_libdir}/libabsl_log_severity.so.%{lib_version}
 %{_libdir}/libabsl_log_sink.so.%{lib_version}
-%{_libdir}/libabsl_low_level_hash.so.%{lib_version}
 %{_libdir}/libabsl_malloc_internal.so.%{lib_version}
 %{_libdir}/libabsl_periodic_sampler.so.%{lib_version}
 %{_libdir}/libabsl_poison.so.%{lib_version}
+%{_libdir}/libabsl_profile_builder.so.%{lib_version}
 %{_libdir}/libabsl_random_distributions.so.%{lib_version}
 %{_libdir}/libabsl_random_internal_distribution_test_util.so.%{lib_version}
 %{_libdir}/libabsl_random_internal_entropy_pool.so.%{lib_version}
diff --git a/sources b/sources
index d12175c..7217a9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20250512.1.tar.gz) = d3ba654ed7dd7b432494918b2de5d8e2b0ad1c42752c5d726f20d6fe2841828fb4e8beb853e3570a11efecef725029ce5ffa3ebc434efff007e7f60735eb9856
+SHA512 (abseil-cpp-20250814.0.tar.gz) = 4ee1a217203933382e728d354a149253a517150eee7580a0abecc69584b2eb200d91933ef424487e3a3fe0e8ab5e77b0288485cac982171b3585314a4417e7d4

From 5205ac8ad2aeef3b98e0827a090e05bf07906089 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 23 Sep 2025 06:29:06 +0100
Subject: [PATCH 38/41] Update to 20250814.1 (close RHBZ#2397466)

---
 .gitignore      | 1 +
 abseil-cpp.spec | 2 +-
 sources         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15a7c9d..193de76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /abseil-cpp-20250512.0.tar.gz
 /abseil-cpp-20250512.1.tar.gz
 /abseil-cpp-20250814.0.tar.gz
+/abseil-cpp-20250814.1.tar.gz
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index c65e4d2..3c14c39 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -2,7 +2,7 @@
 %global lib_version 2508.0.0
 
 Name:           abseil-cpp
-Version:        20250814.0
+Version:        20250814.1
 Release:        %autorelease
 Summary:        C++ Common Libraries
 
diff --git a/sources b/sources
index 7217a9c..f6e2a00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abseil-cpp-20250814.0.tar.gz) = 4ee1a217203933382e728d354a149253a517150eee7580a0abecc69584b2eb200d91933ef424487e3a3fe0e8ab5e77b0288485cac982171b3585314a4417e7d4
+SHA512 (abseil-cpp-20250814.1.tar.gz) = 7083b73c3cf763f6f7a7edb70a5171f44d27045a0f5e52ca043e0a86379af2c50cf85dbfea30ebaa22a7bb2929452581d26b1ba18945023b057267d4c3bad2f7

From 07413ab0108569a00eced025fd124333747eff06 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 12 Nov 2025 10:04:46 +0000
Subject: [PATCH 39/41] Rebuilt for gtest 1.17.0


From 893317922c4b74d5942e4f28cb774c86abe46034 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 9 Jan 2026 10:14:32 +0000
Subject: [PATCH 40/41] =?UTF-8?q?Report=20and=20work=20around=20a=20test?=
 =?UTF-8?q?=20that=20doesn=E2=80=99t=20build=20with=20GCC=2016?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ock-in-test-Test-Mutex-FunctorCondit.patch | 38 +++++++++++++++++++
 abseil-cpp.spec                               |  6 +++
 2 files changed, 44 insertions(+)
 create mode 100644 0001-Omit-the-bind-block-in-test-Test-Mutex-FunctorCondit.patch

diff --git a/0001-Omit-the-bind-block-in-test-Test-Mutex-FunctorCondit.patch b/0001-Omit-the-bind-block-in-test-Test-Mutex-FunctorCondit.patch
new file mode 100644
index 0000000..11150a1
--- /dev/null
+++ b/0001-Omit-the-bind-block-in-test-Test-Mutex-FunctorCondit.patch
@@ -0,0 +1,38 @@
+From 8e8c72e1cb92d63aa2aaa7f9d8ccb059250928d1 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Fri, 9 Jan 2026 07:37:42 +0000
+Subject: [PATCH] =?UTF-8?q?Omit=20the=20=E2=80=9Cbind=E2=80=9D=20block=20i?=
+ =?UTF-8?q?n=20test=20Test=20Mutex::FunctorCondition?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Work around failure to compile with GCC 16,
+https://github.com/abseil/abseil-cpp/issues/1992.
+---
+ absl/synchronization/mutex_test.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/absl/synchronization/mutex_test.cc b/absl/synchronization/mutex_test.cc
+index 793acf8c..7acd2e56 100644
+--- a/absl/synchronization/mutex_test.cc
++++ b/absl/synchronization/mutex_test.cc
+@@ -1022,6 +1022,7 @@ TEST(Mutex, FunctorCondition) {
+     EXPECT_TRUE(c.Eval());
+   }
+ 
++#if 0
+   {  // bind
+     int value = 0;
+     auto is_positive = std::bind(std::less<int>(), 0, std::cref(value));
+@@ -1030,6 +1031,7 @@ TEST(Mutex, FunctorCondition) {
+     value = 1;
+     EXPECT_TRUE(c.Eval());
+   }
++#endif
+ 
+   {  // std::function
+     int value = 3;
+-- 
+2.52.0
+
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 3c14c39..7117654 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -24,6 +24,12 @@ License:        Apache-2.0 AND LicenseRef-Fedora-Public-Domain
 URL:            https://abseil.io
 Source:         https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
 
+# Omit the “bind” block in test Test Mutex::FunctorCondition
+#
+# Work around failure to compile with GCC 16,
+# https://github.com/abseil/abseil-cpp/issues/1992.
+Patch:          0001-Omit-the-bind-block-in-test-Test-Mutex-FunctorCondit.patch
+
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster
 BuildRequires:  ninja-build

From 5dc15e5f19b5d9974c1379874105d2cb9b5196cb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:24:09 +0000
Subject: [PATCH 41/41] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild