Accepting request 871676 from KDE:Frameworks5

KDE Frameworks 5.79 (forwarded request 871084 from cgiboudeaux)

OBS-URL: https://build.opensuse.org/request/show/871676
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kcompletion?expand=0&rev=90
This commit is contained in:
Dominique Leuenberger 2021-02-17 17:10:23 +00:00 committed by Git OBS Bridge
commit a96feb6daf
7 changed files with 30 additions and 46 deletions

View File

@ -1,27 +0,0 @@
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a73972651b5230c8df2d5d7b463d48004b8fd6672bda164e834eec5345113fa9
size 121480

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl/wedgACgkQWNDuZIpI
s7sCvAf+JoPkXXbVO7Sh5FJdGU/bYPTxC9jwAk4QmnFd2uRRaoQ4pY0/h2aweu0L
TjsVVW49L7z5l5dBYHOII/4JnvmTMb6IyPW0YhCN6mtjcw6AVW2M7luSthAi4nyz
FbD2KhVDK06p0u6AWKcBeML2MamIGA+S+jp37yTw42wIqCwpi6rfMb72PzWuU6QM
kUlnzAfjNRBFVg/9BZ5JM7OVABdvuzaZICyDCVkdP2xqLJRKhDvqI2zps8RtXenJ
3VE0i5My9XiE5v13itkrzbOUOpdyT3uuuypzkA+z5EkYvdBAiw2ywDs1ohkq2sjq
zKPmGlPe1YDiHQI0k7/U0YSdZW5qaA==
=AQmk
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9bff8b791d2434057a0137805e8dcc81ddfaa6dc87f0b5180c74be770934d7fe
size 121808

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmAe6tIACgkQWNDuZIpI
s7uk1AgApuKnCNL1ZtC3ci8v6qDDx7v4VIL9IHYI/UiZWHJmRaiSKOFzmoZi9/vd
Zqp+AL3FmmRz3icQzX6wNyAXn/11XqZSXGEFE52We9Wtyn3QGXlYPciq4+giylnD
H6HLY+82vLQJ8nemuCR9+joQHMzlUmjUnOtIh+SUu8V/GX42x+VYm5YvgxlH/x3k
DgkZulZxy2C2L7n9RPyvkDQhxtDcUeskmG6o7EZ2AMQ/IjyeaATl3oLksuTFxcbh
aJtznl9QHM//HDMCQ2flFCEh/gRiPZcczDgOAnMCxFpZ0Yu2V9+vkpASeeKndEU1
hW0WCFiznO4KrKAzkwr2vSypF7iq0Q==
=znD9
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Feb 8 08:46:04 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 5.79.0
* New feature release
* For more details please see:
* https://kde.org/announcements/kde-frameworks-5.79.0
- Changes since 5.78.0:
* Add missing include
* Remove unused include
* Fix regression caused due to porting from operator+ to operator| (kde#431493)
- Drop upstream patch:
* kcompletion/0001-Fix-regression-caused-due-to-porting-from-operator-t.patch
-------------------------------------------------------------------
Mon Jan 25 22:29:28 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>

View File

@ -17,14 +17,14 @@
%define lname libKF5Completion5
%define _tar_path 5.78
%define _tar_path 5.79
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: kcompletion
Version: 5.78.0
Version: 5.79.0
Release: 0
Summary: Widgets with advanced completion support
License: LGPL-2.1-or-later
@ -36,8 +36,6 @@ 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
@ -80,7 +78,6 @@ can be used with own widgets.
%prep
%setup -q
%autopatch -p1
%build
%cmake_kf5 -d build