Re: git: 2a31fb87a487 - main - x11-toolkits/qwt6: Update to 6.3.0

From: Rainer Hurling <rhurlin_at_gwdg.de>
Date: Mon, 24 Mar 2025 07:15:12 UTC
Hi Loïc,

Thanks for the update of x11-toolkits/qwt6. Unfortunately, it seems 
broken in the build for the qt6 flavor:


====> Compressing man pages (compress-man)
===>   Installing ldconfig configuration file
===========================================================================
====> Running Q/A tests (stage-qa)
Warning: you might not need LIB_DEPENDS on libGL.so
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: %%QT_INCDIR%%/qwt6/QwtPlotGLCanvas
===> Error: Plist issues found.
*** Error code 1
Stop.
make: stopped making "check-plist" in /usr/ports/x11-toolkits/qwt6
=>> Error: check-plist failures detected
=>> Cleaning up wrkdir
===>  Cleaning for qwt6-qt6-6.3.0


My brief analysis so far shows the following:

- 'make FLAVOR=qt[56] configure' generates the file classincludes/Makefile

- for FLAVOR=qt5 the Makefile contains entries for QwtPlotGLCanvas and 
QwtPlotOpenGLCanvase

- for FLAVOR=qt6 the Makefile contains only one entry for 
QwtPlotOpenGLCanvas

- interestingly, for both flavors there are nevertheless the two files 
QwtPlotGLCanvas and QwtPlotOpenGLCanvas in the directory classincludes/


It seems that configure does not find the appropriate GL with Qt6 or 
only incompletely? An extension to 'USE_GL=gl opengl' is obviously not 
enough here either ...

Unfortunately, I haven't gotten any further with my knowledge so far. 
That's why I haven't opened a PR on Bugzilla yet. You probably have a 
few more ideas?

Best wishes,
Rainer


Am 21.03.25 um 15:28 schrieb Loïc Bartoletti:
> The branch main has been updated by lbartoletti:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=2a31fb87a487115c81fa35f72d7f92864b320604
> 
> commit 2a31fb87a487115c81fa35f72d7f92864b320604
> Author:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
> AuthorDate: 2025-03-21 14:27:11 +0000
> Commit:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
> CommitDate: 2025-03-21 14:28:17 +0000
> 
>      x11-toolkits/qwt6: Update to 6.3.0
> ---
>   cad/caneda/Makefile         |  1 +
>   comms/gnuradio/Makefile     |  2 +-
>   graphics/qgis-ltr/Makefile  |  2 +-
>   graphics/qgis/Makefile      |  2 +-
>   net/ecal/Makefile           |  2 +-
>   science/elmerfem/Makefile   |  2 +-
>   x11-toolkits/qwt6/Makefile  |  2 +-
>   x11-toolkits/qwt6/distinfo  |  6 +++---
>   x11-toolkits/qwt6/pkg-plist | 16 +++++++++++++++-
>   9 files changed, 25 insertions(+), 10 deletions(-)
> 
> diff --git a/cad/caneda/Makefile b/cad/caneda/Makefile
> index 6b07c8a87e96..9679aae6afcd 100644
> --- a/cad/caneda/Makefile
> +++ b/cad/caneda/Makefile
> @@ -1,5 +1,6 @@
>   PORTNAME=	caneda
>   DISTVERSION=	0.4.0
> +PORTREVISION=	1
>   CATEGORIES=	cad
>   DIST_SUBDIR=	${PORTNAME}
>   
> diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
> index 1ff8dbfaf364..1df632a8707a 100644
> --- a/comms/gnuradio/Makefile
> +++ b/comms/gnuradio/Makefile
> @@ -1,7 +1,7 @@
>   PORTNAME=	gnuradio
>   DISTVERSIONPREFIX=	v
>   DISTVERSION=	3.8.4.0
> -PORTREVISION=	24
> +PORTREVISION=	25
>   CATEGORIES=	comms astro hamradio
>   
>   MAINTAINER=	hamradio@FreeBSD.org
> diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
> index fb43078494b6..d64bd424da37 100644
> --- a/graphics/qgis-ltr/Makefile
> +++ b/graphics/qgis-ltr/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	qgis
>   DISTVERSION=	3.40.4
> -PORTREVISION=	2
> +PORTREVISION=	3
>   CATEGORIES=	graphics geography
>   MASTER_SITES=	https://qgis.org/downloads/
>   PKGNAMESUFFIX=	-ltr
> diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
> index c682c36cf3b8..f4e5885c668a 100644
> --- a/graphics/qgis/Makefile
> +++ b/graphics/qgis/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	qgis
>   DISTVERSION=	3.42.0
> -PORTREVISION=	4
> +PORTREVISION=	5
>   CATEGORIES=	graphics geography
>   MASTER_SITES=	https://qgis.org/downloads/
>   
> diff --git a/net/ecal/Makefile b/net/ecal/Makefile
> index 42637b17fd11..098030f2ec5f 100644
> --- a/net/ecal/Makefile
> +++ b/net/ecal/Makefile
> @@ -1,7 +1,7 @@
>   PORTNAME=	ecal
>   DISTVERSIONPREFIX=	v
>   DISTVERSION=	5.13.3
> -PORTREVISION=	4
> +PORTREVISION=	5
>   CATEGORIES=	net devel
>   
>   MAINTAINER=	yuri@FreeBSD.org
> diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile
> index 07f6ca3a8231..a671637aad8e 100644
> --- a/science/elmerfem/Makefile
> +++ b/science/elmerfem/Makefile
> @@ -1,7 +1,7 @@
>   PORTNAME=	elmerfem
>   DISTVERSIONPREFIX=	release-
>   DISTVERSION=	9.0
> -PORTREVISION=	19
> +PORTREVISION=	20
>   CATEGORIES=	science
>   
>   PATCH_SITES=	https://github.com/ElmerCSC/${PORTNAME}/commit/
> diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
> index d78c4400e009..863edcf593fc 100644
> --- a/x11-toolkits/qwt6/Makefile
> +++ b/x11-toolkits/qwt6/Makefile
> @@ -1,5 +1,5 @@
>   PORTNAME=	qwt
> -PORTVERSION=	6.2.0
> +PORTVERSION=	6.3.0
>   CATEGORIES=	x11-toolkits
>   MASTER_SITES=	SF
>   PKGNAMESUFFIX=	6-${FLAVOR}
> diff --git a/x11-toolkits/qwt6/distinfo b/x11-toolkits/qwt6/distinfo
> index f351bf9d19c8..8352acfcbb16 100644
> --- a/x11-toolkits/qwt6/distinfo
> +++ b/x11-toolkits/qwt6/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1645822439
> -SHA256 (qwt-6.2.0.tar.bz2) = 9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530
> -SIZE (qwt-6.2.0.tar.bz2) = 4815773
> +TIMESTAMP = 1742388821
> +SHA256 (qwt-6.3.0.tar.bz2) = dcb085896c28aaec5518cbc08c0ee2b4e60ada7ac929d82639f6189851a6129a
> +SIZE (qwt-6.3.0.tar.bz2) = 4737935
> diff --git a/x11-toolkits/qwt6/pkg-plist b/x11-toolkits/qwt6/pkg-plist
> index dedda693ddea..d30b2a5bb1ce 100644
> --- a/x11-toolkits/qwt6/pkg-plist
> +++ b/x11-toolkits/qwt6/pkg-plist
> @@ -105,6 +105,20 @@
>   %%QT_INCDIR%%/qwt6/QwtPointMapper
>   %%QT_INCDIR%%/qwt6/QwtPointPolar
>   %%QT_INCDIR%%/qwt6/QwtPointSeriesData
> +%%QT_INCDIR%%/qwt6/QwtPolarCanvas
> +%%QT_INCDIR%%/qwt6/QwtPolarCurve
> +%%QT_INCDIR%%/qwt6/QwtPolarFitter
> +%%QT_INCDIR%%/qwt6/QwtPolarGrid
> +%%QT_INCDIR%%/qwt6/QwtPolarItem
> +%%QT_INCDIR%%/qwt6/QwtPolarItemDict
> +%%QT_INCDIR%%/qwt6/QwtPolarLayout
> +%%QT_INCDIR%%/qwt6/QwtPolarMagnifier
> +%%QT_INCDIR%%/qwt6/QwtPolarMarker
> +%%QT_INCDIR%%/qwt6/QwtPolarPanner
> +%%QT_INCDIR%%/qwt6/QwtPolarPicker
> +%%QT_INCDIR%%/qwt6/QwtPolarPlot
> +%%QT_INCDIR%%/qwt6/QwtPolarRenderer
> +%%QT_INCDIR%%/qwt6/QwtPolarSpectrogram
>   %%QT_INCDIR%%/qwt6/QwtPowerTransform
>   %%QT_INCDIR%%/qwt6/QwtRasterData
>   %%QT_INCDIR%%/qwt6/QwtRichTextEngine
> @@ -246,7 +260,6 @@
>   %%QT_INCDIR%%/qwt6/qwt_polar_panner.h
>   %%QT_INCDIR%%/qwt6/qwt_polar_picker.h
>   %%QT_INCDIR%%/qwt6/qwt_polar_plot.h
> -@comment %%QT_INCDIR%%/qwt6/qwt_plot_glcanvas.h
>   %%QT_INCDIR%%/qwt6/qwt_polar_renderer.h
>   %%QT_INCDIR%%/qwt6/qwt_polar_spectrogram.h
>   %%QT_INCDIR%%/qwt6/qwt_raster_data.h
> @@ -280,6 +293,7 @@
>   %%QT_INCDIR%%/qwt6/qwt_weeding_curve_fitter.h
>   %%QT_INCDIR%%/qwt6/qwt_wheel.h
>   %%QT_INCDIR%%/qwt6/qwt_widget_overlay.h
> +@comment %%QT_INCDIR%%/qwt6/qwt_plot_glcanvas.h
>   %%QT_LIBDIR%%/libqwt.so
>   %%QT_LIBDIR%%/libqwt.so.6
>   %%QT_LIBDIR%%/libqwt.so.%%SHLIB_SHVER%%