From 50027b7a8b828a6801c64f20e3554e5a3e68d122 Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspr@nonempty.org>
Date: Sun, 2 Aug 2020 22:29:32 +0200
Subject: Drop Work-around-963955.patch, underlying Qt bug is fixed.

---
 debian/patches/0009-Work-around-963955.patch | 120 ---------------------------
 debian/patches/series                        |   1 -
 2 files changed, 121 deletions(-)
 delete mode 100644 debian/patches/0009-Work-around-963955.patch

(limited to 'debian')

diff --git a/debian/patches/0009-Work-around-963955.patch b/debian/patches/0009-Work-around-963955.patch
deleted file mode 100644
index 76eeb500..00000000
--- a/debian/patches/0009-Work-around-963955.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From: Gard Spreemann <gspr@nonempty.org>
-Date: Mon, 29 Jun 2020 13:37:10 +0200
-Subject: Work around #963955.
-
-This works around a bug in Qt 5.14.x causing any software using TBB
-together with Qt to FTBFS. It is fixed upstream in 5.15.1.
----
- src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex.h | 2 ++
- src/Bottleneck_distance/include/gudhi/Persistence_graph.h         | 2 ++
- src/Hasse_complex/include/gudhi/Hasse_complex.h                   | 2 ++
- src/Nerve_GIC/include/gudhi/GIC.h                                 | 2 ++
- src/Simplex_tree/include/gudhi/Simplex_tree.h                     | 2 ++
- src/Tangential_complex/benchmark/benchmark_tc.cpp                 | 2 ++
- src/Tangential_complex/include/gudhi/Tangential_complex.h         | 2 ++
- 7 files changed, 14 insertions(+)
-
-diff --git a/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex.h b/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex.h
-index aa255ec..ae29f6c 100644
---- a/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex.h
-+++ b/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex.h
-@@ -15,8 +15,10 @@
- #include <gudhi/Bitmap_cubical_complex_periodic_boundary_conditions_base.h>
- 
- #ifdef GUDHI_USE_TBB
-+#ifndef Q_MOC_RUN
- #include <tbb/parallel_sort.h>
- #endif
-+#endif
- 
- #include <limits>
- #include <utility>    // for pair<>
-diff --git a/src/Bottleneck_distance/include/gudhi/Persistence_graph.h b/src/Bottleneck_distance/include/gudhi/Persistence_graph.h
-index e1e3522..b865681 100644
---- a/src/Bottleneck_distance/include/gudhi/Persistence_graph.h
-+++ b/src/Bottleneck_distance/include/gudhi/Persistence_graph.h
-@@ -14,8 +14,10 @@
- #include <gudhi/Internal_point.h>
- 
- #ifdef GUDHI_USE_TBB
-+#ifndef Q_MOC_RUN
- #include <tbb/parallel_sort.h>
- #endif
-+#endif
- 
- #include <vector>
- #include <algorithm>
-diff --git a/src/Hasse_complex/include/gudhi/Hasse_complex.h b/src/Hasse_complex/include/gudhi/Hasse_complex.h
-index 8ce8c36..4842cc2 100644
---- a/src/Hasse_complex/include/gudhi/Hasse_complex.h
-+++ b/src/Hasse_complex/include/gudhi/Hasse_complex.h
-@@ -21,8 +21,10 @@
- #include <limits>  // for infinity value
- 
- #ifdef GUDHI_USE_TBB
-+#ifndef Q_MOC_RUN
- #include <tbb/parallel_for.h>
- #endif
-+#endif
- 
- namespace Gudhi {
- 
-diff --git a/src/Nerve_GIC/include/gudhi/GIC.h b/src/Nerve_GIC/include/gudhi/GIC.h
-index 1b1f932..653501c 100644
---- a/src/Nerve_GIC/include/gudhi/GIC.h
-+++ b/src/Nerve_GIC/include/gudhi/GIC.h
-@@ -13,7 +13,9 @@
- #define GIC_H_
- 
- #ifdef GUDHI_USE_TBB
-+#ifndef Q_MOC_RUN
- #include <tbb/parallel_for.h>
-+#endif
- #include <mutex>
- #endif
- 
-diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
-index 889dbd0..ac64650 100644
---- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
-+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
-@@ -27,8 +27,10 @@
- #include <boost/container/static_vector.hpp>
- 
- #ifdef GUDHI_USE_TBB
-+#ifndef Q_MOC_RUN
- #include <tbb/parallel_sort.h>
- #endif
-+#endif
- 
- #include <utility>
- #include <vector>
-diff --git a/src/Tangential_complex/benchmark/benchmark_tc.cpp b/src/Tangential_complex/benchmark/benchmark_tc.cpp
-index e3b2a04..3e5227a 100644
---- a/src/Tangential_complex/benchmark/benchmark_tc.cpp
-+++ b/src/Tangential_complex/benchmark/benchmark_tc.cpp
-@@ -48,8 +48,10 @@ const std::size_t ONLY_LOAD_THE_FIRST_N_POINTS = 20000000;
- #include <cmath>  // for std::sqrt
- 
- #ifdef GUDHI_USE_TBB
-+#ifndef Q_MOC_RUN
- #include <tbb/task_scheduler_init.h>
- #endif
-+#endif
- #include "XML_exporter.h"
- #include "RIB_exporter.h"
- #define GUDHI_TC_EXPORT_PERFORMANCE_DATA
-diff --git a/src/Tangential_complex/include/gudhi/Tangential_complex.h b/src/Tangential_complex/include/gudhi/Tangential_complex.h
-index f007bdd..e49261e 100644
---- a/src/Tangential_complex/include/gudhi/Tangential_complex.h
-+++ b/src/Tangential_complex/include/gudhi/Tangential_complex.h
-@@ -58,8 +58,10 @@
- #include <cstddef>  // for std::size_t
- 
- #ifdef GUDHI_USE_TBB
-+#ifndef Q_MOC_RUN
- #include <tbb/parallel_for.h>
- #include <tbb/combinable.h>
-+#endif
- #include <mutex>
- #endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index ee37db40..4d8eed77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
 0006-Install-Python-module-in-correct-location.patch
 0007-Move-towards-reproducible-builds.patch
 0008-Don-t-try-to-install-Hera.patch
-0009-Work-around-963955.patch
-- 
cgit v1.2.3