Sync from SUSE:SLFO:Main qt6-quick3d revision 43ac0fc792c77e1919fb54fcf6443b91
This commit is contained in:
parent
648f920bd3
commit
7efc8ccb4c
@ -1,42 +0,0 @@
|
||||
From 2b765ff271ccfe5fdc513fe3a36829f18e30e861 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
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 <fvogt@suse.de>
|
||||
---
|
||||
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
|
||||
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 26 14:26:22 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 6.6.3:
|
||||
* https://www.qt.io/blog/qt-6.6.3-released
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 14 16:53:24 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 6.6.2
|
||||
* https://www.qt.io/blog/qt-6.6.2-released
|
||||
- Drop patch, merged upstream:
|
||||
* 0001-Fix-some-depends-statements-in-QML-modules.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 27 14:00:15 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define real_version 6.6.1
|
||||
%define real_version 6.6.3
|
||||
%define short_version 6.6
|
||||
%define tar_name qtquick3d-everywhere-src
|
||||
%define tar_suffix %{nil}
|
||||
@ -27,15 +27,13 @@
|
||||
%endif
|
||||
#
|
||||
Name: qt6-quick3d%{?pkg_suffix}
|
||||
Version: 6.6.1
|
||||
Version: 6.6.3
|
||||
Release: 0
|
||||
Summary: API for creating 3D content and 3D user interfaces based on Qt Quick
|
||||
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
|
||||
|
BIN
qtquick3d-everywhere-src-6.6.1.tar.xz
(Stored with Git LFS)
BIN
qtquick3d-everywhere-src-6.6.1.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
qtquick3d-everywhere-src-6.6.3.tar.xz
(Stored with Git LFS)
Normal file
BIN
qtquick3d-everywhere-src-6.6.3.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user