diff --git a/Fix-build-with-Qt-5.15.patch b/Fix-build-with-Qt-5.15.patch new file mode 100644 index 0000000..e9da9e8 --- /dev/null +++ b/Fix-build-with-Qt-5.15.patch @@ -0,0 +1,42 @@ +From 9ef1670e7ea0852cdfb694dd4d839977305bd4a2 Mon Sep 17 00:00:00 2001 +From: Gilles Caulier +Date: Wed, 20 May 2020 13:05:55 +0200 +Subject: fix broken compilation with Qt 5.15 CCBUGS: 421817 + +diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp +index 241d5fc..f11ad4b 100644 +--- a/core/libs/dimg/filters/levels/histogrampainter.cpp ++++ b/core/libs/dimg/filters/levels/histogrampainter.cpp +@@ -30,6 +30,7 @@ + // Qt includes + + #include ++#include + + // KDE includes + +diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp +index cccccbd..e8b2e1b 100644 +--- a/core/libs/dimg/filters/curves/curveswidget.cpp ++++ b/core/libs/dimg/filters/curves/curveswidget.cpp +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + // KDE includes + +diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp +index b376994..4d4dbfb 100644 +--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp ++++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp +@@ -44,6 +44,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include diff --git a/digikam.changes b/digikam.changes index 1d07e2f..193add8 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 5 11:55:04 UTC 2020 - Wolfgang Bauer + +- Add Fix-build-with-Qt-5.15.patch to fix build with Qt 5.15 + (kde#421817) + ------------------------------------------------------------------- Sat Jan 11 22:09:41 UTC 2020 - Fabian Vogt diff --git a/digikam.spec b/digikam.spec index 9c43ff2..b6343ff 100644 --- a/digikam.spec +++ b/digikam.spec @@ -33,6 +33,8 @@ Patch1: 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch # PATCH-FIX-UPSTREAM Patch2: fix-build-with-opencv-4.2.patch Patch3: dlib-update-to-work-with-latest-version-of-OpenCV.patch +# PATCH-FIX-UPSTREAM +Patch4: Fix-build-with-Qt-5.15.patch BuildRequires: QtAV-devel >= 1.12 BuildRequires: bison BuildRequires: boost-devel @@ -184,6 +186,7 @@ The main digikam libraries that are being shared between showfoto and digikam %endif %patch2 -p1 %patch3 -p1 +%patch4 -p1 # 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')