6.6.0

.gitignore

@@ -23,3 +23,4 @@
 /qtbase-everywhere-src-6.5.2.tar.xz
 /qt-everywhere-src-6.5.3.tar.xz
 /qtbase-everywhere-src-6.5.3.tar.xz
+/qtbase-everywhere-src-6.6.0.tar.xz

qt6-qtbase.spec

@@ -37,7 +37,7 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
-Version: 6.5.3
+Version: 6.6.0
 Release: 1%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -87,8 +87,9 @@ Patch56: qtbase-mysql.patch
 # fix FTBFS against libglvnd-1.3.4+
 Patch58: qtbase-libglvnd.patch
 
-# gcc-11
+# fix FTBS against libxkbcommon 1.6.0
-Patch90: qtbase-gcc11.patch
+Patch59: qtbase-libxkbcommon-1.6.0.patch
+
 
 %if 0%{?fedora} < 39
 # Latest QGnomePlatform needs to be specified to be used
@@ -354,6 +355,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
  -DQT_FEATURE_enable_new_dtags=ON \
  -DQT_FEATURE_journald=%{?journald:ON}%{!?journald:OFF} \
  -DQT_FEATURE_openssl_linked=ON \
+ -DQT_FEATURE_openssl_hash=ON \
  -DQT_FEATURE_libproxy=ON \
  -DQT_FEATURE_sctp=ON \
  -DQT_FEATURE_separate_debug_info=OFF \
@@ -411,7 +413,7 @@ translationdir=%{_qt6_translationdir}
 
 Name: Qt6
 Description: Qt6 Configuration
-Version: 6.5.3
+Version: 6.6.0
 EOF
 
 # rpm macros
@@ -586,6 +588,7 @@ make check -k ||:
 %{_bindir}/qmake*
 %{_bindir}/qtpaths*
 %{_bindir}/qt-cmake
+%{_bindir}/qt-cmake-create
 %{_bindir}/qt-configure-module
 %{_libdir}/qt6/bin/qmake6
 %{_qt6_bindir}/androiddeployqt
@@ -596,6 +599,7 @@ make check -k ||:
 %{_qt6_bindir}/qmake
 %{_qt6_bindir}/qtpaths*
 %{_qt6_bindir}/qt-cmake
+%{_qt6_bindir}/qt-cmake-create
 %{_qt6_bindir}/qt-configure-module
 %{_qt6_libexecdir}/qt-cmake-private
 %{_qt6_libexecdir}/qt-cmake-standalone-test
@@ -824,6 +828,9 @@ make check -k ||:
 
 
 %changelog
+* Tue Oct 10 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.0-1
+- 6.6.0
+
 * Sun Oct 01 2023 Justin Zobel <justin.zobel@gmail.com> - 6.5.3-1
 - new version
 

qtbase-gcc11.patch

@@ -1,36 +0,0 @@
-diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.h b/examples/corelib/tools/contiguouscache/randomlistmodel.h
-index 1fabb0d9..393ebaa3 100644
---- a/examples/corelib/tools/contiguouscache/randomlistmodel.h
-+++ b/examples/corelib/tools/contiguouscache/randomlistmodel.h
-@@ -50,6 +50,7 @@
- #ifndef RANDOMLISTMODEL_H
- #define RANDOMLISTMODEL_H
- 
-+#include <limits>
- #include <QContiguousCache>
- #include <QAbstractListModel>
- 
-diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h
-index a7606253..60747cf0 100644
---- a/src/corelib/text/qanystringview.h
-+++ b/src/corelib/text/qanystringview.h
-@@ -39,6 +39,7 @@
- #ifndef QANYSTRINGVIEW_H
- #define QANYSTRINGVIEW_H
- 
-+#include <limits>
- #include <QtCore/qstringview.h>
- #include <QtCore/qutf8stringview.h>
- 
-diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h
-index 9f646aaa..a5af793c 100644
---- a/src/corelib/text/qbytearray.h
-+++ b/src/corelib/text/qbytearray.h
-@@ -41,6 +41,7 @@
- #ifndef QBYTEARRAY_H
- #define QBYTEARRAY_H
- 
-+#include <limits>
- #include <QtCore/qrefcount.h>
- #include <QtCore/qnamespace.h>
- #include <QtCore/qarraydata.h>

qtbase-libxkbcommon-1.6.0.patch

@@ -0,0 +1,24 @@
+diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
+index d254aeec..fab21226 100644
+--- a/src/gui/platform/unix/qxkbcommon.cpp
++++ b/src/gui/platform/unix/qxkbcommon.cpp
+@@ -239,10 +239,15 @@ static constexpr const auto KeyTbl = qMakeArray(
+         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
+-        Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
+-        Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
+-        Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
+-        Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
++        // These were removed in libxkbcommon 1.6.0
++        // XK_dead_lowline
++        Xkb2Qt<0xfe90,                          Qt::Key_Dead_Lowline>,
++        // XK_dead_aboveverticalline
++        Xkb2Qt<0xfe91,                          Qt::Key_Dead_Aboveverticalline>,
++        // XK_dead_belowverticalline
++        Xkb2Qt<0xfe92,                          Qt::Key_Dead_Belowverticalline>,
++        // XK_dead_longsolidusoverlay
++        Xkb2Qt<0xfe93,                          Qt::Key_Dead_Longsolidusoverlay>,
+ 
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.

sources

@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.5.3.tar.xz) = 31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9
+SHA512 (qtbase-everywhere-src-6.6.0.tar.xz) = 4e85acefeddc0a3cd6ba615b4768f435c4e237a605172153a1777a10285dab83d9cf220c18ce6d723d051b8b432f3e92be94925b54c2eb972c2c1d9ace849e17