x11-toolkits/qwt6: Update to 6.2.0 and flavorize it

- Update to 6.2.0 - Flavorize Qt - Delete patches fixed/applied upstream - Update ports with qwt6@qt5 PR: 265069 Reported by: yuri
2024-12-28 05:29:48 +00:00 · 2022-02-25 22:59:22 +01:00 · 2022-02-25 22:59:22 +01:00 · 8eff564840
commit 8eff564840
parent 2f66c587e2
17 changed files with 229 additions and 140 deletions
--- a/cad/caneda/Makefile
+++ b/cad/caneda/Makefile
@ -11,7 +11,7 @@ WWW=		http://caneda.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
+LIB_DEPENDS=	libqwt.so:x11-toolkits/qwt6@qt5

 USES=		cmake compiler:c++11-lang desktop-file-utils qt:5 \
 		shared-mime-info
@ -20,6 +20,6 @@ GH_ACCOUNT=	Caneda
 GH_PROJECT=	Caneda
 USE_QT=		core gui printsupport svg widgets buildtools:build linguisttools:build qmake:build

-CMAKE_ARGS=	-DQWT_INCLUDE_DIR=${LOCALBASE}/include/qt5/qwt6 -DQWT_LIBRARY=${LOCALBASE}/lib/qt5/libqwt6.so
+CMAKE_ARGS=	-DQWT_INCLUDE_DIR=${LOCALBASE}/include/qt5/qwt6 -DQWT_LIBRARY=${LOCALBASE}/lib/qt5/libqwt.so

 .include <bsd.port.mk>
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@ -34,7 +34,7 @@ LIB_DEPENDS=	libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libgmpxx.so:math/gmp \
-		libqwt6.so:x11-toolkits/qwt6 \
+		libqwt.so:x11-toolkits/qwt6@qt5 \
 		${PY_BOOST} \
 		liblog4cpp.so:devel/log4cpp \
 		libportaudio.so:audio/portaudio \
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	qgis
 DISTVERSION=	3.28.15
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 PKGNAMESUFFIX=	-ltr
@ -48,7 +49,7 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
-		libqwt6.so:x11-toolkits/qwt6 \
+		libqwt.so:x11-toolkits/qwt6@qt5 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
@ -125,7 +126,7 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
-		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
+		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE WITH_BINDINGS WITH_COPC \
 		WITH_CUSTOM_WIDGETS WITH_EPT WITH_PDAL WITH_POSTGRESQL
@ -133,7 +134,6 @@ CMAKE_OFF=	ENABLE_TESTS WITH_QTWEBKIT WITH_QWTPOLAR

 # math/pdal fails in pdal_wrench() with "undefined reference to symbol 'pthread_create@@FBSD_1.0'"
 CXXFLAGS+=	-pthread
-
 CONFLICTS_INSTALL=	qgis

 PLIST_SUB=	DISTVERSION=${DISTVERSION}
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	qgis
 DISTVERSION=	3.34.3
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/

@ -48,7 +49,7 @@ LIB_DEPENDS=	libdraco.so:archivers/draco \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
-		libqwt6.so:x11-toolkits/qwt6 \
+		libqwt.so:x11-toolkits/qwt6@qt5 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
@ -125,7 +126,7 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
-		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
+		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_ASTYLE WITH_BINDINGS WITH_COPC \
 		WITH_CUSTOM_WIDGETS WITH_DRACO WITH_EPT \
--- a/net/ecal/Makefile
+++ b/net/ecal/Makefile
@ -22,7 +22,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libftxui-component.so:devel/ftxui \
 		libhdf5.so:science/hdf5 \
 		libprotobuf.so:devel/protobuf \
-		libqwt6.so:x11-toolkits/qwt6 \
+		libqwt.so:x11-toolkits/qwt6@qt5 \
 		libspdlog.so:devel/spdlog \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libyaml-cpp.so:devel/yaml-cpp
@ -50,7 +50,7 @@ CMAKE_ARGS=	-DGIT_REVISION_MAJOR=${DISTVERSION:R:R} \
 		-DGIT_REVISION_PATCH=${DISTVERSION:E} \
 		-Dasio_INCLUDE_DIR=${LOCALBASE}/include \
 		-Dqwt_INCLUDE_DIR=${LOCALBASE}/include/qt5/qwt6 \
-		-Dqwt_LIBRARY=${LOCALBASE}/lib/qt5/libqwt6.so
+		-Dqwt_LIBRARY=${LOCALBASE}/lib/qt5/libqwt.so

 CXXFLAGS+=	-pthread # see https://github.com/eclipse-ecal/ecal/issues/933
 LDFLAGS+=	-labsl_hash -labsl_log_internal_message -labsl_log_internal_nullguard -labsl_spinlock_wait -ltinyxml2
--- a/science/elmerfem/Makefile
+++ b/science/elmerfem/Makefile
@ -47,11 +47,11 @@ OPTIONS_SUB=		yes
 GUI_DESC=		Build with ElmerGUI (Graphical User Interface)
 OCC_DESC=		Use OpenCASCADE for CAD import in ElmerGUI

-GUI_LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
+GUI_LIB_DEPENDS=	libqwt.so:x11-toolkits/qwt6@qt5
 GUI_USES=		gl jpeg qt:5 xorg
 GUI_USE=		gl=gl,glu xorg=ice,sm,x11,xext,xt qt=${_QT5_LIBS:ts,}
 GUI_CMAKE_BOOL=		WITH_ELMERGUI WITH_PARAVIEW
-GUI_CMAKE_ON=		-DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \
+GUI_CMAKE_ON=		-DQWT_LIBRARY=${QT_LIBDIR}/libqwt.so \
 			-DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \
 			-DDESIRED_QT_VERSION=5 \
 			-DWITH_QT5:BOOL=TRUE \
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@ -1,33 +1,36 @@
 PORTNAME=	qwt
-PORTVERSION=	6.1.6
-PORTREVISION=	1
+PORTVERSION=	6.2.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
-PKGNAMESUFFIX=	6-qt5
+PKGNAMESUFFIX=	6-${FLAVOR}

 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Qt Widgets for Technical Applications
 WWW=		http://qwt.sourceforge.net/

-USES=		compiler:c++11-lang gl gmake qmake qt:5 tar:bzip2
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
+
+USES=		compiler:c++11-lang gl gmake qmake qt:${FLAVOR:S/qt//} tar:bzip2
 USE_GL=		gl
-USE_QT=		buildtools:build widgets gui core designer gui opengl svg xml printsupport concurrent
+_USE_QT_qt5=	concurrent core designer dbus gui opengl printsupport svg xml widgets buildtools:build qmake:build
+_USE_QT_qt6=	base svg tools
+USE_QT=		${_USE_QT_${FLAVOR}}
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}

-DOCSDIR=	${PREFIX}/share/doc/qwt6-qt5
+DOCSDIR=	${PREFIX}/share/doc/qwt6-${FLAVOR}
 PORTDOCS=	*
 PLIST_SUB=	SHLIB_VER=${PORTVERSION} \
-		SHLIB_SHVER=${PORTVERSION:R}
+		SHLIB_SHVER=${PORTVERSION:R} \
+		FLAVOR=${FLAVOR:S/qt/Qt/}

 QMAKE_ARGS+=	PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}

-PLIST_FILES=	${PREFIX}/${QT_PLUGINDIR_REL}/designer/libqwt6_designer_plugin.so
-
 OPTIONS_DEFINE=	DOCS

 post-patch:
 	@${REINPLACE_CMD} -e '/INSTALLS.*doc/d' ${WRKSRC}/doc/doc.pro
-	@${REINPLACE_CMD} -e 's/%%QT_VERSION%%/5/g' \
+	@${REINPLACE_CMD} \
 			-e 's|%%QT_INCDIR%%|${QT_INCDIR}|g' \
 			-e 's|%%QT_LIBDIR%%|${QT_LIBDIR}|g' \
 			-e 's|%%QT_MKSPECDIR%%|${QT_MKSPECDIR}|g' \
--- a/x11-toolkits/qwt6/distinfo
+++ b/x11-toolkits/qwt6/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1610702716
-SHA256 (qwt-6.1.6.tar.bz2) = 99460d31c115ee4117b0175d885f47c2c590d784206f09815dc058fbe5ede1f6
-SIZE (qwt-6.1.6.tar.bz2) = 4306402
+TIMESTAMP = 1645822439
+SHA256 (qwt-6.2.0.tar.bz2) = 9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530
+SIZE (qwt-6.2.0.tar.bz2) = 4815773
--- a/x11-toolkits/qwt6/files/patch-designer_designer.pro
+++ b/x11-toolkits/qwt6/files/patch-designer_designer.pro
@ -1,25 +1,7 @@
--- designer/designer.pro.orig	2018-03-06 14:52:45 UTC
+--- designer/designer.pro.orig	2022-03-09 06:02:25 UTC
 +++ designer/designer.pro
-@@ -42,7 +42,7 @@ contains(QWT_CONFIG, QwtDesigner) {
- 
- 
-     TEMPLATE        = lib
-    TARGET          = qwt_designer_plugin
-+    TARGET          = qwt6_designer_plugin
- 
-     DESTDIR         = plugins/designer
- 
-@@ -84,7 +84,7 @@ contains(QWT_CONFIG, QwtDesigner) {
-         # into the plugin. Not supported on Windows !
- 
-         QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
-        qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
-+        qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt6)
- 
-         contains(QWT_CONFIG, QwtDll) {
- 
-@@ -113,7 +113,7 @@ contains(QWT_CONFIG, QwtDesigner) {
- 
+@@ -122,7 +122,7 @@ contains(QWT_CONFIG, QwtDesigner) {
+     SOURCES += qwt_designer_plugin.cpp
     RESOURCES += qwt_designer_plugin.qrc
 
 -    target.path = $${QWT_INSTALL_PLUGINS}
--- a/x11-toolkits/qwt6/files/patch-qwt.prf
+++ b/x11-toolkits/qwt6/files/patch-qwt.prf
@ -1,8 +0,0 @@
--- qwt.prf.orig	2017-10-06 14:51:04 UTC
-+++ qwt.prf
-@@ -34,4 +34,4 @@ else {
- }   
- 
- # QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
-qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt)
-+qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt6)
--- a/x11-toolkits/qwt6/files/patch-qwtconfig.pri
+++ b/x11-toolkits/qwt6/files/patch-qwtconfig.pri
@ -1,6 +1,6 @@
--- qwtconfig.pri.orig	2018-03-06 14:23:36 UTC
+--- qwtconfig.pri.orig	2022-03-09 05:42:32 UTC
 +++ qwtconfig.pri
-@@ -19,7 +19,7 @@ QWT_VERSION      = $${QWT_VER_MAJ}.$${QW
+@@ -19,7 +19,7 @@ QWT_VERSION      = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${
 QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
 
 unix {
@ -22,7 +22,7 @@
 
 ######################################################################
 # Designer plugin
-@@ -42,7 +42,7 @@ QWT_INSTALL_LIBS      = $${QWT_INSTALL_P
+@@ -42,7 +42,7 @@ QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
 # runtime environment of designer/creator.
 ######################################################################
 
@ -31,8 +31,8 @@
 
 # linux distributors often organize the Qt installation
 # their way and QT_INSTALL_PREFIX doesn't offer a good
-@@ -63,7 +63,7 @@ QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_P
- # with every Qt upgrade. 
+@@ -63,7 +63,7 @@ QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins
+ # with every Qt upgrade.
 ######################################################################
 
 -QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
@ -40,12 +40,3 @@
 # QWT_INSTALL_FEATURES  = $$[QT_INSTALL_PREFIX]/features
 
 ######################################################################
-@@ -110,7 +110,7 @@ QWT_CONFIG     += QwtOpenGL
- # to your qmake project file.
- ######################################################################
- 
-#QWT_CONFIG     += QwtMathML
-+QWT_CONFIG     += QwtMathML
- 
- ######################################################################
- # If you want to build the Qwt designer plugin, 
--- a/x11-toolkits/qwt6/files/patch-src__src.pro
+++ b/x11-toolkits/qwt6/files/patch-src__src.pro
@ -1,11 +0,0 @@
--- src/src.pro.orig	2016-06-13 07:14:23 UTC
-+++ src/src.pro
-@@ -17,7 +17,7 @@ include( $${QWT_ROOT}/qwtfunctions.pri )
- QWT_OUT_ROOT = $${OUT_PWD}/..
- 
- TEMPLATE          = lib
-TARGET            = $$qwtLibraryTarget(qwt)
-+TARGET            = $$qwtLibraryTarget(qwt$${QWT_VER_MAJ})
- 
- DESTDIR           = $${QWT_OUT_ROOT}/lib
- 
--- a/x11-toolkits/qwt6/files/patch-src_qwtnullpaintdevice.h
+++ b/x11-toolkits/qwt6/files/patch-src_qwtnullpaintdevice.h
@ -1,10 +0,0 @@
--- src/qwt_null_paintdevice.h.orig	2020-05-30 06:48:02 UTC
-+++ src/qwt_null_paintdevice.h
-@@ -11,6 +11,7 @@
- #define QWT_NULL_PAINT_DEVICE_H 1
- 
- #include "qwt_global.h"
-+#include <QPainterPath>
- #include <qpaintdevice.h>
- #include <qpaintengine.h>
- 
--- a/x11-toolkits/qwt6/files/patch-src_qwt__painter.h
+++ b/x11-toolkits/qwt6/files/patch-src_qwt__painter.h
@ -1,18 +0,0 @@
--- src/qwt_painter.h.orig	2020-05-30 06:47:45 UTC
-+++ src/qwt_painter.h
-@@ -17,6 +17,7 @@
- #include <qpen.h>
- #include <qline.h>
- #include <qpalette.h>
-+#include <QPainterPath>
- 
- class QPainter;
- class QBrush;
-@@ -31,7 +32,6 @@ class QwtColorMap;
- class QwtInterval;
- 
- class QTextDocument;
-class QPainterPath;
- 
- /*!
-   \brief A collection of QPainter workarounds
--- a/x11-toolkits/qwt6/files/patch-src_qwtplotglcanvas.h
+++ b/x11-toolkits/qwt6/files/patch-src_qwtplotglcanvas.h
@ -1,10 +0,0 @@
--- src/qwt_plot_glcanvas.h.orig	2020-05-30 07:00:16 UTC
-+++ src/qwt_plot_glcanvas.h
-@@ -11,6 +11,7 @@
- #define QWT_PLOT_GLCANVAS_H
- 
- #include "qwt_global.h"
-+#include <QPainterPath>
- #include <qframe.h>
- #include <qgl.h>
- 
--- a/x11-toolkits/qwt6/files/patch-textengines_textengines.pri
+++ b/x11-toolkits/qwt6/files/patch-textengines_textengines.pri
@ -1,11 +0,0 @@
--- textengines/textengines.pri.orig	2017-10-06 14:51:21 UTC
-+++ textengines/textengines.pri
-@@ -34,7 +34,7 @@ contains(QWT_CONFIG, QwtFramework) {
-     CONFIG += lib_bundle
- }
- 
-qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
-+qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt6)
- 
- # Install directives
- 
--- a/x11-toolkits/qwt6/pkg-plist
+++ b/x11-toolkits/qwt6/pkg-plist
@ -1,3 +1,157 @@
+%%QT_INCDIR%%/qwt6/QwtAbstractLegend
+%%QT_INCDIR%%/qwt6/QwtAbstractScale
+%%QT_INCDIR%%/qwt6/QwtAbstractScaleDraw
+%%QT_INCDIR%%/qwt6/QwtAbstractSlider
+%%QT_INCDIR%%/qwt6/QwtAlphaColorMap
+%%QT_INCDIR%%/qwt6/QwtAnalogClock
+%%QT_INCDIR%%/qwt6/QwtArrowButton
+%%QT_INCDIR%%/qwt6/QwtAxis
+%%QT_INCDIR%%/qwt6/QwtAxisId
+%%QT_INCDIR%%/qwt6/QwtBezier
+%%QT_INCDIR%%/qwt6/QwtCPointerData
+%%QT_INCDIR%%/qwt6/QwtClipper
+%%QT_INCDIR%%/qwt6/QwtColorMap
+%%QT_INCDIR%%/qwt6/QwtColumnRect
+%%QT_INCDIR%%/qwt6/QwtColumnSymbol
+%%QT_INCDIR%%/qwt6/QwtCompass
+%%QT_INCDIR%%/qwt6/QwtCompassMagnetNeedle
+%%QT_INCDIR%%/qwt6/QwtCompassRose
+%%QT_INCDIR%%/qwt6/QwtCompassScaleDraw
+%%QT_INCDIR%%/qwt6/QwtCompassWindArrow
+%%QT_INCDIR%%/qwt6/QwtCounter
+%%QT_INCDIR%%/qwt6/QwtCurveFitter
+%%QT_INCDIR%%/qwt6/QwtDate
+%%QT_INCDIR%%/qwt6/QwtDateScaleDraw
+%%QT_INCDIR%%/qwt6/QwtDateScaleEngine
+%%QT_INCDIR%%/qwt6/QwtDial
+%%QT_INCDIR%%/qwt6/QwtDialNeedle
+%%QT_INCDIR%%/qwt6/QwtDialSimpleNeedle
+%%QT_INCDIR%%/qwt6/QwtDynGridLayout
+%%QT_INCDIR%%/qwt6/QwtEventPattern
+%%QT_INCDIR%%/qwt6/QwtGlobal
+%%QT_INCDIR%%/qwt6/QwtGraphic
+%%QT_INCDIR%%/qwt6/QwtHueColorMap
+%%QT_INCDIR%%/qwt6/QwtInterval
+%%QT_INCDIR%%/qwt6/QwtIntervalSample
+%%QT_INCDIR%%/qwt6/QwtIntervalSeriesData
+%%QT_INCDIR%%/qwt6/QwtIntervalSymbol
+%%QT_INCDIR%%/qwt6/QwtKnob
+%%QT_INCDIR%%/qwt6/QwtLegend
+%%QT_INCDIR%%/qwt6/QwtLegendData
+%%QT_INCDIR%%/qwt6/QwtLegendLabel
+%%QT_INCDIR%%/qwt6/QwtLinearColorMap
+%%QT_INCDIR%%/qwt6/QwtLinearScaleEngine
+%%QT_INCDIR%%/qwt6/QwtLogScaleEngine
+%%QT_INCDIR%%/qwt6/QwtLogTransform
+%%QT_INCDIR%%/qwt6/QwtMagnifier
+%%QT_INCDIR%%/qwt6/QwtMath
+%%QT_INCDIR%%/qwt6/QwtMatrixRasterData
+%%QT_INCDIR%%/qwt6/QwtNullPaintDevice
+%%QT_INCDIR%%/qwt6/QwtNullTransform
+%%QT_INCDIR%%/qwt6/QwtOHLCSample
+%%QT_INCDIR%%/qwt6/QwtPainter
+%%QT_INCDIR%%/qwt6/QwtPainterCommand
+%%QT_INCDIR%%/qwt6/QwtPanner
+%%QT_INCDIR%%/qwt6/QwtPicker
+%%QT_INCDIR%%/qwt6/QwtPickerClickPointMachine
+%%QT_INCDIR%%/qwt6/QwtPickerClickRectMachine
+%%QT_INCDIR%%/qwt6/QwtPickerDragLineMachine
+%%QT_INCDIR%%/qwt6/QwtPickerDragPointMachine
+%%QT_INCDIR%%/qwt6/QwtPickerDragRectMachine
+%%QT_INCDIR%%/qwt6/QwtPickerMachine
+%%QT_INCDIR%%/qwt6/QwtPickerPolygonMachine
+%%QT_INCDIR%%/qwt6/QwtPickerTrackerMachine
+%%QT_INCDIR%%/qwt6/QwtPixelMatrix
+%%QT_INCDIR%%/qwt6/QwtPlainTextEngine
+%%QT_INCDIR%%/qwt6/QwtPlot
+%%QT_INCDIR%%/qwt6/QwtPlotAbstractBarChart
+%%QT_INCDIR%%/qwt6/QwtPlotAbstractCanvas
+%%QT_INCDIR%%/qwt6/QwtPlotBarChart
+%%QT_INCDIR%%/qwt6/QwtPlotCanvas
+%%QT_INCDIR%%/qwt6/QwtPlotCurve
+%%QT_INCDIR%%/qwt6/QwtPlotDict
+%%QT_INCDIR%%/qwt6/QwtPlotDirectPainter
+%%QT_INCDIR%%/qwt6/QwtPlotGLCanvas
+%%QT_INCDIR%%/qwt6/QwtPlotGraphicItem
+%%QT_INCDIR%%/qwt6/QwtPlotGrid
+%%QT_INCDIR%%/qwt6/QwtPlotHistogram
+%%QT_INCDIR%%/qwt6/QwtPlotIntervalCurve
+%%QT_INCDIR%%/qwt6/QwtPlotItem
+%%QT_INCDIR%%/qwt6/QwtPlotLayout
+%%QT_INCDIR%%/qwt6/QwtPlotLegendItem
+%%QT_INCDIR%%/qwt6/QwtPlotMagnifier
+%%QT_INCDIR%%/qwt6/QwtPlotMarker
+%%QT_INCDIR%%/qwt6/QwtPlotMultiBarChart
+%%QT_INCDIR%%/qwt6/QwtPlotOpenGLCanvas
+%%QT_INCDIR%%/qwt6/QwtPlotPanner
+%%QT_INCDIR%%/qwt6/QwtPlotPicker
+%%QT_INCDIR%%/qwt6/QwtPlotRasterItem
+%%QT_INCDIR%%/qwt6/QwtPlotRenderer
+%%QT_INCDIR%%/qwt6/QwtPlotRescaler
+%%QT_INCDIR%%/qwt6/QwtPlotScaleItem
+%%QT_INCDIR%%/qwt6/QwtPlotSeriesItem
+%%QT_INCDIR%%/qwt6/QwtPlotShapeItem
+%%QT_INCDIR%%/qwt6/QwtPlotSpectroCurve
+%%QT_INCDIR%%/qwt6/QwtPlotSpectrogram
+%%QT_INCDIR%%/qwt6/QwtPlotSvgItem
+%%QT_INCDIR%%/qwt6/QwtPlotTextLabel
+%%QT_INCDIR%%/qwt6/QwtPlotTradingCurve
+%%QT_INCDIR%%/qwt6/QwtPlotVectorField
+%%QT_INCDIR%%/qwt6/QwtPlotZoneItem
+%%QT_INCDIR%%/qwt6/QwtPlotZoomer
+%%QT_INCDIR%%/qwt6/QwtPoint3D
+%%QT_INCDIR%%/qwt6/QwtPoint3DSeriesData
+%%QT_INCDIR%%/qwt6/QwtPointArrayData
+%%QT_INCDIR%%/qwt6/QwtPointMapper
+%%QT_INCDIR%%/qwt6/QwtPointPolar
+%%QT_INCDIR%%/qwt6/QwtPointSeriesData
+%%QT_INCDIR%%/qwt6/QwtPowerTransform
+%%QT_INCDIR%%/qwt6/QwtRasterData
+%%QT_INCDIR%%/qwt6/QwtRichTextEngine
+%%QT_INCDIR%%/qwt6/QwtRoundScaleDraw
+%%QT_INCDIR%%/qwt6/QwtSamplingThread
+%%QT_INCDIR%%/qwt6/QwtSaturationValueColorMap
+%%QT_INCDIR%%/qwt6/QwtScaleArithmetic
+%%QT_INCDIR%%/qwt6/QwtScaleDiv
+%%QT_INCDIR%%/qwt6/QwtScaleDraw
+%%QT_INCDIR%%/qwt6/QwtScaleEngine
+%%QT_INCDIR%%/qwt6/QwtScaleMap
+%%QT_INCDIR%%/qwt6/QwtScaleWidget
+%%QT_INCDIR%%/qwt6/QwtSeriesData
+%%QT_INCDIR%%/qwt6/QwtSetSample
+%%QT_INCDIR%%/qwt6/QwtSetSeriesData
+%%QT_INCDIR%%/qwt6/QwtSimpleCompassRose
+%%QT_INCDIR%%/qwt6/QwtSlider
+%%QT_INCDIR%%/qwt6/QwtSpline
+%%QT_INCDIR%%/qwt6/QwtSplineBasis
+%%QT_INCDIR%%/qwt6/QwtSplineC1
+%%QT_INCDIR%%/qwt6/QwtSplineC2
+%%QT_INCDIR%%/qwt6/QwtSplineCubic
+%%QT_INCDIR%%/qwt6/QwtSplineCurveFitter
+%%QT_INCDIR%%/qwt6/QwtSplineG1
+%%QT_INCDIR%%/qwt6/QwtSplineInterpolating
+%%QT_INCDIR%%/qwt6/QwtSplineLocal
+%%QT_INCDIR%%/qwt6/QwtSplineParameter
+%%QT_INCDIR%%/qwt6/QwtSplineParametrization
+%%QT_INCDIR%%/qwt6/QwtSplinePleasing
+%%QT_INCDIR%%/qwt6/QwtSplinePolynomial
+%%QT_INCDIR%%/qwt6/QwtSymbol
+%%QT_INCDIR%%/qwt6/QwtSyntheticPointData
+%%QT_INCDIR%%/qwt6/QwtSystemClock
+%%QT_INCDIR%%/qwt6/QwtText
+%%QT_INCDIR%%/qwt6/QwtTextEngine
+%%QT_INCDIR%%/qwt6/QwtTextLabel
+%%QT_INCDIR%%/qwt6/QwtThermo
+%%QT_INCDIR%%/qwt6/QwtTradingChartData
+%%QT_INCDIR%%/qwt6/QwtTransform
+%%QT_INCDIR%%/qwt6/QwtVectorFieldArrow
+%%QT_INCDIR%%/qwt6/QwtVectorFieldData
+%%QT_INCDIR%%/qwt6/QwtVectorFieldSample
+%%QT_INCDIR%%/qwt6/QwtVectorFieldSymbol
+%%QT_INCDIR%%/qwt6/QwtVectorFieldThinArrow
+%%QT_INCDIR%%/qwt6/QwtWeedingCurveFitter
+%%QT_INCDIR%%/qwt6/QwtWheel
+%%QT_INCDIR%%/qwt6/QwtWidgetOverlay
 %%QT_INCDIR%%/qwt6/qwt.h
 %%QT_INCDIR%%/qwt6/qwt_abstract_legend.h
 %%QT_INCDIR%%/qwt6/qwt_abstract_scale.h
@ -5,12 +159,14 @@
 %%QT_INCDIR%%/qwt6/qwt_abstract_slider.h
 %%QT_INCDIR%%/qwt6/qwt_analog_clock.h
 %%QT_INCDIR%%/qwt6/qwt_arrow_button.h
+%%QT_INCDIR%%/qwt6/qwt_axis.h
+%%QT_INCDIR%%/qwt6/qwt_axis_id.h
+%%QT_INCDIR%%/qwt6/qwt_bezier.h
 %%QT_INCDIR%%/qwt6/qwt_clipper.h
 %%QT_INCDIR%%/qwt6/qwt_color_map.h
 %%QT_INCDIR%%/qwt6/qwt_column_symbol.h
 %%QT_INCDIR%%/qwt6/qwt_compass.h
 %%QT_INCDIR%%/qwt6/qwt_compass_rose.h
-%%QT_INCDIR%%/qwt6/qwt_compat.h
 %%QT_INCDIR%%/qwt6/qwt_counter.h
 %%QT_INCDIR%%/qwt6/qwt_curve_fitter.h
 %%QT_INCDIR%%/qwt6/qwt_date.h
@ -30,7 +186,6 @@
 %%QT_INCDIR%%/qwt6/qwt_legend_label.h
 %%QT_INCDIR%%/qwt6/qwt_magnifier.h
 %%QT_INCDIR%%/qwt6/qwt_math.h
-%%QT_INCDIR%%/qwt6/qwt_mathml_text_engine.h
 %%QT_INCDIR%%/qwt6/qwt_matrix_raster_data.h
 %%QT_INCDIR%%/qwt6/qwt_null_paintdevice.h
 %%QT_INCDIR%%/qwt6/qwt_painter.h
@ -41,12 +196,13 @@
 %%QT_INCDIR%%/qwt6/qwt_pixel_matrix.h
 %%QT_INCDIR%%/qwt6/qwt_plot.h
 %%QT_INCDIR%%/qwt6/qwt_plot_abstract_barchart.h
+%%QT_INCDIR%%/qwt6/qwt_plot_abstract_canvas.h
 %%QT_INCDIR%%/qwt6/qwt_plot_barchart.h
 %%QT_INCDIR%%/qwt6/qwt_plot_canvas.h
 %%QT_INCDIR%%/qwt6/qwt_plot_curve.h
 %%QT_INCDIR%%/qwt6/qwt_plot_dict.h
 %%QT_INCDIR%%/qwt6/qwt_plot_directpainter.h
-%%QT_INCDIR%%/qwt6/qwt_plot_glcanvas.h
+%%QT_INCDIR%%/qwt6/qwt_plot_graphicitem.h
 %%QT_INCDIR%%/qwt6/qwt_plot_grid.h
 %%QT_INCDIR%%/qwt6/qwt_plot_histogram.h
 %%QT_INCDIR%%/qwt6/qwt_plot_intervalcurve.h
@ -56,6 +212,7 @@
 %%QT_INCDIR%%/qwt6/qwt_plot_magnifier.h
 %%QT_INCDIR%%/qwt6/qwt_plot_marker.h
 %%QT_INCDIR%%/qwt6/qwt_plot_multi_barchart.h
+%%QT_INCDIR%%/qwt6/qwt_plot_opengl_canvas.h
 %%QT_INCDIR%%/qwt6/qwt_plot_panner.h
 %%QT_INCDIR%%/qwt6/qwt_plot_picker.h
 %%QT_INCDIR%%/qwt6/qwt_plot_rasteritem.h
@ -69,12 +226,29 @@
 %%QT_INCDIR%%/qwt6/qwt_plot_svgitem.h
 %%QT_INCDIR%%/qwt6/qwt_plot_textlabel.h
 %%QT_INCDIR%%/qwt6/qwt_plot_tradingcurve.h
+%%QT_INCDIR%%/qwt6/qwt_plot_vectorfield.h
 %%QT_INCDIR%%/qwt6/qwt_plot_zoneitem.h
 %%QT_INCDIR%%/qwt6/qwt_plot_zoomer.h
 %%QT_INCDIR%%/qwt6/qwt_point_3d.h
 %%QT_INCDIR%%/qwt6/qwt_point_data.h
 %%QT_INCDIR%%/qwt6/qwt_point_mapper.h
 %%QT_INCDIR%%/qwt6/qwt_point_polar.h
+%%QT_INCDIR%%/qwt6/qwt_polar.h
+%%QT_INCDIR%%/qwt6/qwt_polar_canvas.h
+%%QT_INCDIR%%/qwt6/qwt_polar_curve.h
+%%QT_INCDIR%%/qwt6/qwt_polar_fitter.h
+%%QT_INCDIR%%/qwt6/qwt_polar_grid.h
+%%QT_INCDIR%%/qwt6/qwt_polar_item.h
+%%QT_INCDIR%%/qwt6/qwt_polar_itemdict.h
+%%QT_INCDIR%%/qwt6/qwt_polar_layout.h
+%%QT_INCDIR%%/qwt6/qwt_polar_magnifier.h
+%%QT_INCDIR%%/qwt6/qwt_polar_marker.h
+%%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
 %%QT_INCDIR%%/qwt6/qwt_round_scale_draw.h
 %%QT_INCDIR%%/qwt6/qwt_samples.h
@ -88,6 +262,13 @@
 %%QT_INCDIR%%/qwt6/qwt_series_store.h
 %%QT_INCDIR%%/qwt6/qwt_slider.h
 %%QT_INCDIR%%/qwt6/qwt_spline.h
+%%QT_INCDIR%%/qwt6/qwt_spline_basis.h
+%%QT_INCDIR%%/qwt6/qwt_spline_cubic.h
+%%QT_INCDIR%%/qwt6/qwt_spline_curve_fitter.h
+%%QT_INCDIR%%/qwt6/qwt_spline_local.h
+%%QT_INCDIR%%/qwt6/qwt_spline_parametrization.h
+%%QT_INCDIR%%/qwt6/qwt_spline_pleasing.h
+%%QT_INCDIR%%/qwt6/qwt_spline_polynomial.h
 %%QT_INCDIR%%/qwt6/qwt_symbol.h
 %%QT_INCDIR%%/qwt6/qwt_system_clock.h
 %%QT_INCDIR%%/qwt6/qwt_text.h
@ -95,17 +276,16 @@
 %%QT_INCDIR%%/qwt6/qwt_text_label.h
 %%QT_INCDIR%%/qwt6/qwt_thermo.h
 %%QT_INCDIR%%/qwt6/qwt_transform.h
+%%QT_INCDIR%%/qwt6/qwt_vectorfield_symbol.h
+%%QT_INCDIR%%/qwt6/qwt_weeding_curve_fitter.h
 %%QT_INCDIR%%/qwt6/qwt_wheel.h
 %%QT_INCDIR%%/qwt6/qwt_widget_overlay.h
-%%QT_LIBDIR%%/libqwt6.so
-%%QT_LIBDIR%%/libqwt6.so.6
-%%QT_LIBDIR%%/libqwt6.so.%%SHLIB_SHVER%%
-%%QT_LIBDIR%%/libqwt6.so.%%SHLIB_VER%%
-%%QT_LIBDIR%%/libqwtmathml.so
-%%QT_LIBDIR%%/libqwtmathml.so.6
-%%QT_LIBDIR%%/libqwtmathml.so.%%SHLIB_SHVER%%
-%%QT_LIBDIR%%/libqwtmathml.so.%%SHLIB_VER%%
+%%QT_LIBDIR%%/libqwt.so
+%%QT_LIBDIR%%/libqwt.so.6
+%%QT_LIBDIR%%/libqwt.so.%%SHLIB_SHVER%%
+%%QT_LIBDIR%%/libqwt.so.%%SHLIB_VER%%
 %%QT_MKSPECDIR%%/features/qwt.prf
 %%QT_MKSPECDIR%%/features/qwtconfig.pri
 %%QT_MKSPECDIR%%/features/qwtfunctions.pri
-%%QT_MKSPECDIR%%/features/qwtmathml.prf
+%%QT_LIBDIR%%/pkgconfig/%%FLAVOR%%Qwt6.pc
+%%QT_PLUGINDIR%%/designer/libqwt_designer_plugin.so