From e006b9b77bee77a99a43cd3171bc0eacf2584959 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 18 May 2021 10:39:02 +0200 Subject: qwt-qt5: upgrade 6.1.4 -> 6.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backported patch can go ========= Qwt 6.1.5 ========= 1) Maintenance - Avoid using some of the deprecated Qt APIs - Missing includes of QPainterPath ( Qt 5.15 ) added - QwtPlotSpectroCurve: missing public inheritance - QwtPlotTradingCurve: missing public inheritance 2) Bug fixes - QwtLinearColorMap: handling of alpha values in color stops fixed - QwtPlotRasterItem: missing color table initialization for QImage::Format_Indexed8 - QwtScaleWidget: missing QEvent::LayoutRequest added - QwtSetSample: bound rectangle fixed for empty sets Signed-off-by: Andreas Müller --- ...interpath.h-include-added-needed-with-Qt-.patch | 131 --------------------- recipes-qt/qwt/qwt-qt5_6.1.4.bb | 56 --------- recipes-qt/qwt/qwt-qt5_6.1.5.bb | 54 +++++++++ 3 files changed, 54 insertions(+), 187 deletions(-) delete mode 100644 recipes-qt/qwt/qwt-qt5/0001-missing-qpainterpath.h-include-added-needed-with-Qt-.patch delete mode 100644 recipes-qt/qwt/qwt-qt5_6.1.4.bb create mode 100644 recipes-qt/qwt/qwt-qt5_6.1.5.bb diff --git a/recipes-qt/qwt/qwt-qt5/0001-missing-qpainterpath.h-include-added-needed-with-Qt-.patch b/recipes-qt/qwt/qwt-qt5/0001-missing-qpainterpath.h-include-added-needed-with-Qt-.patch deleted file mode 100644 index 5caf7930..00000000 --- a/recipes-qt/qwt/qwt-qt5/0001-missing-qpainterpath.h-include-added-needed-with-Qt-.patch +++ /dev/null @@ -1,131 +0,0 @@ -From c44af9a6f0eff02b439ef770755da551f281e9ad Mon Sep 17 00:00:00 2001 -From: rathmann -Date: Sun, 29 Mar 2020 09:11:29 +0000 -Subject: [PATCH] missing qpainterpath.h include added needed with Qt 5.15 - Beta2 - -Partial backport from -https://sourceforge.net/p/qwt/code/3187/ - ---- -diff -uNr qwt-6.1.4.orig/src/qwt_compass_rose.cpp qwt-6.1.4/src/qwt_compass_rose.cpp ---- qwt-6.1.4.orig/src/qwt_compass_rose.cpp 2019-01-02 17:21:31.280460826 +0100 -+++ qwt-6.1.4/src/qwt_compass_rose.cpp 2020-04-14 13:33:27.214932546 +0200 -@@ -11,6 +11,7 @@ - #include "qwt_point_polar.h" - #include "qwt_painter.h" - #include -+#include - - static QPointF qwtIntersection( - QPointF p11, QPointF p12, QPointF p21, QPointF p22 ) -diff -uNr qwt-6.1.4.orig/src/qwt_dial_needle.cpp qwt-6.1.4/src/qwt_dial_needle.cpp ---- qwt-6.1.4.orig/src/qwt_dial_needle.cpp 2019-01-02 17:21:31.284460922 +0100 -+++ qwt-6.1.4/src/qwt_dial_needle.cpp 2020-04-14 13:33:37.006864250 +0200 -@@ -13,6 +13,7 @@ - #include "qwt_painter.h" - #include - #include -+#include - - #if QT_VERSION < 0x040601 - #define qFastSin(x) qSin(x) -diff -uNr qwt-6.1.4.orig/src/qwt_null_paintdevice.cpp qwt-6.1.4/src/qwt_null_paintdevice.cpp ---- qwt-6.1.4.orig/src/qwt_null_paintdevice.cpp 2019-01-02 17:21:31.296461212 +0100 -+++ qwt-6.1.4/src/qwt_null_paintdevice.cpp 2020-04-14 13:31:21.983807348 +0200 -@@ -9,6 +9,7 @@ - - #include "qwt_null_paintdevice.h" - #include -+#include - #include - - class QwtNullPaintDevice::PrivateData -diff -uNr qwt-6.1.4.orig/src/qwt_painter_command.h qwt-6.1.4/src/qwt_painter_command.h ---- qwt-6.1.4.orig/src/qwt_painter_command.h 2020-04-14 13:29:35.128556140 +0200 -+++ qwt-6.1.4/src/qwt_painter_command.h 2020-04-14 13:28:23.957056341 +0200 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - - class QPainterPath; - -diff -uNr qwt-6.1.4.orig/src/qwt_painter.cpp qwt-6.1.4/src/qwt_painter.cpp ---- qwt-6.1.4.orig/src/qwt_painter.cpp 2019-01-02 17:21:31.452464985 +0100 -+++ qwt-6.1.4/src/qwt_painter.cpp 2020-04-14 13:30:22.356224890 +0200 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -uNr qwt-6.1.4.orig/src/qwt_plot_glcanvas.cpp qwt-6.1.4/src/qwt_plot_glcanvas.cpp ---- qwt-6.1.4.orig/src/qwt_plot_glcanvas.cpp 2019-01-02 17:21:31.300461309 +0100 -+++ qwt-6.1.4/src/qwt_plot_glcanvas.cpp 2020-04-14 13:33:14.947018129 +0200 -@@ -12,6 +12,7 @@ - #include "qwt_painter.h" - #include - #include -+#include - #include - #include - #include -diff -uNr qwt-6.1.4.orig/src/qwt_plot_panner.cpp qwt-6.1.4/src/qwt_plot_panner.cpp ---- qwt-6.1.4.orig/src/qwt_plot_panner.cpp 2019-01-02 17:21:31.468465371 +0100 -+++ qwt-6.1.4/src/qwt_plot_panner.cpp 2020-04-14 13:32:33.259309129 +0200 -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #if QT_VERSION >= 0x050000 - #if QT_VERSION < 0x050100 -diff -uNr qwt-6.1.4.orig/src/qwt_plot_renderer.cpp qwt-6.1.4/src/qwt_plot_renderer.cpp ---- qwt-6.1.4.orig/src/qwt_plot_renderer.cpp 2019-01-02 17:21:31.352462567 +0100 -+++ qwt-6.1.4/src/qwt_plot_renderer.cpp 2020-04-14 13:31:51.019604276 +0200 -@@ -20,6 +20,7 @@ - #include "qwt_math.h" - - #include -+#include - #include - #include - #include -diff -uNr qwt-6.1.4.orig/src/qwt_widget_overlay.cpp qwt-6.1.4/src/qwt_widget_overlay.cpp ---- qwt-6.1.4.orig/src/qwt_widget_overlay.cpp 2019-01-02 17:21:31.388463437 +0100 -+++ qwt-6.1.4/src/qwt_widget_overlay.cpp 2020-04-14 13:31:07.091911561 +0200 -@@ -11,6 +11,7 @@ - #include "qwt_painter.h" - #include - #include -+#include - #include - #include - -diff -uNr qwt-6.1.4.orig/examples/dials/attitude_indicator.cpp qwt-6.1.4/examples/dials/attitude_indicator.cpp ---- qwt-6.1.4.orig/examples/dials/attitude_indicator.cpp 2019-01-02 17:21:31.164458020 +0100 -+++ qwt-6.1.4/examples/dials/attitude_indicator.cpp 2020-04-14 13:44:46.354218570 +0200 -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - #include - - AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color ) -diff -uNr qwt-6.1.4.orig/src/qwt_plot_glcanvas.h qwt-6.1.4/src/qwt_plot_glcanvas.h ---- qwt-6.1.4.orig/src/qwt_plot_glcanvas.h 2020-04-14 13:44:26.642354964 +0200 -+++ qwt-6.1.4/src/qwt_plot_glcanvas.h 2020-04-14 13:42:38.555103164 +0200 -@@ -12,6 +12,7 @@ - - #include "qwt_global.h" - #include -+#include - #include - - class QwtPlot; diff --git a/recipes-qt/qwt/qwt-qt5_6.1.4.bb b/recipes-qt/qwt/qwt-qt5_6.1.4.bb deleted file mode 100644 index 18eebbf1..00000000 --- a/recipes-qt/qwt/qwt-qt5_6.1.4.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Qt Widget Extension for Technical Applications" -SECTION = "libs" -HOMEPAGE = "http://qwt.sourceforge.net/index.html" - -# LGPLv2.1 + some exceptions -LICENSE = "QWTv1.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" - -DEPENDS = "qtbase qtsvg qttools" - -COMPATIBLE_HOST_toolchain-clang_riscv32 = "null" -COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" - -inherit qmake5 - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ - file://0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch \ - file://0001-missing-qpainterpath.h-include-added-needed-with-Qt-.patch \ -" -SRC_URI[qwt.md5sum] = "4fb1852f694420e3ab9c583526edecc5" -SRC_URI[qwt.sha256sum] = "1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9" - -S = "${WORKDIR}/qwt-${PV}" - -EXTRA_QMAKEVARS_PRE += " \ - QWT_CONFIG+=QwtPkgConfig \ - QWT_CONFIG+=QwtExamples \ -" - -do_configure_prepend() { - sed -i \ - -e 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' \ - -e 's:^QWT_INSTALL_LIBS.*:QWT_INSTALL_LIBS = ${libdir}:' \ - ${S}/*.pri - export QWT_INSTALL_LIBS=${libdir} -} - -do_install_append() { - # seems out of tree build confuses installation of examples - # so install them manually - install -d ${D}${bindir}/ - cp ${B}/examples/bin/* ${D}${bindir}/ -} - - -PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " -FILES_${PN}-examples = "${bindir}/*" -FILES_${PN}-features = "${prefix}/features" -FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" -FILES_${PN}-doc += "${prefix}/doc" - -INSANE_SKIP_${PN}-plugins += "libdir" -INSANE_SKIP_${PN}-dbg += "libdir" - -RPROVIDES_${PN}-dev = "libqwt-qt5-dev" diff --git a/recipes-qt/qwt/qwt-qt5_6.1.5.bb b/recipes-qt/qwt/qwt-qt5_6.1.5.bb new file mode 100644 index 00000000..b483af59 --- /dev/null +++ b/recipes-qt/qwt/qwt-qt5_6.1.5.bb @@ -0,0 +1,54 @@ +SUMMARY = "Qt Widget Extension for Technical Applications" +SECTION = "libs" +HOMEPAGE = "http://qwt.sourceforge.net/index.html" + +# LGPLv2.1 + some exceptions +LICENSE = "QWTv1.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" + +DEPENDS = "qtbase qtsvg qttools" + +COMPATIBLE_HOST_toolchain-clang_riscv32 = "null" +COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" + +inherit qmake5 + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ + file://0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch \ +" +SRC_URI[qwt.sha256sum] = "4076de63ec2b5e84379ddfebf27c7b29b8dc9074f3db7e2ca61d11a1d8adc041" + +S = "${WORKDIR}/qwt-${PV}" + +EXTRA_QMAKEVARS_PRE += " \ + QWT_CONFIG+=QwtPkgConfig \ + QWT_CONFIG+=QwtExamples \ +" + +do_configure_prepend() { + sed -i \ + -e 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' \ + -e 's:^QWT_INSTALL_LIBS.*:QWT_INSTALL_LIBS = ${libdir}:' \ + ${S}/*.pri + export QWT_INSTALL_LIBS=${libdir} +} + +do_install_append() { + # seems out of tree build confuses installation of examples + # so install them manually + install -d ${D}${bindir}/ + cp ${B}/examples/bin/* ${D}${bindir}/ +} + + +PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " +FILES_${PN}-examples = "${bindir}/*" +FILES_${PN}-features = "${prefix}/features" +FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" +FILES_${PN}-doc += "${prefix}/doc" + +INSANE_SKIP_${PN}-plugins += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" + +RPROVIDES_${PN}-dev = "libqwt-qt5-dev" -- cgit v1.2.3-54-g00ecf