qwt6-qt5: update to 6.1.5

Maintenance
- Avoid using some of the deprecated Qt APIs
- Missing includes of QPainterPath ( Qt 5.15 ) added
- QwtPlotSpectroCurve: missing public inheritance
- QwtPlotTradingCurve: missing public inheritance

Bug fixes
- QwtLinearColorMap: handling of alpha values in color stops fixed
- QwtPlotRasterItem: missing color table initialization for
  QImage::Format_Indexed8
- QwtScaleWidget: missing QEvent::LayoutRequest added
- QwtSetSample: bound rectangle fixed for empty sets

11 files changed, 25 insertions, 121 deletions

diff --git a/x11/qwt6-qt5/Makefile b/x11/qwt6-qt5/Makefile
index 4ebee41ed72..54397072f22 100644
--- a/x11/qwt6-qt5/Makefile
+++ b/x11/qwt6-qt5/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2020/08/18 17:58:18 leot Exp $
+# $NetBSD: Makefile,v 1.11 2020/08/30 08:05:57 tnn Exp $
 
-DISTNAME=	qwt-6.1.4
-PKGNAME=	qwt6-qt5-6.1.4
-PKGREVISION=	7
+DISTNAME=	qwt-6.1.5
+PKGNAME=	qwt6-qt5-6.1.5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qwt/}
 EXTRACT_SUFX=	.tar.bz2
@@ -22,6 +21,11 @@ INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
 PLIST_SUBST+=	VERSION=${PKGVERSION_NOREV}
 
+# remove tex temp files that should not be installed
+post-extract:
+	rm -f ${WRKSRC}/doc/html/_form*
+	rm -f ${WRKSRC}/doc/html/functions_*~.html
+
 do-configure:
 	cd ${WRKSRC} && env ${CONFIGURE_ENV} ${QTDIR}/bin/qmake
 
diff --git a/x11/qwt6-qt5/PLIST b/x11/qwt6-qt5/PLIST
index c768e19d478..7cf466c19d1 100644
--- a/x11/qwt6-qt5/PLIST
+++ b/x11/qwt6-qt5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/28 19:00:37 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/08/30 08:05:57 tnn Exp $
 qt5/plugins/designer/libqwt_designer_plugin.so
 qwt-${VERSION}/doc/html/analogclock.png
 qwt-${VERSION}/doc/html/annotated.html
@@ -749,17 +749,9 @@ qwt-${VERSION}/doc/html/doxygen.png
 qwt-${VERSION}/doc/html/dynsections.js
 qwt-${VERSION}/doc/html/folderclosed.png
 qwt-${VERSION}/doc/html/folderopen.png
-qwt-${VERSION}/doc/html/form_0.png
-qwt-${VERSION}/doc/html/form_1.png
-qwt-${VERSION}/doc/html/form_2.png
-qwt-${VERSION}/doc/html/form_3.png
-qwt-${VERSION}/doc/html/form_4.png
-qwt-${VERSION}/doc/html/form_5.png
-qwt-${VERSION}/doc/html/formula.repository
 qwt-${VERSION}/doc/html/friedberg-bars-600x400.png
 qwt-${VERSION}/doc/html/friedberg-tube-600x400.png
 qwt-${VERSION}/doc/html/functions.html
-qwt-${VERSION}/doc/html/functions_0x7e.html
 qwt-${VERSION}/doc/html/functions_b.html
 qwt-${VERSION}/doc/html/functions_c.html
 qwt-${VERSION}/doc/html/functions_d.html
@@ -794,7 +786,6 @@ qwt-${VERSION}/doc/html/functions_eval_y.html
 qwt-${VERSION}/doc/html/functions_f.html
 qwt-${VERSION}/doc/html/functions_func.html
 qwt-${VERSION}/doc/html/functions_func.js
-qwt-${VERSION}/doc/html/functions_func_0x7e.html
 qwt-${VERSION}/doc/html/functions_func_b.html
 qwt-${VERSION}/doc/html/functions_func_c.html
 qwt-${VERSION}/doc/html/functions_func_d.html
@@ -1661,4 +1652,4 @@ qwt-${VERSION}/include/qwt_widget_overlay.h
 qwt-${VERSION}/lib/libqwt.so
 qwt-${VERSION}/lib/libqwt.so.6
 qwt-${VERSION}/lib/libqwt.so.6.1
-qwt-${VERSION}/lib/libqwt.so.6.1.4
+qwt-${VERSION}/lib/libqwt.so.6.1.5
diff --git a/x11/qwt6-qt5/buildlink3.mk b/x11/qwt6-qt5/buildlink3.mk
index 5879967e66e..7d1d4be9c90 100644
--- a/x11/qwt6-qt5/buildlink3.mk
+++ b/x11/qwt6-qt5/buildlink3.mk
@@ -1,18 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.9 2020/08/17 20:18:00 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2020/08/30 08:05:57 tnn Exp $
 
 BUILDLINK_TREE+=	qwt6-qt5
 
 .if !defined(QWT6_QT5_BUILDLINK3_MK)
 QWT6_QT5_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qwt6-qt5+=	qwt6-qt5>=6.1.4
-BUILDLINK_ABI_DEPENDS.qwt6-qt5+=	qwt6-qt5>=6.1.4nb6
+BUILDLINK_API_DEPENDS.qwt6-qt5+=	qwt6-qt5>=6.1.5
 BUILDLINK_PKGSRCDIR.qwt6-qt5?=		../../x11/qwt6-qt5
 
-QWT_DIR=			${BUILDLINK_PREFIX.qwt6-qt5}/qwt-6.1.4
-BUILDLINK_INCDIRS.qwt6-qt5+=	qwt-6.1.4/include
-BUILDLINK_LIBDIRS.qwt6-qt5+=	qwt-6.1.4/lib
-BUILDLINK_RPATHDIRS.qwt6-qt5+=	qwt-6.1.4/lib
+QWT_DIR=			${BUILDLINK_PREFIX.qwt6-qt5}/qwt-6.1.5
+BUILDLINK_INCDIRS.qwt6-qt5+=	qwt-6.1.5/include
+BUILDLINK_LIBDIRS.qwt6-qt5+=	qwt-6.1.5/lib
+BUILDLINK_RPATHDIRS.qwt6-qt5+=	qwt-6.1.5/lib
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
diff --git a/x11/qwt6-qt5/distinfo b/x11/qwt6-qt5/distinfo
index c08d9c81cd9..eb527890078 100644
--- a/x11/qwt6-qt5/distinfo
+++ b/x11/qwt6-qt5/distinfo
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.2 2020/06/09 07:01:55 mef Exp $
+$NetBSD: distinfo,v 1.3 2020/08/30 08:05:57 tnn Exp $
 
-SHA1 (qwt-6.1.4.tar.bz2) = a1028cb0a33322920266fb183869023b8ed30394
-RMD160 (qwt-6.1.4.tar.bz2) = a78f245b430b3e97443245d336031be59e2b0e17
-SHA512 (qwt-6.1.4.tar.bz2) = 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da
-Size (qwt-6.1.4.tar.bz2) = 4227315 bytes
-SHA1 (patch-pri) = ae8ca6197b76c082e22e4a9df57328ff8033d724
+SHA1 (qwt-6.1.5.tar.bz2) = 07c71427f1f4bbd0354b3a98965943ce2f220766
+RMD160 (qwt-6.1.5.tar.bz2) = 37bf5b741cbf9c760879b88cdfae741c0c6dc9ce
+SHA512 (qwt-6.1.5.tar.bz2) = 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
+Size (qwt-6.1.5.tar.bz2) = 4408268 bytes
 SHA1 (patch-qwt.prf) = f952dfc68909a24c847a8c33ea4b2cd21591fd31
-SHA1 (patch-src_qwt__dial.h) = 414509a26cf2db092881958a047291a14bc343a4
-SHA1 (patch-src_qwt__global.h) = 0624e0cdb8f3e30c34182969ef111c79da6fe128
-SHA1 (patch-src_qwt__null__paintdevice.cpp) = 7e0d8cdf2f22c565c69198128b8e0b74cc586ea2
-SHA1 (patch-src_qwt__painter.h) = f499a1316b6ffc584692b3d310483921ffe0c7e9
-SHA1 (patch-src_qwt__painter__command.h) = 27db14826ab80bf915031da7c6591a20715c3163
-SHA1 (patch-src_qwt__scale__draw.cpp) = ef8d66c0d86e6be825f7c592b081c2f28ec98508
+SHA1 (patch-qwtconfig.pri) = c1fae28cc33d35445c772f32da55ba20b20fe40a
diff --git a/x11/qwt6-qt5/patches/patch-pri b/x11/qwt6-qt5/patches/patch-qwtconfig.pri
index 8944b06d59a..5de9cf0c57b 100644
--- a/x11/qwt6-qt5/patches/patch-pri
+++ b/x11/qwt6-qt5/patches/patch-qwtconfig.pri
@@ -1,4 +1,6 @@
-$NetBSD: patch-pri,v 1.1 2019/10/28 19:00:37 bouyer Exp $
+$NetBSD: patch-qwtconfig.pri,v 1.1 2020/08/30 08:05:57 tnn Exp $
+
+Don't hardcode PREFIX.
 
 --- qwtconfig.pri.orig	2019-01-02 17:21:31.556467499 +0100
 +++ qwtconfig.pri	2019-10-25 18:51:20.912266571 +0200
diff --git a/x11/qwt6-qt5/patches/patch-src_qwt__dial.h b/x11/qwt6-qt5/patches/patch-src_qwt__dial.h
deleted file mode 100644
index 2cdf1b8947c..00000000000
--- a/x11/qwt6-qt5/patches/patch-src_qwt__dial.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_qwt__dial.h,v 1.1 2020/06/09 07:01:55 mef Exp $
-
-Fix missing QPainterPath
-
---- src/qwt_dial.h.orig	2019-01-02 16:21:30.356438480 +0000
-+++ src/qwt_dial.h
-@@ -15,6 +15,7 @@
- #include "qwt_abstract_scale_draw.h"
- #include <qframe.h>
- #include <qpalette.h>
-+#include <QPainterPath>
- 
- class QwtDialNeedle;
- class QwtRoundScaleDraw;
diff --git a/x11/qwt6-qt5/patches/patch-src_qwt__global.h b/x11/qwt6-qt5/patches/patch-src_qwt__global.h
deleted file mode 100644
index 8e769be68b8..00000000000
--- a/x11/qwt6-qt5/patches/patch-src_qwt__global.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_qwt__global.h,v 1.1 2020/06/09 07:01:55 mef Exp $
-
-Fix missing QPainterPath
-
---- src/qwt_global.h.orig	2019-01-02 16:21:30.380439061 +0000
-+++ src/qwt_global.h
-@@ -11,6 +11,8 @@
- #define QWT_GLOBAL_H
- 
- #include <qglobal.h>
-+#include <QPainterPath>
-+
- 
- // QWT_VERSION is (major << 16) + (minor << 8) + patch.
- 
diff --git a/x11/qwt6-qt5/patches/patch-src_qwt__null__paintdevice.cpp b/x11/qwt6-qt5/patches/patch-src_qwt__null__paintdevice.cpp
deleted file mode 100644
index c15a63030c7..00000000000
--- a/x11/qwt6-qt5/patches/patch-src_qwt__null__paintdevice.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_qwt__null__paintdevice.cpp,v 1.1 2020/06/09 07:01:55 mef Exp $
-
-Fix missing QPainterPath
-
---- src/qwt_null_paintdevice.cpp.orig	2019-01-02 16:21:31.296461212 +0000
-+++ src/qwt_null_paintdevice.cpp
-@@ -10,6 +10,8 @@
- #include "qwt_null_paintdevice.h"
- #include <qpaintengine.h>
- #include <qpixmap.h>
-+#include <QPainterPath>
-+
- 
- class QwtNullPaintDevice::PrivateData
- {
diff --git a/x11/qwt6-qt5/patches/patch-src_qwt__painter.h b/x11/qwt6-qt5/patches/patch-src_qwt__painter.h
deleted file mode 100644
index d07d100f6a6..00000000000
--- a/x11/qwt6-qt5/patches/patch-src_qwt__painter.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_qwt__painter.h,v 1.1 2020/06/09 07:01:55 mef Exp $
-
-Add missing QPainterPath
-
---- src/qwt_painter.h.orig	2019-01-02 16:21:30.232435482 +0000
-+++ src/qwt_painter.h
-@@ -17,6 +17,7 @@
- #include <qpen.h>
- #include <qline.h>
- #include <qpalette.h>
-+#include <QPainterPath>
- 
- class QPainter;
- class QBrush;
diff --git a/x11/qwt6-qt5/patches/patch-src_qwt__painter__command.h b/x11/qwt6-qt5/patches/patch-src_qwt__painter__command.h
deleted file mode 100644
index 4c69f4830f8..00000000000
--- a/x11/qwt6-qt5/patches/patch-src_qwt__painter__command.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_qwt__painter__command.h,v 1.1 2020/06/09 07:01:55 mef Exp $
-
-Fix missing QPainterPath
-
---- src/qwt_painter_command.h.orig	2019-01-02 16:21:30.320437610 +0000
-+++ src/qwt_painter_command.h
-@@ -15,6 +15,7 @@
- #include <qpixmap.h>
- #include <qimage.h>
- #include <qpolygon.h>
-+#include <QPainterPath>
- 
- class QPainterPath;
- 
diff --git a/x11/qwt6-qt5/patches/patch-src_qwt__scale__draw.cpp b/x11/qwt6-qt5/patches/patch-src_qwt__scale__draw.cpp
deleted file mode 100644
index 0e8a5d40472..00000000000
--- a/x11/qwt6-qt5/patches/patch-src_qwt__scale__draw.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_qwt__scale__draw.cpp,v 1.1 2020/06/09 07:01:55 mef Exp $
-
-Fix missing QPainterPath
-
---- src/qwt_scale_draw.cpp.orig	2019-01-02 16:21:31.400463727 +0000
-+++ src/qwt_scale_draw.cpp
-@@ -15,6 +15,7 @@
- #include <qpen.h>
- #include <qpainter.h>
- #include <qmath.h>
-+#include <QPainterPath>
- 
- #if QT_VERSION < 0x040601
- #define qFastSin(x) qSin(x)