sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (3eb2e5ce6bb3342577c1e1338c3d3dd6a5869d5f)
- 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 (3eb2e5ce6bb3342577c1e1338c3d3dd6a5869d5f)
- Date: Wed, 10 Jul 2024 10:09:40 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
crypto/botan/DETAILS | 4 ++--
crypto/botan/HISTORY | 4 ++++
qt6/qt6wayland/DETAILS | 2 +-
qt6/qt6wayland/HISTORY | 4 ++++
qt6/qt6wayland/PRE_BUILD | 3 +++
qt6/qt6wayland/patches/popup.diff | 17 +++++++++++++++++
6 files changed, 31 insertions(+), 3 deletions(-)
New commits:
commit 3eb2e5ce6bb3342577c1e1338c3d3dd6a5869d5f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
botan: => 3.5.0 SECURITY FIX
commit 062d64d5b2b83fd1493d75930f224b6adebf77b9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qt6wayland - upstream patch
diff --git a/crypto/botan/DETAILS b/crypto/botan/DETAILS
index 9402cd2..80e46dd 100755
--- a/crypto/botan/DETAILS
+++ b/crypto/botan/DETAILS
@@ -1,6 +1,6 @@
SPELL=botan
- VERSION=3.4.0
-
+ VERSION=3.5.0
+ SECURITY_PATCH=1
SOURCE=Botan-$VERSION.tar.xz
SOURCE_URL[0]=https://botan.randombit.net/releases/$SOURCE
SOURCE_GPG="botan.gpg:$SOURCE.asc"
diff --git a/crypto/botan/HISTORY b/crypto/botan/HISTORY
index 140dba7..dcc919c 100644
--- a/crypto/botan/HISTORY
+++ b/crypto/botan/HISTORY
@@ -1,3 +1,7 @@
+2024-07-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.0
+ SECURITY_PATCH++, fix CVE-2024-34702 CVE-2024-39312
+
2024-05-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4.0
diff --git a/qt6/qt6wayland/DETAILS b/qt6/qt6wayland/DETAILS
index d3e6d92..690ea58 100755
--- a/qt6/qt6wayland/DETAILS
+++ b/qt6/qt6wayland/DETAILS
@@ -1,7 +1,7 @@
SPELL=qt6wayland
source $GRIMOIRE/$SECTION/QT6_VERSIONS
-
+PATCHLEVEL=1
# SECURITY_PATCH=2
ENTERED=20210116
SHORT=""
diff --git a/qt6/qt6wayland/HISTORY b/qt6/qt6wayland/HISTORY
index 2d20382..ae21ca5 100644
--- a/qt6/qt6wayland/HISTORY
+++ b/qt6/qt6wayland/HISTORY
@@ -1,3 +1,7 @@
+2024-07-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD patches/*: added
+ * DETAILS: PATCHLEVEL=1
+
2024-06-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: use generic QT6_VERSIONS which also provides the checksums
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/popup.diff
b/qt6/qt6wayland/patches/popup.diff
new file mode 100644
index 0000000..74f5bcd
--- /dev/null
+++ b/qt6/qt6wayland/patches/popup.diff
@@ -0,0 +1,17 @@
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index
22aeba10237b66b88cf2e81e2395a1a4610e9035..c3725ffc9891f0aead47ecbeb94affc21e0b82ed
100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -1157,8 +1157,10 @@ QWaylandWindow
*QWaylandWindow::guessTransientParent() const
+ return mTopPopup;
+ }
+
+- if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup)
+- return display()->lastInputWindow();
++ if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) {
++ if (auto lastInputWindow = display()->lastInputWindow())
++ return closestShellSurfaceWindow(lastInputWindow->window());
++ }
+
+ return nullptr;
+ }
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (3eb2e5ce6bb3342577c1e1338c3d3dd6a5869d5f), Treeve Jelbert, 07/10/2024
Archive powered by MHonArc 2.6.24.