pool/krdc
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 407207 from home:favogt:branches:KDE:Applications

Browse Source 
Fix build by removing upstreamed fix-bookmarks-migration.patch

OBS-URL: https://build.opensuse.org/request/show/407207
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/krdc?expand=0&rev=35
This commit is contained in:
Raymond Wooninck 2016-07-08 09:16:43 +00:00 committed by Git OBS Bridge
parent 02297ae245
commit 59e67cea65
3 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fix-bookmarks-migration.patch
View File

@ -1,28 +0,0 @@
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);

5
krdc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 8 06:35:57 UTC 2016 - fvogt@suse.com
- Fix build by removing upstreamed fix-bookmarks-migration.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 8 00:12:18 UTC 2016 - tittiatcoke@gmail.com Fri Jul 8 00:12:18 UTC 2016 - tittiatcoke@gmail.com

3
krdc.spec
View File

@ -42,8 +42,6 @@ Summary: Remote Desktop Connection
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Networking/Remote Desktop Group: Productivity/Networking/Remote Desktop
Source0: %{name}-%{version}.tar.xz 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: freerdp Requires: freerdp
Requires: breeze5-icons Requires: breeze5-icons
@ -61,7 +59,6 @@ Development libraries and headers needed to build software using krdc
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch -p1
%build %build
%ifarch ppc ppc64 %ifarch ppc ppc64