Accepting request 1188708 from KDE:Frameworks
- Add upstream fix: * 0001-Partially-revert-cccaa8.patch OBS-URL: https://build.opensuse.org/request/show/1188708 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kf6-kwidgetsaddons?expand=0&rev=8
This commit is contained in:
commit
8c3aa35df5
38
0001-Partially-revert-cccaa8.patch
Normal file
38
0001-Partially-revert-cccaa8.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
From c0e1e0010f6feb6532486135dd77a1a4cdc72831 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||||
|
Date: Tue, 16 Jul 2024 12:43:16 +0300
|
||||||
|
Subject: [PATCH] Partially revert cccaa8f89897146043a535d45a276e3a57412815
|
||||||
|
|
||||||
|
The widget may not be properly integrated into the widget tree when
|
||||||
|
KJobWidgets::setWindow() is called.
|
||||||
|
|
||||||
|
(cherry picked from commit 185e946c8b918471ee5164815d3296bc06d8a2e7)
|
||||||
|
---
|
||||||
|
src/kjobwidgets.cpp | 11 ++---------
|
||||||
|
1 file changed, 2 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/kjobwidgets.cpp b/src/kjobwidgets.cpp
|
||||||
|
index b092a2e0..a64a422e 100644
|
||||||
|
--- a/src/kjobwidgets.cpp
|
||||||
|
+++ b/src/kjobwidgets.cpp
|
||||||
|
@@ -14,15 +14,8 @@ void KJobWidgets::setWindow(QObject *job, QWidget *widget)
|
||||||
|
{
|
||||||
|
job->setProperty("widget", QVariant::fromValue(widget));
|
||||||
|
|
||||||
|
- QWindow *windowHandle = nullptr;
|
||||||
|
- if (widget) {
|
||||||
|
- QWidget *window = widget->window();
|
||||||
|
- if (window->winId()) {
|
||||||
|
- windowHandle = window->windowHandle();
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- setWindowHandle(job, windowHandle);
|
||||||
|
+ QWindow *window = widget ? widget->windowHandle() : nullptr;
|
||||||
|
+ setWindowHandle(job, window);
|
||||||
|
}
|
||||||
|
|
||||||
|
void KJobWidgets::setWindowHandle(QObject *job, QWindow *window)
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 19 16:32:37 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add upstream fix:
|
||||||
|
* 0001-Partially-revert-cccaa8.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jul 9 09:42:00 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
Tue Jul 9 09:42:00 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
@ -35,6 +35,8 @@ Source: %{rname}-%{version}.tar.xz
|
|||||||
Source1: %{rname}-%{version}.tar.xz.sig
|
Source1: %{rname}-%{version}.tar.xz.sig
|
||||||
Source2: frameworks.keyring
|
Source2: frameworks.keyring
|
||||||
%endif
|
%endif
|
||||||
|
#PATCH-FIX-UPSTREAM
|
||||||
|
Patch0: 0001-Partially-revert-cccaa8.patch
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: kf6-extra-cmake-modules >= %{_kf6_bugfix_version}
|
BuildRequires: kf6-extra-cmake-modules >= %{_kf6_bugfix_version}
|
||||||
|
Loading…
Reference in New Issue
Block a user