Begin updating packaging for Abseil 20200923

Bump package versions and names to reflect the new Abseil LTS. Remove
patches that have been incorporated upstream, and refresh the
configuration patch.

4 files changed, 16 insertions, 96 deletions

diff --git a/debian/patches/bug970333.diff b/debian/patches/bug970333.diff
deleted file mode 100644
index efca5a5a..00000000
--- a/debian/patches/bug970333.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Zach Toogood <zach@yousician.com>
-Subject: Fix CMake Threads dependency issue
-Origin: upstream, https://github.com/abseil/abseil-cpp/commit/68494aae959dfbbf781cdf03a988d2f5fc7e4802
-Bug: https://github.com/abseil/abseil-cpp/issues/668
-Bug-Debian: https://bugs.debian.org/970333
-
-Improve CMake support by finding the Threads module with find_dependency
-rather than trying to include it directly. This silences a CMake warning.
-
---- a/CMake/abslConfig.cmake.in
-+++ b/CMake/abslConfig.cmake.in
-@@ -1,6 +1,7 @@
- # absl CMake configuration file.
- 
--include(FindThreads)
-+include(CMakeFindDependencyMacro)
-+find_dependency(Threads)
- 
- @PACKAGE_INIT@
- 
diff --git a/debian/patches/configure.diff b/debian/patches/configure.diff
index bb88ae7d..dc1ed9e7 100644
--- a/debian/patches/configure.diff
+++ b/debian/patches/configure.diff
@@ -20,13 +20,13 @@ Configure Abseil for Debian.
 
 --- a/CMake/AbseilHelpers.cmake
 +++ b/CMake/AbseilHelpers.cmake
-@@ -215,6 +215,9 @@
+@@ -217,6 +217,9 @@
          OUTPUT_NAME "absl_${_NAME}"
        )
      endif()
 +
-+    set_property(TARGET ${_NAME} PROPERTY SOVERSION 20200225)
-+    set_property(TARGET ${_NAME} PROPERTY VERSION "20200225.0.2")
++    set_property(TARGET ${_NAME} PROPERTY SOVERSION 20200923)
++    set_property(TARGET ${_NAME} PROPERTY VERSION "20200923.0.0")
    else()
      # Generating header-only library
      add_library(${_NAME} INTERFACE)
@@ -68,37 +68,38 @@ Configure Abseil for Debian.
  
  
  // ABSL_OPTION_USE_INLINE_NAMESPACE
-@@ -206,6 +206,6 @@
+@@ -206,7 +206,7 @@
  // allowed.
  
  #define ABSL_OPTION_USE_INLINE_NAMESPACE 1
--#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_2020_02_25
-+#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian0
+-#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_2020_09_23
++#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian1
  
- #endif  // ABSL_BASE_OPTIONS_H_
+ // ABSL_OPTION_HARDENED
+ //
 --- a/absl/container/internal/have_sse.h
 +++ b/absl/container/internal/have_sse.h
 @@ -17,22 +17,14 @@
  #define ABSL_CONTAINER_INTERNAL_HAVE_SSE_H_
  
- #ifndef SWISSTABLE_HAVE_SSE2
+ #ifndef ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2
 -#if defined(__SSE2__) ||  \
 -    (defined(_MSC_VER) && \
 -     (defined(_M_X64) || (defined(_M_IX86) && _M_IX86_FP >= 2)))
 +#if defined(__x86_64__) || (defined(_MSC_VER) && defined(_M_X64))
- #define SWISSTABLE_HAVE_SSE2 1
+ #define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2 1
  #else
- #define SWISSTABLE_HAVE_SSE2 0
+ #define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2 0
  #endif
  #endif
  
--#ifndef SWISSTABLE_HAVE_SSSE3
+-#ifndef ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3
 -#ifdef __SSSE3__
--#define SWISSTABLE_HAVE_SSSE3 1
+-#define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 1
 -#else
- #define SWISSTABLE_HAVE_SSSE3 0
+ #define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 0
 -#endif
 -#endif
  
- #if SWISSTABLE_HAVE_SSSE3 && !SWISSTABLE_HAVE_SSE2
- #error "Bad configuration!"
+ #if ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 && \
+     !ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2
diff --git a/debian/patches/license.diff b/debian/patches/license.diff
deleted file mode 100644
index 08f315e4..00000000
--- a/debian/patches/license.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Benjamin Barenblat <bbaren@google.com>
-Subject: Correct Apache license headers
-Forwarded: yes
-Applied-Upstream: https://github.com/abseil/abseil-cpp/commit/bd317cae3bc2630d1b12c5f1d77036e937d1d725
-
-This repository has always been licensed under the Apache license, but some
-files lacked headers to locally indicate that fact. Add the appropriate headers.
-
-The author works at Google. Upstream applied this patch as Piper revision
-310223650 and exported it to GitHub; the Applied-Upstream URL above points to
-the exported commit.
-
---- a/absl/debugging/internal/stacktrace_arm-inl.inc
-+++ b/absl/debugging/internal/stacktrace_arm-inl.inc
-@@ -1,9 +1,18 @@
--// Copyright 2011 and onwards Google Inc.
--// All rights reserved.
-+// Copyright 2017 The Abseil Authors.
-+//
-+// Licensed under the Apache License, Version 2.0 (the "License");
-+// you may not use this file except in compliance with the License.
-+// You may obtain a copy of the License at
-+//
-+//      https://www.apache.org/licenses/LICENSE-2.0
-+//
-+// Unless required by applicable law or agreed to in writing, software
-+// distributed under the License is distributed on an "AS IS" BASIS,
-+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+// See the License for the specific language governing permissions and
-+// limitations under the License.
- //
--// Author: Doug Kwan
- // This is inspired by Craig Silverstein's PowerPC stacktrace code.
--//
- 
- #ifndef ABSL_DEBUGGING_INTERNAL_STACKTRACE_ARM_INL_H_
- #define ABSL_DEBUGGING_INTERNAL_STACKTRACE_ARM_INL_H_
---- a/absl/debugging/internal/stacktrace_generic-inl.inc
-+++ b/absl/debugging/internal/stacktrace_generic-inl.inc
-@@ -1,7 +1,16 @@
--// Copyright 2000 - 2007 Google Inc.
--// All rights reserved.
-+// Copyright 2017 The Abseil Authors.
- //
--// Author: Sanjay Ghemawat
-+// Licensed under the Apache License, Version 2.0 (the "License");
-+// you may not use this file except in compliance with the License.
-+// You may obtain a copy of the License at
-+//
-+//      https://www.apache.org/licenses/LICENSE-2.0
-+//
-+// Unless required by applicable law or agreed to in writing, software
-+// distributed under the License is distributed on an "AS IS" BASIS,
-+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+// See the License for the specific language governing permissions and
-+// limitations under the License.
- //
- // Portable implementation - just use glibc
- //
diff --git a/debian/patches/series b/debian/patches/series
index f544d1d9..dbd8a0ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-license.diff
 configure.diff
-bug970333.diff