Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2014-09-01 16:59:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2014-08-16 15:42:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2014-09-01 16:59:41.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 26 21:24:36 UTC 2014 - [email protected] + +- 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 + +------------------------------------------------------------------- New: ---- 0001-Let-Kdelibs4Migration-searches-in-.kde4-first-it-s-p.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.EZbH0F/_old 2014-09-01 16:59:42.000000000 +0200 +++ /var/tmp/diff_new_pack.EZbH0F/_new 2014-09-01 16:59:42.000000000 +0200 @@ -35,6 +35,9 @@ 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 @@ %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 ++++++ 0001-Let-Kdelibs4Migration-searches-in-.kde4-first-it-s-p.patch ++++++ >From 4dafb6cecb673cd3c83a467be479e3b78a276402 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <[email protected]> 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
