SHA256
1
0
forked from pool/krdc

Accepting request 405495 from home:wolfi323:branches:KDE:Applications

- Add fix-bookmarks-migration.patch to fix bookmarks migration from the KDE4 version (boo#983900, kde#361823)

OBS-URL: https://build.opensuse.org/request/show/405495
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/krdc?expand=0&rev=33
This commit is contained in:
Raymond Wooninck 2016-06-29 17:41:29 +00:00 committed by Git OBS Bridge
parent beafff7c6d
commit dbdf4068f8
3 changed files with 37 additions and 0 deletions

View File

@ -0,0 +1,28 @@
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sat, 25 Jun 2016 11:12:46 +0000
Subject: Fix bookmarks migration from the KDE4 version
X-Git-Url: http://quickgit.kde.org/?p=krdc.git&a=commitdiff&h=7d9ad0152dbc47c30f261c9d4c026e01bea31b7d
---
Fix bookmarks migration from the KDE4 version
targetBasePath needs a trailing slash because the file name is appended
afterwards.
BUG: 361823
FIXED-IN: 16.04.3
REVIEW: 128281
---
--- a/main.cpp
+++ b/main.cpp
@@ -52,7 +52,7 @@
if (migrate.migrate()) {
Kdelibs4Migration dataMigrator;
const QString sourceBasePath = dataMigrator.saveLocation("data", QStringLiteral("krdc"));
- const QString targetBasePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/krdc");
+ const QString targetBasePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/krdc/");
QString targetFilePath;
QDir sourceDir(sourceBasePath);
QDir targetDir(targetBasePath);

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 29 14:56:41 UTC 2016 - wbauer@tmo.at
- Add fix-bookmarks-migration.patch to fix bookmarks migration from
the KDE4 version (boo#983900, kde#361823)
-------------------------------------------------------------------
Mon Jun 27 18:48:44 UTC 2016 - fvogt@suse.com

View File

@ -42,6 +42,8 @@ Summary: Remote Desktop Connection
License: GPL-2.0+
Group: Productivity/Networking/Remote Desktop
Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM fix-bookmarks-migration.patch boo#983900, kde#361823 -- fix bookmarks migration from the KDE4 version
Patch: fix-bookmarks-migration.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: freerdp
Requires: breeze5-icons
@ -59,6 +61,7 @@ Development libraries and headers needed to build software using krdc
%prep
%setup -q -n %{name}-%{version}
%patch -p1
%build
%ifarch ppc ppc64