summarylogtreecommitdiffstats
path: root/qwt-lib-qt5.15.patch
diff options
context:
space:
mode:
authorChris Morgan2021-05-02 02:53:00 +1000
committerChris Morgan2021-05-02 02:53:00 +1000
commitd6b35e6777b5ca3a3b70650f672451c70c354aec (patch)
tree0254cba14936771a196b35ddb0a38f210c474ece /qwt-lib-qt5.15.patch
parent0a96444171f04469636f12c41855b286c0b99cd8 (diff)
downloadaur-d6b35e6777b5ca3a3b70650f672451c70c354aec.tar.gz
Make it build, and adhere to Arch standards more
• Its vendored qwt-lib thing needs a straightforward patch because of something that I hear Qt 5.15 broke. • Git submodules are supposed to be specified as sources and sorted out in prepare. This was incidentally moderately necessary to sort out because the qwt patch needs the submodules to be up to date, so either the patch application had to be shifted to build, or the submodules to prepare. • Improve the package version by pulling something from Git. In theory this package should probably also be renamed to entropy-piano-tuner-git, but upstream looks pretty dead. I dunno. Anyway, 1.2.0.r27.gee7857a > git. (And not just in meaningfulness; in version comparison, too, so an epoch bump isn’t needed.)
Diffstat (limited to 'qwt-lib-qt5.15.patch')
-rw-r--r--qwt-lib-qt5.15.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/qwt-lib-qt5.15.patch b/qwt-lib-qt5.15.patch
new file mode 100644
index 000000000000..c6579096be47
--- /dev/null
+++ b/qwt-lib-qt5.15.patch
@@ -0,0 +1,66 @@
+diff --git a/thirdparty/qwt-lib/qwt/qwt_null_paintdevice.h b/thirdparty/qwt-lib/qwt/qwt_null_paintdevice.h
+index d7f03be..cef492e 100644
+--- a/thirdparty/qwt-lib/qwt/qwt_null_paintdevice.h
++++ b/thirdparty/qwt-lib/qwt/qwt_null_paintdevice.h
+@@ -13,6 +13,7 @@
+ #include "qwt_global.h"
+ #include <qpaintdevice.h>
+ #include <qpaintengine.h>
++#include <QPainterPath>
+
+ /*!
+ \brief A null paint device doing nothing
+diff --git a/thirdparty/qwt-lib/qwt/qwt_painter.h b/thirdparty/qwt-lib/qwt/qwt_painter.h
+index 9609b69..67095a3 100644
+--- a/thirdparty/qwt-lib/qwt/qwt_painter.h
++++ b/thirdparty/qwt-lib/qwt/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
+diff --git a/thirdparty/qwt-lib/qwt/qwt_painter_command.h b/thirdparty/qwt-lib/qwt/qwt_painter_command.h
+index 2da597a..3a85b68 100644
+--- a/thirdparty/qwt-lib/qwt/qwt_painter_command.h
++++ b/thirdparty/qwt-lib/qwt/qwt_painter_command.h
+@@ -15,8 +15,7 @@
+ #include <qpixmap.h>
+ #include <qimage.h>
+ #include <qpolygon.h>
+-
+-class QPainterPath;
++#include <QPainterPath>
+
+ /*!
+ QwtPainterCommand represents the attributes of a paint operation
+diff --git a/thirdparty/qwt-lib/qwt/qwt_symbol.h b/thirdparty/qwt-lib/qwt/qwt_symbol.h
+index ea16d88..8dc65c3 100644
+--- a/thirdparty/qwt-lib/qwt/qwt_symbol.h
++++ b/thirdparty/qwt-lib/qwt/qwt_symbol.h
+@@ -12,6 +12,7 @@
+
+ #include "qwt_global.h"
+ #include <qpolygon.h>
++#include <QPainterPath>
+
+ class QPainter;
+ class QRect;
+@@ -21,7 +22,6 @@ class QPen;
+ class QColor;
+ class QPointF;
+ class QPolygonF;
+-class QPainterPath;
+ class QPixmap;
+ class QByteArray;
+ class QwtGraphic;