Re: UPDATE: qwt-6.2.0

2023-09-04 Thread Stefan Hagen
Stefan Hagen wrote (2023-09-03 16:38 IST):
> Rafael Sadowski wrote (2023-08-31 07:00 IST):
> > Simple update qwt-6.2.0. Tested on amd64. OK?
> 
> How to test it?
> 
> It breaks gnuradio:
> /usr/ports/pobj/gnuradio-3.8.2.0/gnuradio-3.8.2.0/gr-qtgui/lib/../include/gnuradio/qtgui/DisplayPlot.h:44:10:
>  fatal error: 'qwt_compat.h' file not found
> 
> I'm trying qgis and bacula next.

gqis and bacula are working.

OK sdk@ for qwt.

> > Cheers Rafael
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/qwt/Makefile,v
> > retrieving revision 1.34
> > diff -u -p -u -p -r1.34 Makefile
> > --- Makefile31 Mar 2022 12:52:13 -  1.34
> > +++ Makefile31 Aug 2023 06:00:26 -
> > @@ -1,10 +1,9 @@
> >  COMMENT=   Qt widgets for technical applications
> >  
> > -VERSION =  6.1.6
> > +VERSION =  6.2.0
> >  DISTNAME = qwt-${VERSION}
> > -REVISION = 1
> >  
> > -SHARED_LIBS =  qwt${QTLIBSUFFIX} 7.1
> > +SHARED_LIBS =  qwt${QTLIBSUFFIX} 8.0
> >  
> >  CATEGORIES =   x11
> >  
> > @@ -28,9 +27,8 @@ MODQMAKE_INSTALL_ROOT =
> >  NO_TEST =  Yes
> >  USE_GMAKE =Yes
> >  
> > -BUILD_DEPENDS =x11/qt5/qtsvg
> > -LIB_DEPENDS =  x11/qt5/qttools,-main
> > -RUN_DEPENDS =  x11/qt5/qtsvg
> > +LIB_DEPENDS =  x11/qt5/qttools,-main \
> > +   x11/qt5/qtsvg
> >  
> >  QTVER =qt5
> >  SUBST_VARS =   WRKINST QTVER QTLIBSUFFIX
> > @@ -38,7 +36,6 @@ SUBST_VARS =  WRKINST QTVER QTLIBSUFFIX
> >  pre-configure:
> > ${SUBST_CMD} ${WRKSRC}/{qwtconfig.pri,qwt.prf} \
> > ${WRKSRC}/designer/designer.pro \
> > -   ${WRKSRC}/textengines/textengines.pri \
> > ${WRKSRC}/src/src.pro
> >  post-configure:
> > # ensure CXXFLAGS/-std=c++11 is passed to all clang++
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/x11/qwt/distinfo,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 distinfo
> > --- distinfo19 Jan 2021 06:20:27 -  1.6
> > +++ distinfo31 Aug 2023 06:00:26 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (qwt-6.1.6.tar.bz2) = mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY=
> > -SIZE (qwt-6.1.6.tar.bz2) = 4306402
> > +SHA256 (qwt-6.2.0.tar.bz2) = kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=
> > +SIZE (qwt-6.2.0.tar.bz2) = 4815773
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/x11/qwt/pkg/PLIST,v
> > retrieving revision 1.7
> > diff -u -p -u -p -r1.7 PLIST
> > --- pkg/PLIST   11 Mar 2022 20:17:15 -  1.7
> > +++ pkg/PLIST   31 Aug 2023 06:00:26 -
> > @@ -4,6 +4,160 @@
> >  @pkgpath x11/qwt,-main
> >  @pkgpath x11/qwt,-common
> >  @pkgpath x11/qwt,-main,qt5
> > +include/QwtAbstractLegend
> > +include/QwtAbstractScale
> > +include/QwtAbstractScaleDraw
> > +include/QwtAbstractSlider
> > +include/QwtAlphaColorMap
> > +include/QwtAnalogClock
> > +include/QwtArrowButton
> > +include/QwtAxis
> > +include/QwtAxisId
> > +include/QwtBezier
> > +include/QwtCPointerData
> > +include/QwtClipper
> > +include/QwtColorMap
> > +include/QwtColumnRect
> > +include/QwtColumnSymbol
> > +include/QwtCompass
> > +include/QwtCompassMagnetNeedle
> > +include/QwtCompassRose
> > +include/QwtCompassScaleDraw
> > +include/QwtCompassWindArrow
> > +include/QwtCounter
> > +include/QwtCurveFitter
> > +include/QwtDate
> > +include/QwtDateScaleDraw
> > +include/QwtDateScaleEngine
> > +include/QwtDial
> > +include/QwtDialNeedle
> > +include/QwtDialSimpleNeedle
> > +include/QwtDynGridLayout
> > +include/QwtEventPattern
> > +include/QwtGlobal
> > +include/QwtGraphic
> > +include/QwtHueColorMap
> > +include/QwtInterval
> > +include/QwtIntervalSample
> > +include/QwtIntervalSeriesData
> > +include/QwtIntervalSymbol
> > +include/QwtKnob
> > +include/QwtLegend
> > +include/QwtLegendData
> > +include/QwtLegendLabel
> > +include/QwtLinearColorMap
> > +include/QwtLinearScaleEngine
> > +include/QwtLogScaleEngine
> > +include/QwtLogTransform
> > +include/QwtMagnifier
> > +include/QwtMath
> > +include/QwtMatrixRasterData
> > +include/QwtNullPaintDevice
> > +include/QwtNullTransform
> > +include/QwtOHLCSample
> 

Re: UPDATE: qwt-6.2.0

2023-09-04 Thread Rafael Sadowski
On Mon Sep 04, 2023 at 12:27:03AM -0400, Daniel Dickman wrote:
> 
> 
> On Sun, 3 Sep 2023, Stefan Hagen wrote:
> 
> > Rafael Sadowski wrote (2023-08-31 07:00 IST):
> > > Simple update qwt-6.2.0. Tested on amd64. OK?
> > 
> > How to test it?
> > 
> > It breaks gnuradio:
> > /usr/ports/pobj/gnuradio-3.8.2.0/gnuradio-3.8.2.0/gr-qtgui/lib/../include/gnuradio/qtgui/DisplayPlot.h:44:10:
> >  fatal error: 'qwt_compat.h' file not found
> > 
> 
> I ran into the same problem while testing a scipy update so integrated 
> pull 5320 from upstream which fixes this problem and have committed this.

Thanks, please commit your fix. OK rsadowski

> 
> This allows me to make progress on scipy.
> 
> With the below I was able to launch gnuradio. Although to be honest it 
> seems like gnuradio itself is in dire need of an update.


I'll do this work when nobody is faster.

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/comms/gnuradio/Makefile,v
> retrieving revision 1.18
> diff -u -p -u -r1.18 Makefile
> --- Makefile  31 Jul 2023 07:18:36 -  1.18
> +++ Makefile  4 Sep 2023 03:05:00 -
> @@ -7,7 +7,7 @@ COMMENT = signal-processing toolkit for 
>  
>  V =  3.8.2.0
>  DISTNAME =   gnuradio-$V
> -REVISION =   7
> +REVISION =   8
>  
>  SHARED_LIBS +=  gnuradio-analog   0.0 # 3.7
>  SHARED_LIBS +=  gnuradio-atsc 0.0 # 3.7
> Index: patches/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot_h
> ===
> RCS file: patches/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot_h
> diff -N patches/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot_h   4 Sep 
> 2023 03:05:00 -
> @@ -0,0 +1,18 @@
> +backport https://github.com/gnuradio/gnuradio/pull/5302 so
> +gnuradio can build with Qwt 6.2
> +
> +Index: gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
> +--- gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h.orig
>  gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
> +@@ -41,7 +41,10 @@
> + #include 
> + 
> + #if QWT_VERSION >= 0x06
> +-#include 
> ++typedef QPointF QwtDoublePoint;
> ++typedef QRectF QwtDoubleRect;
> ++
> ++typedef QwtInterval QwtDoubleInterval;
> + #endif
> + 
> + typedef QList QColorList;
> Index: patches/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot_h
> ===
> RCS file: 
> patches/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot_h
> diff -N patches/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot_h 
> 4 Sep 2023 03:05:00 -
> @@ -0,0 +1,17 @@
> +backport https://github.com/gnuradio/gnuradio/pull/5302 so
> +gnuradio can build with Qwt 6.2
> +
> +Index: gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
> +--- gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h.orig
>  gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
> +@@ -35,7 +35,9 @@
> + #if QWT_VERSION < 0x06
> + #include 
> + #else
> +-#include 
> ++#include 
> ++
> ++typedef QwtInterval QwtDoubleInterval;
> + #endif
> + 
> + /*!
> Index: patches/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot_h
> ===
> RCS file: patches/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot_h
> diff -N patches/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot_h  
> 4 Sep 2023 03:05:00 -
> @@ -0,0 +1,17 @@
> +backport https://github.com/gnuradio/gnuradio/pull/5302 so
> +gnuradio can build with Qwt 6.2
> +
> +Index: gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
> +--- gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h.orig
>  gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
> +@@ -34,7 +34,9 @@
> + #if QWT_VERSION < 0x06
> + #include 
> + #else
> +-#include 
> ++#include 
> ++
> ++typedef QwtInterval QwtDoubleInterval;
> + #endif
> + 
> + /*!
> Index: patches/patch-gr-qtgui_include_gnuradio_qtgui_plot_raster_h
> ===
> RCS file: patches/patch-gr-qtgui_include_gnuradio_qtgui_plot_raster_h
> diff -N patches/patch-gr-qtgui_include_gnuradio_qtgui_plot_raster_h
> --- /dev/null 

Re: UPDATE: qwt-6.2.0

2023-09-03 Thread Daniel Dickman



On Sun, 3 Sep 2023, Stefan Hagen wrote:

> Rafael Sadowski wrote (2023-08-31 07:00 IST):
> > Simple update qwt-6.2.0. Tested on amd64. OK?
> 
> How to test it?
> 
> It breaks gnuradio:
> /usr/ports/pobj/gnuradio-3.8.2.0/gnuradio-3.8.2.0/gr-qtgui/lib/../include/gnuradio/qtgui/DisplayPlot.h:44:10:
>  fatal error: 'qwt_compat.h' file not found
> 

I ran into the same problem while testing a scipy update so integrated 
pull 5320 from upstream which fixes this problem and have committed this.

This allows me to make progress on scipy.

With the below I was able to launch gnuradio. Although to be honest it 
seems like gnuradio itself is in dire need of an update.

Index: Makefile
===
RCS file: /cvs/ports/comms/gnuradio/Makefile,v
retrieving revision 1.18
diff -u -p -u -r1.18 Makefile
--- Makefile31 Jul 2023 07:18:36 -  1.18
+++ Makefile4 Sep 2023 03:05:00 -
@@ -7,7 +7,7 @@ COMMENT =   signal-processing toolkit for 
 
 V =3.8.2.0
 DISTNAME = gnuradio-$V
-REVISION = 7
+REVISION = 8
 
 SHARED_LIBS +=  gnuradio-analog   0.0 # 3.7
 SHARED_LIBS +=  gnuradio-atsc 0.0 # 3.7
Index: patches/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot_h
===
RCS file: patches/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot_h
diff -N patches/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot_h 4 Sep 2023 
03:05:00 -
@@ -0,0 +1,18 @@
+backport https://github.com/gnuradio/gnuradio/pull/5302 so
+gnuradio can build with Qwt 6.2
+
+Index: gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
+--- gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h.orig
 gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
+@@ -41,7 +41,10 @@
+ #include 
+ 
+ #if QWT_VERSION >= 0x06
+-#include 
++typedef QPointF QwtDoublePoint;
++typedef QRectF QwtDoubleRect;
++
++typedef QwtInterval QwtDoubleInterval;
+ #endif
+ 
+ typedef QList QColorList;
Index: patches/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot_h
===
RCS file: patches/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot_h
diff -N patches/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot_h   
4 Sep 2023 03:05:00 -
@@ -0,0 +1,17 @@
+backport https://github.com/gnuradio/gnuradio/pull/5302 so
+gnuradio can build with Qwt 6.2
+
+Index: gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
+--- gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h.orig
 gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
+@@ -35,7 +35,9 @@
+ #if QWT_VERSION < 0x06
+ #include 
+ #else
+-#include 
++#include 
++
++typedef QwtInterval QwtDoubleInterval;
+ #endif
+ 
+ /*!
Index: patches/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot_h
===
RCS file: patches/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot_h
diff -N patches/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot_h
4 Sep 2023 03:05:00 -
@@ -0,0 +1,17 @@
+backport https://github.com/gnuradio/gnuradio/pull/5302 so
+gnuradio can build with Qwt 6.2
+
+Index: gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
+--- gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h.orig
 gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
+@@ -34,7 +34,9 @@
+ #if QWT_VERSION < 0x06
+ #include 
+ #else
+-#include 
++#include 
++
++typedef QwtInterval QwtDoubleInterval;
+ #endif
+ 
+ /*!
Index: patches/patch-gr-qtgui_include_gnuradio_qtgui_plot_raster_h
===
RCS file: patches/patch-gr-qtgui_include_gnuradio_qtgui_plot_raster_h
diff -N patches/patch-gr-qtgui_include_gnuradio_qtgui_plot_raster_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-gr-qtgui_include_gnuradio_qtgui_plot_raster_h 4 Sep 2023 
03:05:00 -
@@ -0,0 +1,19 @@
+backport https://github.com/gnuradio/gnuradio/pull/5302 so
+gnuradio can build with Qwt 6.2
+
+Index: gr-qtgui/include/gnuradio/qtgui/plot_raster.h
+--- gr-qtgui/include/gnuradio/qtgui/plot_raster.h.orig
 gr-qtgui/include/gnuradio/qtgui/plot_raster.h
+@@ -28,8 +28,10 @@
+ #include 
+ 
+ #if QWT_VERSION >= 0x06
+-#include 
+-#include  // doesn't seem necessary, but is...
++#include 
++#include 
++
++typedef QwtInterval QwtDoubleInterval;
+ #endif
+ 
+ class QwtColorMap;
Index: patches/patch-gr-qtgui_include_gnuradio_qtgui_plot_waterfall_h
=

Re: UPDATE: qwt-6.2.0

2023-09-03 Thread Stefan Hagen
Rafael Sadowski wrote (2023-08-31 07:00 IST):
> Simple update qwt-6.2.0. Tested on amd64. OK?

How to test it?

It breaks gnuradio:
/usr/ports/pobj/gnuradio-3.8.2.0/gnuradio-3.8.2.0/gr-qtgui/lib/../include/gnuradio/qtgui/DisplayPlot.h:44:10:
 fatal error: 'qwt_compat.h' file not found

I'm trying qgis and bacula next.

Best regards,
Stefan



> Cheers Rafael
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qwt/Makefile,v
> retrieving revision 1.34
> diff -u -p -u -p -r1.34 Makefile
> --- Makefile  31 Mar 2022 12:52:13 -  1.34
> +++ Makefile  31 Aug 2023 06:00:26 -
> @@ -1,10 +1,9 @@
>  COMMENT= Qt widgets for technical applications
>  
> -VERSION =6.1.6
> +VERSION =6.2.0
>  DISTNAME =   qwt-${VERSION}
> -REVISION =   1
>  
> -SHARED_LIBS =qwt${QTLIBSUFFIX} 7.1
> +SHARED_LIBS =qwt${QTLIBSUFFIX} 8.0
>  
>  CATEGORIES = x11
>  
> @@ -28,9 +27,8 @@ MODQMAKE_INSTALL_ROOT =
>  NO_TEST =Yes
>  USE_GMAKE =  Yes
>  
> -BUILD_DEPENDS =  x11/qt5/qtsvg
> -LIB_DEPENDS =x11/qt5/qttools,-main
> -RUN_DEPENDS =x11/qt5/qtsvg
> +LIB_DEPENDS =x11/qt5/qttools,-main \
> + x11/qt5/qtsvg
>  
>  QTVER =  qt5
>  SUBST_VARS = WRKINST QTVER QTLIBSUFFIX
> @@ -38,7 +36,6 @@ SUBST_VARS =WRKINST QTVER QTLIBSUFFIX
>  pre-configure:
>   ${SUBST_CMD} ${WRKSRC}/{qwtconfig.pri,qwt.prf} \
>   ${WRKSRC}/designer/designer.pro \
> - ${WRKSRC}/textengines/textengines.pri \
>   ${WRKSRC}/src/src.pro
>  post-configure:
>   # ensure CXXFLAGS/-std=c++11 is passed to all clang++
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/qwt/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- distinfo  19 Jan 2021 06:20:27 -  1.6
> +++ distinfo  31 Aug 2023 06:00:26 -
> @@ -1,2 +1,2 @@
> -SHA256 (qwt-6.1.6.tar.bz2) = mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY=
> -SIZE (qwt-6.1.6.tar.bz2) = 4306402
> +SHA256 (qwt-6.2.0.tar.bz2) = kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=
> +SIZE (qwt-6.2.0.tar.bz2) = 4815773
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/qwt/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 PLIST
> --- pkg/PLIST 11 Mar 2022 20:17:15 -  1.7
> +++ pkg/PLIST 31 Aug 2023 06:00:26 -
> @@ -4,6 +4,160 @@
>  @pkgpath x11/qwt,-main
>  @pkgpath x11/qwt,-common
>  @pkgpath x11/qwt,-main,qt5
> +include/QwtAbstractLegend
> +include/QwtAbstractScale
> +include/QwtAbstractScaleDraw
> +include/QwtAbstractSlider
> +include/QwtAlphaColorMap
> +include/QwtAnalogClock
> +include/QwtArrowButton
> +include/QwtAxis
> +include/QwtAxisId
> +include/QwtBezier
> +include/QwtCPointerData
> +include/QwtClipper
> +include/QwtColorMap
> +include/QwtColumnRect
> +include/QwtColumnSymbol
> +include/QwtCompass
> +include/QwtCompassMagnetNeedle
> +include/QwtCompassRose
> +include/QwtCompassScaleDraw
> +include/QwtCompassWindArrow
> +include/QwtCounter
> +include/QwtCurveFitter
> +include/QwtDate
> +include/QwtDateScaleDraw
> +include/QwtDateScaleEngine
> +include/QwtDial
> +include/QwtDialNeedle
> +include/QwtDialSimpleNeedle
> +include/QwtDynGridLayout
> +include/QwtEventPattern
> +include/QwtGlobal
> +include/QwtGraphic
> +include/QwtHueColorMap
> +include/QwtInterval
> +include/QwtIntervalSample
> +include/QwtIntervalSeriesData
> +include/QwtIntervalSymbol
> +include/QwtKnob
> +include/QwtLegend
> +include/QwtLegendData
> +include/QwtLegendLabel
> +include/QwtLinearColorMap
> +include/QwtLinearScaleEngine
> +include/QwtLogScaleEngine
> +include/QwtLogTransform
> +include/QwtMagnifier
> +include/QwtMath
> +include/QwtMatrixRasterData
> +include/QwtNullPaintDevice
> +include/QwtNullTransform
> +include/QwtOHLCSample
> +include/QwtPainter
> +include/QwtPainterCommand
> +include/QwtPanner
> +include/QwtPicker
> +include/QwtPickerClickPointMachine
> +include/QwtPickerClickRectMachine
> +include/QwtPickerDragLineMachine
> +include/QwtPickerDragPointMachine
> +include/QwtPickerDragRectMachine
> +include/QwtPickerMachine
> +include/QwtPickerPolygonMachine
> +include/QwtPickerTrackerMachine
> +include/QwtPixelMatrix
> +include/QwtPlainTextEngine
> +include/QwtPlot
> +include/QwtPlotAbstractBarChart
> +include/QwtPlotAbstractCanvas
> +include/QwtPlotBarChart
> +include/QwtPlotCanvas
> +include/QwtPlotCurve
> +include/QwtPlotDict
> +include/QwtPlotDirectPainter
> 

UPDATE: qwt-6.2.0

2023-08-31 Thread Rafael Sadowski
Simple update qwt-6.2.0. Tested on amd64. OK?

Cheers Rafael

Index: Makefile
===
RCS file: /cvs/ports/x11/qwt/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile31 Mar 2022 12:52:13 -  1.34
+++ Makefile31 Aug 2023 06:00:26 -
@@ -1,10 +1,9 @@
 COMMENT=   Qt widgets for technical applications
 
-VERSION =  6.1.6
+VERSION =  6.2.0
 DISTNAME = qwt-${VERSION}
-REVISION = 1
 
-SHARED_LIBS =  qwt${QTLIBSUFFIX} 7.1
+SHARED_LIBS =  qwt${QTLIBSUFFIX} 8.0
 
 CATEGORIES =   x11
 
@@ -28,9 +27,8 @@ MODQMAKE_INSTALL_ROOT =
 NO_TEST =  Yes
 USE_GMAKE =Yes
 
-BUILD_DEPENDS =x11/qt5/qtsvg
-LIB_DEPENDS =  x11/qt5/qttools,-main
-RUN_DEPENDS =  x11/qt5/qtsvg
+LIB_DEPENDS =  x11/qt5/qttools,-main \
+   x11/qt5/qtsvg
 
 QTVER =qt5
 SUBST_VARS =   WRKINST QTVER QTLIBSUFFIX
@@ -38,7 +36,6 @@ SUBST_VARS =  WRKINST QTVER QTLIBSUFFIX
 pre-configure:
${SUBST_CMD} ${WRKSRC}/{qwtconfig.pri,qwt.prf} \
${WRKSRC}/designer/designer.pro \
-   ${WRKSRC}/textengines/textengines.pri \
${WRKSRC}/src/src.pro
 post-configure:
# ensure CXXFLAGS/-std=c++11 is passed to all clang++
Index: distinfo
===
RCS file: /cvs/ports/x11/qwt/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo19 Jan 2021 06:20:27 -  1.6
+++ distinfo31 Aug 2023 06:00:26 -
@@ -1,2 +1,2 @@
-SHA256 (qwt-6.1.6.tar.bz2) = mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY=
-SIZE (qwt-6.1.6.tar.bz2) = 4306402
+SHA256 (qwt-6.2.0.tar.bz2) = kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=
+SIZE (qwt-6.2.0.tar.bz2) = 4815773
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/qwt/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST   11 Mar 2022 20:17:15 -  1.7
+++ pkg/PLIST   31 Aug 2023 06:00:26 -
@@ -4,6 +4,160 @@
 @pkgpath x11/qwt,-main
 @pkgpath x11/qwt,-common
 @pkgpath x11/qwt,-main,qt5
+include/QwtAbstractLegend
+include/QwtAbstractScale
+include/QwtAbstractScaleDraw
+include/QwtAbstractSlider
+include/QwtAlphaColorMap
+include/QwtAnalogClock
+include/QwtArrowButton
+include/QwtAxis
+include/QwtAxisId
+include/QwtBezier
+include/QwtCPointerData
+include/QwtClipper
+include/QwtColorMap
+include/QwtColumnRect
+include/QwtColumnSymbol
+include/QwtCompass
+include/QwtCompassMagnetNeedle
+include/QwtCompassRose
+include/QwtCompassScaleDraw
+include/QwtCompassWindArrow
+include/QwtCounter
+include/QwtCurveFitter
+include/QwtDate
+include/QwtDateScaleDraw
+include/QwtDateScaleEngine
+include/QwtDial
+include/QwtDialNeedle
+include/QwtDialSimpleNeedle
+include/QwtDynGridLayout
+include/QwtEventPattern
+include/QwtGlobal
+include/QwtGraphic
+include/QwtHueColorMap
+include/QwtInterval
+include/QwtIntervalSample
+include/QwtIntervalSeriesData
+include/QwtIntervalSymbol
+include/QwtKnob
+include/QwtLegend
+include/QwtLegendData
+include/QwtLegendLabel
+include/QwtLinearColorMap
+include/QwtLinearScaleEngine
+include/QwtLogScaleEngine
+include/QwtLogTransform
+include/QwtMagnifier
+include/QwtMath
+include/QwtMatrixRasterData
+include/QwtNullPaintDevice
+include/QwtNullTransform
+include/QwtOHLCSample
+include/QwtPainter
+include/QwtPainterCommand
+include/QwtPanner
+include/QwtPicker
+include/QwtPickerClickPointMachine
+include/QwtPickerClickRectMachine
+include/QwtPickerDragLineMachine
+include/QwtPickerDragPointMachine
+include/QwtPickerDragRectMachine
+include/QwtPickerMachine
+include/QwtPickerPolygonMachine
+include/QwtPickerTrackerMachine
+include/QwtPixelMatrix
+include/QwtPlainTextEngine
+include/QwtPlot
+include/QwtPlotAbstractBarChart
+include/QwtPlotAbstractCanvas
+include/QwtPlotBarChart
+include/QwtPlotCanvas
+include/QwtPlotCurve
+include/QwtPlotDict
+include/QwtPlotDirectPainter
+include/QwtPlotGLCanvas
+include/QwtPlotGraphicItem
+include/QwtPlotGrid
+include/QwtPlotHistogram
+include/QwtPlotIntervalCurve
+include/QwtPlotItem
+include/QwtPlotLayout
+include/QwtPlotLegendItem
+include/QwtPlotMagnifier
+include/QwtPlotMarker
+include/QwtPlotMultiBarChart
+include/QwtPlotOpenGLCanvas
+include/QwtPlotPanner
+include/QwtPlotPicker
+include/QwtPlotRasterItem
+include/QwtPlotRenderer
+include/QwtPlotRescaler
+include/QwtPlotScaleItem
+include/QwtPlotSeriesItem
+include/QwtPlotShapeItem
+include/QwtPlotSpectroCurve
+include/QwtPlotSpectrogram
+include/QwtPlotSvgItem
+include/QwtPlotTextLabel
+include/QwtPlotTradingCurve
+include/QwtPlotVectorField
+include/QwtPlotZoneItem
+include/QwtPlotZoomer
+include/QwtPoint3D
+include/QwtPoint3DSeriesData
+include/QwtPointArrayData
+include/QwtPointMapper
+include/QwtPointPolar
+include/QwtPointSeriesData
+include/QwtPowerTransform
+include/QwtRasterData
+include/QwtRichTextEngine
+include/QwtRoundScaleDraw
+include