Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2016-10-10 16:16:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2016-10-03 15:50:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2016-10-10 16:16:08.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Oct 3 16:27:33 UTC 2016 - alarr...@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. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.ACq4a5/_old 2016-10-10 16:16:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ACq4a5/_new 2016-10-10 16:16:15.000000000 +0200 @@ -26,7 +26,7 @@ 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 alarr...@suse.com kde#364258 -- Migration wizard page to migrate configuration and db from digikam4 +# PATCH-FIX-UPSTREAM migration_from_digikam4.diff alarr...@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 ++++++ migration_from_digikam4.diff ++++++ --- /var/tmp/diff_new_pack.ACq4a5/_old 2016-10-10 16:16:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ACq4a5/_new 2016-10-10 16:16:15.000000000 +0200 @@ -111,7 +111,7 @@ =================================================================== --- /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 @@ + 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 @@ -#else - // Linux settings place. - QLatin1String("~/.config/"), QLatin1String("~/.kde4/share/config") - #endif +-#endif ++#endif +#else // defined Q_OS_LINUX + "</qt>", + QLatin1String(digikam_version_short)
