CVS commit: pkgsrc/x11/qwt6-qt5

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Tue Jun  9 07:01:55 UTC 2020

Modified Files:
        pkgsrc/x11/qwt6-qt5: buildlink3.mk distinfo
        pkgsrc/x11/qwt6-qt5/patches: patch-qwt.prf
Added Files:
        pkgsrc/x11/qwt6-qt5/patches: patch-src_qwt__dial.h
            patch-src_qwt__global.h patch-src_qwt__null__paintdevice.cpp
            patch-src_qwt__painter.h patch-src_qwt__painter__command.h
            patch-src_qwt__scale__draw.cpp

Log Message:
(x11/qwt6-qt5)  Adhoc fix for build problem, with following QPainterPath error

qwt_painter_command.h:85:22: error: field 'clipPath' has incomplete type 'QPainterPath'

Patches are not confirmed that all are necessary. But at least packaged on NetBSD/amd64 9.0


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/qwt6-qt5/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/qwt6-qt5/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/qwt6-qt5/patches/patch-qwt.prf
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__dial.h \
    pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__global.h \
    pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__null__paintdevice.cpp \
    pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__painter.h \
    pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__painter__command.h \
    pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__scale__draw.cpp

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

Modified files:

Index: pkgsrc/x11/qwt6-qt5/buildlink3.mk
diff -u pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.7 pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.8
--- pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.7       Tue Jun  2 08:23:07 2020
+++ pkgsrc/x11/qwt6-qt5/buildlink3.mk   Tue Jun  9 07:01:55 2020
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.7 2020/06/02 08:23:07 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2020/06/09 07:01:55 mef Exp $
 
 BUILDLINK_TREE+=       qwt6-qt5
 
-.if !defined(QWT_BUILDLINK3_MK)
-QWT_BUILDLINK3_MK:=
+.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.4nb5
@@ -16,6 +16,6 @@ BUILDLINK_RPATHDIRS.qwt6-qt5+=        qwt-6.1.4
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
-.endif # QWT_BUILDLINK3_MK
+.endif # QWT6_QT5_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -qwt6-qt5

Index: pkgsrc/x11/qwt6-qt5/distinfo
diff -u pkgsrc/x11/qwt6-qt5/distinfo:1.1 pkgsrc/x11/qwt6-qt5/distinfo:1.2
--- pkgsrc/x11/qwt6-qt5/distinfo:1.1    Mon Oct 28 19:00:37 2019
+++ pkgsrc/x11/qwt6-qt5/distinfo        Tue Jun  9 07:01:55 2020
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.1 2019/10/28 19:00:37 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2020/06/09 07:01:55 mef 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 (patch-qwt.prf) = e6ba3daffb0ba084e435dd573bde50341933b694
+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

Index: pkgsrc/x11/qwt6-qt5/patches/patch-qwt.prf
diff -u pkgsrc/x11/qwt6-qt5/patches/patch-qwt.prf:1.1 pkgsrc/x11/qwt6-qt5/patches/patch-qwt.prf:1.2
--- pkgsrc/x11/qwt6-qt5/patches/patch-qwt.prf:1.1       Mon Oct 28 19:00:37 2019
+++ pkgsrc/x11/qwt6-qt5/patches/patch-qwt.prf   Tue Jun  9 07:01:55 2020
@@ -1,4 +1,5 @@
-$NetBSD: patch-qwt.prf,v 1.1 2019/10/28 19:00:37 bouyer Exp $
+$NetBSD: patch-qwt.prf,v 1.2 2020/06/09 07:01:55 mef Exp $
+
 Needs to add QWT_INSTALL_LIBS to RPATH 
 
 --- qwt.prf.orig       2019-10-27 11:19:56.445946771 +0100

Added files:

Index: pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__dial.h
diff -u /dev/null pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__dial.h:1.1
--- /dev/null   Tue Jun  9 07:01:55 2020
+++ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__dial.h   Tue Jun  9 07:01:55 2020
@@ -0,0 +1,14 @@
+$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;
Index: pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__global.h
diff -u /dev/null pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__global.h:1.1
--- /dev/null   Tue Jun  9 07:01:55 2020
+++ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__global.h Tue Jun  9 07:01:55 2020
@@ -0,0 +1,15 @@
+$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.
+ 
Index: pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__null__paintdevice.cpp
diff -u /dev/null pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__null__paintdevice.cpp:1.1
--- /dev/null   Tue Jun  9 07:01:55 2020
+++ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__null__paintdevice.cpp    Tue Jun  9 07:01:55 2020
@@ -0,0 +1,15 @@
+$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
+ {
Index: pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__painter.h
diff -u /dev/null pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__painter.h:1.1
--- /dev/null   Tue Jun  9 07:01:55 2020
+++ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__painter.h        Tue Jun  9 07:01:55 2020
@@ -0,0 +1,14 @@
+$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;
Index: pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__painter__command.h
diff -u /dev/null pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__painter__command.h:1.1
--- /dev/null   Tue Jun  9 07:01:55 2020
+++ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__painter__command.h       Tue Jun  9 07:01:55 2020
@@ -0,0 +1,14 @@
+$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;
+ 
Index: pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__scale__draw.cpp
diff -u /dev/null pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__scale__draw.cpp:1.1
--- /dev/null   Tue Jun  9 07:01:55 2020
+++ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__scale__draw.cpp  Tue Jun  9 07:01:55 2020
@@ -0,0 +1,14 @@
+$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)