diff --git a/0001-Fix-some-depends-statements-in-QML-modules.patch b/0001-Fix-some-depends-statements-in-QML-modules.patch new file mode 100644 index 0000000..18aa3d0 --- /dev/null +++ b/0001-Fix-some-depends-statements-in-QML-modules.patch @@ -0,0 +1,42 @@ +From 2b765ff271ccfe5fdc513fe3a36829f18e30e861 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Thu, 23 Nov 2023 09:37:25 +0100 +Subject: [PATCH] Fix some depends statements in QML modules + +DEPENDENCIES refers to module identifiers, not CMake targets. + +Signed-off-by: Fabian Vogt +--- + src/helpers/impl/CMakeLists.txt | 2 +- + src/quick3dparticleeffects/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/helpers/impl/CMakeLists.txt b/src/helpers/impl/CMakeLists.txt +index 22c6f12ff..b3f773280 100644 +--- a/src/helpers/impl/CMakeLists.txt ++++ b/src/helpers/impl/CMakeLists.txt +@@ -9,7 +9,7 @@ qt_internal_add_qml_module(Quick3DHelpersImpl + NO_PLUGIN_OPTIONAL + DEPENDENCIES + QtQuick3D/auto +- Quick3DHelpers/auto ++ QtQuick3D.Helpers/auto + SOURCES + sceneeffects.cpp sceneeffects_p.h + qquick3drenderstatsmeshesmodel_p.h qquick3drenderstatsmeshesmodel.cpp +diff --git a/src/quick3dparticleeffects/CMakeLists.txt b/src/quick3dparticleeffects/CMakeLists.txt +index 61528cddb..120afe6c7 100644 +--- a/src/quick3dparticleeffects/CMakeLists.txt ++++ b/src/quick3dparticleeffects/CMakeLists.txt +@@ -13,7 +13,7 @@ qt_internal_add_qml_module(Quick3DParticleEffects + PLUGIN_TARGET qtquick3dparticleeffectsplugin + DEPENDENCIES + QtQuick3D/auto +- QtQuick3DParticles3D/auto ++ QtQuick3D.Particles3D/auto + NO_SYNC_QT + DEFINES + QT_BUILD_QUICK3DPARTICLEEFFECTS_LIB +-- +2.42.1 + diff --git a/qt6-quick3d.changes b/qt6-quick3d.changes index 191a436..e328853 100644 --- a/qt6-quick3d.changes +++ b/qt6-quick3d.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 08:39:31 UTC 2023 - Fabian Vogt + +- Add patch to fix module dependencies: + * 0001-Fix-some-depends-statements-in-QML-modules.patch + ------------------------------------------------------------------- Tue Oct 10 09:39:56 UTC 2023 - Christophe Marin diff --git a/qt6-quick3d.spec b/qt6-quick3d.spec index c55a864..f7e9fdf 100644 --- a/qt6-quick3d.spec +++ b/qt6-quick3d.spec @@ -34,6 +34,8 @@ License: GPL-3.0-or-later URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-quick3d-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-some-depends-statements-in-QML-modules.patch BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel @@ -360,6 +362,7 @@ Requires: cmake(Qt6Quick3DUtils) = %{real_version} This package provides private headers of libQt6Quick3DUtils that do not have any ABI or API guarantees. + ### Private only library ### %package -n libQt6Quick3DGlslParser6