qt6-6.6.2

desktop/toolkit/qt6/qt6-base/actions.py

@@ -22,7 +22,7 @@ absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir)
 bindirQt6="/usr/lib/qt6/bin"
 
 def setup():
-    #shelltools.system("patch -Rp1 < qt6-base-nouveau-freeze.patch")
+    shelltools.system("patch -Rp1 < fb92bb07.patch")
     
     checkdeletepath="%s/qtbase/src/3rdparty"  % absoluteWorkDir
     for dir in ('libjpeg', 'freetype', 'libpng', 'zlib', "xcb", "sqlite"):

desktop/toolkit/qt6/qt6-base/files/fb92bb07.patch

@@ -0,0 +1,72 @@
+From fb92bb073e6e1dd327b9ee94bb1e5726e96396bf Mon Sep 17 00:00:00 2001
+From: Axel Spoerl <axel.spoerl@qt.io>
+Date: Thu, 25 Jan 2024 17:27:45 +0100
+Subject: API Review Widgets: Remove QDockWidget debug operators
+
+Adding specific debug operators for QDockWidget has introduced new
+symbols in 6.6.1. Remove them again, we maintain forward binary
+compatibility within a patch cycle.
+
+[ChangeLog][QtWidgets][QDockWidget] Removed debug streaming operator
+incorrectly introduced as a new symbol in Qt 6.6.1.
+
+Task-number: QTBUG-119952
+Pick-to: 6.6.2
+Change-Id: I1d5b96b442dc910d1782dbede6119708d8336991
+Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
+---
+ src/widgets/widgets/qdockwidget.cpp | 21 ---------------------
+ src/widgets/widgets/qdockwidget.h   |  5 -----
+ 2 files changed, 26 deletions(-)
+
+diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
+index da8882d13c..7792bea118 100644
+--- a/src/widgets/widgets/qdockwidget.cpp
++++ b/src/widgets/widgets/qdockwidget.cpp
+@@ -1836,27 +1836,6 @@ QWidget *QDockWidget::titleBarWidget() const
+     return layout->widgetForRole(QDockWidgetLayout::TitleBar);
+ }
+ 
+-#ifndef QT_NO_DEBUG_STREAM
+-QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget)
+-{
+-    QDebugStateSaver saver(dbg);
+-    dbg.nospace();
+-    return dockWidget ? dbg << *dockWidget : dbg << "QDockWidget(0x0)";
+-}
+-
+-QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget)
+-{
+-    QDebugStateSaver saver(dbg);
+-    dbg.nospace();
+-    dbg << "QDockWidget(" << static_cast<const void *>(&dockWidget);
+-    dbg << "->(ObjectName=" << dockWidget.objectName();
+-    dbg << "; floating=" << dockWidget.isFloating();
+-    dbg << "; features=" << dockWidget.features();
+-    dbg << ";))";
+-    return dbg;
+-}
+-#endif // QT_NO_DEBUG_STREAM
+-
+ QT_END_NAMESPACE
+ 
+ #include "qdockwidget.moc"
+diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h
+index 211b703e03..92b7663acd 100644
+--- a/src/widgets/widgets/qdockwidget.h
++++ b/src/widgets/widgets/qdockwidget.h
+@@ -64,11 +64,6 @@ public:
+     inline bool isAreaAllowed(Qt::DockWidgetArea area) const
+     { return (allowedAreas() & area) == area; }
+ 
+-#ifndef QT_NO_DEBUG_STREAM
+-    friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget);
+-    friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget);
+-#endif
+-
+ #ifndef QT_NO_ACTION
+     QAction *toggleViewAction() const;
+ #endif
+-- 
+cgit v1.2.3
+

desktop/toolkit/qt6/qt6-base/pspec.xml

@@ -11,9 +11,9 @@
         <Summary>Cross platform application and UI framework</Summary>
         <Description>Cross platform application and UI development framework</Description>
         <License>'GPL3' 'LGPL3' 'FDL' 'custom'</License>
-        <Archive sha1sum="7dd0a77cc785f6cd6fa2e556dbf3c9e6de35801a" type="tarxz">https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz</Archive>
+        <Archive sha1sum="d25ebd9f030548484dbe7999f297b91b1e4346be" type="tarxz">https://download.qt.io/official_releases/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz</Archive>
         <AdditionalFiles>
-<!--             <AdditionalFile target="qt6-base-nouveau-freeze.patch">qt6-base-nouveau-freeze.patch</AdditionalFile> -->
+            <AdditionalFile target="fb92bb07.patch">fb92bb07.patch</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
             <Dependency>ninja</Dependency>
@@ -94,7 +94,7 @@
             <Patch level="1">mkspecs.patch</Patch>
             <Patch level="1">qt6-base-nostrip.patch</Patch>
 
-<!--             <Patch level="1">fedora/qtbase-tell-truth-about-private-api.patch</Patch> -->
+<!--             <Patch level="1">fb92bb07.patch</Patch> -->
 <!--             <Patch level="1">fedora/qtbase-version-check.patch</Patch> -->
 <!--             <Patch level="1">fedora/qtbase-moc-macros.patch</Patch> -->
 <!--             <Patch level="1">fedora/qtbase-firebird.patch</Patch> -->
@@ -295,6 +295,13 @@
     </Package>-->
 
     <History>
+        <Update release="9">
+            <Date>2024-02-15</Date>
+            <Version>6.6.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="8">
             <Date>2023-11-28</Date>
             <Version>6.6.1</Version>