Accepting request 970791 from KDE:Qt6

Qt 6.3.0 (forwarded request 970780 from cgiboudeaux)

OBS-URL: https://build.opensuse.org/request/show/970791
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-declarative?expand=0&rev=17

0001-CMake-Look-for-QtLanguageServerPrivate.patch

@@ -0,0 +1,33 @@
+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
+

_constraints

@@ -2,7 +2,7 @@
 <constraints>
   <hardware>
     <disk>
-      <size unit="G">15</size>
+      <size unit="G">18</size>
     </disk>
     <processors>4</processors>
   </hardware>
@@ -17,6 +17,16 @@
       </memory>
     </hardware>
   </overwrite>
+  <overwrite>
+    <conditions>
+      <arch>aarch64</arch>
+    </conditions>
+    <hardware>
+      <memory>
+        <size unit="G">7</size>
+      </memory>
+    </hardware>
+  </overwrite>
   <overwrite>
     <conditions>
       <arch>riscv64</arch>
@@ -27,4 +37,18 @@
       </memory>
     </hardware>
   </overwrite>
+  <!-- relax constraints for qt6-declarative:docs -->
+  <overwrite>
+    <conditions>
+      <package>qt6-declarative:docs</package>
+    </conditions>
+    <hardware>
+      <disk>
+        <size unit="G">2</size>
+      </disk>
+      <memory>
+        <size unit="G">2</size>
+      </memory>
+    </hardware>
+  </overwrite>
 </constraints>

qt6-declarative.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Apr  8 11:56:53 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 6.3.0:
+  * https://www.qt.io/blog/qt-6.3-released
+
+-------------------------------------------------------------------
+Tue Mar 29 12:28:32 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 6.3.0-rc
+- Add upstream fix:
+  * 0001-CMake-Look-for-QtLanguageServerPrivate.patch
+- Update build constraints
+
 -------------------------------------------------------------------
 Mon Mar 21 08:46:36 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
 

qt6-declarative.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qt6-declarative
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
 #
 
 
-%define real_version 6.2.4
+%define real_version 6.3.0
-%define short_version 6.2
+%define short_version 6.3
 %define tar_name qtdeclarative-everywhere-src
 %define tar_suffix %{nil}
 #
@@ -27,13 +27,15 @@
 %endif
 #
 Name:           qt6-declarative%{?pkg_suffix}
-Version:        6.2.4
+Version:        6.3.0
 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:  python3-base
 BuildRequires:  qt6-core-private-devel
 BuildRequires:  qt6-gui-private-devel
@@ -43,6 +45,7 @@ BuildRequires:  qt6-widgets-private-devel
 BuildRequires:  cmake(Qt6Concurrent)
 BuildRequires:  cmake(Qt6Core)
 BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6LanguageServerPrivate)
 BuildRequires:  cmake(Qt6Network)
 BuildRequires:  cmake(Qt6OpenGL)
 BuildRequires:  cmake(Qt6OpenGLWidgets)
@@ -325,6 +328,9 @@ Requires:       libQt6Qml6 = %{version}
 # Executables are required
 Requires:       qt6-declarative-tools
 Requires:       cmake(Qt6Network)
+# qmldevtools is gone in 6.3
+Provides:       qt6-qmldevtools-devel-static = 6.3
+Obsoletes:      qt6-qmldevtools-devel-static < 6.3
 
 %description -n qt6-qml-devel
 Development files for the Qt 6 Qml library.
@@ -836,13 +842,6 @@ Obsoletes:      qt6-qmldebug-private-devel < 6.2.0
 The Qt6 QmlDebug static library.
 This library does not have any ABI or API guarantees.
 
-%package -n qt6-qmldevtools-devel-static
-Summary:        Qt6 QmlDevTools static library
-%requires_eq    qt6-core-private-devel
-
-%description -n qt6-qmldevtools-devel-static
-The Qt6 QmlDevTools static library.
-
 %package -n qt6-qmldom-devel-static
 Summary:        Qt6 QmlDom static library
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@@ -858,6 +857,13 @@ The goal of the Dom library is to provide a nicer to use basis for the
 Qml Code model, to be used by the various QML tools, the designer and
 the new compiler.
 
+%package -n qt6-qmllint-devel-static
+Summary:        Qt6 QmlLint static library
+%requires_eq    qt6-core-private-devel
+
+%description -n qt6-qmllint-devel-static
+The Qt6 QmlLint static library.
+
 %package -n qt6-quickcontrolstestutils-devel-static
 Summary:        Qt6 QuickControlsTestUtils static library
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@@ -912,7 +918,10 @@ mkdir -p %{buildroot}%{_qt6_importsdir}
 
 # CMake files are not needed for plugins
 rm -r %{buildroot}%{_qt6_cmakedir}/Qt6Qml/QmlPlugins
-rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Dependencies,Targets*}.cmake
+rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Targets}*.cmake
+
+# There are no private headers
+rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration_private.pri
 
 %post -n libQt6LabsAnimation6 -p /sbin/ldconfig
 %post -n libQt6LabsFolderListModel6 -p /sbin/ldconfig
@@ -987,10 +996,12 @@ rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Dependencies,Targets*}.cmake
 %{_bindir}/qmleasing6
 %{_bindir}/qmlformat6
 %{_bindir}/qmllint6
+%{_bindir}/qmlls6
 %{_bindir}/qmlplugindump6
 %{_bindir}/qmlpreview6
 %{_bindir}/qmlprofiler6
 %{_bindir}/qmlscene6
+%{_bindir}/qmltc6
 %{_bindir}/qmltestrunner6
 %{_bindir}/qmltime6
 %{_qt6_bindir}/qml
@@ -998,10 +1009,12 @@ rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Dependencies,Targets*}.cmake
 %{_qt6_bindir}/qmleasing
 %{_qt6_bindir}/qmlformat
 %{_qt6_bindir}/qmllint
+%{_qt6_bindir}/qmlls
 %{_qt6_bindir}/qmlplugindump
 %{_qt6_bindir}/qmlpreview
 %{_qt6_bindir}/qmlprofiler
 %{_qt6_bindir}/qmlscene
+%{_qt6_bindir}/qmltc
 %{_qt6_bindir}/qmltestrunner
 %{_qt6_bindir}/qmltime
 %{_qt6_libexecdir}/qmlcachegen
@@ -1121,11 +1134,14 @@ rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Dependencies,Targets*}.cmake
 %files -n qt6-qml-devel
 %dir %{_qt6_mkspecsdir}/features
 %{_qt6_cmakedir}/Qt6Qml/
+%{_qt6_cmakedir}/Qt6QmlIntegration/
 # Files from the two directories above are only used by Qt6QmlMacros.cmake
 %{_qt6_cmakedir}/Qt6QmlImportScanner/
 %{_qt6_cmakedir}/Qt6QmlTools/
 %{_qt6_descriptionsdir}/Qml.json
+%{_qt6_descriptionsdir}/QmlIntegration.json
 %{_qt6_includedir}/QtQml/
+%{_qt6_includedir}/QtQmlIntegration/
 %{_qt6_libdir}/libQt6Qml.prl
 %{_qt6_libdir}/libQt6Qml.so
 %{_qt6_metatypesdir}/qt6qml_*_metatypes.json
@@ -1133,6 +1149,7 @@ rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Dependencies,Targets*}.cmake
 %{_qt6_mkspecsdir}/features/qmltypes.prf
 %{_qt6_mkspecsdir}/features/qtquickcompiler.prf
 %{_qt6_mkspecsdir}/modules/qt_lib_qml.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_qmlintegration.pri
 %exclude %{_qt6_includedir}/QtQml/%{real_version}
 
 %files -n qt6-qml-private-devel
@@ -1453,14 +1470,6 @@ rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Dependencies,Targets*}.cmake
 %{_qt6_metatypesdir}/qt6qmldebugprivate_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_qmldebug_private.pri
 
-%files -n qt6-qmldevtools-devel-static
-%{_qt6_cmakedir}/Qt6QmlDevToolsPrivate/
-%{_qt6_descriptionsdir}/QmlDevToolsPrivate.json
-%{_qt6_libdir}/libQt6QmlDevTools.a
-%{_qt6_libdir}/libQt6QmlDevTools.prl
-%{_qt6_metatypesdir}/qt6qmldevtoolsprivate_*_metatypes.json
-%{_qt6_mkspecsdir}/modules/qt_lib_qmldevtools_private.pri
-
 %files -n qt6-qmldom-devel-static
 %{_qt6_cmakedir}/Qt6QmlDomPrivate/
 %{_qt6_descriptionsdir}/QmlDomPrivate.json
@@ -1470,6 +1479,15 @@ rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Dependencies,Targets*}.cmake
 %{_qt6_metatypesdir}/qt6qmldomprivate_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_qmldom_private.pri
 
+%files -n qt6-qmllint-devel-static
+%{_qt6_cmakedir}/Qt6QmlLintPrivate/
+%{_qt6_descriptionsdir}/QmlLintPrivate.json
+%{_qt6_includedir}/QtQmlLint/
+%{_qt6_libdir}/libQt6QmlLint.a
+%{_qt6_libdir}/libQt6QmlLint.prl
+%{_qt6_metatypesdir}/qt6qmllintprivate_*_metatypes.json
+%{_qt6_mkspecsdir}/modules/qt_lib_qmllint_private.pri
+
 %files -n qt6-quickcontrolstestutils-devel-static
 %{_qt6_cmakedir}/Qt6QuickControlsTestUtilsPrivate/
 %{_qt6_descriptionsdir}/QuickControlsTestUtilsPrivate.json

qtdeclarative-everywhere-src-6.2.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa6a8b5bfe43203daf022b7949c7874240ec28b9c4b7ebc52b2e5ea440e6e94f
-size 29475416

qtdeclarative-everywhere-src-6.3.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+size 30067416