Accepting request 983730 from KDE:Qt6

Qt 6.3.1 (forwarded request 983727 from cgiboudeaux)

OBS-URL: https://build.opensuse.org/request/show/983730
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-base?expand=0&rev=21

0001-CMake-Don-t-hardcode-the-library-directory-name.patch

@@ -1,30 +0,0 @@
-From 84ceaac19b17888059f063acc1934237c9d4727f Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Thu, 24 Mar 2022 16:21:21 +0100
-Subject: [PATCH] CMake: Don't hardcode the library directory name
-
-Using INSTALL_LIBDIR is the only reliable way to get the library install directory.
-
-Change-Id: Ib8c4fb8b4d339c63209393d7fdb3d1c3425b03a4
-Amends: d1c56073b4c
-Pick-to: 6.2 6.3
----
- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index a515fcd43d..c1108f583b 100644
---- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-@@ -806,7 +806,7 @@ macro(qt_examples_build_begin)
-     if(NOT QT_IS_EXTERNAL_EXAMPLES_BUILD OR NOT __qt_all_examples_ported_to_external_projects)
-         qt_internal_set_up_build_dir_package_paths()
-         list(APPEND CMAKE_FIND_ROOT_PATH "${QT_BUILD_DIR}")
--        list(APPEND QT_EXAMPLES_CMAKE_PREFIX_PATH "${QT_BUILD_DIR}/lib/cmake")
-+        list(APPEND QT_EXAMPLES_CMAKE_PREFIX_PATH "${QT_BUILD_DIR}/${INSTALL_LIBDIR}/cmake")
-     endif()
- 
-     # Because CMAKE_INSTALL_RPATH is empty by default in the repo project, examples need to have
--- 
-2.35.1
-

0001-Fix-build-with-GCC12-avoid-QCborStreamReader-prepars.patch

@@ -1,60 +0,0 @@
-From 65e233bd48801c1d48da735d62d00179cb986155 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Fri, 22 Apr 2022 10:22:52 -0700
-Subject: [PATCH] Fix build with GCC12: avoid QCborStreamReader::preparse()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 12 doesn't like that we're calling preparse() on the empty
-QByteArray() (whose .data() == &QByteArray::_empty), despite the
-condition being impossible.
-
-Reported at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105348
-
-In function ‘void* qt_cbor_decoder_read(void*, void*, size_t, size_t)’,
-    inlined from ‘void* read_bytes_unchecked(const CborValue*, void*, size_t, size_t)’ at cborinternal_p.h:234:51,
-    inlined from ‘uint32_t read_uint32(const CborValue*, size_t)’ at cborinternal_p.h:271:25,
-    inlined from ‘uint64_t _cbor_value_decode_int64_internal(const CborValue*)’ at cborparser.c:333:23,
-    inlined from ‘uint64_t _cbor_value_extract_int64_helper(const CborValue*)’ at cbor.h:372:50,
-    inlined from ‘void QCborStreamReader::preparse()’ at qcborstreamreader.cpp:769:59,
-    inlined from ‘QCborStreamReader::QCborStreamReader(const QByteArray&)’ at qcborstreamreader.cpp:825:13,
-    inlined from ‘QCborStreamReader::QCborStreamReader()’ at qcborstreamreader.cpp:790:37,
-    inlined from ‘QtPrivate::QMetaTypeForType<QCborStreamReader>::getDefaultCtr()::<lambda(const QtPrivate::QMetaTypeInterface*, void*)>’ at qmetatype.h:2302:65,
-    inlined from ‘static constexpr void QtPrivate::QMetaTypeForType<QCborStreamReader>::getDefaultCtr()::<lambda(const QtPrivate::QMetaTypeInterface*, void*)>::_FUN(const QtPrivate::QMetaTypeInterface*, void*)’ at qmetatype.h:2302:20:
-qcborstreamreader.cpp:706:18: error: array subscript ‘unsigned int[0]’ is partly outside array bounds of ‘const char [1]’ [-Werror=array-bounds]
-qbytearray.h:92:23: note: object ‘QByteArray::_empty’ of size 1
-
-Change-Id: If05aeeb7176e4f13af9afffd16e8485d34e36100
-Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-(cherry picked from commit d7d6f46324c7dbcfb02ddea3ab1b8db433c9b0d0)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/corelib/serialization/qcborstreamreader.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/corelib/serialization/qcborstreamreader.cpp b/src/corelib/serialization/qcborstreamreader.cpp
-index cf90f3e397..273941214b 100644
---- a/src/corelib/serialization/qcborstreamreader.cpp
-+++ b/src/corelib/serialization/qcborstreamreader.cpp
-@@ -565,7 +565,7 @@ public:
-     CborValue currentElement;
-     QCborError lastError = {};
- 
--    QByteArray::size_type bufferStart;
-+    QByteArray::size_type bufferStart = 0;
-     bool corrupt = false;
- 
-     QCborStreamReaderPrivate(const QByteArray &data)
-@@ -787,7 +787,7 @@ inline void QCborStreamReader::preparse()
-    \sa addData(), isValid()
-  */
- QCborStreamReader::QCborStreamReader()
--    : QCborStreamReader(QByteArray())
-+    : d(new QCborStreamReaderPrivate({})), type_(Invalid)
- {
- }
- 
--- 
-2.36.0
-

0001-QtOpenGL-Fix-build-with-GCC-12-qt_imageForBrush-is-i.patch

@@ -1,31 +0,0 @@
-From fe84b31c871449da9d75c2d2615f3f061d969234 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Fri, 22 Apr 2022 09:44:43 -0700
-Subject: [PATCH] QtOpenGL: Fix build with GCC 12: qt_imageForBrush is in QtGui
-
-/usr/bin/ld: lib/libQt6OpenGL.t.so.6.4.0: protected symbol `_Z16qt_imageForBrushib' isn't defined
-
-Change-Id: If05aeeb7176e4f13af9afffd16e845af9638337b
-Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-(cherry picked from commit 507115ebbb04cdebd09125a422fa3c081987a371)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/opengl/qopenglpaintengine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/opengl/qopenglpaintengine.cpp b/src/opengl/qopenglpaintengine.cpp
-index 98ab71dad5..5b6da3fa20 100644
---- a/src/opengl/qopenglpaintengine.cpp
-+++ b/src/opengl/qopenglpaintengine.cpp
-@@ -112,7 +112,7 @@
- QT_BEGIN_NAMESPACE
- 
- 
--Q_OPENGL_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert);
-+Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert);
- 
- ////////////////////////////////// Private Methods //////////////////////////////////////////
- 
--- 
-2.36.0
-

0001-XCB-fix-GCC-12-warning-about-uninitialized-variable-.patch

@@ -1,38 +0,0 @@
-From f4e4af57b8829a0290264b9612be4a3a0946e88d Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Fri, 22 Apr 2022 11:21:31 -0700
-Subject: [PATCH] XCB: fix GCC 12 warning about uninitialized variable use
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC is right that symbolsGroup2 could remain uninitialized for some
-conditions. So always initialize it.
-
-qxcbkeyboard.cpp:284:48: error: ‘symbolsGroup2’ may be used uninitialized [-Werror=maybe-uninitialized]
-
-Change-Id: If05aeeb7176e4f13af9afffd16e84af7d7806b0d
-Reviewed-by: Zhang Hao <543985125@qq.com>
-Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-(cherry picked from commit e92e48bc791ddafe14be39aae10790b680ddd1f7)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/plugins/platforms/xcb/qxcbkeyboard.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
-index 48abbbf74c..99870d6f45 100644
---- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp
-+++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
-@@ -257,7 +257,7 @@ struct xkb_keymap *QXcbKeyboard::keymapFromCore(const KeysymModifierMap &keysymM
-             const int maxGroup1 = 4; // We only support 4 shift states anyway
-             const int maxGroup2 = 2; // Only 3rd and 4th keysym are group 2
-             xcb_keysym_t symbolsGroup1[maxGroup1];
--            xcb_keysym_t symbolsGroup2[maxGroup2];
-+            xcb_keysym_t symbolsGroup2[maxGroup2] = { XKB_KEY_NoSymbol, XKB_KEY_NoSymbol };
-             for (int i = 0; i < maxGroup1 + maxGroup2; i++) {
-                 xcb_keysym_t sym = i < keysymsPerKeycode ? codeMap[i] : XKB_KEY_NoSymbol;
-                 if (mapGroup2ToLevel3) {
--- 
-2.36.0
-

qt6-base.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jun 17 15:15:01 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 6.3.1:
+  * https://www.qt.io/blog/qt-6.3.1-released
+- Drop patches, now upstream:
+  * 0001-CMake-Don-t-hardcode-the-library-directory-name.patch
+  * 0001-XCB-fix-GCC-12-warning-about-uninitialized-variable-.patch
+  * 0001-Fix-build-with-GCC12-avoid-QCborStreamReader-prepars.patch
+  * 0001-QtOpenGL-Fix-build-with-GCC-12-qt_imageForBrush-is-i.patch
+
 -------------------------------------------------------------------
 Tue May 10 07:30:33 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
 

qt6-base.spec

@@ -16,7 +16,7 @@
 #
 
 
-%define real_version 6.3.0
+%define real_version 6.3.1
 %define short_version 6.3
 %define tar_name qtbase-everywhere-src
 %define tar_suffix %{nil}
@@ -30,7 +30,7 @@
 %global with_gles 1
 %endif
 Name:           qt6-base%{?pkg_suffix}
-Version:        6.3.0
+Version:        6.3.1
 Release:        0
 Summary:        Qt 6 core components (Core, Gui, Widgets, Network...)
 # Legal: qtpaths is BSD-3-Clause
@@ -39,10 +39,6 @@ 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-base-rpmlintrc
 # Patches 0-100 are upstream patches #
-Patch0:         0001-CMake-Don-t-hardcode-the-library-directory-name.patch
-Patch1:         0001-XCB-fix-GCC-12-warning-about-uninitialized-variable-.patch
-Patch2:         0001-Fix-build-with-GCC12-avoid-QCborStreamReader-prepars.patch
-Patch3:         0001-QtOpenGL-Fix-build-with-GCC-12-qt_imageForBrush-is-i.patch
 # Patches 100-200 are openSUSE and/or non-upstream(able) patches #
 Patch100:       0001-Tell-the-truth-about-private-API.patch
 %if 0%{?suse_version} == 1500
@@ -799,6 +795,7 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_openglwidgets_private.pri
 # These files are only useful for the Qt continuous integration
 rm %{buildroot}%{_qt6_libexecdir}/android_*.sh
 rm %{buildroot}%{_qt6_libexecdir}/ensure_pro_file.cmake
+rm %{buildroot}%{_qt6_libexecdir}/qt-testrunner.py
 
 # This is only for Apple platforms and has a python2 dep
 rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
@@ -883,6 +880,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libexecdir}/tracegen
 %{_qt6_libexecdir}/uic
 %{_qt6_mkspecsdir}/*
+%{_qt6_pkgconfigdir}/Qt6Platform.pc
 %exclude %{_qt6_mkspecsdir}/modules/*.pri
 
 %files -n libQt6Concurrent6
@@ -896,6 +894,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6Concurrent.so
 %{_qt6_metatypesdir}/qt6concurrent_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_concurrent.pri
+%{_qt6_pkgconfigdir}/Qt6Concurrent.pc
 
 %files -n libQt6Core6
 %license LICENSE.*
@@ -924,6 +923,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_mkspecsdir}/modules/qt_lib_core.pri
 # workaround for boo#1195368, QTBUG-100370
 %{_qt6_mkspecsdir}/modules/qt_lib_core_private.pri
+%{_qt6_pkgconfigdir}/Qt6Core.pc
 %exclude %{_qt6_includedir}/QtCore/%{real_version}
 
 %files -n qt6-core-private-devel
@@ -942,6 +942,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6DBus.so
 %{_qt6_metatypesdir}/qt6dbus_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_dbus.pri
+%{_qt6_pkgconfigdir}/Qt6DBus.pc
 %exclude %{_qt6_includedir}/QtDBus/%{real_version}
 
 %files -n qt6-dbus-private-devel
@@ -972,6 +973,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6Gui.so
 %{_qt6_metatypesdir}/qt6gui_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_gui.pri
+%{_qt6_pkgconfigdir}/Qt6Gui.pc
 %exclude %{_qt6_includedir}/QtGui/%{real_version}
 
 %files -n qt6-gui-private-devel
@@ -1017,6 +1019,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6Network.so
 %{_qt6_metatypesdir}/qt6network_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_network.pri
+%{_qt6_pkgconfigdir}/Qt6Network.pc
 %exclude %{_qt6_includedir}/QtNetwork/%{real_version}
 
 %files -n qt6-network-private-devel
@@ -1035,6 +1038,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6OpenGL.so
 %{_qt6_metatypesdir}/qt6opengl_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_opengl.pri
+%{_qt6_pkgconfigdir}/Qt6OpenGL.pc
 %exclude %{_qt6_includedir}/QtOpenGL/%{real_version}
 
 %files -n qt6-opengl-private-devel
@@ -1053,6 +1057,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6OpenGLWidgets.so
 %{_qt6_metatypesdir}/qt6openglwidgets_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_openglwidgets.pri
+%{_qt6_pkgconfigdir}/Qt6OpenGLWidgets.pc
 
 %files -n libQt6PrintSupport6
 %dir %{_qt6_pluginsdir}/printsupport
@@ -1066,6 +1071,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6PrintSupport.so
 %{_qt6_metatypesdir}/qt6printsupport_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_printsupport.pri
+%{_qt6_pkgconfigdir}/Qt6PrintSupport.pc
 %exclude %{_qt6_includedir}/QtPrintSupport/%{real_version}
 
 %files -n qt6-printsupport-private-devel
@@ -1085,6 +1091,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6Sql.so
 %{_qt6_mkspecsdir}/modules/qt_lib_sql.pri
 %{_qt6_metatypesdir}/qt6sql_*_metatypes.json
+%{_qt6_pkgconfigdir}/Qt6Sql.pc
 %exclude %{_qt6_includedir}/QtSql/%{real_version}
 
 %files -n qt6-sql-private-devel
@@ -1103,6 +1110,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6Test.so
 %{_qt6_metatypesdir}/qt6test_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_testlib.pri
+%{_qt6_pkgconfigdir}/Qt6Test.pc
 %exclude %{_qt6_includedir}/QtTest/%{real_version}
 
 %files -n qt6-test-private-devel
@@ -1122,6 +1130,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6Widgets.so
 %{_qt6_metatypesdir}/qt6widgets_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_widgets.pri
+%{_qt6_pkgconfigdir}/Qt6Widgets.pc
 %exclude %{_qt6_includedir}/QtWidgets/%{real_version}
 
 %files -n qt6-widgets-private-devel
@@ -1140,6 +1149,7 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %{_qt6_libdir}/libQt6Xml.so
 %{_qt6_metatypesdir}/qt6xml_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_xml.pri
+%{_qt6_pkgconfigdir}/Qt6Xml.pc
 %exclude %{_qt6_includedir}/QtXml/%{real_version}
 
 %files -n qt6-xml-private-devel

qtbase-everywhere-src-6.3.0.tar.xz

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

qtbase-everywhere-src-6.3.1.tar.xz

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