Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (5a1f763126cad532eb7a24cf3e020cb8394dffc6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (5a1f763126cad532eb7a24cf3e020cb8394dffc6)
  • Date: Thu, 17 Apr 2025 07:57:59 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt6/qt6wayland/DETAILS | 2 -
qt6/qt6wayland/HISTORY | 4 ++
qt6/qt6wayland/PRE_BUILD | 3 +
qt6/qt6wayland/patches/qwaylandwindow.diff | 51
+++++++++++++++++++++++++++++
4 files changed, 59 insertions(+), 1 deletion(-)

New commits:
commit 5a1f763126cad532eb7a24cf3e020cb8394dffc6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qt6wayland - upstream patch

diff --git a/qt6/qt6wayland/DETAILS b/qt6/qt6wayland/DETAILS
index 6d96179..614c000 100755
--- a/qt6/qt6wayland/DETAILS
+++ b/qt6/qt6wayland/DETAILS
@@ -1,7 +1,7 @@
SPELL=qt6wayland
source $GRIMOIRE/$SECTION/QT6_VERSIONS

-PATCHLEVEL=2
+PATCHLEVEL=3
# SECURITY_PATCH=2
ENTERED=20210116
SHORT=""
diff --git a/qt6/qt6wayland/HISTORY b/qt6/qt6wayland/HISTORY
index 0f5564c..5eae638 100644
--- a/qt6/qt6wayland/HISTORY
+++ b/qt6/qt6wayland/HISTORY
@@ -1,3 +1,7 @@
+2025-04-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD qwaylandwindow.diff: added
+
2024-09-25 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD patches/*: deleted

diff --git a/qt6/qt6wayland/PRE_BUILD b/qt6/qt6wayland/PRE_BUILD
new file mode 100755
index 0000000..4604ffc
--- /dev/null
+++ b/qt6/qt6wayland/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/qt6/qt6wayland/patches/qwaylandwindow.diff
b/qt6/qt6wayland/patches/qwaylandwindow.diff
new file mode 100644
index 0000000..1f0f4a3
--- /dev/null
+++ b/qt6/qt6wayland/patches/qwaylandwindow.diff
@@ -0,0 +1,51 @@
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index
7a3bf6ddcae849eb14a44e34f2758f77488895bb..578a84e998f90cdf9beaddce8344c55fb23aedf0
100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -106,6 +106,7 @@ void QWaylandWindow::initWindow()
+ */
+ mSurface->attach(nullptr, 0, 0);
+ mSurface->commit();
++ resetFrameCallback();
+
+ if (window()->type() == Qt::Desktop)
+ return;
+@@ -325,6 +326,15 @@ void QWaylandWindow::resetSurfaceRole()
+ delete std::exchange(mShellSurface, nullptr);
+ delete std::exchange(mSubSurfaceWindow, nullptr);
+ emit surfaceRoleDestroyed();
++
++ resetFrameCallback();
++ mInFrameRender = false;
++ mWaitingToApplyConfigure = false;
++ mExposed = false;
++}
++
++void QWaylandWindow::resetFrameCallback()
++{
+ {
+ QMutexLocker lock(&mFrameSyncMutex);
+ if (mFrameCallback) {
+@@ -338,10 +348,7 @@ void QWaylandWindow::resetSurfaceRole()
+ killTimer(mFrameCallbackCheckIntervalTimerId);
+ mFrameCallbackCheckIntervalTimerId = -1;
+ }
+- mInFrameRender = false;
+ mFrameCallbackTimedOut = false;
+- mWaitingToApplyConfigure = false;
+- mExposed = false;
+ }
+
+ QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface)
+diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
+index
1a99efb8d6c0580bcccfb73a17e3afeeccb32803..ac08f1f084a2586635f3405bc326cccda85eb69e
100644
+--- a/src/client/qwaylandwindow_p.h
++++ b/src/client/qwaylandwindow_p.h
+@@ -351,6 +351,7 @@ private:
+ bool shouldCreateShellSurface() const;
+ bool shouldCreateSubSurface() const;
+ void resetSurfaceRole();
++ void resetFrameCallback();
+ QPlatformScreen *calculateScreenFromSurfaceEvents() const;
+ void setOpaqueArea(const QRegion &opaqueArea);
+ bool isOpaque() const;


  • [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (5a1f763126cad532eb7a24cf3e020cb8394dffc6), Treeve Jelbert, 04/17/2025

Archive powered by MHonArc 2.6.24.

Top of Page