From 8dd75635b6be4bf925f4f77cdcf9c037c11d3d02 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sat, 15 Feb 2020 23:18:59 -0500 Subject: [PATCH] Remove cmake patch, code applied upstream. --- debian/changelog | 1 + debian/patches/cmake-fix-find-boost.patch | 16 ---------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 debian/patches/cmake-fix-find-boost.patch diff --git a/debian/changelog b/debian/changelog index 83e4148..c3fc6c2 100644 --- 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 Sat, 15 Feb 2020 22:50:34 -0500 diff --git a/debian/patches/cmake-fix-find-boost.patch b/debian/patches/cmake-fix-find-boost.patch deleted file mode 100644 index 6e6f93b..0000000 --- a/debian/patches/cmake-fix-find-boost.patch +++ /dev/null @@ -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( diff --git a/debian/patches/series b/debian/patches/series index 646c946..683ca99 100644 --- 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