rpm/kcoreaddons
SHA256
1
0
Fork 0
forked from pool/kcoreaddons
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcoreaddons?expand=0&rev=33

Browse Source
This commit is contained in:
Hrvoje Senjan
2014-08-26 21:25:45 +00:00
committed by Git OBS Bridge
parent 2d5e8b73fe
commit 4df8419a34
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
0001-Let-Kdelibs4Migration-searches-in-.kde4-first-it-s-p.patch Normal file
View File

@@ -0,0 +1,26 @@
From 4dafb6cecb673cd3c83a467be479e3b78a276402 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Tue, 17 Jun 2014 20:26:57 +0200
Subject: [PATCH 1/1] Let Kdelibs4Migration searches in .kde4 first, it's
possible that some users have ancient unused config in .kde
---
src/lib/util/kdelibs4migration.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/util/kdelibs4migration.cpp b/src/lib/util/kdelibs4migration.cpp
index e1ec678..e6f1ad6 100644
--- a/src/lib/util/kdelibs4migration.cpp
+++ b/src/lib/util/kdelibs4migration.cpp
@@ -39,7 +39,7 @@ Kdelibs4Migration::Kdelibs4Migration()
} else {
QDir homeDir = QDir::home();
QVector<QString> testSubdirs;
- testSubdirs << QStringLiteral(".kde") << QStringLiteral(".kde4");
+ testSubdirs << QStringLiteral(".kde4") << QStringLiteral(".kde");
Q_FOREACH (const QString &testSubdir, testSubdirs) {
if (homeDir.exists(testSubdir)) {
//qDebug() << "Using" << testSubdir << "as the location of the old config file";
--
1.9.3

8
kcoreaddons.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Aug 26 21:24:36 UTC 2014 - hrvoje.senjan@gmail.com
- Added 0001-Let-Kdelibs4Migration-searches-in-.kde4-first-it-s-p.patch:
Let Kdelibs4Migration searches in .kde4 first, it's possible that
some users have ancient unused config in .kde, and openSUSE
has .kde4 as default
-------------------------------------------------------------------
Sat Aug 2 10:20:07 UTC 2014 - hrvoje.senjan@gmail.com

5
kcoreaddons.spec
View File

@@ -35,6 +35,9 @@ Group: System/GUI/KDE
Url: http://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE 0001-Let-Kdelibs4Migration-searches-in-.kde4-first-it-s-p.patch -- Let Kdelibs4Migration searches in .kde4 first, it's
# possible that some users have ancient unused config in .kde, and openSUSE has .kde4 as default
Patch0: 0001-Let-Kdelibs4Migration-searches-in-.kde4-first-it-s-p.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -72,7 +75,7 @@ replacement, accessing user information and many more. Development files.
%lang_package
%prep
%setup -q
#rm -rf po/{af,pl,si}
%patch0 -p1
%build
%cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert