Hello community,
here is the log from the commit of package digikam for openSUSE:Factory checked
in at 2017-12-10 18:17:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/digikam (Old)
and /work/SRC/openSUSE:Factory/.digikam.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam"
Sun Dec 10 18:17:29 2017 rev:164 rq:555601 version:5.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2017-11-23
09:45:40.349758890 +0100
+++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2017-12-10
18:17:32.530916934 +0100
@@ -1,0 +2,6 @@
+Fri Dec 8 19:48:19 UTC 2017 - wba...@tmo.at
+
+- Add fix-Qt-5.9.3-empty-album-problem.patch to fix albums showing
+ up empty with Qt 5.9.3 or higher (kde#387373)
+
+-------------------------------------------------------------------
New:
----
fix-Qt-5.9.3-empty-album-problem.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.5Kq3L8/_old 2017-12-10 18:17:36.554725278 +0100
+++ /var/tmp/diff_new_pack.5Kq3L8/_new 2017-12-10 18:17:36.558725087 +0100
@@ -28,6 +28,8 @@
Patch0: 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch
# PATCH-FIX-UPSTREAM
Patch1: Adapt-to-KCalCore-API-changes.patch
+# PATCH-FIX-UPSTREAM
+Patch2: fix-Qt-5.9.3-empty-album-problem.patch
#This pulls in QWebEngine, which is not available on ppc64
%ifarch %ix86 x86_64 %arm aarch64 mips mips64
BuildRequires: akonadi-contact-devel
@@ -172,6 +174,7 @@
%patch0 -p1
%endif
%patch1 -p1
+%patch2 -p1
# Remove build time references so build-compare can do its work
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e
%%Y')
++++++ fix-Qt-5.9.3-empty-album-problem.patch ++++++
>From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001
From: Maik Qualmann <metzping...@gmail.com>
Date: Tue, 28 Nov 2017 21:29:00 +0100
Subject: try to fix the Qt-5.9.3 empty album problem CCBUGS: 387373
---
core/libs/database/coredb/coredburl.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/core/libs/database/coredb/coredburl.cpp
b/core/libs/database/coredb/coredburl.cpp
index 2c0d0eb..b1bdf71 100644
--- a/core/libs/database/coredb/coredburl.cpp
+++ b/core/libs/database/coredb/coredburl.cpp
@@ -88,8 +88,13 @@ CoreDbUrl CoreDbUrl::fromAlbumAndName(const QString& name,
const DbEngineParameters& parameters)
{
CoreDbUrl url;
+ QString path(album);
url.setScheme(QLatin1String("digikamalbums"));
- url.setPath(QLatin1Char('/') + album + QLatin1Char('/') + name);
+
+ if (path != QLatin1String("/"))
+ path += QLatin1Char('/');
+
+ url.setPath(path + name);
QUrlQuery q(url);
q.addQueryItem(QLatin1String("albumRoot"),
albumRoot.adjusted(QUrl::StripTrailingSlash).toLocalFile());
--
cgit v0.11.2
