From 822344a3b04754a95193afd8e7bcdbc48ce42cd3 Mon Sep 17 00:00:00 2001 From: groni Date: Sun, 28 Jun 2015 15:31:50 +0200 Subject: [PATCH] kactivities version bump and check --- desktop/kde/framework/kactivities/actions.py | 33 +++++++ .../kactivities/files/build-source.patch | 17 ++++ .../kactivities/files/kamd-rename.patch | 91 ++++++++++++++++++ desktop/kde/framework/kactivities/pspec.xml | 94 +++++++++++++++++++ 4 files changed, 235 insertions(+) create mode 100755 desktop/kde/framework/kactivities/actions.py create mode 100644 desktop/kde/framework/kactivities/files/build-source.patch create mode 100644 desktop/kde/framework/kactivities/files/kamd-rename.patch create mode 100755 desktop/kde/framework/kactivities/pspec.xml diff --git a/desktop/kde/framework/kactivities/actions.py b/desktop/kde/framework/kactivities/actions.py new file mode 100755 index 0000000000..54ae37f90a --- /dev/null +++ b/desktop/kde/framework/kactivities/actions.py @@ -0,0 +1,33 @@ +#!/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 pisitools +from pisi.actionsapi import cmaketools +from pisi.actionsapi import shelltools +from pisi.actionsapi import get + +def setup(): + shelltools.makedirs("%s/build" %get.workDIR()) + + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DKACTIVITIES_ENABLE_EXCEPTIONS=OFF \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ + -DQML_INSTALL_DIR=lib/qt5/qml \ + -DLIB_INSTALL_DIR=lib \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DLOCALE_INSTALL_DIR=/usr/share/locale \ + -DBUILD_TESTING=OFF") + +def build(): + cmaketools.make() + +def install(): + cmaketools.install() + + pisitools.dodoc("README.md", "MAINTAINER", "TODO") diff --git a/desktop/kde/framework/kactivities/files/build-source.patch b/desktop/kde/framework/kactivities/files/build-source.patch new file mode 100644 index 0000000000..7546123148 --- /dev/null +++ b/desktop/kde/framework/kactivities/files/build-source.patch @@ -0,0 +1,17 @@ +--- a/CMakeLists.txt 2014-09-09 02:40:08.000000000 +0300 ++++ b/CMakeLists.txt 2014-09-22 17:47:14.215639453 +0300 +@@ -6,13 +6,6 @@ + + set(REQUIRED_QT_VERSION 5.2.0) + +-# We don't build in-source +-if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- message ( +- FATAL_ERROR +- "kactivities require an out of source build. Please create a separate build directory and run 'cmake path_to_plasma [options]' there." +- ) +-endif () + + # Extra CMake stuff + find_package (ECM 1.2.0 REQUIRED NO_MODULE) + diff --git a/desktop/kde/framework/kactivities/files/kamd-rename.patch b/desktop/kde/framework/kactivities/files/kamd-rename.patch new file mode 100644 index 0000000000..50f109f79a --- /dev/null +++ b/desktop/kde/framework/kactivities/files/kamd-rename.patch @@ -0,0 +1,91 @@ +diff --git a/autotests/Process.cpp b/autotests/Process.cpp +index a7a0507..afa4bf1 100644 +--- a/autotests/Process.cpp ++++ b/autotests/Process.cpp +@@ -83,7 +83,7 @@ void Modifier::initTestCase() + // qDebug() << env; + + s_process->setEnvironment(env); +- s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd")); ++ s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5")); + s_process->waitForStarted(); + + +diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp +index 077c634..7be66dd 100644 +--- a/src/lib/core/manager_p.cpp ++++ b/src/lib/core/manager_p.cpp +@@ -94,11 +94,11 @@ Manager *Manager::self() + ->property("org.kde.KActivities.core.disableAutostart") + .toBool()) { + qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon"; +- QProcess::startDetached(QStringLiteral("kactivitymanagerd")); ++ QProcess::startDetached(QStringLiteral("kactivitymanagerd5")); + } + + #else +- QProcess::startDetached(QStringLiteral("kactivitymanagerd")); ++ QProcess::startDetached(QStringLiteral("kactivitymanagerd5")); + #endif + } + +diff --git a/src/service/Application.cpp b/src/service/Application.cpp +index 6b0e3e1..3894540 100644 +--- a/src/service/Application.cpp ++++ b/src/service/Application.cpp +@@ -280,7 +280,7 @@ int main(int argc, char **argv) + application.setApplicationName(QStringLiteral("ActivityManager")); + application.setOrganizationDomain(QStringLiteral("kde.org")); + +- // KAboutData about("kactivitymanagerd", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0", ++ // KAboutData about("kactivitymanagerd5", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0", + // ki18n("KDE Activity Management Service"), + // KAboutData::License_GPL, + // ki18n("(c) 2010, 2011, 2012 Ivan Cukic"), KLocalizedString(), +@@ -333,7 +333,7 @@ int main(int argc, char **argv) + // Starting the dameon + + QProcess::startDetached( +- KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd", ++ KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5", + QStringList{"start-daemon"} + ); + +diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt +index 4b4978b..2220f34 100644 +--- a/src/service/CMakeLists.txt ++++ b/src/service/CMakeLists.txt +@@ -62,9 +62,9 @@ qt5_add_dbus_adaptor ( + Features.h Features + ) + +-add_executable (kactivitymanagerd ${kactivitymanager_SRCS}) ++add_executable (kactivitymanagerd5 ${kactivitymanager_SRCS}) + +-target_link_libraries (kactivitymanagerd ++target_link_libraries (kactivitymanagerd5 + Qt5::Core + Qt5::DBus + Qt5::Widgets +@@ -84,7 +84,7 @@ install (FILES + ) + + install (TARGETS +- kactivitymanagerd ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ++ kactivitymanagerd5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} + ) + + install (FILES +diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop +index be5faa1..3c9b9a9 100644 +--- a/src/service/files/kactivitymanagerd.desktop ++++ b/src/service/files/kactivitymanagerd.desktop +@@ -4,7 +4,7 @@ Icon=preferences-activities + X-KDE-ServiceTypes= + X-DBUS-StartupType=Unique + X-KDE-StartupNotify=false +-Exec=kactivitymanagerd ++Exec=kactivitymanagerd5 + + Name=Activity Manager + Name[ar]=مدير الأنشطة diff --git a/desktop/kde/framework/kactivities/pspec.xml b/desktop/kde/framework/kactivities/pspec.xml new file mode 100755 index 0000000000..63e573cadc --- /dev/null +++ b/desktop/kde/framework/kactivities/pspec.xml @@ -0,0 +1,94 @@ + + + + + kactivities + http://www.kde.org + + Pisi Linux Admins + admins@pisilinux.org + + LGPLv2 + library + app:console + Library for KDE's Plasma Activities support + Kactivities provides an API for using and interacting with the Plasma Activities Manager. + http://download.kde.org/stable/frameworks/5.11/kactivities-5.11.0.tar.xz + + qt5-base-devel + python3 + boost-devel + extra-cmake-modules + + + build-source.patch + + + + + kactivities + + qt5-base + qt5-declarative + libgcc + kconfig + kconfigwidgets + kcoreaddons + kcmutils + kdeclarative + kdbusaddons + ki18n + kio + kglobalaccel + kservice + kxmlgui + kwindowsystem + + + /usr/share + /usr/share/locale + /usr/bin + /usr/lib/qt5 + /usr/lib + /usr/share/doc + + + kactivities + + + kactivities + + + + + kactivities-devel + Development files for kactivities + + qt5-base-devel + boost-devel + kactivities + + + /usr/include + /usr/lib/cmake + /usr/lib/pkgconfig + + + + + + 2015-06-27 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-06-01 + 5.10.0 + First Release. + Stefan Gronewold(groni) + groni@pisilinux.org + + +