From 15d122761f6e6c4c1d30b45d87408c479074eddc5a5e73c9c2f5f9d9be4936d4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 10 Oct 2016 14:16:08 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 152.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=3293bae11162280cd0eb27f2062069e2 --- digikam.changes | 7 +++++++ digikam.spec | 2 +- migration_from_digikam4.diff | 22 ++++++++++++++++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/digikam.changes b/digikam.changes index 65f220c..7531f50 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 3 16:27:33 UTC 2016 - alarrosa@suse.com + +- Updated migration_from_digikam4.diff to migrate also the + geobookmarks.xml file from digikam4. This patch thus fixes + kde#364258, kde#357944 and kde#368968. + ------------------------------------------------------------------- Mon Oct 3 07:55:43 UTC 2016 - alarrosa@suse.com diff --git a/digikam.spec b/digikam.spec index 0735563..7f83b81 100644 --- a/digikam.spec +++ b/digikam.spec @@ -26,7 +26,7 @@ Url: http://www.digikam.org/ Source0: http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE find_libastro-qt5.patch -- fix build of geolocation support in Leap 42.1 Patch2: find_libastro-qt5.patch -# PATCH-FIX-UPSTREAM migration_from_digikam4.diff alarrosa@suse.com kde#364258 -- Migration wizard page to migrate configuration and db from digikam4 +# PATCH-FIX-UPSTREAM migration_from_digikam4.diff alarrosa@suse.com kde#364258 kde#357944 kde#368968 -- Migration wizard page to migrate configuration and db from digikam4 Patch3: migration_from_digikam4.diff #This pulls in QWebEngine, which is not available on ppc64 %ifarch %ix86 x86_64 %arm aarch64 mips mips64 diff --git a/migration_from_digikam4.diff b/migration_from_digikam4.diff index 9107b6d..443f969 100644 --- a/migration_from_digikam4.diff +++ b/migration_from_digikam4.diff @@ -111,7 +111,7 @@ Index: digikam-5.2.0/core/utilities/assistants/firstrun/migratefromdigikam4page. =================================================================== --- /dev/null +++ digikam-5.2.0/core/utilities/assistants/firstrun/migratefromdigikam4page.cpp -@@ -0,0 +1,203 @@ +@@ -0,0 +1,220 @@ +/* ============================================================ + * + * This file is a part of digiKam project @@ -255,7 +255,24 @@ Index: digikam-5.2.0/core/utilities/assistants/firstrun/migratefromdigikam4page. + qCDebug(DIGIKAM_GENERAL_LOG) << "Config file" << oldConfigFile << "was migrated to" << newConfigLocation; + } + } ++ } + ++ // Migrate $KDEHOME/share/apps/kipi/geobookmarks.xml to ./.local/share/digikam/geobookmarks.xml ++ QString oldGeobookmarksFile = migration.locateLocal("data", QStringLiteral("kipi/geobookmarks.xml")); ++ const QString newGeobookmarksFile = QStandardPaths::writableLocation(QStandardPaths::DataLocation) ++ + QStringLiteral("/geobookmarks.xml"); ++ ++ if (QFile(newGeobookmarksFile).exists()) { ++ qCDebug(DIGIKAM_GENERAL_LOG) << newGeobookmarksFile << " already exists. Skipping"; ++ } else { ++ QFileInfo fileInfo(newGeobookmarksFile); ++ QDir().mkpath(fileInfo.absolutePath()); ++ ++ if (!oldGeobookmarksFile.isEmpty()) { ++ if (QFile(oldGeobookmarksFile).copy(newGeobookmarksFile)) { ++ qCDebug(DIGIKAM_GENERAL_LOG) << "Config file" << oldGeobookmarksFile << "was migrated to" << newGeobookmarksFile; ++ } ++ } + } + + // Fix albumroot identifier since digiKam 5 doesn't interpret correctly @@ -402,7 +419,8 @@ Index: digikam-5.2.0/core/utilities/assistants/firstrun/welcomepage.cpp -#else - // Linux settings place. - QLatin1String("~/.config/"), QLatin1String("~/.kde4/share/config") - #endif +-#endif ++#endif +#else // defined Q_OS_LINUX + "", + QLatin1String(digikam_version_short)