[PR PATCH] qwt: update to 6.1.5

[PR PATCH] qwt: update to 6.1.5

[heliocat]

[-- Attachment #1: Type: text/plain, Size: 1575 bytes --]

There is a new pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages qwt
https://github.com/void-linux/void-packages/pull/30803

qwt: update to 6.1.5
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

@gspe 

A patch file from https://github.com/void-linux/void-packages/pull/30803.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qwt-30803.patch --]
[-- Type: text/x-diff, Size: 3377 bytes --]

From bfd464d3e7a07a3b545d9e717f1fcf52f370d101 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 11:42:25 -0700
Subject: [PATCH] qwt: update to 6.1.5

---
 srcpkgs/qwt/patches/qt5-5.15.0.patch | 58 ----------------------------
 srcpkgs/qwt/template                 | 10 ++---
 2 files changed, 5 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/qwt/patches/qt5-5.15.0.patch

diff --git a/srcpkgs/qwt/patches/qt5-5.15.0.patch b/srcpkgs/qwt/patches/qt5-5.15.0.patch
deleted file mode 100644
index 20ebd1d39f97..000000000000
--- a/srcpkgs/qwt/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -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;
- 
diff --git a/srcpkgs/qwt/template b/srcpkgs/qwt/template
index 0e96184000ee..c64ed533175b 100644
--- a/srcpkgs/qwt/template
+++ b/srcpkgs/qwt/template
@@ -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|' \
+	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/&|' \

Re: [PR REVIEW] qwt: update to 6.1.5

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30803#discussion_r630585697

Comment:
Please move to `post_patch`

Re: [PR PATCH] [Updated] qwt: update to 6.1.5

[heliocat]

[-- Attachment #1: Type: text/plain, Size: 1580 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages qwt
https://github.com/void-linux/void-packages/pull/30803

qwt: update to 6.1.5
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

@gspe 

A patch file from https://github.com/void-linux/void-packages/pull/30803.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qwt-30803.patch --]
[-- Type: text/x-diff, Size: 3394 bytes --]

From c05aa9f107bb744c66bb45ab469a3901c7b7d55e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 11 May 2021 11:42:25 -0700
Subject: [PATCH] qwt: update to 6.1.5

---
 srcpkgs/qwt/patches/qt5-5.15.0.patch | 58 ----------------------------
 srcpkgs/qwt/template                 | 12 +++---
 2 files changed, 6 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/qwt/patches/qt5-5.15.0.patch

diff --git a/srcpkgs/qwt/patches/qt5-5.15.0.patch b/srcpkgs/qwt/patches/qt5-5.15.0.patch
deleted file mode 100644
index 20ebd1d39f97..000000000000
--- a/srcpkgs/qwt/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -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;
- 
diff --git a/srcpkgs/qwt/template b/srcpkgs/qwt/template
index 0e96184000ee..f03bbd1af605 100644
--- a/srcpkgs/qwt/template
+++ b/srcpkgs/qwt/template
@@ -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/&|' \

Re: [PR REVIEW] qwt: update to 6.1.5

[heliocat]

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/30803#discussion_r630593424

Comment:
Updated.

Re: [PR PATCH] [Merged]: qwt: update to 6.1.5

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1426 bytes --]

There's a merged pull request on the void-packages repository

qwt: update to 6.1.5
https://github.com/void-linux/void-packages/pull/30803

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

@gspe