Update patches and bump internal namespace

5 files changed, 14 insertions, 34 deletions

diff --git a/debian/patches/configure.diff b/debian/patches/configure.diff
index 3cd575f0..c9a28733 100644
--- a/debian/patches/configure.diff
+++ b/debian/patches/configure.diff
@@ -19,9 +19,9 @@ Configure Abseil for Debian.
      if(ABSL_ENABLE_INSTALL)
        set_target_properties(${_NAME} PROPERTIES
          OUTPUT_NAME "absl_${_NAME}"
--        SOVERSION "2308.0.0"
-+        SOVERSION 20230802
-+        VERSION "20230802.0.1"
+-        SOVERSION "2401.0.0"
++        SOVERSION 20240116
++        VERSION "20240116.0.1"
        )
      endif()
    else()
@@ -61,18 +61,18 @@ Configure Abseil for Debian.
 -#define ABSL_OPTION_USE_STD_VARIANT 2
 +#define ABSL_OPTION_USE_STD_VARIANT 0
  
- 
- // ABSL_OPTION_USE_INLINE_NAMESPACE
-@@ -200,7 +200,7 @@
+ // ABSL_OPTION_USE_STD_ORDERING
+ //
+@@ -226,7 +226,7 @@
  // allowed.
  
  #define ABSL_OPTION_USE_INLINE_NAMESPACE 1
--#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20230802
-+#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian5
+-#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240116
++#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian6
  
  // ABSL_OPTION_HARDENED
  //
-@@ -227,6 +227,6 @@
+@@ -253,6 +253,6 @@
  // checks enabled by this option may abort the program in a different way and
  // log additional information when `NDEBUG` is not defined.
  
diff --git a/debian/patches/cordz-info-statistics-test.diff b/debian/patches/cordz-info-statistics-test.diff
index 646133a1..3e2861f3 100644
--- a/debian/patches/cordz-info-statistics-test.diff
+++ b/debian/patches/cordz-info-statistics-test.diff
@@ -1,6 +1,6 @@
 --- a/absl/strings/internal/cordz_info_statistics_test.cc
 +++ b/absl/strings/internal/cordz_info_statistics_test.cc
-@@ -468,6 +468,8 @@
+@@ -412,6 +412,8 @@
  }
  
  TEST(CordzInfoStatisticsTest, ThreadSafety) {
diff --git a/debian/patches/cpu-features.diff b/debian/patches/cpu-features.diff
index 614c7dcb..485d2bc5 100644
--- a/debian/patches/cpu-features.diff
+++ b/debian/patches/cpu-features.diff
@@ -17,7 +17,7 @@ Explicitly set supported CPU features.
 
 --- a/absl/base/config.h
 +++ b/absl/base/config.h
-@@ -848,7 +848,7 @@
+@@ -915,7 +915,7 @@
  // which architectures support the various x86 instruction sets.
  #ifdef ABSL_INTERNAL_HAVE_SSE
  #error ABSL_INTERNAL_HAVE_SSE cannot be directly set
@@ -26,7 +26,7 @@ Explicitly set supported CPU features.
  #define ABSL_INTERNAL_HAVE_SSE 1
  #elif (defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1)) && \
      !defined(_M_ARM64EC)
-@@ -864,7 +864,7 @@
+@@ -931,7 +931,7 @@
  // which architectures support the various x86 instruction sets.
  #ifdef ABSL_INTERNAL_HAVE_SSE2
  #error ABSL_INTERNAL_HAVE_SSE2 cannot be directly set
@@ -35,7 +35,7 @@ Explicitly set supported CPU features.
  #define ABSL_INTERNAL_HAVE_SSE2 1
  #elif (defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)) && \
      !defined(_M_ARM64EC)
-@@ -886,8 +886,6 @@
+@@ -953,8 +953,6 @@
  // by the CPU.
  #ifdef ABSL_INTERNAL_HAVE_SSSE3
  #error ABSL_INTERNAL_HAVE_SSSE3 cannot be directly set
@@ -44,7 +44,7 @@ Explicitly set supported CPU features.
  #endif
  
  // ABSL_INTERNAL_HAVE_ARM_NEON is used for compile-time detection of NEON (ARM
-@@ -899,7 +897,7 @@
+@@ -966,7 +964,7 @@
  // https://llvm.org/docs/CompileCudaWithLLVM.html#detecting-clang-vs-nvcc-from-code
  #ifdef ABSL_INTERNAL_HAVE_ARM_NEON
  #error ABSL_INTERNAL_HAVE_ARM_NEON cannot be directly set
diff --git a/debian/patches/empty-flags-library.diff b/debian/patches/empty-flags-library.diff
deleted file mode 100644
index d47d44be..00000000
--- a/debian/patches/empty-flags-library.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Benjamin Barenblat <bbaren@google.com>
-Subject: Eliminate libabsl_flags.so and libabsl_flags.a
-Forwarded: not-needed
-
-The libabsl_flags library only contains code when compiling with MSVC, which
-Debian doesn't use. Skip compiling absl/flags/flag.cc, and make the Abseil flags
-library header-only.
-
---- a/absl/flags/CMakeLists.txt
-+++ b/absl/flags/CMakeLists.txt
-@@ -200,8 +200,6 @@
- absl_cc_library(
-   NAME
-     flags
--  SRCS
--    "flag.cc"
-   HDRS
-     "declare.h"
-     "flag.h"
diff --git a/debian/patches/series b/debian/patches/series
index ee48fdd3..18bf90c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 configure.diff
 cpu-features.diff
 latomic.diff
-empty-flags-library.diff
 cordz-info-statistics-test.diff
 pkg-config-directives.diff
 riscv-nan-formatting.diff