From 6f6fb70e32685d0954695e265789b59f7091d14e Mon Sep 17 00:00:00 2001 From: groni Date: Tue, 23 Jun 2015 18:46:59 +0200 Subject: [PATCH 1/2] kconfigwidgets version bump --- .../kde5-kconfigwidgets/actions.py | 19 ++++++++--------- .../kde5-kconfigwidgets/comar/package.py | 6 ++++++ .../kde5-kconfigwidgets/pspec.xml | 21 ++++++++++--------- 3 files changed, 26 insertions(+), 20 deletions(-) mode change 100755 => 100644 desktop/kde/kde5-framework/kde5-kconfigwidgets/actions.py create mode 100644 desktop/kde/kde5-framework/kde5-kconfigwidgets/comar/package.py diff --git a/desktop/kde/kde5-framework/kde5-kconfigwidgets/actions.py b/desktop/kde/kde5-framework/kde5-kconfigwidgets/actions.py old mode 100755 new mode 100644 index b4c095499e..178bcb1c32 --- a/desktop/kde/kde5-framework/kde5-kconfigwidgets/actions.py +++ b/desktop/kde/kde5-framework/kde5-kconfigwidgets/actions.py @@ -4,21 +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 +from pisi.actionsapi import shelltools +from pisi.actionsapi import get + def setup(): - 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") + #shelltools.export("XDG_DATA_DIRS", get.workDIR()) + kde5.configure() def build(): - cmaketools.make() + kde5.make() def install(): - cmaketools.install() - + kde5.install() + pisitools.dodoc("README.md", "COPYING.LIB", "COPYING") diff --git a/desktop/kde/kde5-framework/kde5-kconfigwidgets/comar/package.py b/desktop/kde/kde5-framework/kde5-kconfigwidgets/comar/package.py new file mode 100644 index 0000000000..57066a108d --- /dev/null +++ b/desktop/kde/kde5-framework/kde5-kconfigwidgets/comar/package.py @@ -0,0 +1,6 @@ +#!/usr/bin/python + +import os + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + os.system("/usr/bin/build-docbook-catalog") diff --git a/desktop/kde/kde5-framework/kde5-kconfigwidgets/pspec.xml b/desktop/kde/kde5-framework/kde5-kconfigwidgets/pspec.xml index 2c0ebc4e53..54c054d574 100755 --- a/desktop/kde/kde5-framework/kde5-kconfigwidgets/pspec.xml +++ b/desktop/kde/kde5-framework/kde5-kconfigwidgets/pspec.xml @@ -14,13 +14,14 @@ app:gui Kconfig widgets KDE5-KConfigWidgets provides easy-to-use classes to create configuration dialogs, as well as a set of widgets which uses KConfig to store their settings. - http://download.kde.org/stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/kconfigwidgets-5.11.0.tar.xz qt5-base-devel python3 + kde5-ki18n-devel kde5-kdoctools-devel extra-cmake-modules - + @@ -50,14 +51,7 @@ kde5-kconfigwidgets-devel Development files for kconfigwidgets - qt5-base-devel - kde5-kconfigwidgets - kde5-kauth-devel - kde5-kcodecs-devel - kde5-kconfig-devel - kde5-kguiaddons-devel - kde5-ki18n-devel - kde5-kwidgetsaddons-devel + kde5-kconfigwidgets /usr/include @@ -67,6 +61,13 @@ + + 2015-06-21 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-05-30 5.10.0 From fa970aa154e55ddbb64b6e87e51ef3eb32ad882d Mon Sep 17 00:00:00 2001 From: groni Date: Tue, 23 Jun 2015 19:00:00 +0200 Subject: [PATCH 2/2] kde5-kdoctools add missing dependencies --- .../kde5-kdoctools/files/docbook.patch | 12 ++++++++++++ .../kde/kde5-framework/kde5-kdoctools/pspec.xml | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 desktop/kde/kde5-framework/kde5-kdoctools/files/docbook.patch diff --git a/desktop/kde/kde5-framework/kde5-kdoctools/files/docbook.patch b/desktop/kde/kde5-framework/kde5-kdoctools/files/docbook.patch new file mode 100644 index 0000000000..fcf75ae26c --- /dev/null +++ b/desktop/kde/kde5-framework/kde5-kdoctools/files/docbook.patch @@ -0,0 +1,12 @@ + diff --git a/cmake/FindDocBookXML4.cmake b/cmake/FindDocBookXML4.cmake +index 415745f..4d7f089 100644 +--- a/cmake/FindDocBookXML4.cmake ++++ b/cmake/FindDocBookXML4.cmake +@@ -34,6 +34,7 @@ function (locate_version version found_dir) + share/xml/docbook/xml-dtd-${version} + share/sgml/docbook/xml-dtd-${version} + share/xml/docbook/${version} ++ opt/docbook/docbook/xml/${version} + ) + + find_path (searched_dir docbookx.dtd diff --git a/desktop/kde/kde5-framework/kde5-kdoctools/pspec.xml b/desktop/kde/kde5-framework/kde5-kdoctools/pspec.xml index 0955bb1730..3965c2bc9f 100755 --- a/desktop/kde/kde5-framework/kde5-kdoctools/pspec.xml +++ b/desktop/kde/kde5-framework/kde5-kdoctools/pspec.xml @@ -18,17 +18,26 @@ qt5-base-devel perl-URI python - docbook-xsl + libgcc + libxml2-devel docbook-xml + docbook-xsl + docbook-sgml4_5 kde5-ki18n-devel + kde5-karchive-devel extra-cmake-modules + + + kde5-kdoctools - qt5-base + qt5-base + libxml2 + libgcc libxslt kde5-karchive @@ -50,6 +59,8 @@ qt5-base-devel kde5-kdoctools kde5-karchive-devel + libgcc + libxml2-devel /usr/include