From 0302600c8e129e1c1b192318ec0f2cccc4edb9fc Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 4 Sep 2018 16:43:14 -0500 Subject: [PATCH] 0002-Add-patch-to-compile-with-pythonQt.patch is no longer needed in favor of a better upstream solution. --- debian/changelog | 2 ++ ...2-Add-patch-to-compile-with-pythonQt.patch | 30 ------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 debian/patches/0002-Add-patch-to-compile-with-pythonQt.patch diff --git a/debian/changelog b/debian/changelog index b4797b4..23d5389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ calamares (3.2.2-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. * Remove the reverse-applicable fix-defaultde-variable.patch. * Bump Standards-version to 4.2.1, no changes needed. + * 0002-Add-patch-to-compile-with-pythonQt.patch is no longer needed in + favor of a better upstream solution. -- Simon Quigley Tue, 04 Sep 2018 16:38:57 -0500 diff --git a/debian/patches/0002-Add-patch-to-compile-with-pythonQt.patch b/debian/patches/0002-Add-patch-to-compile-with-pythonQt.patch deleted file mode 100644 index b8f72e8..0000000 --- a/debian/patches/0002-Add-patch-to-compile-with-pythonQt.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Raul Rodrigo Segura -Date: Thu, 14 Jun 2018 23:21:30 +0200 -Subject: Add patch to compile with pythonQt - ---- - CMakeModules/FindPythonQt.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeModules/FindPythonQt.cmake b/CMakeModules/FindPythonQt.cmake -index f0f4b8a..23e61d3 100644 ---- a/CMakeModules/FindPythonQt.cmake -+++ b/CMakeModules/FindPythonQt.cmake -@@ -24,7 +24,7 @@ string(REGEX REPLACE - ) - - if(NOT EXISTS "${PYTHONQT_INSTALL_DIR}") -- find_path(PYTHONQT_INSTALL_DIR include/PythonQt/PythonQt.h DOC "Directory where PythonQt was installed.") -+ find_path(PYTHONQT_INSTALL_DIR include/PythonQt5/PythonQt.h DOC "Directory where PythonQt was installed.") - endif() - # XXX Since PythonQt 3.0 is not yet cmakeified, depending - # on how PythonQt is built, headers will not always be -@@ -32,7 +32,7 @@ endif() - # is added as an option. See [1] for more details. - # [1] https://github.com/commontk/CTK/pull/538#issuecomment-86106367 - find_path(PYTHONQT_INCLUDE_DIR PythonQt.h -- PATHS "${PYTHONQT_INSTALL_DIR}/include/PythonQt" -+ PATHS "${PYTHONQT_INSTALL_DIR}/include/PythonQt5" - "${PYTHONQT_INSTALL_DIR}/src" - DOC "Path to the PythonQt include directory") - diff --git a/debian/patches/series b/debian/patches/series index bb52cef..c09e1ec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0001-replace-pkexec-by-sudo.patch -0002-Add-patch-to-compile-with-pythonQt.patch 0003-remove-wrong-path.patch apport-package-hook.patch