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

Accepting request 811909 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/811909
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=187
This commit is contained in:
Dominique Leuenberger 2020-06-06 21:39:28 +00:00 committed by Git OBS Bridge
commit 7c1aca8849
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Fix-build-with-Qt-5.15.patch Normal file
View File

@ -0,0 +1,42 @@
From 9ef1670e7ea0852cdfb694dd4d839977305bd4a2 Mon Sep 17 00:00:00 2001
From: Gilles Caulier <caulier.gilles@gmail.com>
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 <QPainter>
+#include <QPainterPath>
// 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 <QFontMetrics>
#include <QPaintEvent>
#include <QMouseEvent>
+#include <QPainterPath>
// 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 <QMatrix>
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
+#include <QPainterPathStroker>
#include <QPixmap>
#include <QTimer>
#include <QWheelEvent>

6
digikam.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 5 11:55:04 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
- 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 <fabian@ritter-vogt.de>

3
digikam.spec
View File

@ -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')