Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/
Date: Thu, 30 Nov 2017 22:14:16
Message-Id: 1512079959.f11c24645887b7016c407ac8737981c3802a7213.asturm@gentoo
1 commit: f11c24645887b7016c407ac8737981c3802a7213
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 30 18:38:48 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 30 22:12:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11c2464
7
8 media-gfx/digikam: Fix build w/ Qt-5.7.0
9
10 Bug: https://bugs.gentoo.org/639300
11 Package-Manager: Portage-2.3.16, Repoman-2.3.6
12
13 media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16 diff --git a/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch
17 index e2abe9be39c..7001850cd9c 100644
18 --- a/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch
19 +++ b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch
20 @@ -3,6 +3,7 @@ From: Maik Qualmann <metzpinguin@×××××.com>
21 Date: Tue, 28 Nov 2017 21:29:00 +0100
22 Subject: try to fix the Qt-5.9.3 empty album problem CCBUGS: 387373
23
24 +* asturm: Fix build w/ Qt-5.7
25 ---
26 libs/database/coredb/coredburl.cpp | 7 ++++++-
27 1 file changed, 6 insertions(+), 1 deletion(-)
28 @@ -19,7 +20,7 @@ index 2c0d0eb..b1bdf71 100644
29 url.setScheme(QLatin1String("digikamalbums"));
30 - url.setPath(QLatin1Char('/') + album + QLatin1Char('/') + name);
31 +
32 -+ if (path != QLatin1Char('/'))
33 ++ if (path != QLatin1String("/"))
34 + path += QLatin1Char('/');
35 +
36 + url.setPath(path + name);