diff --git a/desktop/toolkit/qt6/qt6-quick3d/actions.py b/desktop/toolkit/qt6/qt6-quick3d/actions.py
index fdff7d2be0..bc816871db 100755
--- a/desktop/toolkit/qt6/qt6-quick3d/actions.py
+++ b/desktop/toolkit/qt6/qt6-quick3d/actions.py
@@ -6,27 +6,30 @@
from pisi.actionsapi import shelltools
from pisi.actionsapi import pisitools
from pisi.actionsapi import qt6
-from pisi.actionsapi import get
+from pisi.actionsapi import get, cmaketools
def setup():
- shelltools.export("CC", "gcc")
- shelltools.export("CXX", "g++")
- shelltools.export("LDFLAGS", "%s" % get.LDFLAGS())
- # pisitools.cflags.remove("-lto-wrapper")
- # pisitools.cxxflags.remove("-lto-wrapper")
- # pisitools.cflags.add(" -ffat-lto-objects")
- # pisitools.cxxflags.add(" -ffat-lto-objects")
- qt6.configure()
+ shelltools.export("CC", "clang")
+ shelltools.export("CXX", "clang++")
+ cmaketools.configure("-B build \
+ -D-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
+ -DCMAKE_BUILD_TYPE=Release")
+
+ # qt6.configure()
def build():
- qt6.make()
+ cmaketools.make("-C build")
+ shelltools.system("cmake --build build")
+ # qt6.make()
def install():
- qt6.install()
+ shelltools.cd("build")
+ cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
+ # qt6.install()
#I hope qtchooser will manage this issue
for bin in shelltools.ls("%s/usr/lib/qt6/bin" % get.installDIR()):
pisitools.dosym("/usr/lib/qt6/bin/%s" % bin, "/usr/bin/%s-qt6" % bin)
- pisitools.dodoc("LICENSES/*")
+ pisitools.dodoc("../LICENSES/*")
diff --git a/desktop/toolkit/qt6/qt6-quick3d/pspec.xml b/desktop/toolkit/qt6/qt6-quick3d/pspec.xml
index f611655d0c..f213f1e344 100755
--- a/desktop/toolkit/qt6/qt6-quick3d/pspec.xml
+++ b/desktop/toolkit/qt6/qt6-quick3d/pspec.xml
@@ -28,7 +28,7 @@
qt6-quicktimeline-devel
- qtquick3d-fix-build-with-gcc11.patch
+
@@ -40,6 +40,7 @@
qt6-declarative
qt6-quicktimeline
libgcc
+ zlib
assimp