Accepting request 983735 from KDE:Qt6
Qt 6.3.1 (forwarded request 983727 from cgiboudeaux) OBS-URL: https://build.opensuse.org/request/show/983735 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-declarative?expand=0&rev=18
This commit is contained in:
commit
473b9c3317
@ -1,33 +0,0 @@
|
||||
From 95665d84fbe3f0a8ef47458bfbd7a3b8837869bc Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Sun, 27 Mar 2022 11:33:31 +0200
|
||||
Subject: [PATCH] CMake: Look for QtLanguageServerPrivate
|
||||
|
||||
The module was renamed to match the CMake target name.
|
||||
|
||||
Change-Id: I67e2191b91ed2293dc652432c0fd786d43052cf4
|
||||
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
||||
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
||||
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
||||
(cherry picked from commit 9ebd7caa207ad211dc20df66868d53adb0f6a3c7)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7269350837..f3bf7d25cd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -11,7 +11,7 @@ project(QtDeclarative # special case
|
||||
)
|
||||
|
||||
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
|
||||
-find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets OpenGL OpenGLWidgets Sql Concurrent Test LanguageServer)
|
||||
+find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets OpenGL OpenGLWidgets Sql Concurrent Test LanguageServerPrivate)
|
||||
|
||||
# Set up QT_HOST_PATH as an extra root path to look for the ShaderToolsTools package
|
||||
# when cross-compiling.
|
||||
--
|
||||
2.35.1
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 17 15:15:08 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.3.1:
|
||||
* https://www.qt.io/blog/qt-6.3.1-released
|
||||
- Drop patch, now upstream:
|
||||
* 0001-CMake-Look-for-QtLanguageServerPrivate.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 8 11:56:53 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define real_version 6.3.0
|
||||
%define real_version 6.3.1
|
||||
%define short_version 6.3
|
||||
%define tar_name qtdeclarative-everywhere-src
|
||||
%define tar_suffix %{nil}
|
||||
@ -27,15 +27,14 @@
|
||||
%endif
|
||||
#
|
||||
Name: qt6-declarative%{?pkg_suffix}
|
||||
Version: 6.3.0
|
||||
Version: 6.3.1
|
||||
Release: 0
|
||||
Summary: Qt 6 Declarative Libraries and tools
|
||||
License: LGPL-3.0-only OR (GPL-2.0-only OR 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-declarative-rpmlintrc
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: 0001-CMake-Look-for-QtLanguageServerPrivate.patch
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python3-base
|
||||
BuildRequires: qt6-core-private-devel
|
||||
BuildRequires: qt6-gui-private-devel
|
||||
@ -1033,6 +1032,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6LabsAnimation.so
|
||||
%{_qt6_metatypesdir}/qt6labsanimation_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_labsanimation.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6LabsAnimation.pc
|
||||
%exclude %{_qt6_includedir}/QtLabsAnimation/%{real_version}
|
||||
|
||||
%files -n qt6-labsanimation-private-devel
|
||||
@ -1050,6 +1050,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6LabsFolderListModel.so
|
||||
%{_qt6_metatypesdir}/qt6labsfolderlistmodel_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_labsfolderlistmodel.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6LabsFolderListModel.pc
|
||||
%exclude %{_qt6_includedir}/QtLabsFolderListModel/%{real_version}
|
||||
|
||||
%files -n qt6-labsfolderlistmodel-private-devel
|
||||
@ -1067,6 +1068,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6LabsQmlModels.so
|
||||
%{_qt6_metatypesdir}/qt6labsqmlmodels_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_labsqmlmodels.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6LabsQmlModels.pc
|
||||
%exclude %{_qt6_includedir}/QtLabsQmlModels/%{real_version}
|
||||
|
||||
%files -n qt6-labsqmlmodels-private-devel
|
||||
@ -1084,6 +1086,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6LabsSettings.so
|
||||
%{_qt6_metatypesdir}/qt6labssettings_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_labssettings.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6LabsSettings.pc
|
||||
%exclude %{_qt6_includedir}/QtLabsSettings/%{real_version}
|
||||
|
||||
%files -n qt6-labssettings-private-devel
|
||||
@ -1101,6 +1104,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6LabsSharedImage.so
|
||||
%{_qt6_metatypesdir}/qt6labssharedimage_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_labssharedimage.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6LabsSharedImage.pc
|
||||
%exclude %{_qt6_includedir}/QtLabsSharedImage/%{real_version}
|
||||
|
||||
%files -n qt6-labssharedimage-private-devel
|
||||
@ -1118,6 +1122,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6LabsWavefrontMesh.so
|
||||
%{_qt6_metatypesdir}/qt6labswavefrontmesh_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_labswavefrontmesh.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6LabsWavefrontMesh.pc
|
||||
%exclude %{_qt6_includedir}/QtLabsWavefrontMesh/%{real_version}
|
||||
|
||||
%files -n qt6-labswavefrontmesh-private-devel
|
||||
@ -1150,6 +1155,8 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_mkspecsdir}/features/qtquickcompiler.prf
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_qml.pri
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6Qml.pc
|
||||
%{_qt6_pkgconfigdir}/Qt6QmlIntegration.pc
|
||||
%exclude %{_qt6_includedir}/QtQml/%{real_version}
|
||||
|
||||
%files -n qt6-qml-private-devel
|
||||
@ -1167,6 +1174,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QmlCore.so
|
||||
%{_qt6_metatypesdir}/qt6qmlcore_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_qmlcore.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QmlCore.pc
|
||||
%exclude %{_qt6_includedir}/QtQmlCore/%{real_version}
|
||||
|
||||
%files -n qt6-qmlcore-private-devel
|
||||
@ -1184,6 +1192,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QmlLocalStorage.so
|
||||
%{_qt6_metatypesdir}/qt6qmllocalstorage_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_qmllocalstorage.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QmlLocalStorage.pc
|
||||
%exclude %{_qt6_includedir}/QtQmlLocalStorage/%{real_version}
|
||||
|
||||
%files -n qt6-qmllocalstorage-private-devel
|
||||
@ -1201,6 +1210,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QmlModels.so
|
||||
%{_qt6_metatypesdir}/qt6qmlmodels_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_qmlmodels.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QmlModels.pc
|
||||
%exclude %{_qt6_includedir}/QtQmlModels/%{real_version}
|
||||
|
||||
%files -n qt6-qmlmodels-private-devel
|
||||
@ -1218,6 +1228,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QmlWorkerScript.so
|
||||
%{_qt6_metatypesdir}/qt6qmlworkerscript_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_qmlworkerscript.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QmlWorkerScript.pc
|
||||
%exclude %{_qt6_includedir}/QtQmlWorkerScript/%{real_version}
|
||||
|
||||
%files -n qt6-qmlworkerscript-private-devel
|
||||
@ -1235,6 +1246,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QmlXmlListModel.so
|
||||
%{_qt6_metatypesdir}/qt6qmlxmllistmodel_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_qmlxmllistmodel.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QmlXmlListModel.pc
|
||||
%exclude %{_qt6_includedir}/QtQmlXmlListModel/%{real_version}
|
||||
|
||||
%files -n qt6-qmlxmllistmodel-private-devel
|
||||
@ -1253,6 +1265,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6Quick.so
|
||||
%{_qt6_metatypesdir}/qt6quick_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_quick.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6Quick.pc
|
||||
%exclude %{_qt6_includedir}/QtQuick/%{real_version}
|
||||
|
||||
%files -n qt6-quick-private-devel
|
||||
@ -1270,6 +1283,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QuickControls2.so
|
||||
%{_qt6_metatypesdir}/qt6quickcontrols2_*.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QuickControls2.pc
|
||||
%exclude %{_qt6_includedir}/QtQuickControls2/%{real_version}
|
||||
|
||||
%files -n qt6-quickcontrols2-private-devel
|
||||
@ -1287,6 +1301,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QuickControls2Impl.so
|
||||
%{_qt6_metatypesdir}/qt6quickcontrols2impl_*.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_quickcontrols2impl.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QuickControls2Impl.pc
|
||||
%exclude %{_qt6_includedir}/QtQuickControls2Impl/%{real_version}
|
||||
|
||||
%files -n qt6-quickcontrols2impl-private-devel
|
||||
@ -1304,6 +1319,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QuickDialogs2.so
|
||||
%{_qt6_metatypesdir}/qt6quickdialogs2_*.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_quickdialogs2.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QuickDialogs2.pc
|
||||
%exclude %{_qt6_includedir}/QtQuickDialogs2/%{real_version}
|
||||
|
||||
%files -n qt6-quickdialogs2-private-devel
|
||||
@ -1321,6 +1337,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QuickDialogs2QuickImpl.so
|
||||
%{_qt6_metatypesdir}/qt6quickdialogs2quickimpl_*.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_quickdialogs2quickimpl.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QuickDialogs2QuickImpl.pc
|
||||
%exclude %{_qt6_includedir}/QtQuickDialogs2QuickImpl/%{real_version}
|
||||
|
||||
%files -n qt6-quickdialogs2quickimpl-private-devel
|
||||
@ -1338,6 +1355,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QuickDialogs2Utils.so
|
||||
%{_qt6_metatypesdir}/qt6quickdialogs2utils_*.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_quickdialogs2utils.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QuickDialogs2Utils.pc
|
||||
%exclude %{_qt6_includedir}/QtQuickDialogs2Utils/%{real_version}
|
||||
|
||||
%files -n qt6-quickdialogs2utils-private-devel
|
||||
@ -1355,6 +1373,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QuickLayouts.so
|
||||
%{_qt6_metatypesdir}/qt6quicklayouts_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_quicklayouts.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QuickLayouts.pc
|
||||
%exclude %{_qt6_includedir}/QtQuickLayouts/%{real_version}
|
||||
|
||||
%files -n qt6-quicklayouts-private-devel
|
||||
@ -1373,6 +1392,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QuickTemplates2.so
|
||||
%{_qt6_metatypesdir}/qt6quicktemplates2_*.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_quicktemplates2.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QuickTemplates2.pc
|
||||
%exclude %{_qt6_includedir}/QtQuickTemplates2/%{real_version}
|
||||
|
||||
%files -n qt6-quicktemplates2-private-devel
|
||||
@ -1390,6 +1410,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QuickTest.so
|
||||
%{_qt6_metatypesdir}/qt6quicktest_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_qmltest.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QuickTest.pc
|
||||
%exclude %{_qt6_includedir}/QtQuickTest/%{real_version}
|
||||
|
||||
%files -n qt6-quicktest-private-devel
|
||||
@ -1407,6 +1428,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
|
||||
%{_qt6_libdir}/libQt6QuickWidgets.so
|
||||
%{_qt6_metatypesdir}/qt6quickwidgets_*_metatypes.json
|
||||
%{_qt6_mkspecsdir}/modules/qt_lib_quickwidgets.pri
|
||||
%{_qt6_pkgconfigdir}/Qt6QuickWidgets.pc
|
||||
%exclude %{_qt6_includedir}/QtQuickWidgets/%{real_version}
|
||||
|
||||
%files -n qt6-quickwidgets-private-devel
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
|
||||
size 30067416
|
3
qtdeclarative-everywhere-src-6.3.1.tar.xz
Normal file
3
qtdeclarative-everywhere-src-6.3.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
|
||||
size 30098680
|
Loading…
Reference in New Issue
Block a user