[arch-commits] Commit in digikam/trunk (PKGBUILD digikam-qt-5.15.patch)

[Maxime Gauduin]

    Date: Tuesday, June 2, 2020 @ 13:33:03
  Author: alucryd
Revision: 388097

add a qt 5.15 patch for digikam

Added:
  digikam/trunk/digikam-qt-5.15.patch
Modified:
  digikam/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   11 ++++++----
 digikam-qt-5.15.patch |   51 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-02 13:11:48 UTC (rev 388096)
+++ PKGBUILD	2020-06-02 13:33:03 UTC (rev 388097)
@@ -7,7 +7,7 @@
 pkgname=digikam
 _pkgver=6.4.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=9
+pkgrel=10
 pkgdesc="An advanced digital photo management application"
 arch=(x86_64)
 license=(GPL)
@@ -18,15 +18,17 @@
 optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)'
             'libkvkontakte: VKontakte plugin'
             'rawtherapee: RAW import' 'darktable: RAW import'
-            'digikam-plugin-gmic: G'MIC plugin'
+            "digikam-plugin-gmic: G'MIC plugin"
             'perl: for digitaglinktree')
 source=("https://download.kde.org/stable/$pkgname/$_pkgver/$pkgname-$_pkgver.tar.xz"{,.sig}
          initialize-imagemagick.patch::"https://cgit.kde.org/digikam.git/patch/?id=76ff65ae"
-         digikam-opencv-4.2.patch)
+         digikam-opencv-4.2.patch
+         digikam-qt-5.15.patch)
 sha256sums=('775012ff515bdd25a0b894c95bf5d33e7122b523da9c0f3af260ec3eff498d6f'
             'SKIP'
             'c559882c0df2243c5a5baab3373bda4084fb9a1d54959770b8846fe026eaf360'
-            'fcd9a18dee3b4d009ec7256207d1b6645d2e2aa918b5cf9f9dc9b44db41f6a7b')
+            'fcd9a18dee3b4d009ec7256207d1b6645d2e2aa918b5cf9f9dc9b44db41f6a7b'
+            '3dd295fe3b49bf2140e44a86e65741522744034e0d204af12a642621feea81fc')
 validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
 
 prepare() {
@@ -35,6 +37,7 @@
   cd $pkgname-$pkgver
   patch -p1 -i ../initialize-imagemagick.patch # Properly initialize exceptions in imagemagick
   patch -p1 -i ../digikam-opencv-4.2.patch # Fix build with opencv 4.2
+  patch -p1 -i ../digikam-qt-5.15.patch # Fix build with qt 5.15
 }
 
 build() {

Added: digikam-qt-5.15.patch
===================================================================
--- digikam-qt-5.15.patch	                        (rev 0)
+++ digikam-qt-5.15.patch	2020-06-02 13:33:03 UTC (rev 388097)
@@ -0,0 +1,51 @@
+From 10fd663f43148fc96ed3afeecf70de15cadd0f8a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm at gentoo.org>
+Date: Sun, 19 Apr 2020 09:55:03 +0200
+Subject: [PATCH] Fix build with Qt 5.15.0
+
+Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>
+---
+ .../dplugins/generic/view/presentation/opengl/presentationgl.cpp | 1 +
+ core/libs/dimg/filters/curves/curveswidget.cpp                   | 1 +
+ core/libs/dimg/filters/levels/histogrampainter.cpp               | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+index b37699436e..6a4f173ab0 100644
+--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
++++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+@@ -44,6 +44,7 @@
+ #include <QMatrix>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QTimer>
+ #include <QWheelEvent>
+diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp
+index cccccbd156..d0beef9bf2 100644
+--- a/core/libs/dimg/filters/curves/curveswidget.cpp
++++ b/core/libs/dimg/filters/curves/curveswidget.cpp
+@@ -40,6 +40,7 @@
+ #include <QColor>
+ #include <QFont>
+ #include <QFontMetrics>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QMouseEvent>
+ 
+diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp
+index 241d5fc4c8..f11ad4b560 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
+ 
+-- 
+2.26.1
+