Remove cmake patch, code applied upstream.

5 years ago · 8dd75635b6
parent 524a0dc9d3
commit 8dd75635b6
3 changed files with 1 additions and 17 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -5,6 +5,7 @@ calamares (3.2.18-0ubuntu1) UNRELEASED; urgency=medium
  * Bump Standards-Version to 4.5.0, no changes needed.
  * Update debian/control with debhelper-compat (= 12), remove
    debian/compat.
+  * Remove cmake-fix-find-boost.patch, code applied upstream.

 -- Dan Simmons <kc2bez@lubuntu.me>  Sat, 15 Feb 2020 22:50:34 -0500

--- a/debian/patches/cmake-fix-find-boost.patch
+++ b/debian/patches/cmake-fix-find-boost.patch
@ -1,16 +0,0 @@
-Description: CMake: fix find-boost with 1.71
-Origin: https://github.com/calamares/calamares/commit/c482990bc5b5233e2f4abda75fda8700308f5bea
-
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -322,6 +322,10 @@
- )
- 
- if ( PYTHONLIBS_FOUND )
-+    # Since Boost provides CMake config files (starting with Boost 1.70.
-+    # or so) the mess that is the Calamares find code picks the wrong
-+    # bits. Suppress those CMake config files, as suggested by @jmrcpn
-+    set(Boost_NO_BOOST_CMAKE ON)
-     include( BoostPython3 )
-     find_boost_python3( ${BOOSTPYTHON_VERSION} ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND )
-     set_package_properties(
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1,3 +1,2 @@
 0001-replace-pkexec-by-sudo.patch
 apport-package-hook.patch
-cmake-fix-find-boost.patch