diff --git a/programming/library/qtutilities/actions.py b/programming/library/qtutilities/actions.py index 1994aef156..6854cfc015 100644 --- a/programming/library/qtutilities/actions.py +++ b/programming/library/qtutilities/actions.py @@ -4,28 +4,21 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import shelltools -from pisi.actionsapi import cmaketools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get +from pisi.actionsapi import mesontools, cmaketools j = ''.join([ ' -DCMAKE_BUILD_TYPE=Release', ' -DBUILD_SHARED_LIBS=ON', ' -DQT_PACKAGE_PREFIX=Qt6', - ' -DDISABLE_DEPRECATED_QT_FEATURES=ON -L ' + ' -DDISABLE_DEPRECATED_QT_FEATURES=ON', + ' -B_build -G Ninja -L ' ]) def setup(): - cmaketools.configure("-B_build %s" % j) + cmaketools.configure(j) def build(): - shelltools.cd("_build") - cmaketools.make() + mesontools.build("-C _build") def install(): - shelltools.cd("_build") - cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) - - pisitools.dodoc("../LICENSE", "../README.md") - + mesontools.install("-C _build") diff --git a/programming/library/qtutilities/pspec.xml b/programming/library/qtutilities/pspec.xml index 1ed47e01a7..e559d43a75 100644 --- a/programming/library/qtutilities/pspec.xml +++ b/programming/library/qtutilities/pspec.xml @@ -13,11 +13,12 @@ programming.library Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models. Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models. - - https://github.com/Martchus/qtutilities/archive/refs/tags/v6.10.0.tar.gz + + https://github.com/Martchus/qtutilities/archive/refs/tags/v6.11.0.tar.gz cmake + ninja doxygen qt6-linguist qt6-base-devel @@ -53,6 +54,13 @@ + + 2023-03-08 + 6.11.0 + Version bump + fury + uglyside@yandex.ru + 2023-02-02 6.10.0