From f52e3e6936c6c7f76d031d0d18085b0dd03f63134780444d67069ca99a0c89ab Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Tue, 26 Jan 2021 15:51:35 +0000
Subject: [PATCH] Accepting request 866686 from
 home:luca_b:branches:KDE:Frameworks5

- Add upstream patch to fix Okular search bar no longer closed
  when pressing ESC (kde#431493):
  * 0001-Fix-regression-caused-due-to-porting-from-operator-t.patch

OBS-URL: https://build.opensuse.org/request/show/866686
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcompletion?expand=0&rev=221
---
 ...aused-due-to-porting-from-operator-t.patch | 27 +++++++++++++++++++
 kcompletion.changes                           |  7 +++++
 kcompletion.spec                              |  3 +++
 3 files changed, 37 insertions(+)
 create mode 100644 0001-Fix-regression-caused-due-to-porting-from-operator-t.patch

diff --git a/0001-Fix-regression-caused-due-to-porting-from-operator-t.patch b/0001-Fix-regression-caused-due-to-porting-from-operator-t.patch
new file mode 100644
index 0000000..1b4f1e6
--- /dev/null
+++ b/0001-Fix-regression-caused-due-to-porting-from-operator-t.patch
@@ -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] 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.30.0
+
diff --git a/kcompletion.changes b/kcompletion.changes
index d9bfa6b..c05aa31 100644
--- a/kcompletion.changes
+++ b/kcompletion.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 25 22:29:28 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
+
+- Add upstream patch to fix Okular search bar no longer closed
+  when pressing ESC (kde#431493):
+  * 0001-Fix-regression-caused-due-to-porting-from-operator-t.patch
+
 -------------------------------------------------------------------
 Wed Jan  6 10:47:23 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kcompletion.spec b/kcompletion.spec
index eb68534..c20e309 100644
--- a/kcompletion.spec
+++ b/kcompletion.spec
@@ -36,6 +36,8 @@ Source1:        https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-
 Source2:        frameworks.keyring
 %endif
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM
+Patch0:         0001-Fix-regression-caused-due-to-porting-from-operator-t.patch
 BuildRequires:  extra-cmake-modules >= %{_kf5_bugfix_version}
 BuildRequires:  fdupes
 BuildRequires:  kf5-filesystem
@@ -78,6 +80,7 @@ can be used with own widgets.
 
 %prep
 %setup -q
+%autopatch -p1
 
 %build
   %cmake_kf5 -d build