Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kactivities version bump and check

Browse Source
This commit is contained in:
groni
2015-06-28 15:31:50 +02:00
parent f0d11acbcc
commit 822344a3b0
4 changed files with 235 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/framework/kactivities/actions.py
Executable
+33
View File
@@ -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")
desktop/kde/framework/kactivities/files/build-source.patch
+17
View File
@@ -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)
desktop/kde/framework/kactivities/files/kamd-rename.patch
+91
View File
@@ -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]=مدير الأنشطة
desktop/kde/framework/kactivities/pspec.xml
Executable
+94
View File
@@ -0,0 +1,94 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>kactivities</Name>
<Homepage>http://www.kde.org</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2</License>
<IsA>library</IsA>
<IsA>app:console</IsA>
<Summary>Library for KDE's Plasma Activities support</Summary>
<Description>Kactivities provides an API for using and interacting with the Plasma Activities Manager.</Description>
<Archive sha1sum="b2f2cf6ddf2060b061248c0ec24f6381ce6917f4" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kactivities-5.11.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>python3</Dependency>
<Dependency>boost-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">build-source.patch</Patch>
</Patches>
</Source>
<Package>
<Name>kactivities</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>kconfigwidgets</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>kcmutils</Dependency>
<Dependency>kdeclarative</Dependency>
<Dependency>kdbusaddons</Dependency>
<Dependency>ki18n</Dependency>
<Dependency>kio</Dependency>
<Dependency>kglobalaccel</Dependency>
<Dependency>kservice</Dependency>
<Dependency>kxmlgui</Dependency>
<Dependency>kwindowsystem</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<Replaces>
<Package>kactivities</Package>
</Replaces>
<Conflicts>
<Package>kactivities</Package>
</Conflicts>
</Package>
<Package>
<Name>kactivities-devel</Name>
<Summary>Development files for kactivities</Summary>
<RuntimeDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>boost-devel</Dependency>
<Dependency release="current">kactivities</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="config">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="2">
<Date>2015-06-27</Date>
<Version>5.11.0</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2015-06-01</Date>
<Version>5.10.0</Version>
<Comment>First Release.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>