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] 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