Jonathan Carter
6 years ago
parent
dd120c1367
commit
1f4f8beace
@ -0,0 +1,21 @@
|
||||
From: Raul Rodrigo Segura <raurodse@gmail.com>
|
||||
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
|
||||
@ -0,0 +1,30 @@
|
||||
From: Raul Rodrigo Segura <raurodse@gmail.com>
|
||||
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")
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
From: Raul Rodrigo Segura <raurodse@gmail.com>
|
||||
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 <PythonQt.h>
|
||||
-#include <extensions/PythonQt_QtAll/PythonQt_QtAll.h>
|
||||
+#include <PythonQt_QtAll.h>
|
||||
|
||||
#include <QDir>
|
||||
#include <QPointer>
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
Loading…
Reference in new issue