qwt: update to 6.1.5

This commit is contained in:
Colin Booth 2021-05-11 11:42:25 -07:00 committed by Érico Nogueira Rolim
parent dea7ee6dc5
commit bd4fb68ea5
2 changed files with 6 additions and 64 deletions

View File

@ -1,58 +0,0 @@
Source: @pullmoll
Upstream: no
Reason: qt5-5.15.0 requires explicit include for QPainterPath
--- src/qwt_painter.h 2019-01-02 17:21:30.232435482 +0100
+++ src/qwt_painter.h 2020-07-14 16:47:54.577577031 +0200
@@ -17,6 +17,7 @@
#include <qpen.h>
#include <qline.h>
#include <qpalette.h>
+#include <qpainterpath.h>
class QPainter;
class QBrush;
@@ -31,7 +32,6 @@
class QwtInterval;
class QTextDocument;
-class QPainterPath;
/*!
\brief A collection of QPainter workarounds
--- src/qwt_null_paintdevice.cpp 2019-01-02 17:21:31.296461212 +0100
+++ src/qwt_null_paintdevice.cpp 2020-07-14 16:49:13.479579545 +0200
@@ -9,6 +9,7 @@
#include "qwt_null_paintdevice.h"
#include <qpaintengine.h>
+#include <qpainterpath.h>
#include <qpixmap.h>
class QwtNullPaintDevice::PrivateData
--- src/qwt_painter_command.h 2019-01-02 17:21:30.320437610 +0100
+++ src/qwt_painter_command.h 2020-07-14 16:50:38.501582253 +0200
@@ -12,12 +12,11 @@
#include "qwt_global.h"
#include <qpaintengine.h>
+#include <qpainterpath.h>
#include <qpixmap.h>
#include <qimage.h>
#include <qpolygon.h>
-class QPainterPath;
-
/*!
QwtPainterCommand represents the attributes of a paint operation
how it is used between QPainter and QPaintDevice
--- src/qwt_plot_glcanvas.h 2019-01-02 17:21:30.204434804 +0100
+++ src/qwt_plot_glcanvas.h 2020-07-14 16:52:54.074586572 +0200
@@ -13,6 +13,7 @@
#include "qwt_global.h"
#include <qframe.h>
#include <qgl.h>
+#include <qpainterpath.h>
class QwtPlot;

View File

@ -1,19 +1,19 @@
# Template file for 'qwt'
pkgname=qwt
version=6.1.4
version=6.1.5
revision=1
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="qt5-tools-devel qt5-svg-devel"
short_desc="Qt Widgets for Technical Applications"
maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
license="Qwt-License, LGPL-2.1"
homepage="http://qwt.sourceforge.net/"
license="LGPL-2.1-only, Qwt-exception-1.0"
homepage="https://qwt.sourceforge.io/"
distfiles="https://sourceforge.net/projects/${pkgname}/files/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
checksum=1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9
checksum=4076de63ec2b5e84379ddfebf27c7b29b8dc9074f3db7e2ca61d11a1d8adc041
pre_configure() {
sed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
post_patch() {
vsed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
-e '/^QWT_INSTALL_DOCS/ s|/doc|/share/doc/qwt|' \
-e '/^QWT_INSTALL_HEADERS/ s|include|&/qwt|' \
-e '/^QWT_INSTALL_PLUGINS/ s|plugins/designer|lib/qt5/&|' \