diff --git a/programming/library/accounts-qml-module/actions.py b/programming/library/accounts-qml-module/actions.py index 8a564934c1..56b4fb82b4 100644 --- a/programming/library/accounts-qml-module/actions.py +++ b/programming/library/accounts-qml-module/actions.py @@ -5,15 +5,24 @@ # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import pisitools -from pisi.actionsapi import qt5 +from pisi.actionsapi import shelltools +from pisi.actionsapi import qt6, autotools, get def setup(): - qt5.configure() + # qt6.configure() + shelltools.system("mkdir build") + shelltools.cd("build") + shelltools.system("qmake6-qt6 ../accounts-qml-module.pro PREFIX=/usr") def build(): - qt5.make() + # qt6.make() + shelltools.cd("build") + # shelltools.system("qmake6-qt6 make") + autotools.make() def install(): - qt5.install() - + shelltools.cd("build") + autotools.rawInstall("INSTALL_ROOT=%s" % get.installDIR()) + # qt6.install() + shelltools.cd("..") pisitools.dodoc("COPYING", "README*") diff --git a/programming/library/accounts-qml-module/pspec.xml b/programming/library/accounts-qml-module/pspec.xml index bfb4e6a413..9fe3c959be 100644 --- a/programming/library/accounts-qml-module/pspec.xml +++ b/programming/library/accounts-qml-module/pspec.xml @@ -12,17 +12,18 @@ library Expose the Online Accounts API to QML applications Expose the Online Accounts API to QML applications - https://gitlab.com/accounts-sso/accounts-qml-module/-/archive/VERSION_0.7/accounts-qml-module-VERSION_0.7.tar.gz + https://gitlab.com/accounts-sso/accounts-qml-module/-/archive/05e79ebbbf3784a87f72b7be571070125c10dfe3/accounts-qml-module-05e79ebbbf3784a87f72b7be571070125c10dfe3.tar.bz2 signond-devel - - qt5-base-devel - qt5-assistant-devel - qt5-declarative-devel + libaccounts-qt6-devel + signond-qt6-devel + qt6-base-devel + qt6-assistant-devel + qt6-declarative-devel - Build-add-qmltypes-file-to-repository.patch - Fix-compilation-with-Qt-5.13.patch + + @@ -30,9 +31,10 @@ accounts-qml-module signond - - qt5-base - qt5-declarative + signond-qt6 + libaccounts-qt6 + qt6-base + qt6-declarative /usr/bin @@ -43,6 +45,13 @@ + + 2020-04-08 + 0.7 + First release + Pisi Linux Admins + admins@pisilinux.org + 2020-04-08 0.6