From 980ffe0ed22544f05978936031b19b0bafaf7091 Mon Sep 17 00:00:00 2001 From: groni Date: Tue, 23 Jun 2015 20:51:29 +0200 Subject: [PATCH 1/3] kde5-solid version bump --- .../kde/kde5-framework/kde5-solid/1actions.py | 24 +++++++++++++++++++ .../kde/kde5-framework/kde5-solid/actions.py | 15 ++++-------- .../kde/kde5-framework/kde5-solid/pspec.xml | 16 +++++++++---- 3 files changed, 41 insertions(+), 14 deletions(-) create mode 100755 desktop/kde/kde5-framework/kde5-solid/1actions.py mode change 100755 => 100644 desktop/kde/kde5-framework/kde5-solid/actions.py 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 From 7aec6a732fc0ee849e9a514dbf9e99b562ee8660 Mon Sep 17 00:00:00 2001 From: groni Date: Tue, 23 Jun 2015 22:18:25 +0200 Subject: [PATCH 2/3] kde5-kpackage version bump --- .../kde5-framework/kde5-kpackage/actions.py | 16 +++--------- .../kde5-framework/kde5-kpackage/pspec.xml | 25 +++++++++++++++++-- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/desktop/kde/kde5-framework/kde5-kpackage/actions.py b/desktop/kde/kde5-framework/kde5-kpackage/actions.py index eb0cad697c..c9b765dc60 100644 --- a/desktop/kde/kde5-framework/kde5-kpackage/actions.py +++ b/desktop/kde/kde5-framework/kde5-kpackage/actions.py @@ -4,24 +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 shelltools -from pisi.actionsapi import cmaketools +from pisi.actionsapi import kde5 from pisi.actionsapi import pisitools -from pisi.actionsapi import get def setup(): - #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") + kde5.configure() def build(): - cmaketools.make() + kde5.make() def install(): - cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + kde5.install() pisitools.dodoc("COPYING", "COPYING.LIB", "README.md") diff --git a/desktop/kde/kde5-framework/kde5-kpackage/pspec.xml b/desktop/kde/kde5-framework/kde5-kpackage/pspec.xml index 061f86e5b0..a4e28d4ed6 100644 --- a/desktop/kde/kde5-framework/kde5-kpackage/pspec.xml +++ b/desktop/kde/kde5-framework/kde5-kpackage/pspec.xml @@ -12,10 +12,11 @@ app:library Framework that lets applications manage user installable packages of non-binary assets KPackage is dependent on the Smart package manager. - http://download.kde.org/stable/frameworks/5.10/kpackage-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/kpackage-5.11.0.tar.xz qt5-base-devel python3 + libgcc qt5-tools-devel extra-cmake-modules kde5-kdoctools-devel @@ -26,6 +27,7 @@ kde5-kpackage qt5-base + libgcc kde5-kconfig kde5-ki18n kde5-kcoreaddons @@ -35,14 +37,33 @@ /usr/bin /usr/lib/qt5 /usr/lib - /usr/include/ /usr/share /usr/share/locale /usr/share/man/man1 + + kpackage-devel + Development files for kpackage + + qt5-base-devel + kde5-kpackage + + + /usr/include + /usr/lib/cmake + /usr/lib/pkgconfig + + + + 2015-06-23 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-05-31 5.10.0 From 196d5adbe6f15a8bb442ec9a32ed184dcf4e51af Mon Sep 17 00:00:00 2001 From: groni Date: Tue, 23 Jun 2015 22:53:01 +0200 Subject: [PATCH 3/3] kwindowsystem version bump --- .../kde5-kwindowsystem/actions.py | 14 +++++------- .../kde5-kwindowsystem/pspec.xml | 22 +++++++++++++++++-- 2 files changed, 25 insertions(+), 11 deletions(-) mode change 100755 => 100644 desktop/kde/kde5-framework/kde5-kwindowsystem/actions.py diff --git a/desktop/kde/kde5-framework/kde5-kwindowsystem/actions.py b/desktop/kde/kde5-framework/kde5-kwindowsystem/actions.py old mode 100755 new mode 100644 index 25e5a4e58b..9f0ecb1249 --- a/desktop/kde/kde5-framework/kde5-kwindowsystem/actions.py +++ b/desktop/kde/kde5-framework/kde5-kwindowsystem/actions.py @@ -4,20 +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 \ - -DLIB_INSTALL_DIR=lib \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF") + kde5.configure() def build(): - cmaketools.make() + kde5.make() def install(): - cmaketools.install() - + kde5.install() + pisitools.dodoc("README.md","COPYING.LIB") diff --git a/desktop/kde/kde5-framework/kde5-kwindowsystem/pspec.xml b/desktop/kde/kde5-framework/kde5-kwindowsystem/pspec.xml index 82e00623da..905d60bdc5 100755 --- a/desktop/kde/kde5-framework/kde5-kwindowsystem/pspec.xml +++ b/desktop/kde/kde5-framework/kde5-kwindowsystem/pspec.xml @@ -13,10 +13,18 @@ app:console KDE5 window manager access framework KWindowSystem provides information about the state of the window manager and allows asking the window manager to change the using a more high-level interface than the NETWinInfo/NETRootInfo low-level classes. - http://download.kde.org/stable/frameworks/5.10/kwindowsystem-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/kwindowsystem-5.11.0.tar.xz qt5-base-devel - qt5-tools-devel + qt5-tools-devel + qt5-x11extras-devel + libX11-devel + libgcc + libxcb-devel + libXrender-devel + libXfixes-devel + xcb-util-devel + xcb-util-keysyms-devel extra-cmake-modules @@ -25,6 +33,9 @@ kde5-kwindowsystem qt5-base + libX11 + libgcc + libxcb qt5-x11extras libXfixes xcb-util-keysyms @@ -58,6 +69,13 @@ + + 2015-06-23 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-05-30 5.10.0