|
Kevin Kofler |
900bc68 |
diff -Nur calamares-3.2.11-default-settings/calamares.desktop calamares-3.2.11-kdesu/calamares.desktop
|
|
Kevin Kofler |
900bc68 |
--- calamares-3.2.11-default-settings/calamares.desktop 2019-07-06 00:52:35.000000000 +0200
|
|
Kevin Kofler |
900bc68 |
+++ calamares-3.2.11-kdesu/calamares.desktop 2019-07-08 23:54:03.108978532 +0200
|
|
Kevin Kofler |
f774b4a |
@@ -5,7 +5,7 @@
|
|
Kevin Kofler |
c791784 |
GenericName=System Installer
|
|
Kevin Kofler |
f774b4a |
Keywords=calamares;system;installer
|
|
Kevin Kofler |
c791784 |
TryExec=calamares
|
|
Kevin Kofler |
c791784 |
-Exec=pkexec /usr/bin/calamares
|
|
Kevin Kofler |
c791784 |
+Exec=kdesu /usr/bin/calamares
|
|
Kevin Kofler |
c791784 |
Comment=Calamares — System Installer
|
|
Kevin Kofler |
c791784 |
Icon=calamares
|
|
Kevin Kofler |
c791784 |
Terminal=false
|
|
Kevin Kofler |
900bc68 |
diff -Nur calamares-3.2.11-default-settings/calamares.desktop.in calamares-3.2.11-kdesu/calamares.desktop.in
|
|
Kevin Kofler |
900bc68 |
--- calamares-3.2.11-default-settings/calamares.desktop.in 2019-07-06 00:52:35.000000000 +0200
|
|
Kevin Kofler |
900bc68 |
+++ calamares-3.2.11-kdesu/calamares.desktop.in 2019-07-08 23:54:03.269977444 +0200
|
|
Kevin Kofler |
a41aa30 |
@@ -5,7 +5,7 @@
|
|
Kevin Kofler |
a41aa30 |
GenericName=System Installer
|
|
Kevin Kofler |
a41aa30 |
Keywords=calamares;system;installer
|
|
Kevin Kofler |
a41aa30 |
TryExec=calamares
|
|
Kevin Kofler |
a41aa30 |
-Exec=pkexec /usr/bin/calamares
|
|
Kevin Kofler |
a41aa30 |
+Exec=kdesu /usr/bin/calamares
|
|
Kevin Kofler |
a41aa30 |
Comment=Calamares — System Installer
|
|
Kevin Kofler |
a41aa30 |
Icon=calamares
|
|
Kevin Kofler |
a41aa30 |
Terminal=false
|
|
Kevin Kofler |
900bc68 |
diff -Nur calamares-3.2.11-default-settings/CMakeLists.txt calamares-3.2.11-kdesu/CMakeLists.txt
|
|
Kevin Kofler |
900bc68 |
--- calamares-3.2.11-default-settings/CMakeLists.txt 2019-07-08 22:25:32.488871708 +0200
|
|
Kevin Kofler |
900bc68 |
+++ calamares-3.2.11-kdesu/CMakeLists.txt 2019-07-08 23:54:03.269977444 +0200
|
|
Kevin Kofler |
a41aa30 |
@@ -45,7 +45,6 @@
|
|
Kevin Kofler |
a41aa30 |
### OPTIONS
|
|
Kevin Kofler |
a41aa30 |
#
|
|
Kevin Kofler |
3fa9135 |
option( INSTALL_CONFIG "Install configuration files" ON )
|
|
Kevin Kofler |
a41aa30 |
-option( INSTALL_POLKIT "Install Polkit configuration" ON )
|
|
Kevin Kofler |
a41aa30 |
option( BUILD_TESTING "Build the testing tree." ON )
|
|
Kevin Kofler |
3c97739 |
option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON )
|
|
Kevin Kofler |
900bc68 |
option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." OFF )
|
|
Kevin Kofler |
900bc68 |
@@ -248,18 +247,6 @@
|
|
Kevin Kofler |
a41aa30 |
#
|
|
Kevin Kofler |
a41aa30 |
find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Concurrent Core Gui Widgets LinguistTools Svg Quick QuickWidgets )
|
|
Kevin Kofler |
a41aa30 |
find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED )
|
|
Kevin Kofler |
a41aa30 |
-if( INSTALL_POLKIT )
|
|
Kevin Kofler |
a41aa30 |
- find_package( PolkitQt5-1 REQUIRED )
|
|
Kevin Kofler |
a41aa30 |
-else()
|
|
Kevin Kofler |
a41aa30 |
- # Find it anyway, for dependencies-reporting
|
|
Kevin Kofler |
a41aa30 |
- find_package( PolkitQt5-1 )
|
|
Kevin Kofler |
a41aa30 |
-endif()
|
|
Kevin Kofler |
a41aa30 |
-set_package_properties(
|
|
Kevin Kofler |
a41aa30 |
- PolkitQt5-1 PROPERTIES
|
|
Kevin Kofler |
a41aa30 |
- DESCRIPTION "Qt5 support for Polkit"
|
|
Kevin Kofler |
a41aa30 |
- URL "https://cgit.kde.org/polkit-qt-1.git"
|
|
Kevin Kofler |
a41aa30 |
- PURPOSE "PolkitQt5-1 helps with installing Polkit configuration"
|
|
Kevin Kofler |
a41aa30 |
-)
|
|
Kevin Kofler |
c791784 |
|
|
Kevin Kofler |
a41aa30 |
# Find ECM once, and add it to the module search path; Calamares
|
|
Kevin Kofler |
a41aa30 |
# modules that need ECM can do
|
|
Kevin Kofler |
900bc68 |
@@ -539,15 +526,6 @@
|
|
Kevin Kofler |
a41aa30 |
)
|
|
Kevin Kofler |
a41aa30 |
endif()
|
|
Kevin Kofler |
a41aa30 |
|
|
Kevin Kofler |
a41aa30 |
-if( INSTALL_POLKIT )
|
|
Kevin Kofler |
a41aa30 |
- install(
|
|
Kevin Kofler |
a41aa30 |
- FILES
|
|
Kevin Kofler |
a41aa30 |
- com.github.calamares.calamares.policy
|
|
Kevin Kofler |
a41aa30 |
- DESTINATION
|
|
Kevin Kofler |
a41aa30 |
- "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}"
|
|
Kevin Kofler |
a41aa30 |
- )
|
|
Kevin Kofler |
a41aa30 |
-endif()
|
|
Kevin Kofler |
a41aa30 |
-
|
|
Kevin Kofler |
c791784 |
install(
|
|
Kevin Kofler |
3c97739 |
FILES
|
|
Kevin Kofler |
c791784 |
calamares.desktop
|
|
Kevin Kofler |
900bc68 |
diff -Nur calamares-3.2.11-default-settings/com.github.calamares.calamares.policy calamares-3.2.11-kdesu/com.github.calamares.calamares.policy
|
|
Kevin Kofler |
900bc68 |
--- calamares-3.2.11-default-settings/com.github.calamares.calamares.policy 2019-07-06 00:52:35.000000000 +0200
|
|
Kevin Kofler |
900bc68 |
+++ calamares-3.2.11-kdesu/com.github.calamares.calamares.policy 1970-01-01 01:00:00.000000000 +0100
|
|
Kevin Kofler |
c791784 |
@@ -1,22 +0,0 @@
|
|
Kevin Kofler |
c791784 |
-
|
|
Kevin Kofler |
c791784 |
-
|
|
Kevin Kofler |
c791784 |
-"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
|
|
Kevin Kofler |
c791784 |
-"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
|
|
Kevin Kofler |
c791784 |
-<policyconfig>
|
|
Kevin Kofler |
c791784 |
-
|
|
Kevin Kofler |
c791784 |
- <vendor>Calamares</vendor>
|
|
Kevin Kofler |
c791784 |
- <vendor_url>https://github.com/calamares</vendor_url>
|
|
Kevin Kofler |
c791784 |
-
|
|
Kevin Kofler |
c791784 |
- <action id="com.github.calamares.calamares.pkexec.run">
|
|
Kevin Kofler |
c791784 |
- <description>Run Installer</description>
|
|
Kevin Kofler |
c791784 |
- <message>Authentication is required to run the installation program</message>
|
|
Kevin Kofler |
c791784 |
- <icon_name>drive-harddisk</icon_name>
|
|
Kevin Kofler |
c791784 |
- <defaults>
|
|
Kevin Kofler |
c791784 |
- <allow_any>no</allow_any>
|
|
Kevin Kofler |
c791784 |
- <allow_inactive>no</allow_inactive>
|
|
Kevin Kofler |
c791784 |
- <allow_active>auth_admin</allow_active>
|
|
Kevin Kofler |
c791784 |
- </defaults>
|
|
Kevin Kofler |
c791784 |
- <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/calamares</annotate>
|
|
Kevin Kofler |
c791784 |
- <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
|
|
Kevin Kofler |
c791784 |
- </action>
|
|
Kevin Kofler |
c791784 |
-</policyconfig>
|
|
Kevin Kofler |
c791784 |
\ No newline at end of file
|