diff --git a/desktop/kde/graphics/digikam/actions.py b/desktop/kde/graphics/digikam/actions.py index db52af29ca..44a0fe5755 100644 --- a/desktop/kde/graphics/digikam/actions.py +++ b/desktop/kde/graphics/digikam/actions.py @@ -11,20 +11,25 @@ from pisi.actionsapi import cmaketools #shelltools.export("HOME", get.workDIR()) def setup(): - kde5.configure("-DBUILD_TESTING=OFF \ - -DENABLE_KFILEMETADATASUPPORT=ON \ - -DENABLE_MEDIAPLAYER=ON \ - -DENABLE_AKONADICONTACTSUPPORT=ON \ - -DENABLE_MYSQLSUPPORT=ON \ - -DENABLE_APPSTYLES=ON \ - -DENABLE_QWEBENGINE=ON \ - -DOpenGL_GL_PREFERENCE=GLVND") + shelltools.makedirs("build") + shelltools.cd("build") + cmaketools.configure("-G 'Ninja' \ + -DBUILD_TESTING=OFF \ + -DENABLE_KFILEMETADATASUPPORT=ON \ + -DENABLE_MEDIAPLAYER=ON \ + -DENABLE_AKONADICONTACTSUPPORT=ON \ + -DENABLE_MYSQLSUPPORT=ON \ + -DENABLE_APPSTYLES=ON \ + -DENABLE_QWEBENGINE=ON \ + -DOpenGL_GL_PREFERENCE=GLVND" \ + sourceDir = '..') def build(): - kde5.make() + shelltools.cd("build") + shelltools.system("ninja") def install(): - kde5.install() + shelltools.system("DESTDIR=%s ninja install" %get.installDIR()) pisitools.dodoc("COPYING", "COPYING-CMAKE-SCRIPTS", "README*", "NEWS") diff --git a/desktop/kde/graphics/digikam/pspec.xml b/desktop/kde/graphics/digikam/pspec.xml index a37cfe7558..305fd5f745 100644 --- a/desktop/kde/graphics/digikam/pspec.xml +++ b/desktop/kde/graphics/digikam/pspec.xml @@ -98,7 +98,8 @@ kcontacts-devel qt5-webengine-devel imagemagick-devel - x265-devel + x265-devel + ninja