Accepting request 518413 from home:wolfi323:test
- Add Really-rate-limit-INF_PROCESSED_SIZE-messages.patch to not cause high CPU load during file copies (kde#383843, boo#1016920, boo#1051349) - Add KDesktopPropsPlugin-create-destination-dir.patch to fix modifying applications' .desktop files in the "Edit File Type" dialog if the corresponding directory doesn't exist in ~/.local/share/ (boo#1000946) OBS-URL: https://build.opensuse.org/request/show/518413 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=195
This commit is contained in:
parent
f5bbe32071
commit
6a8778cc7e
29
KDesktopPropsPlugin-create-destination-dir.patch
Normal file
29
KDesktopPropsPlugin-create-destination-dir.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From a0fc624d50bbd7942834913ece52d26849ba7243 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||||
|
Date: Thu, 17 Aug 2017 12:51:53 +0200
|
||||||
|
Subject: [KDesktopPropsPlugin] Create destination directory if it doesn't
|
||||||
|
exist
|
||||||
|
|
||||||
|
If the directory doesn't exist, applying the changes will fail with
|
||||||
|
"Could not save properties. You do not have sufficient access to write
|
||||||
|
to xxx".
|
||||||
|
---
|
||||||
|
src/widgets/kpropertiesdialog.cpp | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
|
||||||
|
index 860ad0e..0abcc9c 100644
|
||||||
|
--- a/src/widgets/kpropertiesdialog.cpp
|
||||||
|
+++ b/src/widgets/kpropertiesdialog.cpp
|
||||||
|
@@ -3674,6 +3674,8 @@ void KDesktopPropsPlugin::applyChanges()
|
||||||
|
|
||||||
|
const QString path(url.toLocalFile());
|
||||||
|
|
||||||
|
+ // make sure the directory exists
|
||||||
|
+ QDir().mkpath(QFileInfo(path).absolutePath());
|
||||||
|
QFile f(path);
|
||||||
|
if (!f.open(QIODevice::ReadWrite)) {
|
||||||
|
KMessageBox::sorry(nullptr, i18n("<qt>Could not save properties. You do not have "
|
||||||
|
--
|
||||||
|
cgit v0.11.2
|
||||||
|
|
41
Really-rate-limit-INF_PROCESSED_SIZE-messages.patch
Normal file
41
Really-rate-limit-INF_PROCESSED_SIZE-messages.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
From 801f58e7e76acd4bcb23d6e8092825cdda203a81 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kevin Funk <kfunk@kde.org>
|
||||||
|
Date: Tue, 22 Aug 2017 14:11:03 +0200
|
||||||
|
Subject: Really rate-limit INF_PROCESSED_SIZE messages
|
||||||
|
|
||||||
|
Summary:
|
||||||
|
Fixing an ancient porting bug which popped up when porting from Qt4 to
|
||||||
|
Qt5.
|
||||||
|
|
||||||
|
FIXED-IN: 5.38
|
||||||
|
BUG: 383843
|
||||||
|
|
||||||
|
Reviewers: dfaure
|
||||||
|
|
||||||
|
Reviewed By: dfaure
|
||||||
|
|
||||||
|
Subscribers: dfaure, #frameworks
|
||||||
|
|
||||||
|
Tags: #frameworks
|
||||||
|
|
||||||
|
Differential Revision: https://phabricator.kde.org/D7463
|
||||||
|
---
|
||||||
|
src/core/slavebase.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/core/slavebase.cpp b/src/core/slavebase.cpp
|
||||||
|
index 3778df8..149564b 100644
|
||||||
|
--- a/src/core/slavebase.cpp
|
||||||
|
+++ b/src/core/slavebase.cpp
|
||||||
|
@@ -535,7 +535,7 @@ void SlaveBase::processedSize(KIO::filesize_t _bytes)
|
||||||
|
emitSignal = true;
|
||||||
|
} else {
|
||||||
|
if (d->lastTimeout.isValid()) {
|
||||||
|
- emitSignal = d->lastTimeout.msecsTo(now); // emit size 10 times a second
|
||||||
|
+ emitSignal = d->lastTimeout.msecsTo(now) >= 100; // emit size 10 times a second
|
||||||
|
} else {
|
||||||
|
emitSignal = true;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
cgit v0.11.2
|
||||||
|
|
11
kio.changes
11
kio.changes
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Aug 22 14:53:37 UTC 2017 - wbauer@tmo.at
|
||||||
|
|
||||||
|
- Add Really-rate-limit-INF_PROCESSED_SIZE-messages.patch to not
|
||||||
|
cause high CPU load during file copies (kde#383843, boo#1016920,
|
||||||
|
boo#1051349)
|
||||||
|
- Add KDesktopPropsPlugin-create-destination-dir.patch to fix
|
||||||
|
modifying applications' .desktop files in the "Edit File Type"
|
||||||
|
dialog if the corresponding directory doesn't exist in
|
||||||
|
~/.local/share/ (boo#1000946)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Aug 15 12:49:25 UTC 2017 - wbauer@tmo.at
|
Tue Aug 15 12:49:25 UTC 2017 - wbauer@tmo.at
|
||||||
|
|
||||||
|
6
kio.spec
6
kio.spec
@ -77,6 +77,10 @@ Source1: baselibs.conf
|
|||||||
Patch0: kio_help-fallback-to-kde4-docs.patch
|
Patch0: kio_help-fallback-to-kde4-docs.patch
|
||||||
# PATCH-FIX-UPSTREAM
|
# PATCH-FIX-UPSTREAM
|
||||||
Patch1: fix-applying-special-file-attributes.patch
|
Patch1: fix-applying-special-file-attributes.patch
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch2: KDesktopPropsPlugin-create-destination-dir.patch
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch3: Really-rate-limit-INF_PROCESSED_SIZE-messages.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -124,6 +128,8 @@ Development files.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build
|
%cmake_kf5 -d build
|
||||||
|
Loading…
Reference in New Issue
Block a user