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

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

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=fc529c75bae295cb4fbc8243d4c5261e
This commit is contained in:
OBS User buildservice-autocommit 2017-12-10 17:17:29 +00:00 committed by Git OBS Bridge
parent e382365613
commit 6cc7841f20
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
digikam.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 8 19:48:19 UTC 2017 - wbauer@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)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 22 11:51:13 UTC 2017 - wbauer@tmo.at Wed Nov 22 11:51:13 UTC 2017 - wbauer@tmo.at

3
digikam.spec
View File

@ -28,6 +28,8 @@ Source0: http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
Patch0: 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch Patch0: 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch
# PATCH-FIX-UPSTREAM # PATCH-FIX-UPSTREAM
Patch1: Adapt-to-KCalCore-API-changes.patch 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 #This pulls in QWebEngine, which is not available on ppc64
%ifarch %ix86 x86_64 %arm aarch64 mips mips64 %ifarch %ix86 x86_64 %arm aarch64 mips mips64
BuildRequires: akonadi-contact-devel BuildRequires: akonadi-contact-devel
@ -172,6 +174,7 @@ The main digikam libraries that are being shared between showfoto and digikam
%patch0 -p1 %patch0 -p1
%endif %endif
%patch1 -p1 %patch1 -p1
%patch2 -p1
# Remove build time references so build-compare can do its work # 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') FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')

31
fix-Qt-5.9.3-empty-album-problem.patch Normal file
View File

@ -0,0 +1,31 @@
From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001
From: Maik Qualmann <metzpinguin@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