Pull in upstream regression fix

epel9
Rex Dieter 4 years ago
parent f4abc14a31
commit 1b8cee87dd

@ -0,0 +1,27 @@
From 7acda936f06193e9fc85ae5cf9ccc8d65971f657 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Tue, 12 Jan 2021 23:43:19 +0100
Subject: [PATCH 3/5] Fix regression caused due to porting from operator+ to
operator|
BUGS: 431493
---
src/klineedit.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/klineedit.cpp b/src/klineedit.cpp
index 1cc9316..8201259 100644
--- a/src/klineedit.cpp
+++ b/src/klineedit.cpp
@@ -1222,7 +1222,7 @@ bool KLineEditPrivate::overrideShortcut(const QKeyEvent *e)
// but doesn't dare force as "stronger than kaction shortcuts"...
else if (e->matches(QKeySequence::SelectAll)) {
return true;
- } else if (qApp->platformName() == QLatin1String("xcb") && (key == Qt::CTRL | Qt::Key_E || key == Qt::CTRL | Qt::Key_U)) {
+ } else if (qApp->platformName() == QLatin1String("xcb") && (key == (Qt::CTRL | Qt::Key_E) || key == (Qt::CTRL | Qt::Key_U))) {
return true;
}
--
2.29.2

@ -3,7 +3,7 @@
Name: kf5-%{framework}
Version: 5.78.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: KDE Frameworks 5 Tier 2 addon with auto completion widgets and classes
License: LGPLv2+
@ -18,6 +18,9 @@ URL: https://invent.kde.org/frameworks/%{framework}
%endif
Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
## upstream fixes
Patch3: 0003-Fix-regression-caused-due-to-porting-from-operator-t.patch
BuildRequires: extra-cmake-modules >= %{majmin}
BuildRequires: kf5-kconfig-devel >= %{majmin}
BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin}
@ -41,7 +44,7 @@ developing applications that use %{name}.
%prep
%setup -q -n %{framework}-%{version}
%setup -q -n %{framework}-%{version} -p1
%build
@ -74,6 +77,9 @@ developing applications that use %{name}.
%changelog
* Tue Jan 26 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.78.0-3
- Pull in upstream regression fix
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.78.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save