Merge pull request #16 from groni/master

kconfigwidgets, kdoctools version bump
This commit is contained in:
Ertuğrul Erata
2015-06-23 21:48:30 +03:00
5 changed files with 51 additions and 22 deletions
+9 -10
View File
@@ -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")
@@ -0,0 +1,6 @@
#!/usr/bin/python
import os
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
os.system("/usr/bin/build-docbook-catalog")
@@ -14,13 +14,14 @@
<IsA>app:gui</IsA>
<Summary>Kconfig widgets</Summary>
<Description>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.</Description>
<Archive sha1sum="bab9c9dedf45e86f9bf60b5575781fd12715a7d9" type="tarxz">http://download.kde.org/stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz</Archive>
<Archive sha1sum="c3f49dc863f232591208e9df04c8e137b30ba685" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kconfigwidgets-5.11.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>python3</Dependency>
<Dependency>kde5-ki18n-devel</Dependency>
<Dependency>kde5-kdoctools-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
</BuildDependencies>
</BuildDependencies>
</Source>
<Package>
@@ -50,14 +51,7 @@
<Name>kde5-kconfigwidgets-devel</Name>
<Summary>Development files for kconfigwidgets</Summary>
<RuntimeDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency release="current">kde5-kconfigwidgets</Dependency>
<Dependency>kde5-kauth-devel</Dependency>
<Dependency>kde5-kcodecs-devel</Dependency>
<Dependency>kde5-kconfig-devel</Dependency>
<Dependency>kde5-kguiaddons-devel</Dependency>
<Dependency>kde5-ki18n-devel</Dependency>
<Dependency>kde5-kwidgetsaddons-devel</Dependency>
<Dependency release="current">kde5-kconfigwidgets</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
@@ -67,6 +61,13 @@
</Package>
<History>
<Update release="2">
<Date>2015-06-21</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-05-30</Date>
<Version>5.10.0</Version>
@@ -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
@@ -18,17 +18,26 @@
<Dependency>qt5-base-devel</Dependency>
<Dependency>perl-URI</Dependency>
<Dependency>python</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>docbook-xml</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>docbook-sgml4_5</Dependency>
<Dependency>kde5-ki18n-devel</Dependency>
<Dependency>kde5-karchive-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
</BuildDependencies>
<Patches>
<!--<Patch level="1">docbook.patch</Patch> -->
</Patches>
</Source>
<Package>
<Name>kde5-kdoctools</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>kde5-karchive</Dependency>
</RuntimeDependencies>
@@ -50,6 +59,8 @@
<Dependency>qt5-base-devel</Dependency>
<Dependency release="current">kde5-kdoctools</Dependency>
<Dependency>kde5-karchive-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libxml2-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>