From 1b86cac3e5ae1317bca86c293f799590bf63723e Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 1 Jul 2015 18:02:56 +0200 Subject: [PATCH 1/8] kinfocenter version bump and check --- desktop/kde/plasma/kinfocenter/actions.py | 19 +++ .../kinfocenter/files/kcm-about-distrorc | 4 + .../files/pisilinux-kinfocenter.diff | 91 ++++++++++++++ desktop/kde/plasma/kinfocenter/pspec.xml | 114 ++++++++++++++++++ 4 files changed, 228 insertions(+) create mode 100644 desktop/kde/plasma/kinfocenter/actions.py create mode 100644 desktop/kde/plasma/kinfocenter/files/kcm-about-distrorc create mode 100644 desktop/kde/plasma/kinfocenter/files/pisilinux-kinfocenter.diff create mode 100755 desktop/kde/plasma/kinfocenter/pspec.xml diff --git a/desktop/kde/plasma/kinfocenter/actions.py b/desktop/kde/plasma/kinfocenter/actions.py new file mode 100644 index 0000000000..56638b7e32 --- /dev/null +++ b/desktop/kde/plasma/kinfocenter/actions.py @@ -0,0 +1,19 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import kde5 +from pisi.actionsapi import pisitools + +def setup(): + kde5.configure() + +def build(): + kde5.make() + +def install(): + kde5.install() + + pisitools.dodoc("COPYING") diff --git a/desktop/kde/plasma/kinfocenter/files/kcm-about-distrorc b/desktop/kde/plasma/kinfocenter/files/kcm-about-distrorc new file mode 100644 index 0000000000..978beb6866 --- /dev/null +++ b/desktop/kde/plasma/kinfocenter/files/kcm-about-distrorc @@ -0,0 +1,4 @@ +[General] +2 Name=Pisi Linux +3 LogoPath=/usr/share/apps/about-distro/pisilinux.png +4 Website=http://www.pisilinux.org/ diff --git a/desktop/kde/plasma/kinfocenter/files/pisilinux-kinfocenter.diff b/desktop/kde/plasma/kinfocenter/files/pisilinux-kinfocenter.diff new file mode 100644 index 0000000000..97531dd6ed --- /dev/null +++ b/desktop/kde/plasma/kinfocenter/files/pisilinux-kinfocenter.diff @@ -0,0 +1,91 @@ +diff --git a/Modules/infosummary/infosum.cpp b/Modules/infosummary/infosum.cpp +index e58beb0..02f000c 100644 +--- a/Modules/infosummary/infosum.cpp ++++ b/Modules/infosummary/infosum.cpp +@@ -61,12 +61,12 @@ void InfoSumPlugin::createDisplay() + void InfoSumPlugin::createOsBox() + { + DefaultBoxWidget *osWidget = new DefaultBoxWidget(); +- osWidget->setIcon(QIcon::fromTheme(QStringLiteral("kde"))); ++ osWidget->setIcon(QIcon::fromTheme(QStringLiteral("PisiLinux"))); + osWidget->setLabelTitles(i18n("OS Version"),i18n("KDE Plasma Version"), i18n("Hostname")); + + OsDepInfo *osInfo = new OsDepInfo(); + +- osWidget->setLabelOne(osInfo->osVersion()); ++ osWidget->setLabelOne(osInfo->osVersion()+'\n'+osInfo->distroName()); + osWidget->setLabelTwo(QString(PLASMA_VERSION_STRING)); + osWidget->setLabelThree(osInfo->hostName()); + osWidget->setWhatsThis(i18nc("OS whats this","This shows information about your Operating System")); +diff --git a/Modules/infosummary/osdepinfo.cpp b/Modules/infosummary/osdepinfo.cpp +index 34afecc..8b7043f 100644 +--- a/Modules/infosummary/osdepinfo.cpp ++++ b/Modules/infosummary/osdepinfo.cpp +@@ -37,6 +37,11 @@ const QString OsDepInfo::osVersion() + return m_osVersion; + } + ++const QString OsDepInfo::distroName() ++{ ++ return m_distroName; ++} ++ + #if defined(Q_OS_UNIX) + #include "osdepinfo_unix.cpp" + #else +@@ -50,6 +55,7 @@ void OsDepInfo::setDepInfo() + { + m_osVersion.clear(); + m_hostName.clear(); ++ m_distroName.clear(); + } + + #endif // Q_OS_UNIX +diff --git a/Modules/infosummary/osdepinfo.h b/Modules/infosummary/osdepinfo.h +index 3452e8b..564a86c 100644 +--- a/Modules/infosummary/osdepinfo.h ++++ b/Modules/infosummary/osdepinfo.h +@@ -32,12 +32,14 @@ class OsDepInfo + + const QString hostName(); + const QString osVersion(); ++ const QString distroName(); + + private: + void setDepInfo(); + + QString m_hostName; + QString m_osVersion; ++ QString m_distroName; + }; + + #endif //OSDEPINFO +diff --git a/Modules/infosummary/osdepinfo_unix.cpp b/Modules/infosummary/osdepinfo_unix.cpp +index d237337..3971945 100644 +--- a/Modules/infosummary/osdepinfo_unix.cpp ++++ b/Modules/infosummary/osdepinfo_unix.cpp +@@ -23,6 +23,18 @@ + #include "osdepinfo.h" + + #include ++#include ++#include ++#include ++ ++QString getDistro() ++{ ++ KConfig osRelease( "/etc/os-release", KConfig::SimpleConfig ); ++ KConfigGroup osR( &osRelease, "" ); ++ QString pretty = osR.readEntry("PRETTY_NAME"); ++ pretty.remove('"'); ++ return(pretty); ++} + + void OsDepInfo::setDepInfo() + { +@@ -31,4 +43,5 @@ void OsDepInfo::setDepInfo() + + m_osVersion = QString(unixInfo.sysname) + ' ' + QString(unixInfo.release); + m_hostName = QString(unixInfo.nodename); ++ m_distroName = getDistro(); + } diff --git a/desktop/kde/plasma/kinfocenter/pspec.xml b/desktop/kde/plasma/kinfocenter/pspec.xml new file mode 100755 index 0000000000..0485cd9598 --- /dev/null +++ b/desktop/kde/plasma/kinfocenter/pspec.xml @@ -0,0 +1,114 @@ + + + + + kinfocenter + http://www.kde.org + + Pisi Linux Admins + admins@pisilinux.org + + LGPLv2 + library + app:console + KDE5 info center + KDE5 Utility that provides information about a computer system. + http://download.kde.org/stable/plasma/5.3.2/kinfocenter-5.3.2.tar.xz + + qt5-base-devel + python3 + pciutils-devel + libX11-devel + libgcc + kcmutils-devel + kcompletion-devel + kconfig-devel + kdelibs4-support-devel + kdoctools-devel + ki18n-devel + kio-devel + kwindowsystem-devel + kxmlgui-devel + kservice-devel + kcoreaddons-devel + kdbusaddons-devel + kiconthemes-devel + kconfigwidgets-devel + kwidgetsaddons-devel + libraw1394-devel + plasma-framework-devel + solid-devel + pciutils-devel + mesa-glu-devel + extra-cmake-modules + + + + + + + + kinfocenter + + qt5-base + qt5-declarative + pciutils + libX11 + libgcc + kservice + kcoreaddons + kdbusaddons + kiconthemes + kconfigwidgets + kwidgetsaddons + kcompletion + kconfig + kdelibs4-support + ki18n + kio + kxmlgui + libraw1394 + kwayland + kcmutils + solid + kdeclarative + mesa-glu + + + /etc + /usr/share + /usr/share/locale + /usr/bin + /usr/lib/cmake + /usr/lib/qt5 + /usr/lib + /usr/share/doc + + + kcm-about-distrorc + + + kde-workspace + + + kde-workspace + + + + + + 2015-07-01 + 5.3.2 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-06-11 + 5.3.1 + First Release. + Stefan Gronewold(groni) + groni@pisilinux.org + + + From 64f379f55e14e2120fddb2b6e5acacbdedf2518e Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 1 Jul 2015 18:13:56 +0200 Subject: [PATCH 2/8] libksysguard version bump and check --- desktop/kde/plasma/libksysguard/actions.py | 19 + .../files/libksysguard_kauth.diff | 339 ++++++++++++++++++ desktop/kde/plasma/libksysguard/pspec.xml | 103 ++++++ 3 files changed, 461 insertions(+) create mode 100644 desktop/kde/plasma/libksysguard/actions.py create mode 100644 desktop/kde/plasma/libksysguard/files/libksysguard_kauth.diff create mode 100755 desktop/kde/plasma/libksysguard/pspec.xml diff --git a/desktop/kde/plasma/libksysguard/actions.py b/desktop/kde/plasma/libksysguard/actions.py new file mode 100644 index 0000000000..389685f7a8 --- /dev/null +++ b/desktop/kde/plasma/libksysguard/actions.py @@ -0,0 +1,19 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import kde5 +from pisi.actionsapi import pisitools + +def setup(): + kde5.configure() + +def build(): + kde5.make() + +def install(): + kde5.install() + + pisitools.dodoc("COPYING.LIB") diff --git a/desktop/kde/plasma/libksysguard/files/libksysguard_kauth.diff b/desktop/kde/plasma/libksysguard/files/libksysguard_kauth.diff new file mode 100644 index 0000000000..b267af97d1 --- /dev/null +++ b/desktop/kde/plasma/libksysguard/files/libksysguard_kauth.diff @@ -0,0 +1,339 @@ +diff --git a/processcore/CMakeLists.txt b/processcore/CMakeLists.txt +index 9fef4ec..939d055 100644 +--- a/processcore/CMakeLists.txt ++++ b/processcore/CMakeLists.txt +@@ -41,18 +41,18 @@ install( FILES processes.h process.h DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguar + #------ KAuth stuff + + # Auth example helper +-# set(ksysguardprocesslist_helper_srcs +-# helper.cpp +-# process.cpp +-# processes_local_p.cpp +-# processes_base_p.cpp) +-# +-# add_executable(ksysguardprocesslist_helper ${ksysguardprocesslist_helper_srcs}) +-# target_link_libraries(ksysguardprocesslist_helper ) +-# install(TARGETS ksysguardprocesslist_helper DESTINATION ${LIBEXEC_INSTALL_DIR}) +-# +-# kauth_install_helper_files(ksysguardprocesslist_helper org.kde.ksysguard.processlisthelper root) +-# kauth_install_actions(org.kde.ksysguard.processlisthelper actions.actions) +-# +-# set_target_properties(ksysguardprocesslist_helper PROPERTIES COMPILE_FLAGS "-Wall -ggdb") ++set(ksysguardprocesslist_helper_srcs ++ helper.cpp ++ process.cpp ++ processes_local_p.cpp ++ processes_base_p.cpp) ++ ++add_executable(ksysguardprocesslist_helper ${ksysguardprocesslist_helper_srcs}) ++target_link_libraries(ksysguardprocesslist_helper Qt5::Core KF5::Auth KF5::I18n) ++install(TARGETS ksysguardprocesslist_helper DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) ++ ++kauth_install_helper_files(ksysguardprocesslist_helper org.kde.ksysguard.processlisthelper root) ++kauth_install_actions(org.kde.ksysguard.processlisthelper actions.actions) ++ ++set_target_properties(ksysguardprocesslist_helper PROPERTIES COMPILE_FLAGS "-Wall -ggdb") + +diff --git a/processcore/helper.cpp b/processcore/helper.cpp +index 6c1f570..c34ab1e 100644 +--- a/processcore/helper.cpp ++++ b/processcore/helper.cpp +@@ -23,24 +23,26 @@ + #include "helper.h" + #include "processes_local_p.h" + ++using namespace KAuth; ++ + KSysGuardProcessListHelper::KSysGuardProcessListHelper() + { + qRegisterMetaType >(); + } + + /* The functions here run as ROOT. So be careful. DO NOT TRUST THE INPUTS TO BE SANE. */ +-#define GET_PID(i) parameters.value(QString("pid%1").arg(i), -1).toULongLong(); if(pid < 0) return KAuth::ActionReply::HelperErrorReply; +-KAuth::ActionReply KSysGuardProcessListHelper::sendsignal(QVariantMap parameters) { +- KAuth::ActionReply errorReply(KAuth::ActionReply::HelperError); ++#define GET_PID(i) parameters.value(QString("pid%1").arg(i), -1).toULongLong(); if(pid < 0) return ActionReply(ActionReply::HelperErrorType); ++ActionReply KSysGuardProcessListHelper::sendsignal(QVariantMap parameters) { ++ ActionReply reply(ActionReply::HelperErrorType); + if(!parameters.contains("signal")) { +- errorReply.setErrorDescription("Internal error - no signal parameter was passed to the helper"); +- errorReply.setErrorCode(1); +- return errorReply; ++ reply.setErrorDescription("Internal error - no signal parameter was passed to the helper"); ++ reply.setErrorCode(static_cast(1)); ++ return reply; + } + if(!parameters.contains("pidcount")) { +- errorReply.setErrorDescription("Internal error - no pidcount parameter was passed to the helper"); +- errorReply.setErrorCode(2); +- return errorReply; ++ reply.setErrorDescription("Internal error - no pidcount parameter was passed to the helper"); ++ reply.setErrorCode(static_cast(2)); ++ return reply; + } + + KSysGuard::ProcessesLocal processes; +@@ -56,17 +58,17 @@ KAuth::ActionReply KSysGuardProcessListHelper::sendsignal(QVariantMap parameters + success = successForThisPid && success; + } + if(success) { +- return KAuth::ActionReply::SuccessReply; ++ return ActionReply::SuccessReply(); + } else { +- errorReply.setErrorDescription(QString("Could not send signal to: ") + errorList.join(", ")); +- errorReply.setErrorCode(0); +- return errorReply; ++ reply.setErrorDescription(QString("Could not send signal to: ") + errorList.join(", ")); ++ reply.setErrorCode(static_cast(0)); ++ return reply; + } + } + +-KAuth::ActionReply KSysGuardProcessListHelper::renice(QVariantMap parameters) { ++ActionReply KSysGuardProcessListHelper::renice(QVariantMap parameters) { + if(!parameters.contains("nicevalue") || !parameters.contains("pidcount")) +- return KAuth::ActionReply::HelperErrorReply; ++ return ActionReply(ActionReply::HelperErrorType); + + KSysGuard::ProcessesLocal processes; + int niceValue = qvariant_cast(parameters.value("nicevalue")); +@@ -77,14 +79,14 @@ KAuth::ActionReply KSysGuardProcessListHelper::renice(QVariantMap parameters) { + success = processes.setNiceness(pid, niceValue) && success; + } + if(success) +- return KAuth::ActionReply::SuccessReply; ++ return ActionReply::SuccessReply(); + else +- return KAuth::ActionReply::HelperErrorReply; ++ return ActionReply(ActionReply::HelperErrorType); + } + +-KAuth::ActionReply KSysGuardProcessListHelper::changeioscheduler(QVariantMap parameters) { ++ActionReply KSysGuardProcessListHelper::changeioscheduler(QVariantMap parameters) { + if(!parameters.contains("ioScheduler") || !parameters.contains("ioSchedulerPriority") || !parameters.contains("pidcount")) +- return KAuth::ActionReply::HelperErrorReply; ++ return ActionReply(ActionReply::HelperErrorType); + + KSysGuard::ProcessesLocal processes; + int ioScheduler = qvariant_cast(parameters.value("ioScheduler")); +@@ -96,14 +98,14 @@ KAuth::ActionReply KSysGuardProcessListHelper::changeioscheduler(QVariantMap par + success = processes.setIoNiceness(pid, ioScheduler, ioSchedulerPriority) && success; + } + if(success) +- return KAuth::ActionReply::SuccessReply; ++ return ActionReply::SuccessReply(); + else +- return KAuth::ActionReply::HelperErrorReply; ++ return ActionReply(ActionReply::HelperErrorType); + + } +-KAuth::ActionReply KSysGuardProcessListHelper::changecpuscheduler(QVariantMap parameters) { ++ActionReply KSysGuardProcessListHelper::changecpuscheduler(QVariantMap parameters) { + if(!parameters.contains("cpuScheduler") || !parameters.contains("cpuSchedulerPriority") || !parameters.contains("pidcount")) +- return KAuth::ActionReply::HelperErrorReply; ++ return ActionReply(ActionReply::HelperErrorType); + + KSysGuard::ProcessesLocal processes; + int cpuScheduler = qvariant_cast(parameters.value("cpuScheduler")); +@@ -116,9 +118,9 @@ KAuth::ActionReply KSysGuardProcessListHelper::changecpuscheduler(QVariantMap pa + success = processes.setScheduler(pid, cpuScheduler, cpuSchedulerPriority) && success; + } + if(success) +- return KAuth::ActionReply::SuccessReply; ++ return ActionReply::SuccessReply(); + else +- return KAuth::ActionReply::HelperErrorReply; ++ return ActionReply(ActionReply::HelperErrorType); + + } + KAUTH_HELPER_MAIN("org.kde.ksysguard.processlisthelper", KSysGuardProcessListHelper) +diff --git a/processcore/processes_linux_p.cpp b/processcore/processes_linux_p.cpp +index 65b8dfd..0cff0e8 100644 +--- a/processcore/processes_linux_p.cpp ++++ b/processcore/processes_linux_p.cpp +@@ -22,7 +22,7 @@ + #include "processes_local_p.h" + #include "process.h" + +-#include ++#include + + #include + #include +diff --git a/processui/ksysguardprocesslist.cpp b/processui/ksysguardprocesslist.cpp +index 1651a0a..ba9d8c9 100644 +--- a/processui/ksysguardprocesslist.cpp ++++ b/processui/ksysguardprocesslist.cpp +@@ -48,6 +48,9 @@ + #include //For SIGTERM + + #include ++#include ++#include ++#include + #include + #include + #include +@@ -188,7 +191,7 @@ struct KSysGuardProcessListPrivate { + int totalRowCount(const QModelIndex &parent) const; + + /** Helper function to setup 'action' with the given pids */ +- void setupKAuthAction(KAuth::Action *action, const QList & pids) const; ++ void setupKAuthAction(KAuth::Action &action, const QList & pids) const; + + /** fire a timer event if we are set to use our internal timer*/ + void fireTimerEvent(); +@@ -392,15 +395,15 @@ int KSysGuardProcessListPrivate::totalRowCount(const QModelIndex &parent ) const + return total; + } + +-void KSysGuardProcessListPrivate::setupKAuthAction(KAuth::Action *action, const QList & pids) const ++void KSysGuardProcessListPrivate::setupKAuthAction(KAuth::Action &action, const QList & pids) const + { +- action->setHelperId("org.kde.ksysguard.processlisthelper"); ++ action.setHelperId("org.kde.ksysguard.processlisthelper"); + + int processCount = pids.count(); + for(int i = 0; i < processCount; i++) { +- action->addArgument(QString("pid%1").arg(i), pids[i]); ++ action.addArgument(QString("pid%1").arg(i), pids[i]); + } +- action->addArgument("pidcount", processCount); ++ action.addArgument("pidcount", processCount); + } + void KSysGuardProcessList::selectionChanged() + { +@@ -1023,23 +1026,19 @@ bool KSysGuardProcessList::reniceProcesses(const QList &pids, int nic + + + #warning KAuth needs porting, but docu is not adjusted, no idea how to do it +-#if 0 +- KAuth::Action *action = new KAuth::Action("org.kde.ksysguard.processlisthelper.renice"); +- action->setParentWidget(window()); ++ KAuth::Action action("org.kde.ksysguard.processlisthelper.renice"); ++ action.setParentWidget(window()); + d->setupKAuthAction( action, unreniced_pids); +- action->addArgument("nicevalue", niceValue); +- KAuth::ActionReply reply = action->execute(); ++ action.addArgument("nicevalue", niceValue); ++ KAuth::ExecuteJob *job = action.execute(); + +- if (reply == KAuth::ActionReply::SuccessReply) { ++ if (job->exec()) { + updateList(); +- delete action; +- } else if (reply != KAuth::ActionReply::UserCancelled && reply != KAuth::ActionReply::AuthorizationDenied) { ++ } else if (!job->exec()) { + KMessageBox::sorry(this, i18n("You do not have the permission to renice the process and there " +- "was a problem trying to run as root. Error %1 %2", reply.errorCode(), reply.errorDescription())); +- delete action; ++ "was a problem trying to run as root. Error %1 %2", job->error(), job->errorString())); + return false; + } +-#endif + return true; + } + +@@ -1189,26 +1188,22 @@ bool KSysGuardProcessList::changeIoScheduler(const QList< long long> &pids, KSys + if(!d->mModel.isLocalhost()) return false; //We can't use kauth to affect non-localhost processes + + #warning KAuth needs porting, but docu is not adjusted, no idea how to do it +-#if 0 +- KAuth::Action *action = new KAuth::Action("org.kde.ksysguard.processlisthelper.changeioscheduler"); +- action->setParentWidget(window()); ++ KAuth::Action action("org.kde.ksysguard.processlisthelper.changeioscheduler"); ++ action.setParentWidget(window()); + + d->setupKAuthAction( action, unchanged_pids); +- action->addArgument("ioScheduler", (int)newIoSched); +- action->addArgument("ioSchedulerPriority", newIoSchedPriority); ++ action.addArgument("ioScheduler", (int)newIoSched); ++ action.addArgument("ioSchedulerPriority", newIoSchedPriority); + +- KAuth::ActionReply reply = action->execute(); ++ KAuth::ExecuteJob *job = action.execute(); + +- if (reply == KAuth::ActionReply::SuccessReply) { ++ if (job->exec()) { + updateList(); +- delete action; +- } else if (reply != KAuth::ActionReply::UserCancelled && reply != KAuth::ActionReply::AuthorizationDenied) { ++ } else if (!job->exec()) { + KMessageBox::sorry(this, i18n("You do not have the permission to change the I/O priority of the process and there " +- "was a problem trying to run as root. Error %1 %2", reply.errorCode(), reply.errorDescription())); +- delete action; ++ "was a problem trying to run as root. Error %1 %2", job->error(), job->errorString())); + return false; + } +-#endif + return true; + } + +@@ -1226,24 +1221,20 @@ bool KSysGuardProcessList::changeCpuScheduler(const QList< long long> &pids, KSy + if(!d->mModel.isLocalhost()) return false; //We can't use KAuth to affect non-localhost processes + + #warning KAuth needs porting, but docu is not adjusted, no idea how to do it +-#if 0 +- KAuth::Action *action = new KAuth::Action("org.kde.ksysguard.processlisthelper.changecpuscheduler"); +- action->setParentWidget(window()); ++ KAuth::Action action("org.kde.ksysguard.processlisthelper.changecpuscheduler"); ++ action.setParentWidget(window()); + d->setupKAuthAction( action, unchanged_pids); +- action->addArgument("cpuScheduler", (int)newCpuSched); +- action->addArgument("cpuSchedulerPriority", newCpuSchedPriority); +- KAuth::ActionReply reply = action->execute(); ++ action.addArgument("cpuScheduler", (int)newCpuSched); ++ action.addArgument("cpuSchedulerPriority", newCpuSchedPriority); ++ KAuth::ExecuteJob *job = action.execute(); + +- if (reply == KAuth::ActionReply::SuccessReply) { ++ if (job->exec()) { + updateList(); +- delete action; +- } else if (reply != KAuth::ActionReply::UserCancelled && reply != KAuth::ActionReply::AuthorizationDenied) { ++ } else if (!job->exec()) { + KMessageBox::sorry(this, i18n("You do not have the permission to change the CPU Scheduler for the process and there " +- "was a problem trying to run as root. Error %1 %2", reply.errorCode(), reply.errorDescription())); +- delete action; ++ "was a problem trying to run as root. Error %1 %2", job->error(), job->errorString())); + return false; + } +-#endif + return true; + } + +@@ -1262,26 +1253,20 @@ bool KSysGuardProcessList::killProcesses(const QList< long long> &pids, int sig) + if(!d->mModel.isLocalhost()) return false; //We can't elevate privileges to kill non-localhost processes + + #warning KAuth needs porting, but docu is not adjusted, no idea how to do it +-#if 0 + KAuth::Action action("org.kde.ksysguard.processlisthelper.sendsignal"); + action.setParentWidget(window()); +- d->setupKAuthAction( &action, unkilled_pids); ++ //action.setHelperId("org.kde.ksysguard.processlisthelper"); ++ d->setupKAuthAction( action, unkilled_pids); + action.addArgument("signal", sig); +- KAuth::ActionReply reply = action.execute(); ++ KAuth::ExecuteJob *job = action.execute(); + +- if (reply == KAuth::ActionReply::SuccessReply) { ++ if (job->exec()) { + updateList(); +- } else if (reply.type() == KAuth::ActionReply::HelperError) { +- if (reply.errorCode() > 0) +- KMessageBox::sorry(this, i18n("You do not have the permission to kill the process and there " +- "was a problem trying to run as root. %1", reply.errorDescription())); +- return false; +- } else if (reply != KAuth::ActionReply::UserCancelled && reply != KAuth::ActionReply::AuthorizationDenied) { ++ } else if (!job->exec()) { + KMessageBox::sorry(this, i18n("You do not have the permission to kill the process and there " +- "was a problem trying to run as root. Error %1 %2", reply.errorCode(), reply.errorDescription())); ++ "was a problem trying to run as root. Error %1 %2", job->error(), job->errorString())); + return false; + } +-#endif + return true; + } + diff --git a/desktop/kde/plasma/libksysguard/pspec.xml b/desktop/kde/plasma/libksysguard/pspec.xml new file mode 100755 index 0000000000..1e5f7b995b --- /dev/null +++ b/desktop/kde/plasma/libksysguard/pspec.xml @@ -0,0 +1,103 @@ + + + + + libksysguard + http://www.kde.org + + Pisi Linux Admins + admins@pisilinux.org + + LGPLv2 + library + app:console + Task management and system monitoring library + Task management and system monitoring library + http://download.kde.org/stable/plasma/5.3.2/libksysguard-5.3.2.tar.xz + + qt5-base-devel + python3 + kdoctools-devel + libgcc + libX11-devel + zlib-devel + extra-cmake-modules + + + + + + + + libksysguard + + qt5-base + libgcc + libX11 + zlib + libXres + qt5-webkit + qt5-x11extras + kwindowsystem + kconfigwidgets + kwidgetsaddons + kconfig + kauth + kcoreaddons + kdelibs4-support + ki18n + plasma-framework + + + /etc + /usr/share + /usr/share/locale + /usr/lib/qt5 + /usr/lib + /usr/share/doc + + + kde-workspace + + + kde-workspace + + + + + libksysguard-devel + Development files for libksysguard + + qt5-base-devel + libksysguard + + + /usr/include + /usr/lib/cmake + /usr/lib/pkgconfig + + + kde-workspace-devel + + + kde-workspace-devel + + + + + + 2015-07-01 + 5.3.2 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-06-12 + 5.3.1 + First Release. + Stefan Gronewold(groni) + groni@pisilinux.org + + + From 2ba8cd17668d7f0f5f9caf63e8233572900c5612 Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 1 Jul 2015 18:22:14 +0200 Subject: [PATCH 3/8] ksysguard version bump and check --- desktop/kde/plasma/ksysguard/actions.py | 19 +++ ...01-Use-run-for-ksysguardd-s-pid-file.patch | 25 ++++ desktop/kde/plasma/ksysguard/pspec.xml | 110 ++++++++++++++++++ 3 files changed, 154 insertions(+) create mode 100644 desktop/kde/plasma/ksysguard/actions.py create mode 100644 desktop/kde/plasma/ksysguard/files/0001-Use-run-for-ksysguardd-s-pid-file.patch create mode 100755 desktop/kde/plasma/ksysguard/pspec.xml diff --git a/desktop/kde/plasma/ksysguard/actions.py b/desktop/kde/plasma/ksysguard/actions.py new file mode 100644 index 0000000000..ec16cb043f --- /dev/null +++ b/desktop/kde/plasma/ksysguard/actions.py @@ -0,0 +1,19 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import kde5 +from pisi.actionsapi import pisitools + +def setup(): + kde5.configure() + +def build(): + kde5.make() + +def install(): + kde5.install() + + pisitools.dodoc("COPYING", "COPYING.DOC", "README") diff --git a/desktop/kde/plasma/ksysguard/files/0001-Use-run-for-ksysguardd-s-pid-file.patch b/desktop/kde/plasma/ksysguard/files/0001-Use-run-for-ksysguardd-s-pid-file.patch new file mode 100644 index 0000000000..d6c9a4a4af --- /dev/null +++ b/desktop/kde/plasma/ksysguard/files/0001-Use-run-for-ksysguardd-s-pid-file.patch @@ -0,0 +1,25 @@ +From 69a8d66c4682410537ce8d1f2b7012fb49773005 Mon Sep 17 00:00:00 2001 +From: Hrvoje Senjan +Date: Wed, 3 Sep 2014 23:13:35 +0200 +Subject: [PATCH 1/1] Use /run for ksysguardd's pid file + +--- + ksysguardd/ksysguardd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ksysguardd/ksysguardd.c b/ksysguardd/ksysguardd.c +index a5ecca1..883f8a1 100644 +--- a/ksysguardd/ksysguardd.c ++++ b/ksysguardd/ksysguardd.c +@@ -62,7 +62,7 @@ static ClientInfo ClientList[ MAX_CLIENTS ]; + static int SocketPort = -1; + static unsigned char BindToAllInterfaces = 0; + static int CurrentSocket; +-static const char LockFile[] = "/var/run/ksysguardd.pid"; ++static const char LockFile[] = "/run/ksysguardd.pid"; + static const char *ConfigFile = KSYSGUARDDRCFILE; + + void signalHandler( int sig ); +-- +2.1.0 + diff --git a/desktop/kde/plasma/ksysguard/pspec.xml b/desktop/kde/plasma/ksysguard/pspec.xml new file mode 100755 index 0000000000..ecb9690d8d --- /dev/null +++ b/desktop/kde/plasma/ksysguard/pspec.xml @@ -0,0 +1,110 @@ + + + + + ksysguard + http://www.kde.org + + Pisi Linux Admins + admins@pisilinux.org + + LGPLv2 + library + app:console + KDE system monitor + KDE5 system monitor daemon and service. + http://download.kde.org/stable/plasma/5.3.2/ksysguard-5.3.2.tar.xz + + qt5-base-devel + libgcc + kio-devel + kxmlgui-devel + kcompletion-devel + kdbusaddons-devel + kiconthemes-devel + kwindowsystem-devel + kconfigwidgets-devel + knotifications-devel + kwidgetsaddons-devel + lm_sensors-devel + python3 + extra-cmake-modules + kdoctools-devel + kconfig-devel + kcoreaddons-devel + kdelibs4-support-devel + ki18n-devel + kinit + kitemviews-devel + knewstuff-devel + libksysguard-devel + plasma-framework-devel + + + + + + + + ksysguard + + qt5-base + libgcc + icon-theme-hicolor + kio + kxmlgui + kcompletion + kdbusaddons + kiconthemes + kwindowsystem + kconfigwidgets + knotifications + kwidgetsaddons + lm_sensors + icon-theme-hicolor + xdg-utils + kdoctools + kconfig + kcoreaddons + kdelibs4-support + ki18n + kinit + kitemviews + knewstuff + libksysguard + plasma-framework + + + /etc + /usr/share + /usr/share/locale + /usr/bin + /usr/lib/qt5 + /usr/lib + /usr/share/doc + + + kde-workspace + + + kde-workspace + + + + + + 2015-07-01 + 5.3.2 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-06-12 + 5.3.1 + First Release. + Stefan Gronewold(groni) + groni@pisilinux.org + + + From c0d9dc88ed93f6323c1ed6835cd78e6e692d0b92 Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 1 Jul 2015 18:39:43 +0200 Subject: [PATCH 4/8] system-settings version bump and check --- desktop/kde/plasma/system-settings/actions.py | 19 ++++ desktop/kde/plasma/system-settings/pspec.xml | 88 +++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 desktop/kde/plasma/system-settings/actions.py create mode 100755 desktop/kde/plasma/system-settings/pspec.xml diff --git a/desktop/kde/plasma/system-settings/actions.py b/desktop/kde/plasma/system-settings/actions.py new file mode 100644 index 0000000000..56638b7e32 --- /dev/null +++ b/desktop/kde/plasma/system-settings/actions.py @@ -0,0 +1,19 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import kde5 +from pisi.actionsapi import pisitools + +def setup(): + kde5.configure() + +def build(): + kde5.make() + +def install(): + kde5.install() + + pisitools.dodoc("COPYING") diff --git a/desktop/kde/plasma/system-settings/pspec.xml b/desktop/kde/plasma/system-settings/pspec.xml new file mode 100755 index 0000000000..850c5d7921 --- /dev/null +++ b/desktop/kde/plasma/system-settings/pspec.xml @@ -0,0 +1,88 @@ + + + + + system-settings + http://www.kde.org + + Pisi Linux Admins + admins@pisilinux.org + + LGPLv2 + library + app:console + KDE5 system settings manager + System-settings is a control panel for KDE5 Plasma + http://download.kde.org/stable/plasma/5.3.2/systemsettings-5.3.2.tar.xz + + qt5-base-devel + kdoctools-devel + libgcc + python3 + extra-cmake-modules + + + + + system-settings + + qt5-base + kauth + libgcc + kcompletion + kcoreaddons + kconfigwidgets + kwidgetsaddons + kcmutils + kconfig + kdbusaddons + khtml + ki18n + kiconthemes + kio + kitemviews + kservice + kwindowsystem + kxmlgui + + + /usr/share + /usr/share/locale + /usr/bin + /usr/lib/qt5 + /usr/lib + /usr/share/doc + + + + + system-settings-devel + Development files for system-settings + + qt5-base-devel + system-settings + + + /usr/include + /usr/lib/cmake + /usr/lib/pkgconfig + + + + + + 2015-07-01 + 5.3.2 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-05-29 + 5.3.1 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + From 433ca872f618293d6044566704018ec9a3f126b9 Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 1 Jul 2015 22:30:55 +0200 Subject: [PATCH 5/8] polkit-kde-authentication-agent-1 version bump and check --- .../actions.py | 19 +++++ .../pspec.xml | 77 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 desktop/kde/plasma/polkit-kde-authentication-agent-1/actions.py create mode 100755 desktop/kde/plasma/polkit-kde-authentication-agent-1/pspec.xml diff --git a/desktop/kde/plasma/polkit-kde-authentication-agent-1/actions.py b/desktop/kde/plasma/polkit-kde-authentication-agent-1/actions.py new file mode 100644 index 0000000000..56638b7e32 --- /dev/null +++ b/desktop/kde/plasma/polkit-kde-authentication-agent-1/actions.py @@ -0,0 +1,19 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import kde5 +from pisi.actionsapi import pisitools + +def setup(): + kde5.configure() + +def build(): + kde5.make() + +def install(): + kde5.install() + + pisitools.dodoc("COPYING") diff --git a/desktop/kde/plasma/polkit-kde-authentication-agent-1/pspec.xml b/desktop/kde/plasma/polkit-kde-authentication-agent-1/pspec.xml new file mode 100755 index 0000000000..b7998dd088 --- /dev/null +++ b/desktop/kde/plasma/polkit-kde-authentication-agent-1/pspec.xml @@ -0,0 +1,77 @@ + + + + + polkit-kde-authentication-agent-1 + http://www.kde.org + + Pisi Linux Admins + admin@pisilinux.org + + LGPLv2 + library + app:console + app:gui + The KDE Plasma Workspace Components + The Polkit-KDE-Agent package contains a graphical Polkit authentication agent for the KDE Plasma Desktop. + http://download.kde.org/stable/plasma/5.3.2/polkit-kde-agent-1-5.3.2.tar.xz + + qt5-base-devel + kdoctools-devel + libgcc + python3 + extra-cmake-modules + + + + + + + polkit-kde-authentication-agent-1 + + qt5-base + libgcc + kcrash + kcoreaddons + polkit-qt + ki18n + kdbusaddons + kiconthemes + kwindowsystem + knotifications + kwidgetsaddons + + + /etc + /usr/share + /usr/share/locale + /usr/bin + /usr/lib/qt5 + /usr/lib + /usr/share/doc + + + kde-workspace + + + kde-workspace + + + + + + 2015-07-01 + 5.3.2 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-05-29 + 5.3.1 + First Release. + Stefan Gronewold(groni) + groni@pisilinux.org + + + From e5a6f33006b7bb84e616b439719886e3262e2773 Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 1 Jul 2015 22:38:55 +0200 Subject: [PATCH 6/8] ksshaskpass version bump and check --- desktop/kde/plasma/ksshaskpass/actions.py | 19 ++++++ .../plasma/ksshaskpass/files/ksshaskpass.sh | 2 + desktop/kde/plasma/ksshaskpass/pspec.xml | 67 +++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 desktop/kde/plasma/ksshaskpass/actions.py create mode 100644 desktop/kde/plasma/ksshaskpass/files/ksshaskpass.sh create mode 100755 desktop/kde/plasma/ksshaskpass/pspec.xml diff --git a/desktop/kde/plasma/ksshaskpass/actions.py b/desktop/kde/plasma/ksshaskpass/actions.py new file mode 100644 index 0000000000..b7b74bc57e --- /dev/null +++ b/desktop/kde/plasma/ksshaskpass/actions.py @@ -0,0 +1,19 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import kde5 +from pisi.actionsapi import pisitools + +def setup(): + kde5.configure() + +def build(): + kde5.make() + +def install(): + kde5.install() + + pisitools.dodoc("README", "COPYING", "ChangeLog") diff --git a/desktop/kde/plasma/ksshaskpass/files/ksshaskpass.sh b/desktop/kde/plasma/ksshaskpass/files/ksshaskpass.sh new file mode 100644 index 0000000000..ae0aaa9e68 --- /dev/null +++ b/desktop/kde/plasma/ksshaskpass/files/ksshaskpass.sh @@ -0,0 +1,2 @@ +test -f /usr/bin/ksshaskpass && export SSH_ASKPASS="/usr/bin/ksshaskpass" + diff --git a/desktop/kde/plasma/ksshaskpass/pspec.xml b/desktop/kde/plasma/ksshaskpass/pspec.xml new file mode 100755 index 0000000000..911c464734 --- /dev/null +++ b/desktop/kde/plasma/ksshaskpass/pspec.xml @@ -0,0 +1,67 @@ + + + + + ksshaskpass + http://www.kde.org + + Pisi Linux Admins + admin@pisilinux.org + + LGPLv2 + library + app:console + ssh-add helper that uses kwallet and kpassworddialog + ssh-add helper that uses kwallet and kpassworddialog + http://download.kde.org/stable/plasma/5.3.2/ksshaskpass-5.3.2.tar.xz + + qt5-base-devel + kdoctools-devel + libgcc + python3 + extra-cmake-modules + + + + + ksshaskpass + + qt5-base + libgcc + kcoreaddons + kwidgetsaddons + ki18n + kwallet + + + /etc + /usr/share + /usr/share/locale + /usr/bin + /usr/lib/qt5 + /usr/lib + /usr/share/man + /usr/share/doc + + + ksshaskpass.sh + + + + + + 2015-07-01 + 5.3.2 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-06-18 + 5.3.1 + First Release. + Stefan Gronewold(groni) + groni@pisilinux.org + + + From 8727c398bc5eb4cd8c4fd70e6ee30493a74813e4 Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 1 Jul 2015 22:48:00 +0200 Subject: [PATCH 7/8] kmenuedit version bump and check --- desktop/kde/plasma/kmenuedit/actions.py | 19 ++++++ desktop/kde/plasma/kmenuedit/pspec.xml | 78 +++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 desktop/kde/plasma/kmenuedit/actions.py create mode 100755 desktop/kde/plasma/kmenuedit/pspec.xml diff --git a/desktop/kde/plasma/kmenuedit/actions.py b/desktop/kde/plasma/kmenuedit/actions.py new file mode 100644 index 0000000000..56638b7e32 --- /dev/null +++ b/desktop/kde/plasma/kmenuedit/actions.py @@ -0,0 +1,19 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import kde5 +from pisi.actionsapi import pisitools + +def setup(): + kde5.configure() + +def build(): + kde5.make() + +def install(): + kde5.install() + + pisitools.dodoc("COPYING") diff --git a/desktop/kde/plasma/kmenuedit/pspec.xml b/desktop/kde/plasma/kmenuedit/pspec.xml new file mode 100755 index 0000000000..f39a209cbd --- /dev/null +++ b/desktop/kde/plasma/kmenuedit/pspec.xml @@ -0,0 +1,78 @@ + + + + + kmenuedit + http://www.kde.org + + Pisi Linux admins + admins@pisilinux.org + + LGPLv2 + library + app:console + Provides the interface and basic tools for the KDE workspace + Provides the interface and basic tools for the KDE workspace + http://download.kde.org/stable/plasma/5.3.2/kmenuedit-5.3.2.tar.xz + + qt5-base-devel + kdoctools-devel + libgcc + extra-cmake-modules + python3 + + + + + kmenuedit + + qt5-base + libgcc + kconfig + kservice + kcompletion + kcoreaddons + kconfigwidgets + kwidgetsaddons + kdbusaddons + kdelibs4-support + ki18n + kiconthemes + kio + kxmlgui + sonnet + + + /usr/share + /usr/share/locale + /usr/bin + /usr/lib/cmake + /usr/lib/qt5 + /usr/lib + /usr/share/doc + + + kde-workspace + + + kde-workspace + + + + + + 2015-07-01 + 5.3.2 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-06-15 + 5.3.1 + First Release. + Stefan Gronewold(groni) + groni@pisilinux.org + + + From 49071d08eabfd801054734702fc194ca713adf3b Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 1 Jul 2015 23:30:22 +0200 Subject: [PATCH 8/8] plasma-nm version bump and check --- desktop/kde/plasma/plasma-nm/actions.py | 19 ++++++ desktop/kde/plasma/plasma-nm/pspec.xml | 91 +++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 desktop/kde/plasma/plasma-nm/actions.py create mode 100755 desktop/kde/plasma/plasma-nm/pspec.xml diff --git a/desktop/kde/plasma/plasma-nm/actions.py b/desktop/kde/plasma/plasma-nm/actions.py new file mode 100644 index 0000000000..f539eaa4b7 --- /dev/null +++ b/desktop/kde/plasma/plasma-nm/actions.py @@ -0,0 +1,19 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import kde5 +from pisi.actionsapi import pisitools + +def setup(): + kde5.configure() + +def build(): + kde5.make() + +def install(): + kde5.install() + + pisitools.dodoc("README", "COPYING.LIB", "COPYING") diff --git a/desktop/kde/plasma/plasma-nm/pspec.xml b/desktop/kde/plasma/plasma-nm/pspec.xml new file mode 100755 index 0000000000..4f776722aa --- /dev/null +++ b/desktop/kde/plasma/plasma-nm/pspec.xml @@ -0,0 +1,91 @@ + + + + + plasma-nm + http://www.kde.org + + Pisi Linux Admins + admin@pisilinux.org + + LGPLv2 + library + app:console + Plasma applet written in QML for managing network connections + Plasma applet written in QML for managing network connections + http://download.kde.org/stable/plasma/5.3.2/plasma-nm-5.3.2.tar.xz + + qt5-base-devel + libgcc + networkmanager-qt-devel + modemmanger-qt-devel + kdelibs4-support-devel + python3 + openconnect-devel + kdoctools-devel + NetworkManager-devel + mobile-broadband-provider-info + extra-cmake-modules + + + + + plasma-nm + + qt5-base + libgcc + openconnect + kio + networkmanager-qt + modemmanager-qt + ki18n + solid + kconfig + kwallet + kxmlgui + kservice + kitemviews + qt5-declarative + kcompletion + kcoreaddons + kdbusaddons + kiconthemes + kwindowsystem + kconfigwidgets + knotifications + kwidgetsaddons + kdelibs4-support + + + /usr/share + /usr/share/locale + /usr/bin + /usr/lib/qt5 + /usr/lib + /usr/share/doc + + + kde-workspace + + + kde-workspace + + + + + 2015-07-01 + 5.3.2 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-06-14 + 5.3.1 + First Release. + Stefan Gronewold(groni) + groni@pisilinux.org + + + +