diff --git a/desktop/kde/kde5-framework/kde5-solid/1actions.py b/desktop/kde/kde5-framework/kde5-solid/1actions.py new file mode 100755 index 0000000000..5dc89c38d1 --- /dev/null +++ b/desktop/kde/kde5-framework/kde5-solid/1actions.py @@ -0,0 +1,24 @@ +#!/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 + +def setup(): + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DQML_INSTALL_DIR=lib/qt5/qml \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DLIB_INSTALL_DIR=lib \ + -DBUILD_TESTING=OFF") + +def build(): + cmaketools.make() + +def install(): + cmaketools.install() + + pisitools.dodoc("README.md","COPYING.LIB", "TODO") diff --git a/desktop/kde/kde5-framework/kde5-solid/actions.py b/desktop/kde/kde5-framework/kde5-solid/actions.py old mode 100755 new mode 100644 index 5dc89c38d1..b3f757179c --- a/desktop/kde/kde5-framework/kde5-solid/actions.py +++ b/desktop/kde/kde5-framework/kde5-solid/actions.py @@ -4,21 +4,16 @@ # 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 -from pisi.actionsapi import cmaketools def setup(): - cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ - -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ - -DQML_INSTALL_DIR=lib/qt5/qml \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DLIB_INSTALL_DIR=lib \ - -DBUILD_TESTING=OFF") + kde5.configure() def build(): - cmaketools.make() + kde5.make() def install(): - cmaketools.install() - + kde5.install() + pisitools.dodoc("README.md","COPYING.LIB", "TODO") diff --git a/desktop/kde/kde5-framework/kde5-solid/pspec.xml b/desktop/kde/kde5-framework/kde5-solid/pspec.xml index 318be2c245..4060500634 100755 --- a/desktop/kde/kde5-framework/kde5-solid/pspec.xml +++ b/desktop/kde/kde5-framework/kde5-solid/pspec.xml @@ -13,10 +13,12 @@ app:console KDE5 hardware integration framework Solid is a device integration framework.It provides a way of querying and interacting with hardware independently of the underlying operating system. - http://download.kde.org/stable/frameworks/5.10/solid-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/solid-5.11.0.tar.xz qt5-base-devel - qt5-tools-devel + libudev-devel + qt5-tools-devel + qt5-declarative extra-cmake-modules @@ -24,8 +26,7 @@ kde5-solid - qt5-base - qt5-declarative + qt5-base /usr/share @@ -52,6 +53,13 @@ + + 2015-06-23 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-05-31 5.10.0