Remove patches which are already in the upstream release

epel9
Jan Grulich 4 years ago
parent 8db861f360
commit 014e0db92f

@ -1,29 +0,0 @@
From 71e465210d5491a5805a26a855232bc103ab0215 Mon Sep 17 00:00:00 2001
From: Felipe Kinoshita <kinofhek@gmail.com>
Date: Fri, 25 Jun 2021 00:56:39 -0300
Subject: [PATCH 3/7] Assing first screen if `screen` is null
BUG: 438277
(cherry picked from commit 60ab32584b3322b384342e1bb784c07123d4ad7b)
---
klipper/klipperpopup.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 390235b4d..0eacc18e2 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -86,7 +86,7 @@ KlipperPopup::KlipperPopup(History *history)
QRect geometry = windowInfo.geometry();
QScreen *screen = QGuiApplication::screenAt(geometry.center());
if (screen == nullptr) {
- return;
+ screen = QGuiApplication::screens()[0];
}
int menuHeight = (screen->geometry().height()) * 3 / 4;
int menuWidth = (screen->geometry().width()) * 1 / 3;
--
2.31.1

@ -1,47 +0,0 @@
From 4ade115a1248cc3c1128a3d10982429ab76cf8f8 Mon Sep 17 00:00:00 2001
From: David Redondo <kde@david-redondo.de>
Date: Mon, 28 Jun 2021 15:56:55 +0200
Subject: [PATCH 5/7] xembed-sni-proxy: Add Menu property
Because we did not have this property the adaptor used a default
constructed empty path. An empty path is invalid though and Qt
would refuse to marshall it.
Unconditionally advertise '/' as the menu path even though we don't have
one. Callers looking for a menu there will receive an error that there's
not the interface that they expected at the path.
BUG:439229
FIXED-IN:5.22.3
(cherry picked from commit b9de2c8546874efcc993913bd55d0ef252b866a8)
---
xembed-sni-proxy/sniproxy.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/xembed-sni-proxy/sniproxy.h b/xembed-sni-proxy/sniproxy.h
index 732eb3e6a..967ee0bd3 100644
--- a/xembed-sni-proxy/sniproxy.h
+++ b/xembed-sni-proxy/sniproxy.h
@@ -44,6 +44,7 @@ class SNIProxy : public QObject
Q_PROPERTY(int WindowId READ WindowId)
Q_PROPERTY(bool ItemIsMenu READ ItemIsMenu)
Q_PROPERTY(KDbusImageVector IconPixmap READ IconPixmap)
+ Q_PROPERTY(QDBusObjectPath Menu READ menu CONSTANT)
public:
explicit SNIProxy(xcb_window_t wid, QObject *parent = nullptr);
@@ -52,7 +53,10 @@ public:
void update();
void resizeWindow(const uint16_t width, const uint16_t height) const;
void hideContainerWindow(xcb_window_t windowId) const;
-
+ QDBusObjectPath menu() const
+ {
+ return QDBusObjectPath("/");
+ }
/**
* @return the category of the application associated to this item
* @see Category
--
2.31.1

@ -1,40 +0,0 @@
From 6a5015951f9899e625bf8572f20cffc64d7aea33 Mon Sep 17 00:00:00 2001
From: David Redondo <kde@david-redondo.de>
Date: Thu, 1 Jul 2021 09:08:05 +0200
Subject: [PATCH 7/7] Guard calls into layer shell
LayerShellQt::Window::get always returns a Window, ensure we only
do it on Wayland.
BUG:439356
FIXED-IN:5.22.3
(cherry picked from commit 211897b07a83a4e5c3b32b1f14fd710375a16240)
---
logout-greeter/shutdowndlg.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/logout-greeter/shutdowndlg.cpp b/logout-greeter/shutdowndlg.cpp
index 97d5dc89d..4de539004 100644
--- a/logout-greeter/shutdowndlg.cpp
+++ b/logout-greeter/shutdowndlg.cpp
@@ -209,10 +209,12 @@ void KSMShutdownDlg::init()
setKeyboardGrabEnabled(true);
KWindowEffects::enableBlurBehind(this, true);
- if (auto w = LayerShellQt::Window::get(this)) {
- w->setKeyboardInteractivity(LayerShellQt::Window::KeyboardInteractivityExclusive);
- w->setExclusiveZone(-1);
- w->setLayer(LayerShellQt::Window::LayerOverlay);
+ if (KWindowSystem::isPlatformWayland()) {
+ if (auto w = LayerShellQt::Window::get(this)) {
+ w->setKeyboardInteractivity(LayerShellQt::Window::KeyboardInteractivityExclusive);
+ w->setExclusiveZone(-1);
+ w->setLayer(LayerShellQt::Window::LayerOverlay);
+ }
}
}
--
2.31.1

@ -63,11 +63,6 @@ Patch105: plasma-workspace-5.21.90-folderview_layout.patch
## upstreamable Patches ## upstreamable Patches
## upstream Patches
Patch3: 0003-Assing-first-screen-if-screen-is-null.patch
Patch5: 0005-xembed-sni-proxy-Add-Menu-property.patch
Patch7: 0007-Guard-calls-into-layer-shell.patch
## upstream Patches (master branch) ## upstream Patches (master branch)
# udev # udev
@ -427,11 +422,6 @@ BuildArch: noarch
%prep %prep
%setup -q -a 20 %setup -q -a 20
## upstream patches
%patch3 -p1 -b .0003
%patch5 -p1 -b .0005
%patch7 -p1 -b .0007
%patch100 -p1 -b .konsole-in-contextmenu %patch100 -p1 -b .konsole-in-contextmenu
# FIXME/TODO: it is unclear whether this is needed or even a good idea anymore -- rex # FIXME/TODO: it is unclear whether this is needed or even a good idea anymore -- rex
%if 0%{?default_lookandfeel:1} %if 0%{?default_lookandfeel:1}

Loading…
Cancel
Save