From b2abfc4293d99e9f9c81b2e0beae2c88014a66fe Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 24 Jun 2015 23:47:54 +0200 Subject: [PATCH] change actions.py and remove kde5-suffix --- desktop/kde/framework/attica/actions.py | 14 +++++--- desktop/kde/framework/kapidox/actions.py | 14 +++++--- desktop/kde/framework/karchive/actions.py | 13 ++++--- desktop/kde/framework/kauth/actions.py | 16 ++++++--- desktop/kde/framework/kcodecs/actions.py | 16 ++++++--- desktop/kde/framework/kcompletion/pspec.xml | 2 +- desktop/kde/framework/kconfig/actions.py | 15 +++++--- .../kde/framework/kconfigwidgets/actions.py | 19 +++++----- .../kde/framework/kconfigwidgets/pspec.xml | 3 +- desktop/kde/framework/kcoreaddons/actions.py | 15 +++++--- desktop/kde/framework/kcrash/actions.py | 18 +++++++--- desktop/kde/framework/kcrash/pspec.xml | 8 ++--- desktop/kde/framework/kdbusaddons/actions.py | 14 +++++--- desktop/kde/framework/kde5-kded/pspec.xml | 31 +++++++++------- .../kde/framework/kde5-kguiaddons/actions.py | 19 ---------- desktop/kde/framework/kdoctools/actions.py | 13 ++++--- desktop/kde/framework/kdoctools/pspec.xml | 4 +-- .../1actions.py => kguiaddons/actions.py} | 4 +-- .../{kde5-kguiaddons => kguiaddons}/pspec.xml | 0 desktop/kde/framework/ki18n/actions.py | 16 ++++++--- desktop/kde/framework/kiconthemes/1actions.py | 27 -------------- desktop/kde/framework/kiconthemes/actions.py | 18 +++++++--- .../actions.py | 0 .../pspec.xml | 17 ++++++--- .../actions.py | 0 .../{kde5-kitemviews => kitemviews}/pspec.xml | 19 +++++++--- desktop/kde/framework/kpackage/actions.py | 16 ++++++--- desktop/kde/framework/kpackage/pspec.xml | 2 +- .../framework/{kde5-kpty => kpty}/actions.py | 0 .../framework/{kde5-kpty => kpty}/pspec.xml | 26 +++++++++----- .../{kde5-kservice => kservice}/actions.py | 0 .../{kde5-kservice => kservice}/pspec.xml | 36 ++++++++++--------- .../kde/framework/kwidgetsaddons/actions.py | 14 +++++--- .../kde/framework/kwindowsystem/actions.py | 14 +++++--- desktop/kde/framework/solid/actions.py | 15 +++++--- .../{kde5-sonnet => sonnet}/actions.py | 0 .../{kde5-sonnet => sonnet}/pspec.xml | 18 +++++++--- .../kde5-kdelibs4-support/pspec.xml | 6 ++-- 38 files changed, 281 insertions(+), 201 deletions(-) mode change 100644 => 100755 desktop/kde/framework/attica/actions.py mode change 100644 => 100755 desktop/kde/framework/kapidox/actions.py mode change 100644 => 100755 desktop/kde/framework/karchive/actions.py mode change 100644 => 100755 desktop/kde/framework/kauth/actions.py mode change 100644 => 100755 desktop/kde/framework/kcodecs/actions.py mode change 100644 => 100755 desktop/kde/framework/kconfig/actions.py mode change 100644 => 100755 desktop/kde/framework/kconfigwidgets/actions.py mode change 100644 => 100755 desktop/kde/framework/kcoreaddons/actions.py mode change 100644 => 100755 desktop/kde/framework/kcrash/actions.py mode change 100644 => 100755 desktop/kde/framework/kdbusaddons/actions.py delete mode 100644 desktop/kde/framework/kde5-kguiaddons/actions.py mode change 100644 => 100755 desktop/kde/framework/kdoctools/actions.py rename desktop/kde/framework/{solid/1actions.py => kguiaddons/actions.py} (76%) rename desktop/kde/framework/{kde5-kguiaddons => kguiaddons}/pspec.xml (100%) mode change 100644 => 100755 desktop/kde/framework/ki18n/actions.py delete mode 100755 desktop/kde/framework/kiconthemes/1actions.py mode change 100644 => 100755 desktop/kde/framework/kiconthemes/actions.py rename desktop/kde/framework/{kde5-kitemmodels => kitemmodels}/actions.py (100%) rename desktop/kde/framework/{kde5-kitemmodels => kitemmodels}/pspec.xml (75%) rename desktop/kde/framework/{kde5-kitemviews => kitemviews}/actions.py (100%) rename desktop/kde/framework/{kde5-kitemviews => kitemviews}/pspec.xml (75%) rename desktop/kde/framework/{kde5-kpty => kpty}/actions.py (100%) rename desktop/kde/framework/{kde5-kpty => kpty}/pspec.xml (72%) rename desktop/kde/framework/{kde5-kservice => kservice}/actions.py (100%) rename desktop/kde/framework/{kde5-kservice => kservice}/pspec.xml (70%) mode change 100644 => 100755 desktop/kde/framework/kwidgetsaddons/actions.py mode change 100644 => 100755 desktop/kde/framework/kwindowsystem/actions.py mode change 100644 => 100755 desktop/kde/framework/solid/actions.py rename desktop/kde/framework/{kde5-sonnet => sonnet}/actions.py (100%) rename desktop/kde/framework/{kde5-sonnet => sonnet}/pspec.xml (77%) diff --git a/desktop/kde/framework/attica/actions.py b/desktop/kde/framework/attica/actions.py old mode 100644 new mode 100755 index f137ac184a..6bca2ff70d --- a/desktop/kde/framework/attica/actions.py +++ b/desktop/kde/framework/attica/actions.py @@ -4,16 +4,20 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING", "AUTHORS", "ChangeLog") diff --git a/desktop/kde/framework/kapidox/actions.py b/desktop/kde/framework/kapidox/actions.py old mode 100644 new mode 100755 index 7ad3db044b..8b093667f5 --- a/desktop/kde/framework/kapidox/actions.py +++ b/desktop/kde/framework/kapidox/actions.py @@ -4,16 +4,20 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DLOCALE_INSTALL_DIR=/usr/share/locale \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md") diff --git a/desktop/kde/framework/karchive/actions.py b/desktop/kde/framework/karchive/actions.py old mode 100644 new mode 100755 index 0cf899f127..f1da0a0e61 --- a/desktop/kde/framework/karchive/actions.py +++ b/desktop/kde/framework/karchive/actions.py @@ -4,16 +4,19 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DLIB_INSTALL_DIR=lib \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING", "COPYING.LIB", "AUTHORS") diff --git a/desktop/kde/framework/kauth/actions.py b/desktop/kde/framework/kauth/actions.py old mode 100644 new mode 100755 index 11b2858877..8fc39e8aaa --- a/desktop/kde/framework/kauth/actions.py +++ b/desktop/kde/framework/kauth/actions.py @@ -4,16 +4,22 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DLIB_INSTALL_DIR=lib \ + -DLIBEXEC_INSTALL_DIR=lib \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING.LIB") diff --git a/desktop/kde/framework/kcodecs/actions.py b/desktop/kde/framework/kcodecs/actions.py old mode 100644 new mode 100755 index 2224377fc7..31d089f3f0 --- a/desktop/kde/framework/kcodecs/actions.py +++ b/desktop/kde/framework/kcodecs/actions.py @@ -4,16 +4,22 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ + -DLIB_INSTALL_DIR=lib \ + -DQML_INSTALL_DIR=lib/qt5/qml \ + -DLOCALE_INSTALL_DIR=/usr/share/locale \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING", "COPYING.LIB") diff --git a/desktop/kde/framework/kcompletion/pspec.xml b/desktop/kde/framework/kcompletion/pspec.xml index ffc3edee0a..dfd515e182 100644 --- a/desktop/kde/framework/kcompletion/pspec.xml +++ b/desktop/kde/framework/kcompletion/pspec.xml @@ -25,7 +25,7 @@ kcompletion qt5-base - kde5-kconfig + kconfig kwidgetsaddons diff --git a/desktop/kde/framework/kconfig/actions.py b/desktop/kde/framework/kconfig/actions.py old mode 100644 new mode 100755 index 3685049507..8307c96119 --- a/desktop/kde/framework/kconfig/actions.py +++ b/desktop/kde/framework/kconfig/actions.py @@ -4,16 +4,21 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DLIB_INSTALL_DIR=lib \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING.LIB", "DESIGN", "TODO") diff --git a/desktop/kde/framework/kconfigwidgets/actions.py b/desktop/kde/framework/kconfigwidgets/actions.py old mode 100644 new mode 100755 index 178bcb1c32..b4c095499e --- a/desktop/kde/framework/kconfigwidgets/actions.py +++ b/desktop/kde/framework/kconfigwidgets/actions.py @@ -4,20 +4,21 @@ # 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 shelltools -from pisi.actionsapi import get - +from pisi.actionsapi import cmaketools def setup(): - #shelltools.export("XDG_DATA_DIRS", get.workDIR()) - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING.LIB", "COPYING") diff --git a/desktop/kde/framework/kconfigwidgets/pspec.xml b/desktop/kde/framework/kconfigwidgets/pspec.xml index 44b31c4420..ba2881537a 100755 --- a/desktop/kde/framework/kconfigwidgets/pspec.xml +++ b/desktop/kde/framework/kconfigwidgets/pspec.xml @@ -18,7 +18,7 @@ qt5-base-devel python3 - kde5-ki18n-devel + ki18n-devel kdoctools-devel extra-cmake-modules @@ -30,6 +30,7 @@ qt5-base kauth kcodecs + kdoctools kconfig kcoreaddons kguiaddons diff --git a/desktop/kde/framework/kcoreaddons/actions.py b/desktop/kde/framework/kcoreaddons/actions.py old mode 100644 new mode 100755 index 11b2858877..3ee8408ad5 --- a/desktop/kde/framework/kcoreaddons/actions.py +++ b/desktop/kde/framework/kcoreaddons/actions.py @@ -4,16 +4,21 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DLIB_INSTALL_DIR=lib \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -D_KDE4_DEFAULT_HOME_POSTFIX=4 \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING.LIB") diff --git a/desktop/kde/framework/kcrash/actions.py b/desktop/kde/framework/kcrash/actions.py old mode 100644 new mode 100755 index 11b2858877..b2f086d2f1 --- a/desktop/kde/framework/kcrash/actions.py +++ b/desktop/kde/framework/kcrash/actions.py @@ -4,16 +4,24 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -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 \ + -DLIBEXEC_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DLOCALE_INSTALL_DIR=/usr/share/locale \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING.LIB") diff --git a/desktop/kde/framework/kcrash/pspec.xml b/desktop/kde/framework/kcrash/pspec.xml index 91ab2a8955..cc70db7b58 100755 --- a/desktop/kde/framework/kcrash/pspec.xml +++ b/desktop/kde/framework/kcrash/pspec.xml @@ -29,8 +29,8 @@ libX11 libgcc qt5-x11extras - kde5-kcoreaddons - kde5-kwindowsystem + kcoreaddons + kwindowsystem /usr/share @@ -48,8 +48,8 @@ qt5-base-devel qt5-x11extras-devel kcrash - kde5-kcoreaddons-devel - kde5-kwindowsystem-devel + kcoreaddons-devel + kwindowsystem-devel /usr/include diff --git a/desktop/kde/framework/kdbusaddons/actions.py b/desktop/kde/framework/kdbusaddons/actions.py old mode 100644 new mode 100755 index 3ab437b852..579b7ea6ee --- a/desktop/kde/framework/kdbusaddons/actions.py +++ b/desktop/kde/framework/kdbusaddons/actions.py @@ -4,16 +4,20 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DLOCALE_INSTALL_DIR=/usr/share/locale \ + -DLIB_INSTALL_DIR=lib \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "MAINTAINER", "COPYING.LIB") diff --git a/desktop/kde/framework/kde5-kded/pspec.xml b/desktop/kde/framework/kde5-kded/pspec.xml index 5b0214eb64..917b1d3a5a 100755 --- a/desktop/kde/framework/kde5-kded/pspec.xml +++ b/desktop/kde/framework/kde5-kded/pspec.xml @@ -2,7 +2,7 @@ - kde5-kded + kded http://www.kde.org Pisi Linux Admins @@ -13,23 +13,23 @@ app:console KDE5 daemon Kded runs in the background and performs a number of small tasks. - http://download.kde.org/stable/frameworks/5.10/kded-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/kded-5.11.0.tar.xz qt5-base-devel - kde5-kdoctools-devel + kdoctools-devel extra-cmake-modules - kde5-kded + kded qt5-base - kde5-kcoreaddons - kde5-kconfig - kde5-kcrash - kde5-kdbusaddons - kde5-kservice + kcoreaddons + kconfig + kcrash + kdbusaddons + kservice /usr/share @@ -41,11 +41,11 @@ - kde5-kded-devel - Development files for kde5-kded + kded-devel + Development files for kded qt5-base-devel - kde5-kded + kded /usr/lib/cmake @@ -54,6 +54,13 @@ + + 2015-06-24 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-06-06 5.10.0 diff --git a/desktop/kde/framework/kde5-kguiaddons/actions.py b/desktop/kde/framework/kde5-kguiaddons/actions.py deleted file mode 100644 index a0965a34a3..0000000000 --- a/desktop/kde/framework/kde5-kguiaddons/actions.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/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.md", "COPYING.LIB", "COPYING") diff --git a/desktop/kde/framework/kdoctools/actions.py b/desktop/kde/framework/kdoctools/actions.py old mode 100644 new mode 100755 index 238456d212..49de0c6163 --- a/desktop/kde/framework/kdoctools/actions.py +++ b/desktop/kde/framework/kdoctools/actions.py @@ -4,16 +4,19 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DLIB_INSTALL_DIR=lib \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING.LIB", "LICENSE", "TODO") diff --git a/desktop/kde/framework/kdoctools/pspec.xml b/desktop/kde/framework/kdoctools/pspec.xml index 0648d58583..0680f457ab 100755 --- a/desktop/kde/framework/kdoctools/pspec.xml +++ b/desktop/kde/framework/kdoctools/pspec.xml @@ -28,12 +28,12 @@ extra-cmake-modules - + - kde5-kdoctools + kdoctools qt5-base libxml2 diff --git a/desktop/kde/framework/solid/1actions.py b/desktop/kde/framework/kguiaddons/actions.py similarity index 76% rename from desktop/kde/framework/solid/1actions.py rename to desktop/kde/framework/kguiaddons/actions.py index 5dc89c38d1..d4321b3b1a 100755 --- a/desktop/kde/framework/solid/1actions.py +++ b/desktop/kde/framework/kguiaddons/actions.py @@ -10,8 +10,6 @@ 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") @@ -21,4 +19,4 @@ def build(): def install(): cmaketools.install() - pisitools.dodoc("README.md","COPYING.LIB", "TODO") + pisitools.dodoc("README.md", "COPYING.LIB", "COPYING") diff --git a/desktop/kde/framework/kde5-kguiaddons/pspec.xml b/desktop/kde/framework/kguiaddons/pspec.xml similarity index 100% rename from desktop/kde/framework/kde5-kguiaddons/pspec.xml rename to desktop/kde/framework/kguiaddons/pspec.xml diff --git a/desktop/kde/framework/ki18n/actions.py b/desktop/kde/framework/ki18n/actions.py old mode 100644 new mode 100755 index 3e60979ae6..94169eca50 --- a/desktop/kde/framework/ki18n/actions.py +++ b/desktop/kde/framework/ki18n/actions.py @@ -4,16 +4,22 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DLIB_INSTALL_DIR=lib \ + -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DLOCALE_INSTALL_DIR=/usr/share/locale \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING.LIB", "COPYING-CMAKE-SCRIPTS") diff --git a/desktop/kde/framework/kiconthemes/1actions.py b/desktop/kde/framework/kiconthemes/1actions.py deleted file mode 100755 index 648143a2e1..0000000000 --- a/desktop/kde/framework/kiconthemes/1actions.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/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 \ - -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ - -DQML_INSTALL_DIR=lib/qt5/qml \ - -DLIB_INSTALL_DIR=lib \ - -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", "COPYING.LIB") diff --git a/desktop/kde/framework/kiconthemes/actions.py b/desktop/kde/framework/kiconthemes/actions.py old mode 100644 new mode 100755 index 11b2858877..648143a2e1 --- a/desktop/kde/framework/kiconthemes/actions.py +++ b/desktop/kde/framework/kiconthemes/actions.py @@ -4,16 +4,24 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -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 \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DLOCALE_INSTALL_DIR=/usr/share/locale \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md", "COPYING.LIB") diff --git a/desktop/kde/framework/kde5-kitemmodels/actions.py b/desktop/kde/framework/kitemmodels/actions.py similarity index 100% rename from desktop/kde/framework/kde5-kitemmodels/actions.py rename to desktop/kde/framework/kitemmodels/actions.py diff --git a/desktop/kde/framework/kde5-kitemmodels/pspec.xml b/desktop/kde/framework/kitemmodels/pspec.xml similarity index 75% rename from desktop/kde/framework/kde5-kitemmodels/pspec.xml rename to desktop/kde/framework/kitemmodels/pspec.xml index 28da8ce4c9..8db476613a 100644 --- a/desktop/kde/framework/kde5-kitemmodels/pspec.xml +++ b/desktop/kde/framework/kitemmodels/pspec.xml @@ -2,7 +2,7 @@ - kde5-kitemmodels + kitemmodels http://www.kde.org Pisi Linux Admins @@ -12,7 +12,7 @@ library Set of item models extending the Qt model-view framework KItemModels provides a set of item models extending the Qt model-view framework. - http://download.kde.org/stable/frameworks/5.10/kitemmodels-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/kitemmodels-5.11.0.tar.xz qt5-base-devel extra-cmake-modules @@ -20,7 +20,7 @@ - kde5-kitemmodels + kitemmodels qt5-base @@ -34,11 +34,11 @@ - kde5-kitemmodels-devel + kitemmodels-devel Development files for kitemmodels qt5-base-devel - kde5-kitemmodels + kitemmodels /usr/include @@ -48,6 +48,13 @@ + + 2015-06-24 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-05-30 5.10.0 diff --git a/desktop/kde/framework/kde5-kitemviews/actions.py b/desktop/kde/framework/kitemviews/actions.py similarity index 100% rename from desktop/kde/framework/kde5-kitemviews/actions.py rename to desktop/kde/framework/kitemviews/actions.py diff --git a/desktop/kde/framework/kde5-kitemviews/pspec.xml b/desktop/kde/framework/kitemviews/pspec.xml similarity index 75% rename from desktop/kde/framework/kde5-kitemviews/pspec.xml rename to desktop/kde/framework/kitemviews/pspec.xml index 5d768aceb4..386648eca7 100755 --- a/desktop/kde/framework/kde5-kitemviews/pspec.xml +++ b/desktop/kde/framework/kitemviews/pspec.xml @@ -2,7 +2,7 @@ - kde5-kitemviews + kitemviews http://www.kde.org Pisi Linux Admins @@ -13,18 +13,20 @@ app:console Set of item models extending the Qt model-view framework KItemViews includes a set of views, which can be used with item models. It includes views for categorizing lists and to add search filters to flat and hierarchical lists. - http://download.kde.org/stable/frameworks/5.10/kitemviews-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/kitemviews-5.11.0.tar.xz qt5-base-devel + libgcc qt5-tools-devel extra-cmake-modules - kde5-kitemviews + kitemviews qt5-base + libgcc /usr/share @@ -36,11 +38,11 @@ - kde5-kitemviews-devel + kitemviews-devel Development files for kitemviews qt5-base-devel - kde5-kitemviews + kitemviews /usr/include @@ -50,6 +52,13 @@ + + 2015-06-24 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-05-30 5.10.0 diff --git a/desktop/kde/framework/kpackage/actions.py b/desktop/kde/framework/kpackage/actions.py index c9b765dc60..eb0cad697c 100644 --- a/desktop/kde/framework/kpackage/actions.py +++ b/desktop/kde/framework/kpackage/actions.py @@ -4,16 +4,24 @@ # 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 shelltools +from pisi.actionsapi import cmaketools from pisi.actionsapi import pisitools +from pisi.actionsapi import get def setup(): - kde5.configure() + #shelltools.cd("kpackage") + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) pisitools.dodoc("COPYING", "COPYING.LIB", "README.md") diff --git a/desktop/kde/framework/kpackage/pspec.xml b/desktop/kde/framework/kpackage/pspec.xml index 13dbee6969..d7c33dbc18 100644 --- a/desktop/kde/framework/kpackage/pspec.xml +++ b/desktop/kde/framework/kpackage/pspec.xml @@ -19,7 +19,7 @@ libgcc qt5-tools-devel extra-cmake-modules - kde5-kdoctools-devel + kdoctools-devel diff --git a/desktop/kde/framework/kde5-kpty/actions.py b/desktop/kde/framework/kpty/actions.py similarity index 100% rename from desktop/kde/framework/kde5-kpty/actions.py rename to desktop/kde/framework/kpty/actions.py diff --git a/desktop/kde/framework/kde5-kpty/pspec.xml b/desktop/kde/framework/kpty/pspec.xml similarity index 72% rename from desktop/kde/framework/kde5-kpty/pspec.xml rename to desktop/kde/framework/kpty/pspec.xml index fab49435a4..6f9f7170b5 100644 --- a/desktop/kde/framework/kde5-kpty/pspec.xml +++ b/desktop/kde/framework/kpty/pspec.xml @@ -2,7 +2,7 @@ - kde5-kpty + kpty http://www.kde.org Pisi Linux Admins @@ -12,7 +12,7 @@ library Libraries for pseudo terminal devices Kpty provides primitives to interface with pseudo terminal devices as well as a KProcess derived class for running child processes and communicating with them using kpty. - http://download.kde.org/stable/frameworks/5.10/kpty-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/kpty-5.11.0.tar.xz qt5-base-devel python3 @@ -21,12 +21,13 @@ - kde5-kpty + kpty qt5-base utempter - kde5-kcoreaddons - kde5-ki18n + libgcc + kcoreaddons + ki18n /usr/share @@ -38,14 +39,14 @@ - kde5-kpty-devel + kpty-devel Development files for kpty qt5-base-devel utempter-devel - kde5-kcoreaddons-devel - kde5-ki18n-devel - kde5-kpty + kcoreaddons-devel + ki18n-devel + kpty /usr/include @@ -55,6 +56,13 @@ + + 2015-06-24 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-05-30 5.10.0 diff --git a/desktop/kde/framework/kde5-kservice/actions.py b/desktop/kde/framework/kservice/actions.py similarity index 100% rename from desktop/kde/framework/kde5-kservice/actions.py rename to desktop/kde/framework/kservice/actions.py diff --git a/desktop/kde/framework/kde5-kservice/pspec.xml b/desktop/kde/framework/kservice/pspec.xml similarity index 70% rename from desktop/kde/framework/kde5-kservice/pspec.xml rename to desktop/kde/framework/kservice/pspec.xml index f7572f865b..e133a9763d 100755 --- a/desktop/kde/framework/kde5-kservice/pspec.xml +++ b/desktop/kde/framework/kservice/pspec.xml @@ -2,7 +2,7 @@ - kde5-kservice + kservice http://www.kde.org Pisi Linux Admins @@ -13,24 +13,25 @@ app:console KDE5 Desktop Services Kservice Provides a plugin framework for handling desktop services. Services can be applications or libraries. They can be bound to MIME types or handled by application specific code. - http://download.kde.org/stable/frameworks/5.10/kservice-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/kservice-5.11.0.tar.xz qt5-base-devel python3 - kde5-kdoctools-devel + kdoctools-devel extra-cmake-modules - kde5-kservice + kservice - qt5-base - kde5-kconfig - kde5-kcoreaddons - kde5-kcrash - kde5-kdbusaddons - kde5-ki18n + qt5-base + libgcc + kconfig + kcoreaddons + kcrash + kdbusaddons + ki18n /etc @@ -45,16 +46,12 @@ - kde5-kservice-devel + kservice-devel Development files for kservice qt5-base-devel boost-devel - kde5-kservice - kde5-kconfig-devel - kde5-kcoreaddons-devel - kde5-kdbusaddons-devel - kde5-ki18n-devel + kservice /usr/include @@ -64,6 +61,13 @@ + + 2015-06-24 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-05-30 5.10.0 diff --git a/desktop/kde/framework/kwidgetsaddons/actions.py b/desktop/kde/framework/kwidgetsaddons/actions.py old mode 100644 new mode 100755 index 03367afb1e..b3339025b6 --- a/desktop/kde/framework/kwidgetsaddons/actions.py +++ b/desktop/kde/framework/kwidgetsaddons/actions.py @@ -4,16 +4,20 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md","COPYING.LIB", "COPYING") diff --git a/desktop/kde/framework/kwindowsystem/actions.py b/desktop/kde/framework/kwindowsystem/actions.py old mode 100644 new mode 100755 index 9f0ecb1249..25e5a4e58b --- a/desktop/kde/framework/kwindowsystem/actions.py +++ b/desktop/kde/framework/kwindowsystem/actions.py @@ -4,16 +4,20 @@ # 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(): - kde5.configure() + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF") def build(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md","COPYING.LIB") diff --git a/desktop/kde/framework/solid/actions.py b/desktop/kde/framework/solid/actions.py old mode 100644 new mode 100755 index b3f757179c..5dc89c38d1 --- a/desktop/kde/framework/solid/actions.py +++ b/desktop/kde/framework/solid/actions.py @@ -4,16 +4,21 @@ # 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(): - kde5.configure() + 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(): - kde5.make() + cmaketools.make() def install(): - kde5.install() - + cmaketools.install() + pisitools.dodoc("README.md","COPYING.LIB", "TODO") diff --git a/desktop/kde/framework/kde5-sonnet/actions.py b/desktop/kde/framework/sonnet/actions.py similarity index 100% rename from desktop/kde/framework/kde5-sonnet/actions.py rename to desktop/kde/framework/sonnet/actions.py diff --git a/desktop/kde/framework/kde5-sonnet/pspec.xml b/desktop/kde/framework/sonnet/pspec.xml similarity index 77% rename from desktop/kde/framework/kde5-sonnet/pspec.xml rename to desktop/kde/framework/sonnet/pspec.xml index 277be35eda..cc4e435f61 100644 --- a/desktop/kde/framework/kde5-sonnet/pspec.xml +++ b/desktop/kde/framework/sonnet/pspec.xml @@ -2,7 +2,7 @@ - kde5-sonnet + sonnet http://www.kde.org Pisi Linux Admins @@ -13,7 +13,7 @@ app:console KDE spell schecking library This framework contains two main components: Interface to KWallet, the safe desktop-wide storage for passwords on KDE workspaces. The kwalletd used to safely store the passwords on KDE work spaces. - http://download.kde.org/stable/frameworks/5.10/sonnet-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/sonnet-5.11.0.tar.xz qt5-base-devel qt5-tools-devel @@ -22,9 +22,10 @@ - kde5-sonnet + sonnet qt5-base + libgcc aspell hunspell @@ -39,11 +40,11 @@ - kde5-sonnet-devel + sonnet-devel Development files for sonnet qt5-base-devel - kde5-sonnet + sonnet /usr/include @@ -53,6 +54,13 @@ + + 2015-06-24 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-05-30 5.10.0 diff --git a/desktop/kde/porting-aids/kde5-kdelibs4-support/pspec.xml b/desktop/kde/porting-aids/kde5-kdelibs4-support/pspec.xml index ed5b9866a1..ce58a466b9 100755 --- a/desktop/kde/porting-aids/kde5-kdelibs4-support/pspec.xml +++ b/desktop/kde/porting-aids/kde5-kdelibs4-support/pspec.xml @@ -22,9 +22,9 @@ docbook-xml openssl-devel intltool - kde5-kdoctools-devel - NetworkManager-devel - extra-cmake-modules + kdoctools-devel + NetworkManager-devel + extra-cmake-modules