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

Updating link to change in openSUSE:Factory/digikam revision 152.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=3293bae11162280cd0eb27f2062069e2
This commit is contained in:
OBS User buildservice-autocommit 2016-10-10 14:16:08 +00:00 committed by Git OBS Bridge
parent 214acc331f
commit 15d122761f
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
digikam.changes
View File

@ -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

2
digikam.spec
View File

@ -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

22
migration_from_digikam4.diff
View File

@ -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
+ "</qt>",
+ QLatin1String(digikam_version_short)