diff -Nru digikam-5.6.0/debian/changelog digikam-5.6.0/debian/changelog --- digikam-5.6.0/debian/changelog 2018-03-15 19:51:38.000000000 +0000 +++ digikam-5.6.0/debian/changelog 2018-03-30 10:27:13.000000000 +0000 @@ -1,3 +1,11 @@ +digikam (4:5.6.0-0ubuntu10) bionic; urgency=medium + + * Cherry pick upstream patch to fix missing album thumbnail previews + with Qt => 5.9.3 + - debian/patches: upstream_fix-Qt-5.9.3-empty-album.patch + + -- Rik Mills Fri, 30 Mar 2018 11:27:13 +0100 + digikam (4:5.6.0-0ubuntu9) bionic; urgency=medium * Add upstream patch to fix conflicts with new KDE global shortcuts diff -Nru digikam-5.6.0/debian/patches/series digikam-5.6.0/debian/patches/series --- digikam-5.6.0/debian/patches/series 2018-03-15 19:51:38.000000000 +0000 +++ digikam-5.6.0/debian/patches/series 2018-03-30 10:27:13.000000000 +0000 @@ -3,3 +3,4 @@ upstream_fix-FTBFS-with_cmake_3.9.patch internal-libraw-fix-ftbfs-with-glibc2.27.patch upstream_fix-conflicting-shortcuts.patch +upstream_fix-Qt-5.9.3-empty-album.patch diff -Nru digikam-5.6.0/debian/patches/upstream_fix-Qt-5.9.3-empty-album.patch digikam-5.6.0/debian/patches/upstream_fix-Qt-5.9.3-empty-album.patch --- digikam-5.6.0/debian/patches/upstream_fix-Qt-5.9.3-empty-album.patch 1970-01-01 00:00:00.000000000 +0000 +++ digikam-5.6.0/debian/patches/upstream_fix-Qt-5.9.3-empty-album.patch 2018-03-30 10:27:13.000000000 +0000 @@ -0,0 +1,31 @@ +From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001 +From: Maik Qualmann +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 != QLatin1Char('/')) ++ path += QLatin1Char('/'); ++ ++ url.setPath(path + name); + + QUrlQuery q(url); + q.addQueryItem(QLatin1String("albumRoot"), albumRoot.adjusted(QUrl::StripTrailingSlash).toLocalFile()); +-- +cgit v0.11.2 +