From 1f4f8beace4b245e2306484b154266fe525c9f7f Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Wed, 27 Jun 2018 14:12:02 +0200 Subject: [PATCH] New upstream release, pyqt patches --- debian/changelog | 8 +++++ debian/control | 4 ++- debian/copyright | 5 +++- .../patches/0001-replace-pkexec-by-sudo.patch | 21 +++++++++++++ ...2-Add-patch-to-compile-with-pythonQt.patch | 30 +++++++++++++++++++ debian/patches/0003-remove-wrong-path.patch | 21 +++++++++++++ debian/patches/series | 4 ++- debian/patches/use-sudo-instead-of-pkexec | 15 ---------- 8 files changed, 90 insertions(+), 18 deletions(-) create mode 100644 debian/patches/0001-replace-pkexec-by-sudo.patch create mode 100644 debian/patches/0002-Add-patch-to-compile-with-pythonQt.patch create mode 100644 debian/patches/0003-remove-wrong-path.patch delete mode 100644 debian/patches/use-sudo-instead-of-pkexec diff --git a/debian/changelog b/debian/changelog index b1044e8..66febb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +calamares (3.2.1-1) unstable; urgency=medium + + * New upstream release + * Update copyright file + * Apply patches from Paul Rodrigo Segura to re-enable pythonqt support. + + -- Jonathan Carter Tue, 26 Jun 2018 14:33:04 +0200 + calamares (3.2.0-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 7d0d0ad..14320eb 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,9 @@ Build-Depends: cmake, qtbase5-dev, qtdeclarative5-dev, qttools5-dev, - qttools5-dev-tools + qttools5-dev-tools, + libpythonqt-qt5-python3-dev, + libpythonqt-qtall-qt5-python3-dev Standards-Version: 4.1.4 Homepage: https://github.com/calamares/calamares Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde-extras/calamares diff --git a/debian/copyright b/debian/copyright index 651270f..457ef35 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,8 +5,11 @@ Source: https://github.com/calamares/calamares Files: * Copyright: 2017-2018, Adriaan de Groot 2017-2018, Alf Gaida + 2017-2018, Gabriel Craciunescu + 2018, Philip Müller + 2018, AlmAck + 2018, Caio Carvalho 2017, Kyle Robbertze - 2017, Gabriel Craciunescu 2016, Artoo 2016, Luca Giambonini 2016, Lisa Vitolo diff --git a/debian/patches/0001-replace-pkexec-by-sudo.patch b/debian/patches/0001-replace-pkexec-by-sudo.patch new file mode 100644 index 0000000..ad9ca01 --- /dev/null +++ b/debian/patches/0001-replace-pkexec-by-sudo.patch @@ -0,0 +1,21 @@ +From: Raul Rodrigo Segura +Date: Fri, 4 May 2018 13:20:44 +0200 +Subject: replace pkexec by sudo + +--- + calamares.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/calamares.desktop b/calamares.desktop +index f8be5d1..53c2424 100644 +--- a/calamares.desktop ++++ b/calamares.desktop +@@ -5,7 +5,7 @@ Name=Install System + GenericName=System Installer + Keywords=calamares;system;installer + TryExec=calamares +-Exec=pkexec /usr/bin/calamares ++Exec=sudo /usr/bin/calamares + Comment=Calamares — System Installer + Icon=calamares + Terminal=false diff --git a/debian/patches/0002-Add-patch-to-compile-with-pythonQt.patch b/debian/patches/0002-Add-patch-to-compile-with-pythonQt.patch new file mode 100644 index 0000000..b8f72e8 --- /dev/null +++ b/debian/patches/0002-Add-patch-to-compile-with-pythonQt.patch @@ -0,0 +1,30 @@ +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/0003-remove-wrong-path.patch b/debian/patches/0003-remove-wrong-path.patch new file mode 100644 index 0000000..abac0e0 --- /dev/null +++ b/debian/patches/0003-remove-wrong-path.patch @@ -0,0 +1,21 @@ +From: Raul Rodrigo Segura +Date: Mon, 18 Jun 2018 13:28:56 +0200 +Subject: remove wrong path + +--- + src/libcalamaresui/modulesystem/PythonQtViewModule.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp +index 88b0c20..858097e 100644 +--- a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp ++++ b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp +@@ -29,7 +29,7 @@ + #include "JobQueue.h" + + #include +-#include ++#include + + #include + #include diff --git a/debian/patches/series b/debian/patches/series index 4522ba4..8cb422a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ -use-sudo-instead-of-pkexec +0001-replace-pkexec-by-sudo.patch +0002-Add-patch-to-compile-with-pythonQt.patch +0003-remove-wrong-path.patch diff --git a/debian/patches/use-sudo-instead-of-pkexec b/debian/patches/use-sudo-instead-of-pkexec deleted file mode 100644 index 83d6641..0000000 --- a/debian/patches/use-sudo-instead-of-pkexec +++ /dev/null @@ -1,15 +0,0 @@ -Description: Use sudo instead of pkexec - Using pkexec breaks window detection and causes calamares to not start under GNOME. - Using sudo works fine and fixes above issues. - ---- calamares-3.0.1.orig/calamares.desktop -+++ calamares-3.0.1/calamares.desktop -@@ -5,7 +5,7 @@ Name=Calamares - GenericName=System Installer - Keywords=calamares;system;installer - TryExec=calamares --Exec=pkexec /usr/bin/calamares -+Exec=sudo /usr/bin/calamares - Comment=Calamares — System Installer - Icon=calamares - Terminal=false