From b2253183c0becc604b69535330f06074f2dd35b0 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Tue, 29 Jul 2025 12:24:50 +0300
Subject: [PATCH] quick3d ver. bump

---
 desktop/toolkit/qt6/qt6-quick3d/actions.py    | 26 +++++++++----------
 .../qt6/qt6-quick3d/files/assimp6.patch       | 22 ++++++++++++++++
 desktop/toolkit/qt6/qt6-quick3d/pspec.xml     | 11 ++++++--
 3 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 desktop/toolkit/qt6/qt6-quick3d/files/assimp6.patch

diff --git a/desktop/toolkit/qt6/qt6-quick3d/actions.py b/desktop/toolkit/qt6/qt6-quick3d/actions.py
index bc816871db..e267fc9bd4 100755
--- a/desktop/toolkit/qt6/qt6-quick3d/actions.py
+++ b/desktop/toolkit/qt6/qt6-quick3d/actions.py
@@ -10,26 +10,26 @@ from pisi.actionsapi import get, cmaketools
 
 
 def setup():
-    shelltools.export("CC", "clang")
-    shelltools.export("CXX", "clang++")
-    cmaketools.configure("-B build \
-                                        -D-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
-                                        -DCMAKE_BUILD_TYPE=Release")
+    # shelltools.export("CC", "clang")
+    # shelltools.export("CXX", "clang++")
+    # cmaketools.configure("-B build \
+                          # -D-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
+                          # -DCMAKE_BUILD_TYPE=Release")
 
-    # qt6.configure()
+    qt6.configure()
 
 def build():
-    cmaketools.make("-C build")
-    shelltools.system("cmake --build build")
-    # qt6.make()
+    # cmaketools.make("-C build")
+    # shelltools.system("cmake --build build")
+    qt6.make()
 
 def install():
-    shelltools.cd("build")
-    cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
-    # 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/files/assimp6.patch b/desktop/toolkit/qt6/qt6-quick3d/files/assimp6.patch
new file mode 100644
index 0000000000..71cbc29db0
--- /dev/null
+++ b/desktop/toolkit/qt6/qt6-quick3d/files/assimp6.patch
@@ -0,0 +1,22 @@
+diff --git a/src/plugins/assetimporters/configure.cmake b/src/plugins/assetimporters/configure.cmake
+index 35fb2890e..745a44513 100644
+--- a/src/plugins/assetimporters/configure.cmake
++++ b/src/plugins/assetimporters/configure.cmake
+@@ -13,7 +13,7 @@ set_property(CACHE INPUT_quick3d_assimp PROPERTY STRINGS undefined no qt system)
+ 
+ #### Libraries
+ 
+-qt_find_package(WrapQuick3DAssimp 5.1.6 PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp MODULE_NAME assetimporters QMAKE_LIB quick3d_assimp)
++qt_find_package(WrapQuick3DAssimp 6 PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp MODULE_NAME assetimporters QMAKE_LIB quick3d_assimp)
+ 
+ # Work around QTBUG-115064
+ # Assimp depends on draco_X, but only one of the two targets gets promoted by qt_find_package
+@@ -35,7 +35,7 @@ qt_config_compile_test("quick3d_assimp"
+                    LABEL "Assimp"
+                    PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../config.tests/quick3d_assimp"
+                    LIBRARIES WrapQuick3DAssimp::WrapQuick3DAssimp
+-                   PACKAGES PACKAGE WrapQuick3DAssimp 5.1.6)
++                   PACKAGES PACKAGE WrapQuick3DAssimp 6)
+ 
+ 
+ #### Tests
diff --git a/desktop/toolkit/qt6/qt6-quick3d/pspec.xml b/desktop/toolkit/qt6/qt6-quick3d/pspec.xml
index f98f0a73c3..384c75cf80 100755
--- a/desktop/toolkit/qt6/qt6-quick3d/pspec.xml
+++ b/desktop/toolkit/qt6/qt6-quick3d/pspec.xml
@@ -22,14 +22,14 @@
       <Dependency>cmake</Dependency>
       <Dependency>vulkan-headers</Dependency>
       <Dependency>llvm-clang-devel</Dependency>
-      <Dependency versionFrom="3.3.1">assimp-devel</Dependency>
+      <Dependency versionFrom="6.0.2">assimp-devel</Dependency>
       <Dependency versionFrom="6.9.1">qt6-base-devel</Dependency>
       <Dependency versionFrom="6.9.1">qt6-declarative-devel</Dependency>
       <Dependency versionFrom="6.9.1">qt6-shadertools-devel</Dependency>
       <Dependency versionFrom="6.9.1">qt6-quicktimeline-devel</Dependency>
     </BuildDependencies>
     <Patches>
-      <!--             <Patch level="1">qtquick3d-fix-build-with-gcc11.patch</Patch> -->
+        <Patch level="1">assimp6.patch</Patch>
     </Patches>
   </Source>
   <Package>
@@ -70,6 +70,13 @@
     </Files>
   </Package>
   <History>
+    <Update release="17">
+      <Date>2025-07-28</Date>
+      <Version>6.9.1</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
     <Update release="16">
       <Date>2025-06-09</Date>
       <Version>6.9.1</Version>