diff --git a/0002-Fix-compilation-with-clang.patch b/0002-Fix-compilation-with-clang.patch new file mode 100644 index 0000000..14de9f3 --- /dev/null +++ b/0002-Fix-compilation-with-clang.patch @@ -0,0 +1,34 @@ +From 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758 Mon Sep 17 00:00:00 2001 +From: Gilles Caulier +Date: Wed, 18 Jan 2017 10:13:20 +0100 +Subject: [PATCH 2/2] Fix compilation with clang + +--- + libs/dmetadata/metaengine_p.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libs/dmetadata/metaengine_p.cpp b/libs/dmetadata/metaengine_p.cpp +index 2c83b58..2b44e06 100644 +--- a/libs/dmetadata/metaengine_p.cpp ++++ b/libs/dmetadata/metaengine_p.cpp +@@ -49,7 +49,7 @@ extern "C" + #include "digikam_debug.h" + + // Pragma directives to reduce warnings from Exiv2. +-#if not defined(__APPLE__) && defined(__GNUC__) ++#if !defined(__APPLE__) && defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif +@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar) + } // namespace Digikam + + // Restore warnings +-#if not defined(__APPLE__) && defined(__GNUC__) ++#if !defined(__APPLE__) && defined(__GNUC__) + #pragma GCC diagnostic pop + #endif + +-- +2.9.3 + diff --git a/digikam.spec b/digikam.spec index cbc96cb..94494ff 100644 --- a/digikam.spec +++ b/digikam.spec @@ -14,6 +14,8 @@ Source10: digikam-import.desktop ## upstream patches +Patch2: 0002-Fix-compilation-with-clang.patch + ## upstreamable patches BuildRequires: boost-devel @@ -170,6 +172,10 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} +pushd core +%patch2 -p1 -b .0002 +popd + %build mkdir %{_target_platform} @@ -313,6 +319,9 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor >& /dev/null ||: %changelog +* Tue Feb 21 2017 Rex Dieter - 5.4.0-3 +- backport upstream FTBFS fix (#1423329) + * Fri Feb 10 2017 Fedora Release Engineering - 5.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild