diff -pruN 8.2+ds-5/debian/changelog 8.2+ds-6/debian/changelog --- 8.2+ds-5/debian/changelog 2022-05-24 12:48:38.000000000 +0000 +++ 8.2+ds-6/debian/changelog 2022-07-31 20:11:30.000000000 +0000 @@ -1,3 +1,13 @@ +ortools (8.2+ds-6) unstable; urgency=medium + + [ Thomas Vincent ] + * d/control: Fix typo in libortools-doc description + + [ Agathe Porte ] + * fix FTBFS with gcc12 (Closes: #1013013) + + -- Agathe Porte Sun, 31 Jul 2022 22:11:30 +0200 + ortools (8.2+ds-5) unstable; urgency=medium * d/rules: remove boilerplate comments diff -pruN 8.2+ds-5/debian/control 8.2+ds-6/debian/control --- 8.2+ds-5/debian/control 2022-05-24 12:14:15.000000000 +0000 +++ 8.2+ds-6/debian/control 2022-07-31 20:11:30.000000000 +0000 @@ -108,7 +108,7 @@ Description: Google Optimization Tools ( . OR-Tools is written in C++, but also provide wrappers in Python, C# and Java. . - This package contains Doxygen documemtation for OR-Tools. + This package contains Doxygen documentation for OR-Tools. Package: ortools-examples Architecture: all diff -pruN 8.2+ds-5/debian/patches/0001-python.cmake-never-download-modules.patch 8.2+ds-6/debian/patches/0001-python.cmake-never-download-modules.patch --- 8.2+ds-5/debian/patches/0001-python.cmake-never-download-modules.patch 2022-03-08 16:35:40.000000000 +0000 +++ 8.2+ds-6/debian/patches/0001-python.cmake-never-download-modules.patch 2022-07-31 20:11:30.000000000 +0000 @@ -1,4 +1,4 @@ -From: Romain Porte +From: Agathe Porte Date: Sun, 14 Mar 2021 18:23:14 +0100 Subject: python.cmake: never download modules diff -pruN 8.2+ds-5/debian/patches/0002-Drop-absl-container-usage-removed-in-abseil-cpp.patch 8.2+ds-6/debian/patches/0002-Drop-absl-container-usage-removed-in-abseil-cpp.patch --- 8.2+ds-5/debian/patches/0002-Drop-absl-container-usage-removed-in-abseil-cpp.patch 2022-03-08 16:35:40.000000000 +0000 +++ 8.2+ds-6/debian/patches/0002-Drop-absl-container-usage-removed-in-abseil-cpp.patch 2022-07-31 20:11:30.000000000 +0000 @@ -1,4 +1,4 @@ -From: Agathe Porte +From: Agathe Porte Date: Sat, 26 Feb 2022 11:38:03 +0100 Subject: Drop absl::container usage (removed in abseil-cpp) @@ -7,7 +7,11 @@ be removed. See -Forwarded: not-needed +This patch is not forwarded to upstream, since contributing to it +requires to sign a CLA using a Google account, which I do not possess +nor wish to. + +Forwarded: no --- cmake/glop.cmake | 1 - ortools/constraint_solver/CMakeLists.txt | 1 - diff -pruN 8.2+ds-5/debian/patches/0003-fix-gcc12-errors.patch 8.2+ds-6/debian/patches/0003-fix-gcc12-errors.patch --- 8.2+ds-5/debian/patches/0003-fix-gcc12-errors.patch 1970-01-01 00:00:00.000000000 +0000 +++ 8.2+ds-6/debian/patches/0003-fix-gcc12-errors.patch 2022-07-31 20:11:30.000000000 +0000 @@ -0,0 +1,52 @@ +From: Agathe Porte +Date: Thu, 28 Jul 2022 12:55:35 +0200 +Subject: fix gcc12 errors + +This patch is not forwarded to upstream, since contributing to it +requires to sign a CLA using a Google account, which I do not possess +nor wish to. + +Forwarded: no +--- + ortools/graph/iterators.h | 7 ++++++- + ortools/graph/topologicalsorter.h | 4 ++-- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/ortools/graph/iterators.h b/ortools/graph/iterators.h +index 1997bcd..7c85bcb 100644 +--- a/ortools/graph/iterators.h ++++ b/ortools/graph/iterators.h +@@ -102,8 +102,13 @@ BeginEndReverseIteratorWrapper Reverse(const Container& c) { + // Simple iterator on an integer range, see IntegerRange below. + template + class IntegerRangeIterator +- : public std::iterator { ++{ + public: ++ using iterator_category = std::input_iterator_tag; ++ using value_type = IntegerType; ++ using difference_type = std::ptrdiff_t; ++ using pointer = IntegerType*; ++ using reference = IntegerType&; + explicit IntegerRangeIterator(IntegerType value) : index_(value) {} + IntegerRangeIterator(const IntegerRangeIterator& other) + : index_(other.index_) {} +diff --git a/ortools/graph/topologicalsorter.h b/ortools/graph/topologicalsorter.h +index 8a3ef82..f3756c9 100644 +--- a/ortools/graph/topologicalsorter.h ++++ b/ortools/graph/topologicalsorter.h +@@ -76,12 +76,12 @@ namespace util { + // Returns true if the graph was a DAG, and outputs the topological order in + // "topological_order". Returns false if the graph is cyclic. + // Works in O(num_nodes + arcs.size()), and is pretty fast. +-inline ABSL_MUST_USE_RESULT bool DenseIntTopologicalSort( ++ABSL_MUST_USE_RESULT inline bool DenseIntTopologicalSort( + int num_nodes, const std::vector>& arcs, + std::vector* topological_order); + + // Like DenseIntTopologicalSort, but stable. +-inline ABSL_MUST_USE_RESULT bool DenseIntStableTopologicalSort( ++ABSL_MUST_USE_RESULT inline bool DenseIntStableTopologicalSort( + int num_nodes, const std::vector>& arcs, + std::vector* topological_order); + diff -pruN 8.2+ds-5/debian/patches/series 8.2+ds-6/debian/patches/series --- 8.2+ds-5/debian/patches/series 2022-03-08 16:35:40.000000000 +0000 +++ 8.2+ds-6/debian/patches/series 2022-07-31 20:11:30.000000000 +0000 @@ -1,2 +1,3 @@ 0001-python.cmake-never-download-modules.patch 0002-Drop-absl-container-usage-removed-in-abseil-cpp.patch +0003-fix-gcc12-errors.patch diff -pruN 8.2+ds-5/debian/salsa-ci.yml 8.2+ds-6/debian/salsa-ci.yml --- 8.2+ds-5/debian/salsa-ci.yml 2021-08-19 17:32:32.000000000 +0000 +++ 8.2+ds-6/debian/salsa-ci.yml 2022-07-31 20:11:30.000000000 +0000 @@ -1,4 +1,2 @@ include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml - + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml