KDE Frameworks 5.48.0
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kwayland?expand=0&rev=150
This commit is contained in:
Git OBS Bridge
parent
58fdf3ec7a
commit
d3bdccb165
@ -1,65 +0,0 @@
|
||||
From 0e580ae9bdc5bef0c845d58e7c647bfac05364aa Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <michalsrb@gmail.com>
|
||||
Date: Thu, 14 Jun 2018 14:21:41 +0200
|
||||
Subject: [PATCH] Do not cancel old clipboard selection if it is same as the
|
||||
new one.
|
||||
|
||||
Summary:
|
||||
GTK applications seem to call wl_data_device::set_selection multiple times with
|
||||
the same wl_data_source object, replacing it with itself. If we cancel it, they
|
||||
will destroy it and the selection will be gone.
|
||||
|
||||
With this patch it is again possible to copy from GTK applications.
|
||||
|
||||
BUG: 395366
|
||||
|
||||
Test Plan: Patch provided by the reporter, he reported success.
|
||||
|
||||
Reviewers: #plasma, #frameworks, romangg
|
||||
|
||||
Reviewed By: #plasma, romangg
|
||||
|
||||
Subscribers: michalsrb, romangg, graesslin, kde-frameworks-devel
|
||||
|
||||
Tags: #frameworks
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D13535
|
||||
---
|
||||
autotests/client/test_datadevice.cpp | 6 ++++++
|
||||
src/server/datadevice_interface.cpp | 3 +++
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/autotests/client/test_datadevice.cpp b/autotests/client/test_datadevice.cpp
|
||||
index eca1cdb..14379f8 100644
|
||||
--- a/autotests/client/test_datadevice.cpp
|
||||
+++ b/autotests/client/test_datadevice.cpp
|
||||
@@ -512,6 +512,12 @@ void TestDataDevice::testReplaceSource()
|
||||
QCOMPARE(selectionOfferedSpy.count(), 2);
|
||||
QVERIFY(sourceCancelled2Spy.isEmpty());
|
||||
|
||||
+ // replace the data source with itself, ensure that it did not get cancelled
|
||||
+ dataDevice->setSelection(1, dataSource2.data());
|
||||
+ QVERIFY(!sourceCancelled2Spy.wait(500));
|
||||
+ QCOMPARE(selectionOfferedSpy.count(), 2);
|
||||
+ QVERIFY(sourceCancelled2Spy.isEmpty());
|
||||
+
|
||||
// create a new DataDevice and replace previous one
|
||||
QScopedPointer<DataDevice> dataDevice2(m_dataDeviceManager->getDataDevice(m_seat));
|
||||
QVERIFY(dataDevice2->isValid());
|
||||
diff --git a/src/server/datadevice_interface.cpp b/src/server/datadevice_interface.cpp
|
||||
index add7ac5..5408add 100644
|
||||
--- a/src/server/datadevice_interface.cpp
|
||||
+++ b/src/server/datadevice_interface.cpp
|
||||
@@ -130,6 +130,9 @@ void DataDeviceInterface::Private::setSelection(DataSourceInterface *dataSource)
|
||||
wl_resource_post_error(dataSource->resource(), WL_DATA_SOURCE_ERROR_INVALID_SOURCE, "Data source is for drag and drop");
|
||||
return;
|
||||
}
|
||||
+ if (selection == dataSource) {
|
||||
+ return;
|
||||
+ }
|
||||
Q_Q(DataDeviceInterface);
|
||||
QObject::disconnect(selectionUnboundConnection);
|
||||
QObject::disconnect(selectionDestroyedConnection);
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dbbdcf05ad00d14931cce83fba968146f46d17053ccd22297a20e2fee9ef2548
|
||||
size 308952
|
||||
3
kwayland-5.48.0.tar.xz
Normal file
3
kwayland-5.48.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e46946f0e901b45588f00decbb27bec60d5b7f357e76100ddd6e0815de148be1
|
||||
size 309224
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 16 04:37:44 UTC 2018 - lbeltrame@kde.org
|
||||
|
||||
- Update to 5.48.0
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://www.kde.org/announcements/kde-frameworks-5.48.0.php
|
||||
- Changes since 5.47.0:
|
||||
* Fix some of cppcheck warnings
|
||||
* [server] Send frame event instead of flush on relative pointer motion (kde#395815)
|
||||
* Fix XDGV6 popup test
|
||||
* Fix stupid copy paste bug in XDGShellV6 Client
|
||||
* Do not cancel old clipboard selection if it is same as the new one. (kde#395366)
|
||||
* Fix compiler warning about hidden virtual overloads
|
||||
* Honor BUILD_TESTING
|
||||
* Fix some spelling issues suggested by new linter tool
|
||||
* Add the arclint file in kwayland
|
||||
* Fix 'unused parameter' warnings
|
||||
* Documentation fix
|
||||
* [server] Small code cleanup in SurfaceInterface
|
||||
* Fixup @since for skip switcher API
|
||||
- Dropped patches, now upstream:
|
||||
* 0001-Do-not-cancel-old-clipboard-selection-if-it-is-same-.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 21 17:11:52 UTC 2018 - fabian@ritter-vogt.de
|
||||
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
#
|
||||
|
||||
|
||||
%define _tar_path 5.47
|
||||
%define _tar_path 5.48
|
||||
# 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||
Name: kwayland
|
||||
Version: 5.47.0
|
||||
Version: 5.48.0
|
||||
Release: 0
|
||||
Summary: KDE Wayland library
|
||||
License: LGPL-2.1-or-later
|
||||
@ -30,8 +30,6 @@ Group: Development/Libraries/KDE
|
||||
Url: http://www.kde.org
|
||||
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
|
||||
Source1: baselibs.conf
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: 0001-Do-not-cancel-old-clipboard-selection-if-it-is-same-.patch
|
||||
BuildRequires: cmake >= 3.0
|
||||
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
||||
BuildRequires: fdupes
|
||||
@ -71,7 +69,6 @@ KWayland provides a Qt-style Client and Server library wrapper for the Wayland l
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user