diff --git a/0489-try-to-fix-the-Qt-5.9.3-empty-album-problem.patch b/0489-try-to-fix-the-Qt-5.9.3-empty-album-problem.patch new file mode 100644 index 0000000..7399a55 --- /dev/null +++ b/0489-try-to-fix-the-Qt-5.9.3-empty-album-problem.patch @@ -0,0 +1,32 @@ +From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001 +From: Maik Qualmann +Date: Tue, 28 Nov 2017 21:29:00 +0100 +Subject: [PATCH 489/489] try to fix the Qt-5.9.3 empty album problem CCBUGS: + 387373 + +--- + libs/database/coredb/coredburl.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/libs/database/coredb/coredburl.cpp b/libs/database/coredb/coredburl.cpp +index 2c0d0ebfdb..b1bdf7187b 100644 +--- a/libs/database/coredb/coredburl.cpp ++++ b/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()); +-- +2.14.3 + diff --git a/digikam.spec b/digikam.spec index ccb0e4f..83b8199 100644 --- a/digikam.spec +++ b/digikam.spec @@ -2,7 +2,7 @@ Name: digikam Summary: A digital camera accessing & photo management application Version: 5.7.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.digikam.org/ @@ -12,7 +12,8 @@ Source0: http://download.kde.org/%{?beta:un}stable/digikam/digikam-%{version}%{? # TODO: upstream me Source10: digikam-import.desktop -## upstream patches (lookaside cache) +## upstream patches +Patch489: 0489-try-to-fix-the-Qt-5.9.3-empty-album-problem.patch ## upstreamable patches # doc-translated FTBFS, https://bugs.kde.org/show_bug.cgi?id=377597 @@ -154,11 +155,11 @@ Obsoletes: kipi-plugins-doc < 5.7.0-2 %if 0%{?fedora} > 21 #Recommends: kipi-plugins-doc = %{version}-%{release} ## expoblending -Requires: hugin-base +Recommends: hugin-base %endif %description -n kf5-kipi-plugins This package contains plugins to use with Kipi, the KDE Image Plugin -Interface. +Interface. Expoblending plugin requires hugin-base. %package -n kf5-kipi-plugins-libs Summary: Runtime libraries for kf5-kipi-plugins @@ -179,6 +180,10 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} +pushd core +%patch489 -p1 -b .0489 +popd + %patch100 -p1 -b .doc_translated # EVIV2_MIN_VERSION @@ -313,6 +318,10 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor >& /dev/null ||: %changelog +* Tue Nov 28 2017 Rex Dieter - 5.7.0-3 +- upstream qt-5.9.3 fix +- kipi-plugins: make hugin-base dep soft + * Sun Sep 17 2017 Rex Dieter - 5.7.0-2 - drop mariadb build deps, rely on exlicit cmake build options only - drop empty kipi-plugins-doc