pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/py-qwt-qt5
Module Name: pkgsrc
Committed By: adam
Date: Sat May 11 20:54:13 UTC 2024
Modified Files:
pkgsrc/x11/py-qwt-qt5: PLIST distinfo
Added Files:
pkgsrc/x11/py-qwt-qt5/patches: patch-sip_qmap__convert.sip
patch-sip_qwt__abstract__scale__draw.sip patch-sip_qwt__axis.sip
patch-sip_qwt__axis__id.sip patch-sip_qwt__color__map.sip
patch-sip_qwt__column__symbol.sip patch-sip_qwt__compass__rose.sip
patch-sip_qwt__curve__fitter.sip patch-sip_qwt__dial__needle.sip
patch-sip_qwt__plot.sip patch-sip_qwt__plot__barchart.sip
patch-sip_qwt__plot__curve.sip patch-sip_qwt__plot__histogram.sip
patch-sip_qwt__plot__item.sip patch-sip_qwt__plot__layout.sip
patch-sip_qwt__plot__marker.sip
patch-sip_qwt__plot__multi__barchart.sip
patch-sip_qwt__plot__picker.sip patch-sip_qwt__plot__rasteritem.sip
patch-sip_qwt__plot__seriesitem.sip
patch-sip_qwt__plot__spectrogram.sip
patch-sip_qwt__plot__zoomer.sip patch-sip_qwt__point__data.sip
patch-sip_qwt__raster__data.sip patch-sip_qwt__scale__engine.sip
patch-sip_qwt__spline.sip patch-sip_qwt__text.sip
patch-sip_qwt__text_engine.sip patch-sip_qwt__transform.sip
Log Message:
py-qwt-qt5: fix builds against qwt-qt5 6.1.6 and newer
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/py-qwt-qt5/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/py-qwt-qt5/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qmap__convert.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__abstract__scale__draw.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__axis.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__axis__id.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__color__map.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__column__symbol.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__compass__rose.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__curve__fitter.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__dial__needle.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__barchart.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__curve.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__histogram.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__item.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__layout.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__marker.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__multi__barchart.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__picker.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__rasteritem.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__seriesitem.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__spectrogram.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__zoomer.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__point__data.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__raster__data.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__scale__engine.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__spline.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__text.sip \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__text_engine.sip
cvs rdiff -u -r0 -r1.3 \
pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__transform.sip
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/py-qwt-qt5/PLIST
diff -u pkgsrc/x11/py-qwt-qt5/PLIST:1.8 pkgsrc/x11/py-qwt-qt5/PLIST:1.9
--- pkgsrc/x11/py-qwt-qt5/PLIST:1.8 Sun Dec 17 08:57:20 2023
+++ pkgsrc/x11/py-qwt-qt5/PLIST Sat May 11 20:54:11 2024
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2023/12/17 08:57:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2024/05/11 20:54:11 adam Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
${PYSITELIB}/PyQt5/Qwt.cpython-${PYTHON_VERSION}.so
${PYSITELIB}/PyQt5/bindings/Qwt/Qwt.toml
${PYSITELIB}/PyQt5/bindings/Qwt/Qwt_Qt5.sip
@@ -68,6 +71,3 @@ ${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text
${PYSITELIB}/PyQt5/bindings/Qwt/qwt_thermo.sip
${PYSITELIB}/PyQt5/bindings/Qwt/qwt_transform.sip
${PYSITELIB}/PyQt5/bindings/Qwt/qwt_wheel.sip
-${PYSITELIB}/${WHEEL_INFODIR}/METADATA
-${PYSITELIB}/${WHEEL_INFODIR}/RECORD
-${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
Index: pkgsrc/x11/py-qwt-qt5/distinfo
diff -u pkgsrc/x11/py-qwt-qt5/distinfo:1.4 pkgsrc/x11/py-qwt-qt5/distinfo:1.5
--- pkgsrc/x11/py-qwt-qt5/distinfo:1.4 Sat Oct 8 13:26:55 2022
+++ pkgsrc/x11/py-qwt-qt5/distinfo Sat May 11 20:54:11 2024
@@ -1,5 +1,34 @@
-$NetBSD: distinfo,v 1.4 2022/10/08 13:26:55 adam Exp $
+$NetBSD: distinfo,v 1.5 2024/05/11 20:54:11 adam Exp $
BLAKE2s (pyqt-qwt-1.02.02.tar.gz) = 70ec253f564f0cbae48901c16a3a89b1c09d797a902cc38f94d8262f3f8736f9
SHA512 (pyqt-qwt-1.02.02.tar.gz) = 2892827fb7e4e71c0f770ba481ef4653f2ef09a68767c178e4f810bb9c2f1e80362c7a37867c9b5d3525aed8118aef6c503ddc28323db02fe159055efed2a71d
Size (pyqt-qwt-1.02.02.tar.gz) = 120948 bytes
+SHA1 (patch-sip_qmap__convert.sip) = 60c7c27f2f3409e798cae76d17b817841bee94d8
+SHA1 (patch-sip_qwt__abstract__scale__draw.sip) = 08c7f3bf4326080c41605f0625953c13bb2603a3
+SHA1 (patch-sip_qwt__axis.sip) = f046aab87a5fced13c0391b296cd8456d598f472
+SHA1 (patch-sip_qwt__axis__id.sip) = f653255ddb7c39ecc50d52484122fcf107ac11f4
+SHA1 (patch-sip_qwt__color__map.sip) = a66d68c9f62dcbf7e0586fd85a80b1cbe1c9c750
+SHA1 (patch-sip_qwt__column__symbol.sip) = 42e8039d76a554d5b800360334f4c65947b0d7c0
+SHA1 (patch-sip_qwt__compass__rose.sip) = 099b62186fb91a8bfeb7ed90fcd743234bf4de44
+SHA1 (patch-sip_qwt__curve__fitter.sip) = 4836f5c5781a17f58626752e74b6f61bed57b91c
+SHA1 (patch-sip_qwt__dial__needle.sip) = bf2b5a9f3e2ffd13eed04c8778a0b99f5ccfdb81
+SHA1 (patch-sip_qwt__plot.sip) = 4ce33d3d03e34ca74db6e6a23501c674a01d4ecb
+SHA1 (patch-sip_qwt__plot__barchart.sip) = 03c80d3ddf038cea75edd5fd3b2ded41106756c8
+SHA1 (patch-sip_qwt__plot__curve.sip) = dd1f807d309350386695d11afa7acf7d3e1a9f08
+SHA1 (patch-sip_qwt__plot__histogram.sip) = 2fa2d6807a07a70064d9aec4595038b78fed54e4
+SHA1 (patch-sip_qwt__plot__item.sip) = d993bcbff017a171386dfadd9ecc811a444649f4
+SHA1 (patch-sip_qwt__plot__layout.sip) = 9249a54eb176818f9e82460d1e7dd5af7f9bf9d7
+SHA1 (patch-sip_qwt__plot__marker.sip) = cd14b21031523ca981e0c20c4e89b7907f225aba
+SHA1 (patch-sip_qwt__plot__multi__barchart.sip) = 9026b434272da6b7dadc595cde31f25ee7845394
+SHA1 (patch-sip_qwt__plot__picker.sip) = d22edb5de6596657581865a3efa1edc5886b9e3b
+SHA1 (patch-sip_qwt__plot__rasteritem.sip) = d12e923bf12529fe0b8a8e8ce806356fe81c5793
+SHA1 (patch-sip_qwt__plot__seriesitem.sip) = f8af7cac0c375b66d74e7d42c7d2db721903e4f7
+SHA1 (patch-sip_qwt__plot__spectrogram.sip) = 5c16575d8fd14caf36f1c361cdca7ff8a2e6c217
+SHA1 (patch-sip_qwt__plot__zoomer.sip) = 80f27394b00d1e07afd60e06e29e36dee7dbbddb
+SHA1 (patch-sip_qwt__point__data.sip) = 61a75ae9a2720b24e1ea6a129b70253c3102901e
+SHA1 (patch-sip_qwt__raster__data.sip) = 9d0234ddf52628a841e19d97bfffb3a918780c74
+SHA1 (patch-sip_qwt__scale__engine.sip) = 4033f16b6ea972f12898db283f3a70917508044a
+SHA1 (patch-sip_qwt__spline.sip) = 1bd4331c6a90a39caf715f4e8d4cf762a45b01a5
+SHA1 (patch-sip_qwt__text.sip) = 2c86bbdc9b9dd9a842eb11194686fa5573e62fe4
+SHA1 (patch-sip_qwt__text_engine.sip) = 64d52ec807b792a22e90523ca420b1cffc38c318
+SHA1 (patch-sip_qwt__transform.sip) = 0f1b75ad1c2475aeefa7a76a5edfd8a6de4f9c6c
Added files:
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qmap__convert.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qmap__convert.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qmap__convert.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-sip_qmap__convert.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qmap_convert.sip.orig 2024-05-11 19:32:30.715677253 +0000
++++ sip/qmap_convert.sip
+@@ -3,6 +3,7 @@
+ %MappedType QMap<double,QString> /TypeHint="Dict[double,QString]", TypeHintValue="{}"/
+ {
+ %TypeHeaderCode
++#include <qmap.h>
+ #include <qwt_compass.h>
+ %End
+
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__abstract__scale__draw.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__abstract__scale__draw.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__abstract__scale__draw.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-sip_qwt__abstract__scale__draw.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_abstract_scale_draw.sip.orig 2024-05-11 19:33:48.206196535 +0000
++++ sip/qwt_abstract_scale_draw.sip
+@@ -54,8 +54,8 @@ public:
+ void setSpacing( double margin );
+ double spacing() const;
+
+- void setPenWidth( int width );
+- int penWidth() const;
++ void setPenWidthF( int width );
++ int penWidthF() const;
+
+ virtual void draw( QPainter *, const QPalette & ) const;
+
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__axis.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__axis.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__axis.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,70 @@
+$NetBSD: patch-sip_qwt__axis.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_axis.sip.orig 2024-05-11 19:35:25.211625345 +0000
++++ sip/qwt_axis.sip
+@@ -0,0 +1,62 @@
++/******************************************************************************
++ * Qwt Widget Library
++ * Copyright (C) 1997 Josef Wilgen
++ * Copyright (C) 2002 Uwe Rathmann
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the Qwt License, Version 1.0
++ *****************************************************************************/
++
++/*!
++ Enums and methods for axes
++ */
++namespace QwtAxis
++{
++%TypeHeaderCode
++#include "qwt_global.h"
++%End
++
++ //! \brief Axis position
++ enum Position
++ {
++ //! Y axis left of the canvas
++ YLeft,
++
++ //! Y axis right of the canvas
++ YRight,
++
++ //! X axis below the canvas
++ XBottom,
++
++ //! X axis above the canvas
++ XTop
++ };
++
++ //! \brief Number of axis positions
++ enum { AxisPositions = XTop + 1 };
++
++ bool isValid( int axisPos );
++ bool isYAxis( int axisPos );
++ bool isXAxis( int axisPos );
++}
++
++/*
++//! \return true, when axisPos is in the valid range [ YLeft, XTop ]
++inline bool QwtAxis::isValid( int axisPos )
++{
++ return ( axisPos >= 0 && axisPos < AxisPositions );
++}
++
++//! \return true, when axisPos is XBottom or XTop
++inline bool QwtAxis::isXAxis( int axisPos )
++{
++ return ( axisPos == XBottom ) || ( axisPos == XTop );
++}
++
++//! \return true, when axisPos is YLeft or YRight
++inline bool QwtAxis::isYAxis( int axisPos )
++{
++ return ( axisPos == YLeft ) || ( axisPos == YRight );
++}
++
++*/
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__axis__id.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__axis__id.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__axis__id.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,9 @@
+$NetBSD: patch-sip_qwt__axis__id.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_axis_id.sip.orig 2024-05-11 19:36:19.096356461 +0000
++++ sip/qwt_axis_id.sip
+@@ -0,0 +1 @@
++typedef int QwtAxisId;
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__color__map.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__color__map.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__color__map.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,219 @@
+$NetBSD: patch-sip_qwt__color__map.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_color_map.sip.orig 2020-12-27 08:53:37.000000000 +0000
++++ sip/qwt_color_map.sip
+@@ -1,4 +1,4 @@
+-/*
++/******************************************************************************
+ * python-qwt. Python wrapper for the Qwt Widget Library
+ * Copyright (C) 1997 Josef Wilgen
+ * Copyright (C) 2002 Uwe Rathmann
+@@ -13,7 +13,7 @@ class QwtColorMap
+ %TypeHeaderCode
+ #include <qwt_color_map.h>
+ %End
+-public:
++ public:
+ enum Format
+ {
+ RGB,
+@@ -23,15 +23,19 @@ public:
+ QwtColorMap( Format = QwtColorMap::RGB );
+ virtual ~QwtColorMap();
+
++ void setFormat( Format );
+ Format format() const;
+- virtual QRgb rgb( const QwtInterval &interval, double value ) const = 0;
+- virtual unsigned char colorIndex( const QwtInterval &interval, double value ) const = 0;
++ virtual QRgb rgb( const QwtInterval& interval, double value ) const = 0;
++ virtual uint colorIndex( int numColors, const QwtInterval& interval, double value ) const;
+
+- QColor color( const QwtInterval &, double value ) const;
+- virtual QVector<QRgb> colorTable( const QwtInterval & ) const;
++ QColor color( const QwtInterval&, double value ) const;
++ virtual QVector< QRgb > colorTable( int ) const;
++ virtual QVector< QRgb > colorTable256() const;
+
+-//private:
+-// Format d_format;
++private:
++ QwtColorMap( const QwtColorMap & );
++
++// Format m_format;
+ };
+
+ class QwtLinearColorMap: QwtColorMap
+@@ -39,7 +43,7 @@ class QwtLinearColorMap: QwtColorMap
+ %TypeHeaderCode
+ #include <qwt_color_map.h>
+ %End
+-public:
++ public:
+ enum Mode
+ {
+ FixedColors,
+@@ -47,33 +51,33 @@ public:
+ };
+
+ QwtLinearColorMap( Format = QwtColorMap::RGB );
+- QwtLinearColorMap( const QColor &from, const QColor &to,
+- Format = QwtColorMap::RGB );
++ QwtLinearColorMap( const QColor& from, const QColor& to,
++ Format = QwtColorMap::RGB );
+
+ virtual ~QwtLinearColorMap();
+
+ void setMode( Mode );
+ Mode mode() const;
+
+- void setColorInterval( const QColor &color1, const QColor &color2 );
++ void setColorInterval( const QColor& color1, const QColor& color2 );
+ void addColorStop( double value, const QColor& );
+- QVector<double> colorStops() const;
++ QVector< double > colorStops() const;
+
+ QColor color1() const;
+ QColor color2() const;
+
+- virtual QRgb rgb( const QwtInterval &, double value ) const;
+- virtual unsigned char colorIndex( const QwtInterval &, double value ) const;
++ virtual QRgb rgb( const QwtInterval&,
++ double value ) const;
++
++ virtual uint colorIndex( int numColors,
++ const QwtInterval&, double value ) const;
+
+ class ColorStops;
+
+-private:
+- // Disabled copy constructor and operator=
++ private:
+ QwtLinearColorMap( const QwtLinearColorMap & );
+- //QwtLinearColorMap &operator=( const QwtLinearColorMap & );
+-
+- //class PrivateData;
+- //PrivateData *d_data;
++// class PrivateData;
++// PrivateData* m_data;
+ };
+
+ class QwtAlphaColorMap: QwtColorMap
+@@ -81,42 +85,92 @@ class QwtAlphaColorMap: QwtColorMap
+ %TypeHeaderCode
+ #include <qwt_color_map.h>
+ %End
+-public:
+- QwtAlphaColorMap( const QColor & = QColor( Qt::gray ) );
++ public:
++ QwtAlphaColorMap( const QColor& = QColor( Qt::gray ) );
+ virtual ~QwtAlphaColorMap();
+
+- void setColor( const QColor & );
++ void setAlphaInterval( int alpha1, int alpha2 );
++
++ int alpha1() const;
++ int alpha2() const;
++
++ void setColor( const QColor& );
+ QColor color() const;
+
+- virtual QRgb rgb( const QwtInterval &, double value ) const;
++ virtual QRgb rgb( const QwtInterval&,
++ double value ) const;
+
+-private:
++ private:
+ QwtAlphaColorMap( const QwtAlphaColorMap & );
+- //QwtAlphaColorMap &operator=( const QwtAlphaColorMap & );
+-
+- virtual unsigned char colorIndex( const QwtInterval &, double value ) const;
++// class PrivateData;
++// PrivateData* m_data;
++};
+
+- //class PrivateData;
+- //PrivateData *d_data;
++class QwtHueColorMap : QwtColorMap
++{
++%TypeHeaderCode
++#include <qwt_color_map.h>
++%End
++ public:
++ QwtHueColorMap( Format = QwtColorMap::RGB );
++ virtual ~QwtHueColorMap();
++
++ void setHueInterval( int hue1, int hue2 ); // direction ?
++ void setSaturation( int saturation );
++ void setValue( int value );
++ void setAlpha( int alpha );
++
++ int hue1() const;
++ int hue2() const;
++ int saturation() const;
++ int value() const;
++ int alpha() const;
++
++ virtual QRgb rgb( const QwtInterval&,
++ double value ) const;
++
++ private:
++ QwtHueColorMap( const QwtHueColorMap & );
++// class PrivateData;
++// PrivateData* m_data;
+ };
+
++class QwtSaturationValueColorMap : QwtColorMap
++{
++%TypeHeaderCode
++#include <qwt_color_map.h>
++%End
++ public:
++ QwtSaturationValueColorMap();
++ virtual ~QwtSaturationValueColorMap();
++
++ void setHue( int hue );
++ void setSaturationInterval( int sat1, int sat2 );
++ void setValueInterval( int value1, int value2 );
++ void setAlpha( int alpha );
++
++ int hue() const;
++ int saturation1() const;
++ int saturation2() const;
++ int value1() const;
++ int value2() const;
++ int alpha() const;
++
++ virtual QRgb rgb( const QwtInterval&,
++ double value ) const;
++
++ private:
++ QwtSaturationValueColorMap( const QwtSaturationValueColorMap & );
++// class PrivateData;
++// PrivateData* m_data;
++};
+
+-/*inline QColor QwtColorMap::color(
+- const QwtInterval &interval, double value ) const
++/*inline QColor QwtColorMap::color( const QwtInterval& interval, double value ) const
+ {
+- if ( d_format == RGB )
+- {
+- return QColor::fromRgba( rgb( interval, value ) );
+- }
+- else
+- {
+- const unsigned int index = colorIndex( interval, value );
+- return colorTable( interval )[index]; // slow
+- }
++ return QColor::fromRgba( rgb( interval, value ) );
+ }
+
+ inline QwtColorMap::Format QwtColorMap::format() const
+ {
+- return d_format;
++ return m_format;
+ }*/
+-
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__column__symbol.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__column__symbol.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__column__symbol.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-sip_qwt__column__symbol.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_column_symbol.sip.orig 2024-05-11 19:48:54.362021705 +0000
++++ sip/qwt_column_symbol.sip
+@@ -143,4 +143,6 @@ public:
+ protected:
+ void drawBox( QPainter * /Transfer/, const QwtColumnRect & ) const;
+
++private:
++ QwtColumnSymbol( const QwtColumnSymbol & );
+ };
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__compass__rose.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__compass__rose.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__compass__rose.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-sip_qwt__compass__rose.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_compass_rose.sip.orig 2024-05-11 19:38:00.537539161 +0000
++++ sip/qwt_compass_rose.sip
+@@ -41,7 +41,8 @@ public:
+ const QPointF ¢er, double radius, double north,
+ QPalette::ColorGroup colorGroup = QPalette::Active ) const = 0;
+
+-//private:
++private:
++ QwtCompassRose( const QwtCompassRose & );
+ // QPalette d_palette;
+ };
+
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__curve__fitter.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__curve__fitter.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__curve__fitter.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,109 @@
+$NetBSD: patch-sip_qwt__curve__fitter.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_curve_fitter.sip.orig 2024-05-11 19:49:47.706766690 +0000
++++ sip/qwt_curve_fitter.sip
+@@ -17,6 +17,25 @@ class QwtCurveFitter
+ public:
+ virtual ~QwtCurveFitter();
+
++ enum Mode
++ {
++ /*!
++ The fitting algorithm creates a polygon - the implementation
++ of fitCurvePath() simply wraps the polygon into a path.
++
++ \sa QwtWeedingCurveFitter
++ */
++ Polygon,
++
++ /*!
++ The fitting algorithm creates a painter path - the implementation
++ of fitCurve() extracts a polygon from the path.
++
++ \sa QwtSplineCurveFitter
++ */
++ Path
++ };
++
+ /*!
+ Find a curve which has the best fit to a series of data points
+
+@@ -24,9 +43,10 @@ public:
+ \return Curve points
+ */
+ virtual QPolygonF fitCurve( const QPolygonF &polygon ) const = 0;
++ virtual QPainterPath fitCurvePath( const QPolygonF& polygon ) const = 0;
+
+ protected:
+- QwtCurveFitter();
++ explicit QwtCurveFitter( Mode mode );
+
+ private:
+ QwtCurveFitter( const QwtCurveFitter & );
+@@ -39,49 +59,20 @@ private:
+ class QwtSplineCurveFitter: public QwtCurveFitter
+ {
+ %TypeHeaderCode
+-#include <qwt_curve_fitter.h>
++#include <qwt_spline_curve_fitter.h>
+ %End
+
+ public:
+- /*!
+- Spline type
+- The default setting is Auto
+- \sa setFitMode(), FitMode()
+- */
+- enum FitMode
+- {
+- /*!
+- Use the default spline algorithm for polygons with
+- increasing x values ( p[i-1] < p[i] ), otherwise use
+- a parametric spline algorithm.
+- */
+- Auto,
+-
+- //! Use a default spline algorithm
+- Spline,
+-
+- //! Use a parametric spline algorithm
+- ParametricSpline
+- };
+-
+ QwtSplineCurveFitter();
+ virtual ~QwtSplineCurveFitter();
+
+- void setFitMode( FitMode );
+- FitMode fitMode() const;
+-
+- void setSpline( const QwtSpline& );
+- //const QwtSpline &spline() const; FIXME.
+- QwtSpline &spline();
+-
+- void setSplineSize( int size );
+- int splineSize() const;
++ void setSpline( QwtSpline* );
++ //const QwtSpline* spline() const;
++ QwtSpline* spline();
+
+ virtual QPolygonF fitCurve( const QPolygonF & ) const;
++ virtual QPainterPath fitCurvePath( const QPolygonF& ) const;
+
+-private:
+- QPolygonF fitSpline( const QPolygonF & ) const;
+- QPolygonF fitParametric( const QPolygonF & ) const;
+
+ //class PrivateData;
+ //PrivateData *d_data;
+@@ -113,7 +104,7 @@ private:
+ class QwtWeedingCurveFitter: public QwtCurveFitter
+ {
+ %TypeHeaderCode
+-#include <qwt_curve_fitter.h>
++#include <qwt_weeding_curve_fitter.h>
+ %End
+
+ public:
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__dial__needle.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__dial__needle.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__dial__needle.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-sip_qwt__dial__needle.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_dial_needle.sip.orig 2024-05-11 19:41:39.926440299 +0000
++++ sip/qwt_dial_needle.sip
+@@ -55,7 +55,8 @@ protected:
+ virtual void drawKnob( QPainter *, double width,
+ const QBrush &, bool sunken ) const;
+
+-//private:
++private:
++ QwtDialNeedle( const QwtDialNeedle & );
+ // QPalette d_palette;
+ };
+
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,286 @@
+$NetBSD: patch-sip_qwt__plot.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot.sip.orig 2020-12-27 08:53:37.000000000 +0000
++++ sip/qwt_plot.sip
+@@ -8,10 +8,14 @@
+ * modify it under the terms of the Qwt License, Version 1.0
+ *****************************************************************************/
+
++typedef int QwtAxisId;
++
+ class QwtPlot: QFrame , QwtPlotDict
+ {
+ %TypeHeaderCode
+ #include <qwt_plot_item.h>
++#include <qwt_axis.h>
++#include <qwt_axis_id.h>
+ %End
+ public:
+ //! \brief Axis index
+@@ -58,104 +62,109 @@ public:
+
+ virtual ~QwtPlot();
+
+- void applyProperties( const QString & );
+- QString grabProperties() const;
++ //void applyProperties( const QString & );
++ //QString grabProperties() const;
+
+ void setAutoReplot( bool = true );
+ bool autoReplot() const;
+
+ // Layout
+
+- void setPlotLayout( QwtPlotLayout * );
++ void setPlotLayout( QwtPlotLayout* );
+
+- QwtPlotLayout *plotLayout();
+- //const QwtPlotLayout *plotLayout() const;
++ QwtPlotLayout* plotLayout();
++ //const QwtPlotLayout* plotLayout() const;
+
+ // Title
+
+- void setTitle( const QString & );
+- void setTitle( const QwtText &t );
++ void setTitle( const QString& );
++ void setTitle( const QwtText& );
+ QwtText title() const;
+
+- QwtTextLabel *titleLabel();
+- //const QwtTextLabel *titleLabel() const;
++ QwtTextLabel* titleLabel();
++ //const QwtTextLabel* titleLabel() const;
+
+ // Footer
+
+- void setFooter( const QString & );
+- void setFooter( const QwtText &t );
++ void setFooter( const QString& );
++ void setFooter( const QwtText& );
+ QwtText footer() const;
+
+- QwtTextLabel *footerLabel();
+- //const QwtTextLabel *footerLabel() const;
++ QwtTextLabel* footerLabel();
++ //const QwtTextLabel* footerLabel() const;
+
+ // Canvas
+
+- void setCanvas( QWidget * /Transfer/);
++ void setCanvas( QWidget* /Transfer/);
+
+- QWidget *canvas();
+- //const QWidget *canvas() const;
++ QWidget* canvas();
++ //const QWidget* canvas() const;
+
+- void setCanvasBackground( const QBrush & );
++ void setCanvasBackground( const QBrush& );
+ QBrush canvasBackground() const;
+
+- virtual QwtScaleMap canvasMap( int axisId ) const;
++ virtual QwtScaleMap canvasMap( QwtAxisId ) const;
+
+- double invTransform( int axisId, int pos ) const;
+- double transform( int axisId, double value ) const;
++ double invTransform( QwtAxisId, double pos ) const;
++ double transform( QwtAxisId, double value ) const;
+
+ // Axes
+
+- QwtScaleEngine *axisScaleEngine( int axisId );
+- //const QwtScaleEngine *axisScaleEngine( int axisId ) const;
+- void setAxisScaleEngine( int axisId, QwtScaleEngine * /Transfer/);
++ bool isAxisValid( QwtAxisId ) const;
++
++ void setAxisVisible( QwtAxisId, bool on = true );
++ bool isAxisVisible( QwtAxisId ) const;
++
++ // Axes data
+
+- void setAxisAutoScale( int axisId, bool on = true );
+- bool axisAutoScale( int axisId ) const;
++ QwtScaleEngine* axisScaleEngine( QwtAxisId );
++ //const QwtScaleEngine* axisScaleEngine( QwtAxisId ) const;
++ void setAxisScaleEngine( QwtAxisId, QwtScaleEngine* /Transfer/);
+
+- void enableAxis( int axisId, bool tf = true );
+- bool axisEnabled( int axisId ) const;
+
+- void setAxisFont( int axisId, const QFont &f );
+- QFont axisFont( int axisId ) const;
++ void setAxisAutoScale( QwtAxisId, bool on = true );
++ bool axisAutoScale( QwtAxisId ) const;
+
+- void setAxisScale( int axisId, double min, double max, double step = 0 );
+- void setAxisScaleDiv( int axisId, const QwtScaleDiv & );
+- void setAxisScaleDraw( int axisId, QwtScaleDraw * /Transfer/);
++ void setAxisFont( QwtAxisId, const QFont& );
++ QFont axisFont( QwtAxisId ) const;
+
+- double axisStepSize( int axisId ) const;
+- QwtInterval axisInterval( int axisId ) const;
++ void setAxisScale( QwtAxisId, double min, double max, double stepSize = 0 );
++ void setAxisScaleDiv( QwtAxisId, const QwtScaleDiv& );
++ void setAxisScaleDraw( QwtAxisId, QwtScaleDraw* /Transfer/);
+
+- const QwtScaleDiv &axisScaleDiv( int axisId ) const;
++ double axisStepSize( QwtAxisId ) const;
++ QwtInterval axisInterval( QwtAxisId ) const;
++ const QwtScaleDiv& axisScaleDiv( QwtAxisId ) const;
+
+- //const QwtScaleDraw *axisScaleDraw( int axisId ) const;
+- QwtScaleDraw *axisScaleDraw( int axisId );
++ //const QwtScaleDraw* axisScaleDraw( QwtAxisId ) const;
++ QwtScaleDraw* axisScaleDraw( QwtAxisId );
+
+- //const QwtScaleWidget *axisWidget( int axisId ) const;
+- QwtScaleWidget *axisWidget( int axisId );
++ //const QwtScaleWidget* axisWidget( QwtAxisId ) const;
++ QwtScaleWidget* axisWidget( QwtAxisId );
+
+- void setAxisLabelAlignment( int axisId, Qt::Alignment );
+- void setAxisLabelRotation( int axisId, double rotation );
++ void setAxisLabelAlignment( QwtAxisId, Qt::Alignment );
++ void setAxisLabelRotation( QwtAxisId, double rotation );
+
+- void setAxisTitle( int axisId, const QString & );
+- void setAxisTitle( int axisId, const QwtText & );
+- QwtText axisTitle( int axisId ) const;
++ void setAxisTitle( QwtAxisId, const QString& );
++ void setAxisTitle( QwtAxisId, const QwtText& );
++ QwtText axisTitle( QwtAxisId ) const;
+
+- void setAxisMaxMinor( int axisId, int maxMinor );
+- int axisMaxMinor( int axisId ) const;
++ void setAxisMaxMinor( QwtAxisId, int maxMinor );
++ int axisMaxMinor( QwtAxisId ) const;
+
+- void setAxisMaxMajor( int axisId, int maxMajor );
+- int axisMaxMajor( int axisId ) const;
++ void setAxisMaxMajor( QwtAxisId, int maxMajor );
++ int axisMaxMajor( QwtAxisId ) const;
+
+ // Legend
+
+- void insertLegend( QwtAbstractLegend * /Transfer/, LegendPosition = QwtPlot::RightLegend, double ratio = -1.0 );
++ void insertLegend( QwtAbstractLegend* /Transfer/,
++ LegendPosition = QwtPlot::RightLegend, double ratio = -1.0 );
+
+- QwtAbstractLegend *legend();
+- //const QwtAbstractLegend *legend() const;
++ QwtAbstractLegend* legend();
++ //const QwtAbstractLegend* legend() const;
+
+ void updateLegend();
+- void updateLegend( const QwtPlotItem *);
++ void updateLegend( const QwtPlotItem* );
+
+ // Misc
+
+@@ -163,72 +172,71 @@ public:
+ virtual QSize minimumSizeHint() const;
+
+ virtual void updateLayout();
+- virtual void drawCanvas( QPainter * );
++ virtual void drawCanvas( QPainter* );
+
+ void updateAxes();
+ void updateCanvasMargins();
+
+- /*virtual void getCanvasMarginsHint(
+- const QwtScaleMap maps[], const QRectF &canvasRect,
+- double &left, double &top, double &right, double &bottom) const;*/
++ virtual void getCanvasMarginsHint(
++ const QwtScaleMap *, const QRectF& canvasRect,
++ double& left, double& top, double& right, double& bottom) const;
+
+- virtual bool event( QEvent * );
+- virtual bool eventFilter( QObject *, QEvent *);
++ virtual bool event( QEvent* );
++ virtual bool eventFilter( QObject*, QEvent* );
+
+- /*virtual void drawItems( QPainter *, const QRectF &,
+- const QwtScaleMap maps[axisCnt] ) const;*/
++ virtual void drawItems( QPainter*, const QRectF&,
++ const QwtScaleMap* ) const;
+
+- virtual QVariant itemToInfo( QwtPlotItem *) const;
+- virtual QwtPlotItem *infoToItem( const QVariant & ) const;
++ virtual QVariant itemToInfo( QwtPlotItem* ) const;
++ virtual QwtPlotItem* infoToItem( const QVariant& ) const;
+
+ signals:
+ /*!
+- A signal indicating, that an item has been attached/detached
++ A signal indicating, that an item has been attached/detached
+
+- \param plotItem Plot item
+- \param on Attached/Detached
++ \param plotItem Plot item
++ \param on Attached/Detached
+ */
+- void itemAttached( QwtPlotItem *plotItem, bool on );
++ void itemAttached( QwtPlotItem* plotItem, bool on );
+
+ /*!
+- A signal with the attributes how to update
+- the legend entries for a plot item.
++ A signal with the attributes how to update
++ the legend entries for a plot item.
+
+- \param itemInfo Info about a plot item, build from itemToInfo()
+- \param data Attributes of the entries ( usually <= 1 ) for
++ \param itemInfo Info about a plot item, build from itemToInfo()
++ \param data Attributes of the entries ( usually <= 1 ) for
+ the plot item.
+
+- \sa itemToInfo(), infoToItem(), QwtAbstractLegend::updateLegend()
++ \sa itemToInfo(), infoToItem(), QwtAbstractLegend::updateLegend()
+ */
+- void legendDataChanged( const QVariant &itemInfo,
+- const QList<QwtLegendData> &data );
++ void legendDataChanged( const QVariant& itemInfo,
++ const QList< QwtLegendData >& data );
+
+ public slots:
+ virtual void replot();
+ void autoRefresh();
+
+ protected:
+- static bool axisValid( int axisId );
+
+- virtual void resizeEvent( QResizeEvent *e );
++ virtual void resizeEvent( QResizeEvent* );
+
+ private slots:
+- void updateLegendItems( const QVariant &itemInfo,
+- const QList<QwtLegendData> &data );
++ void updateLegendItems( const QVariant& itemInfo,
++ const QList< QwtLegendData >& legendData );
+
+ /*private:
+ friend class QwtPlotItem;
+- void attachItem( QwtPlotItem *, bool );
++ void attachItem( QwtPlotItem*, bool );
+
+ void initAxesData();
+ void deleteAxesData();
+ void updateScaleDiv();
+
+- void initPlot( const QwtText &title );
++ void initPlot( const QwtText& title );
+
+- class AxisData;
+- AxisData *d_axisData[axisCnt];
++ class ScaleData;
++ ScaleData* m_scaleData;
+
+ class PrivateData;
+- PrivateData *d_data;*/
++ PrivateData* m_data;*/
+ };
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__barchart.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__barchart.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__barchart.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__plot__barchart.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_barchart.sip.orig 2024-05-11 19:55:39.059591910 +0000
++++ sip/qwt_plot_barchart.sip
+@@ -40,7 +40,7 @@ public:
+ LegendBarTitles
+ };
+
+- explicit QwtPlotBarChart( const QString &title = QString::null );
++ explicit QwtPlotBarChart( const QString &title = QString() );
+ explicit QwtPlotBarChart( const QwtText &title );
+
+ virtual ~QwtPlotBarChart();
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__curve.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__curve.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__curve.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__plot__curve.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_curve.sip.orig 2024-05-11 19:56:29.609000676 +0000
++++ sip/qwt_plot_curve.sip
+@@ -170,7 +170,7 @@ public:
+ //! Paint attributes
+ //typedef QFlags<PaintAttribute> PaintAttributes;
+
+- explicit QwtPlotCurve( const QString &title = QString::null);
++ explicit QwtPlotCurve( const QString &title = QString() );
+ explicit QwtPlotCurve( const QwtText &title );
+
+ virtual ~QwtPlotCurve();
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__histogram.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__histogram.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__histogram.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__plot__histogram.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_histogram.sip.orig 2024-05-11 19:58:26.497873265 +0000
++++ sip/qwt_plot_histogram.sip
+@@ -23,7 +23,7 @@ public:
+ UserStyle = 100
+ };
+
+- explicit QwtPlotHistogram( const QString &title = QString::null );
++ explicit QwtPlotHistogram( const QString &title = QString() );
+ //explicit QwtPlotHistogram( const QwtText &title );
+ virtual ~QwtPlotHistogram();
+
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__item.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__item.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__item.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,44 @@
+$NetBSD: patch-sip_qwt__plot__item.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_item.sip.orig 2024-05-11 20:04:32.848763543 +0000
++++ sip/qwt_plot_item.sip
+@@ -52,8 +52,8 @@ public:
+ //! For QwtPlotSpectrogram
+ Rtti_PlotSpectrogram,
+
+- //! For QwtPlotSvgItem
+- Rtti_PlotSVG,
++ //! For QwtPlotGraphicItem, QwtPlotSvgItem
++ Rtti_PlotGraphic,
+
+ //! For QwtPlotTradingCurve
+ Rtti_PlotTradingCurve,
+@@ -73,7 +73,10 @@ public:
+ //! For QwtPlotZoneItem
+ Rtti_PlotZone,
+
+- /*!
++ //! For QwtPlotVectorField
++ Rtti_PlotVectorField,
++
++ /*!
+ Values >= Rtti_PlotUserItem are reserved for plot items
+ not implemented in the Qwt library.
+ */
+@@ -234,11 +237,11 @@ public:
+
+ virtual QList<QwtLegendData> legendData() const;
+
+-/* virtual QwtGraphic legendIcon( int index, const QSizeF & ) const;
++ virtual QwtGraphic legendIcon( int index, const QSizeF & ) const;
+
+ protected:
+ QwtGraphic defaultIcon( const QBrush &, const QSizeF & ) const;
+-*/
++
+ private:
+ // Disabled copy constructor and operator=
+ QwtPlotItem( const QwtPlotItem & );
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__layout.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__layout.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__layout.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,55 @@
+$NetBSD: patch-sip_qwt__plot__layout.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_layout.sip.orig 2020-12-27 08:53:37.000000000 +0000
++++ sip/qwt_plot_layout.sip
+@@ -41,9 +41,9 @@ public:
+ //! Ignore the footer.
+ IgnoreFooter = 0x20
+ };
++ typedef QFlags<QwtPlotLayout::Option> Options;
+
+ //! Layout options
+- //typedef QFlags<Option> Options;
+
+ explicit QwtPlotLayout();
+ virtual ~QwtPlotLayout();
+@@ -68,8 +68,8 @@ public:
+
+ virtual QSize minimumSizeHint( const QwtPlot * ) const;
+
+- /*virtual void activate( const QwtPlot *,
+- const QRectF &rect, Options options = 0x00 );*/
++ virtual void activate( const QwtPlot *,
++ const QRectF &rect, Options options );
+
+ virtual void invalidate();
+
+@@ -89,17 +89,19 @@ protected:
+ void setScaleRect( int axis, const QRectF & );
+ void setCanvasRect( const QRectF & );
+
+- //QRectF layoutLegend( Options options, const QRectF & ) const;
+- QRectF alignLegend( const QRectF &canvasRect,
+- const QRectF &legendRect ) const;
++ //QRectF layoutLegend( Option options, const QRectF & ) const;
++ //QRectF alignLegend( const QRectF &canvasRect,
++ // const QRectF &legendRect ) const;
+
+- /*void expandLineBreaks( Options options, const QRectF &rect,
++ /*void expandLineBreaks( Option options, const QRectF &rect,
+ int &dimTitle, int &dimFooter, int dimAxes[QwtPlot::axisCnt] ) const;
+
+- void alignScales( Options options, QRectF &canvasRect,
++ void alignScales( Option options, QRectF &canvasRect,
+ QRectF scaleRect[QwtPlot::axisCnt] ) const;*/
+
+-/*private:
++private:
++ QwtPlotLayout( const QwtPlotLayout & );
++/*
+ class PrivateData;
+
+ PrivateData *d_data;*/
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__marker.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__marker.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__marker.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__plot__marker.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_marker.sip.orig 2024-05-11 20:09:05.785552748 +0000
++++ sip/qwt_plot_marker.sip
+@@ -35,7 +35,7 @@ public:
+ Cross
+ };
+
+- explicit QwtPlotMarker( const QString &title = QString::null );
++ explicit QwtPlotMarker( const QString &title = QString() );
+ explicit QwtPlotMarker( const QwtText &title );
+
+ virtual ~QwtPlotMarker();
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__multi__barchart.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__multi__barchart.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__multi__barchart.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__plot__multi__barchart.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_multi_barchart.sip.orig 2024-05-11 20:19:43.721112694 +0000
++++ sip/qwt_plot_multi_barchart.sip
+@@ -21,7 +21,7 @@ public:
+ Stacked
+ };
+
+- explicit QwtPlotMultiBarChart( const QString &title = QString::null );
++ explicit QwtPlotMultiBarChart( const QString &title = QString() );
+ explicit QwtPlotMultiBarChart( const QwtText &title );
+
+ virtual ~QwtPlotMultiBarChart();
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__picker.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__picker.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__picker.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__plot__picker.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_picker.sip.orig 2024-05-11 20:19:09.494228953 +0000
++++ sip/qwt_plot_picker.sip
+@@ -24,7 +24,7 @@ public:
+ explicit QwtPlotPicker( int xAxis, int yAxis,
+ RubberBand rubberBand, DisplayMode trackerMode, QWidget * /TransferThis/ );
+
+- virtual void setAxis( int xAxis, int yAxis );
++ virtual void setAxes( int xAxis, int yAxis );
+
+ int xAxis() const;
+ int yAxis() const;
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__rasteritem.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__rasteritem.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__rasteritem.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__plot__rasteritem.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_rasteritem.sip.orig 2024-05-11 20:15:33.534745773 +0000
++++ sip/qwt_plot_rasteritem.sip
+@@ -27,7 +27,7 @@ public:
+
+ typedef QFlags<QwtPlotRasterItem::PaintAttribute> PaintAttributes;
+
+- explicit QwtPlotRasterItem( const QString& title = QString::null );
++ explicit QwtPlotRasterItem( const QString& title = QString() );
+ explicit QwtPlotRasterItem( const QwtText& title );
+ virtual ~QwtPlotRasterItem();
+
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__seriesitem.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__seriesitem.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__seriesitem.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__plot__seriesitem.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_seriesitem.sip.orig 2024-05-11 20:14:58.355036560 +0000
++++ sip/qwt_plot_seriesitem.sip
+@@ -13,7 +13,7 @@ class QwtPlotSeriesItem: QwtPlotItem, Qw
+ #include <qwt_plot_seriesitem.h>
+ %End
+ public:
+- explicit QwtPlotSeriesItem( const QString &title = QString::null );
++ explicit QwtPlotSeriesItem( const QString &title = QString() );
+ //explicit QwtPlotSeriesItem( const QwtText &title );
+ virtual ~QwtPlotSeriesItem();
+ void setOrientation( Qt::Orientation );
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__spectrogram.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__spectrogram.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__spectrogram.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__plot__spectrogram.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_spectrogram.sip.orig 2024-05-11 20:14:11.671333252 +0000
++++ sip/qwt_plot_spectrogram.sip
+@@ -31,7 +31,7 @@ public:
+ //! Display modes
+ typedef QFlags<QwtPlotSpectrogram::DisplayMode> DisplayModes;
+
+- explicit QwtPlotSpectrogram( const QString &title = QString::null );
++ explicit QwtPlotSpectrogram( const QString &title = QString() );
+ virtual ~QwtPlotSpectrogram();
+
+ void setDisplayMode( QwtPlotSpectrogram::DisplayMode, bool on = true );
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__zoomer.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__zoomer.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__plot__zoomer.sip Sat May 11 20:54:12 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__plot__zoomer.sip,v 1.1 2024/05/11 20:54:12 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_plot_zoomer.sip.orig 2024-05-11 20:13:14.838718190 +0000
++++ sip/qwt_plot_zoomer.sip
+@@ -25,7 +25,7 @@ public:
+ QRectF zoomBase() const;
+ QRectF zoomRect() const;
+
+- virtual void setAxis( int xAxis, int yAxis );
++ virtual void setAxes( int xAxis, int yAxis );
+
+ void setMaxStackDepth( int );
+ int maxStackDepth() const;
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__point__data.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__point__data.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__point__data.sip Sat May 11 20:54:13 2024
@@ -0,0 +1,148 @@
+$NetBSD: patch-sip_qwt__point__data.sip,v 1.1 2024/05/11 20:54:13 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_point_data.sip.orig 2024-05-11 20:12:06.870168546 +0000
++++ sip/qwt_point_data.sip
+@@ -8,16 +8,35 @@
+ * modify it under the terms of the Qwt License, Version 1.0
+ *****************************************************************************/
+
+-class QwtPointArrayData: QwtSeriesDataQPointF
++class QwtPointArrayDataDouble: QwtPointSeriesData
+ {
+ %TypeHeaderCode
++#include <qwt_series_data.h>
+ #include <qwt_point_data.h>
++typedef QwtSeriesData<QPointF> QwtSeriesDataQPointF;
++typedef QwtArraySeriesData<QPointF> QwtArraySeriesDataQPointF;
++typedef QwtPointArrayData<double> QwtPointArrayDataDouble;
+ %End
+
+ public:
+- QwtPointArrayData( const QVector<double> &x, const QVector<double> &y );
+- //QwtPointArrayData( const double *x, const double *y, size_t size ); FIXME
+-
++ QwtPointArrayDataDouble( const QVector<double> &x, const QVector<double> &y );
++
++
++ QwtPointArrayDataDouble(QVector<double> &,QVector<double> &)[( const double *x, const double *y, size_t size )];
++
++ %MethodCode
++ //QVector<double> d_x;
++ //QVector<double> d_y;
++ //size_t size;
++ //const double*x;
++ //const double*y;
++ //d_x.resize( size );
++ //::memcpy( d_x.data(), x, size * sizeof( double ) );
++
++ //d_y.resize( size );
++ //::memcpy( d_y.data(), y, size * sizeof( double ) );
++ %End
++
+ virtual QRectF boundingRect() const;
+
+ virtual size_t size() const;
+@@ -33,44 +52,65 @@ public:
+
+ /*!
+ \brief Data class containing two pointers to memory blocks of doubles.
+- */
+-/*class QwtCPointerData: QwtSeriesDataQPointF
++*/
++class QwtCPointerDataDouble: QwtPointSeriesData
+ {
+ %TypeHeaderCode
++#include <qwt_series_data.h>
+ #include <qwt_point_data.h>
++typedef QwtSeriesData<QPointF> QwtSeriesDataQPointF;
++typedef QwtArraySeriesData<QPointF> QwtArraySeriesDataQPointF;
++typedef QwtCPointerData<double> QwtCPointerDataDouble;
+ %End
+
+ public:
+- //QwtCPointerData( const double *x, const double *y, size_t size ); FIXME
+-
++ QwtCPointerDataDouble(SIP_PYLIST,SIP_PYLIST,size_t size)[( const double *x, const double *y, size_t size )];
++ %MethodCode
++ //const double *d_x;
++ //const double *d_y;
++ //size_t d_size;
++ //size_t size;
++ //const double*x;
++ //const double*y;
++ //d_x = x ;
++ //d_y = y ;
++ //d_size = size ;
++ %End
++
++
+ virtual QRectF boundingRect() const;
+ virtual size_t size() const;
+ virtual QPointF sample( size_t i ) const;
+
+- const double *xData() const;
+- const double *yData() const;
+-*/
++ //const double *xData() const;
++ //const double *yData() const;
++
++ const SIP_PYLIST xData() const;
++ %MethodCode
++ //const double *d_x;
++ //return d_x;
++ %End
++ const SIP_PYLIST yData() const;
++ %MethodCode
++ //const double *d_y;
++ //return d_y;
++ %End
++
++
++
+ /*private:
+ const double *d_x;
+ const double *d_y;
+ size_t d_size;*/
+-//};
+-
+-
+-/*class SinusData: QwtSyntheticPointData FIXME
+-{
+-%TypeHeaderCode
+-#include <qwt_point_data.h>
+-%End
+-public:
+- SinusData();
+- virtual double y( double x ) const;
+-};*/
++};
+
+-class QwtSyntheticPointData: QwtSeriesDataQPointF
++class QwtSyntheticPointData: QwtPointSeriesData
+ {
+ %TypeHeaderCode
++#include <qwt_series_data.h>
+ #include <qwt_point_data.h>
++typedef QwtSeriesData<QPointF> QwtSeriesDataQPointF;
++typedef QwtArraySeriesData<QPointF> QwtArraySeriesDataQPointF;
+ %End
+ public:
+ QwtSyntheticPointData( size_t size,
+@@ -91,6 +131,7 @@ public:
+ virtual void setRectOfInterest( const QRectF & );
+ QRectF rectOfInterest() const;
+
++
+ /*private:
+ size_t d_size;
+ QwtInterval d_interval;
+@@ -98,3 +139,6 @@ public:
+ QwtInterval d_intervalOfInterest;*/
+ };
+
++
++
++
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__raster__data.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__raster__data.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__raster__data.sip Sat May 11 20:54:13 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-sip_qwt__raster__data.sip,v 1.1 2024/05/11 20:54:13 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_raster_data.sip.orig 2024-05-11 19:45:15.568368399 +0000
++++ sip/qwt_raster_data.sip
+@@ -25,8 +25,7 @@ public:
+ QwtRasterData();
+ virtual ~QwtRasterData();
+
+- virtual void setInterval( Qt::Axis, const QwtInterval & );
+- const QwtInterval &interval(Qt::Axis) const;
++ virtual QwtInterval interval( Qt::Axis ) const = 0;
+
+ virtual QRectF pixelHint( const QRectF & ) const;
+
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__scale__engine.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__scale__engine.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__scale__engine.sip Sat May 11 20:54:13 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-sip_qwt__scale__engine.sip,v 1.1 2024/05/11 20:54:13 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_scale_engine.sip.orig 2024-05-11 19:46:34.398837955 +0000
++++ sip/qwt_scale_engine.sip
+@@ -111,7 +111,9 @@ protected:
+
+ QwtInterval buildInterval( double v ) const;
+
+-/*private:
++private:
++ QwtScaleEngine( const QwtScaleEngine & );
++/*
+ class PrivateData;
+ PrivateData *d_data;*/
+ };
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__spline.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__spline.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__spline.sip Sat May 11 20:54:13 2024
@@ -0,0 +1,83 @@
+$NetBSD: patch-sip_qwt__spline.sip,v 1.1 2024/05/11 20:54:13 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_spline.sip.orig 2024-05-11 20:09:56.560195066 +0000
++++ sip/qwt_spline.sip
+@@ -15,40 +15,52 @@ class QwtSpline
+ %End
+
+ public:
+- //! Spline type
+- enum SplineType
++
++ enum BoundaryType
+ {
+- //! A natural spline
+- Natural,
++ ConditionalBoundaries,
++ PeriodicPolygon,
++ ClosedPolygon
++ };
+
+- //! A periodic spline
+- Periodic
++ enum BoundaryPosition
++ {
++ AtBeginning,
++ AtEnd
+ };
+
+- QwtSpline();
+- QwtSpline( const QwtSpline & );
++ enum BoundaryCondition
++ {
++ Clamped1,
++ Clamped2,
++ Clamped3,
++ LinearRunout
++ };
+
+- ~QwtSpline();
++ QwtSpline();
++ virtual ~QwtSpline();
+
+- //QwtSpline &operator=( const QwtSpline & );
++ void setParametrization( int type );
++ //void setParametrization( QwtSplineParametrization* );
++ //const QwtSplineParametrization* parametrization() const;
+
+- void setSplineType( SplineType );
+- SplineType splineType() const;
++ void setBoundaryType( BoundaryType );
++ BoundaryType boundaryType() const;
+
+- bool setPoints( const QPolygonF& points );
+- QPolygonF points() const;
++ void setBoundaryValue( BoundaryPosition, double value );
++ double boundaryValue( BoundaryPosition ) const;
+
+- void reset();
++ void setBoundaryCondition( BoundaryPosition, int condition );
++ int boundaryCondition( BoundaryPosition ) const;
+
+- bool isValid() const;
+- double value( double x ) const;
++ void setBoundaryConditions( int condition,
++ double valueBegin = 0.0, double valueEnd = 0.0 );
+
+- const QVector<double> &coefficientsA() const;
+- const QVector<double> &coefficientsB() const;
+- const QVector<double> &coefficientsC() const;
++ virtual QPolygonF polygon( const QPolygonF&, double tolerance ) const;
++ virtual QPainterPath painterPath( const QPolygonF& ) const = 0;
+
+-protected:
+- bool buildNaturalSpline( const QPolygonF & );
+- bool buildPeriodicSpline( const QPolygonF & );
++ virtual uint locality() const;
+
++private:
++ QwtSpline( const QwtSpline & );
+ };
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__text.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__text.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__text.sip Sat May 11 20:54:13 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-sip_qwt__text.sip,v 1.1 2024/05/11 20:54:13 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_text.sip.orig 2024-05-11 19:47:18.813705205 +0000
++++ sip/qwt_text.sip
+@@ -42,7 +42,7 @@ public:
+ typedef QFlags<QwtText::LayoutAttribute> LayoutAttributes;
+
+ QwtText( const QwtText & );
+- QwtText( const QString & = QString::null, QwtText::TextFormat textFormat = AutoText );
++ QwtText( const QString & = QString(), QwtText::TextFormat textFormat = AutoText );
+ ~QwtText();
+
+ bool operator==( const QwtText & ) const;
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__text_engine.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__text_engine.sip:1.1
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__text_engine.sip Sat May 11 20:54:13 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-sip_qwt__text_engine.sip,v 1.1 2024/05/11 20:54:13 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_text_engine.sip.orig 2024-05-11 20:10:54.539817875 +0000
++++ sip/qwt_text_engine.sip
+@@ -24,6 +24,9 @@ public:
+
+ protected:
+ QwtTextEngine();
++
++private:
++ QwtTextEngine( const QwtTextEngine & );
+ };
+
+ class QwtPlainTextEngine: QwtTextEngine
Index: pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__transform.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__transform.sip:1.3
--- /dev/null Sat May 11 20:54:13 2024
+++ pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__transform.sip Sat May 11 20:54:13 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-sip_qwt__transform.sip,v 1.3 2024/05/11 20:54:13 adam Exp $
+
+Builds against qwt-qt5 6.1.6
+https://github.com/GauiStori/PyQt-Qwt/pull/22
+
+--- sip/qwt_transform.sip.orig 2024-05-11 19:42:44.185023847 +0000
++++ sip/qwt_transform.sip
+@@ -45,6 +45,9 @@ public:
+
+ //! Virtualized copy operation
+ virtual QwtTransform *copy() const = 0;
++
++private:
++ QwtTransform( const QwtTransform & );
+ };
+
+ /*!
Home |
Main Index |
Thread Index |
Old Index