1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
|
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2015-11-26 20:06:32.000000000 +0800
+++ b/CMakeLists.txt 2015-11-26 20:13:56.658390319 +0800
@@ -1,9 +1,18 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 2.8.16)
project(polkit-kde-kcmodules-1)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
-find_package(KDE4 REQUIRED)
+find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+include(FeatureSummary)
+
+find_package(Qt5 REQUIRED COMPONENTS Widgets)
+find_package(KF5 REQUIRED COMPONENTS KDELibs4Support I18n KCMUtils)
function(dbus_add_activation_system_service _sources)
pkg_search_module( DBUS dbus-1 )
@@ -16,13 +25,12 @@
endforeach (_i ${ARGN})
endfunction(dbus_add_activation_system_service _sources)
-set(POLKITQT-1_MIN_VERSION "0.103.0")
-find_package(PolkitQt-1 REQUIRED)
+set(POLKITQT5-1_MIN_VERSION "0.103.0")
+find_package(PolkitQt5-1 REQUIRED)
include(FindPkgConfig)
-include_directories(${KDE4_INCLUDES}
- ${POLKITQT-1_INCLUDE_DIR}
+include_directories(${POLKITQT-1_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/common)
add_subdirectory(common)
diff -Naur a/common/identitywidget.h b/common/identitywidget.h
--- a/common/identitywidget.h 2015-11-26 20:06:32.000000000 +0800
+++ b/common/identitywidget.h 2015-11-26 20:13:56.659390334 +0800
@@ -11,9 +11,10 @@
#ifndef IDENTITYWIDGET_H
#define IDENTITYWIDGET_H
-#include <QtGui/QWidget>
+#include <QWidget>
#include <kdemacros.h>
+#include <KIcon>
namespace Ui {
class IdentityWidget;
diff -Naur a/helper/CMakeLists.txt b/helper/CMakeLists.txt
--- a/helper/CMakeLists.txt 2015-11-26 20:06:32.000000000 +0800
+++ b/helper/CMakeLists.txt 2015-11-26 20:13:56.659390334 +0800
@@ -22,7 +22,7 @@
DEPENDS polkit-kde-helper-policy-gen)
add_custom_target("actions for polkit-kde" ALL DEPENDS ${_output})
-install(FILES ${_output} DESTINATION ${KDE4_AUTH_POLICY_FILES_INSTALL_DIR})
+install(FILES ${_output} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions)
#########
@@ -39,7 +41,10 @@
kde4_add_executable(polkitkde1helper ${polkitkde1helper_SRCS})
-target_link_libraries(polkitkde1helper ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} ${POLKITQT-1_CORE_LIBRARY} polkitkdekcmodulesprivate)
+target_link_libraries(polkitkde1helper
+ KF5::KDELibs4Support
+ PolkitQt5-1::Core
+polkitkdekcmodulesprivate)
install(TARGETS polkitkde1helper DESTINATION ${LIBEXEC_INSTALL_DIR})
diff -Naur a/polkitactions/ActionWidget.h b/polkitactions/ActionWidget.h
--- a/polkitactions/ActionWidget.h 2015-11-26 20:06:32.000000000 +0800
+++ b/polkitactions/ActionWidget.h 2015-11-26 20:13:56.659390334 +0800
@@ -11,7 +11,7 @@
#ifndef ACTIONWIDGET_H
#define ACTIONWIDGET_H
-#include <QtGui/QWidget>
+#include <QWidget>
#include "PKLAEntry.h"
#include <PolkitQt1/ActionDescription>
diff -Naur a/polkitactions/CMakeLists.txt b/polkitactions/CMakeLists.txt
--- a/polkitactions/CMakeLists.txt 2015-11-26 20:06:32.000000000 +0800
+++ b/polkitactions/CMakeLists.txt 2015-11-26 20:13:56.660390348 +0800
@@ -16,12 +16,13 @@
explicitwidget.ui
actionwidget.ui)
-kde4_add_plugin(kcm_polkitactions ${kcm_polkitactions_SRCS})
+add_library(kcm_polkitactions ${kcm_polkitactions_SRCS})
target_link_libraries(kcm_polkitactions
- ${KDE4_KDECORE_LIBS}
- ${KDE4_KDEUI_LIBRARY}
- ${POLKITQT-1_CORE_LIBRARY}
+ PolkitQt5-1::Core
+ KF5::KCMUtils
+ KF5::KDELibs4Support
+ KF5::I18n
polkitkdekcmodulesprivate
)
diff -Naur a/polkitactions/PolkitActionsKCM.cpp b/polkitactions/PolkitActionsKCM.cpp
--- a/polkitactions/PolkitActionsKCM.cpp 2015-11-26 20:06:32.000000000 +0800
+++ b/polkitactions/PolkitActionsKCM.cpp 2015-11-26 20:13:56.660390348 +0800
@@ -27,23 +27,24 @@
#include <QDBusMetaType>
#include <QDBusPendingCall>
-K_PLUGIN_FACTORY(KCMPolkitActionsFactory,
- registerPlugin<PolkitActionsKCM>();
- )
+
+
+K_PLUGIN_FACTORY(KCMPolkitActionsFactory, registerPlugin<PolkitActionsKCM>();)
K_EXPORT_PLUGIN(KCMPolkitActionsFactory("kcm_polkitactions"))
+#include <PolkitActionsKCM.moc>
+
PolkitActionsKCM::PolkitActionsKCM(QWidget* parent, const QVariantList& args)
- : KCModule(KCMPolkitActionsFactory::componentData(), parent, args)
+ : KCModule(parent, args)
, m_ui(new Ui::PolkitActionsMainView)
{
- KAboutData *about =
- new KAboutData("kcm_polkitactions", "kcm_polkitactions", ki18n("Global system policy settings"),
- "1.0.0", ki18n("A configuration for polkit-1 system administrators and policy priorities"),
- KAboutData::License_GPL, ki18n("(c), 2009 Dario Freddi"),
- ki18n("From this module, you can configure system administrators and priorities "
- "for the policies defined in the Actions module"));
+ KAboutData* about = new KAboutData("kcm_polkitactions", i18n("Global system policy settings"), "1.0.0");
+ about->setShortDescription(i18n("A configuration for polkit-1 system administrators and policy priorities."));
+ about->setLicense(KAboutLicense::GPL);
- about->addAuthor(ki18n("Dario Freddi"), ki18n("Maintainer") , "drf@kde.org", "http://drfav.wordpress.com");
+ about->addAuthor("Dario Freddi", i18n("Maintainer"), "drf@kde.org");
+
+
setAboutData(about);
diff -Naur a/polkitactions/kcm_polkitactions.desktop b/polkitactions/kcm_polkitactions.desktop
--- a/polkitactions/kcm_polkitactions.desktop 2015-11-26 20:06:32.000000000 +0800
+++ b/polkitactions/kcm_polkitactions.desktop 2015-11-26 20:16:06.500246304 +0800
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 kcm_polkitactions
+Exec=kcmshell5 kcm_polkitactions
Icon=system-lock-screen
Type=Service
X-KDE-ServiceTypes=KCModule
diff -Naur a/polkitconfig/CMakeLists.txt b/polkitconfig/CMakeLists.txt
--- a/polkitconfig/CMakeLists.txt 2015-11-26 20:06:32.000000000 +0800
+++ b/polkitconfig/CMakeLists.txt 2015-11-26 20:13:56.660390348 +0800
@@ -11,8 +11,10 @@
kde4_add_plugin(kcm_polkitconfig ${kcm_polkitconfig_SRCS})
target_link_libraries(kcm_polkitconfig
- ${KDE4_KDECORE_LIBS}
- ${KDE4_KDEUI_LIBRARY}
+ PolkitQt5-1::Core
+ KF5::KCMUtils
+ KF5::KDELibs4Support
+ KF5::I18n
polkitkdekcmodulesprivate
)
diff -Naur a/polkitconfig/kcm_polkitconfig.desktop b/polkitconfig/kcm_polkitconfig.desktop
--- a/polkitconfig/kcm_polkitconfig.desktop 2015-11-26 20:06:32.000000000 +0800
+++ b/polkitconfig/kcm_polkitconfig.desktop 2015-11-26 20:16:15.467373458 +0800
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell4 kcm_polkitconfig
+Exec=kcmshell5 kcm_polkitconfig
Icon=system-lock-screen
Type=Service
X-KDE-ServiceTypes=KCModule
diff -Naur a/polkitconfig/kcmpolkitconfig.cpp b/polkitconfig/kcmpolkitconfig.cpp
--- a/polkitconfig/kcmpolkitconfig.cpp 2015-11-26 20:06:32.000000000 +0800
+++ b/polkitconfig/kcmpolkitconfig.cpp 2015-11-26 20:13:56.660390348 +0800
@@ -31,17 +31,21 @@
)
K_EXPORT_PLUGIN(KCMPolkitConfigFactory("kcm_polkitconfig"))
+#include <kcmpolkitconfig.moc>
+
KCMPolkitConfig::KCMPolkitConfig(QWidget* parent, const QVariantList& args)
- : KCModule(KCMPolkitConfigFactory::componentData(), parent, args)
+ : KCModule(parent, args)
{
KAboutData *about =
- new KAboutData("kcm_polkitconfig", "kcm_polkitconfig", ki18n("Global system policy settings"),
- "1.0.0", ki18n("A configuration for polkit-1 system administrators and policy priorities"),
- KAboutData::License_GPL, ki18n("(c), 2009 Dario Freddi"),
- ki18n("From this module, you can configure system administrators and priorities "
- "for the policies defined in the Actions module"));
-
- about->addAuthor(ki18n("Dario Freddi"), ki18n("Maintainer") , "drf@kde.org",
+ new KAboutData("kcm_polkitconfig", i18n("Global system policy settings"),"1.0.0");
+ about->setShortDescription(i18n("A configuration for polkit-1 system administrators and policy priorities"));
+ about->setLicense(KAboutLicense::GPL);
+//, i18n("(c), 2009 Dario Freddi"),
+ // i18n("From this module, you can configure system
+//administrators and priorities "
+ // "for the policies defined in the Actions module"));
+
+ about->addAuthor("Dario Freddi", i18n("Maintainer") , "drf@kde.org",
"http://drfav.wordpress.com");
setAboutData(about);
|