CVS commit: pkgsrc/graphics/digikam

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Jun 10 11:08:05 UTC 2020

Modified Files:
        pkgsrc/graphics/digikam: Makefile distinfo
Added Files:
        pkgsrc/graphics/digikam/patches:
            patch-core_dplugins_generic_view_presentation_opengl_presentationgl.cpp
            patch-core_libs_dimg_filters_curves_curveswidget.cpp
            patch-core_libs_dimg_filters_levels_histogrampainter.cpp

Log Message:
digikam: fix build with qt5.15


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 pkgsrc/graphics/digikam/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/graphics/digikam/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/digikam/patches/patch-core_dplugins_generic_view_presentation_opengl_presentationgl.cpp \
    pkgsrc/graphics/digikam/patches/patch-core_libs_dimg_filters_curves_curveswidget.cpp \
    pkgsrc/graphics/digikam/patches/patch-core_libs_dimg_filters_levels_histogrampainter.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/digikam/Makefile
diff -u pkgsrc/graphics/digikam/Makefile:1.158 pkgsrc/graphics/digikam/Makefile:1.159
--- pkgsrc/graphics/digikam/Makefile:1.158      Tue Jun  2 08:24:00 2020
+++ pkgsrc/graphics/digikam/Makefile    Wed Jun 10 11:08:05 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.158 2020/06/02 08:24:00 adam Exp $
+# $NetBSD: Makefile,v 1.159 2020/06/10 11:08:05 markd Exp $
 
 DISTNAME=      digikam-6.4.0
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_KDE:=digikam/6.4.0/}
 

Index: pkgsrc/graphics/digikam/distinfo
diff -u pkgsrc/graphics/digikam/distinfo:1.51 pkgsrc/graphics/digikam/distinfo:1.52
--- pkgsrc/graphics/digikam/distinfo:1.51       Tue May 26 11:27:21 2020
+++ pkgsrc/graphics/digikam/distinfo    Wed Jun 10 11:08:05 2020
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.51 2020/05/26 11:27:21 joerg Exp $
+$NetBSD: distinfo,v 1.52 2020/06/10 11:08:05 markd Exp $
 
 SHA1 (digikam-6.4.0-03/digikam-6.4.0.tar.xz) = 6f067b31a2109f82b2e78c89fc84bd03eab30674
 RMD160 (digikam-6.4.0-03/digikam-6.4.0.tar.xz) = 818826ba0fd64785cb25297a1f4c11e0747e0eb2
 SHA512 (digikam-6.4.0-03/digikam-6.4.0.tar.xz) = b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
 Size (digikam-6.4.0-03/digikam-6.4.0.tar.xz) = 340146992 bytes
+SHA1 (patch-core_dplugins_generic_view_presentation_opengl_presentationgl.cpp) = 5153f0f5f299f7a4e4400cf5241f849d29df07e6
+SHA1 (patch-core_libs_dimg_filters_curves_curveswidget.cpp) = f3b49dcae4c3339ff05eb3e59e234f3df9c2dd05
+SHA1 (patch-core_libs_dimg_filters_levels_histogrampainter.cpp) = 357fccdcf1616d96efa8e9eedde33aec70005d56
 SHA1 (patch-core_libs_facesengine_detection_opencvfacedetector.cpp) = e5c05583c31c4d0bfc9a2b7548a7131709a50f96
 SHA1 (patch-core_libs_facesengine_recognition_dlib-dnn_dnnface_dnn__base_cv__image.h) = e3164ad2cc91232abc36b66e56806ad4a0715ee6
 SHA1 (patch-core_libs_kmemoryinfo_libstatgrab_kmemoryinfo_backend.cpp) = d4e4bee19424ef0af3d399822b428b274114ba46

Added files:

Index: pkgsrc/graphics/digikam/patches/patch-core_dplugins_generic_view_presentation_opengl_presentationgl.cpp
diff -u /dev/null pkgsrc/graphics/digikam/patches/patch-core_dplugins_generic_view_presentation_opengl_presentationgl.cpp:1.1
--- /dev/null   Wed Jun 10 11:08:05 2020
+++ pkgsrc/graphics/digikam/patches/patch-core_dplugins_generic_view_presentation_opengl_presentationgl.cpp     Wed Jun 10 11:08:05 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-core_dplugins_generic_view_presentation_opengl_presentationgl.cpp,v 1.1 2020/06/10 11:08:05 markd Exp $
+
+qt5.15 fix
+
+--- core/dplugins/generic/view/presentation/opengl/presentationgl.cpp.orig     2019-11-03 09:03:59.000000000 +0000
++++ 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>
Index: pkgsrc/graphics/digikam/patches/patch-core_libs_dimg_filters_curves_curveswidget.cpp
diff -u /dev/null pkgsrc/graphics/digikam/patches/patch-core_libs_dimg_filters_curves_curveswidget.cpp:1.1
--- /dev/null   Wed Jun 10 11:08:05 2020
+++ pkgsrc/graphics/digikam/patches/patch-core_libs_dimg_filters_curves_curveswidget.cpp        Wed Jun 10 11:08:05 2020
@@ -0,0 +1,14 @@
+
+qt5.15 fix
+$NetBSD: patch-core_libs_dimg_filters_curves_curveswidget.cpp,v 1.1 2020/06/10 11:08:05 markd Exp $
+
+--- core/libs/dimg/filters/curves/curveswidget.cpp.orig        2019-11-03 09:03:59.000000000 +0000
++++ core/libs/dimg/filters/curves/curveswidget.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include <QPixmap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPoint>
+ #include <QPen>
+ #include <QEvent>
Index: pkgsrc/graphics/digikam/patches/patch-core_libs_dimg_filters_levels_histogrampainter.cpp
diff -u /dev/null pkgsrc/graphics/digikam/patches/patch-core_libs_dimg_filters_levels_histogrampainter.cpp:1.1
--- /dev/null   Wed Jun 10 11:08:05 2020
+++ pkgsrc/graphics/digikam/patches/patch-core_libs_dimg_filters_levels_histogrampainter.cpp    Wed Jun 10 11:08:05 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-core_libs_dimg_filters_levels_histogrampainter.cpp,v 1.1 2020/06/10 11:08:05 markd Exp $
+
+qt5.15 fix
+
+--- core/libs/dimg/filters/levels/histogrampainter.cpp.orig    2019-11-03 09:03:59.000000000 +0000
++++ core/libs/dimg/filters/levels/histogrampainter.cpp
+@@ -30,6 +30,7 @@
+ // Qt includes
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ // KDE includes
+