lmms: fix build w/ qt5-5.15.0
Also revbump to rebuild just in case.
This commit is contained in:
parent
a2d871ad47
commit
9b5c7a38f4
2 changed files with 62 additions and 1 deletions
54
srcpkgs/lmms/patches/qt5-5.15.0.patch
Normal file
54
srcpkgs/lmms/patches/qt5-5.15.0.patch
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
Source: @pullmoll
|
||||||
|
Upstream: no
|
||||||
|
Reason: qt5-5.15.0 requires explicit include for QPainterPath
|
||||||
|
|
||||||
|
--- src/gui/AutomationPatternView.cpp 2018-11-03 02:43:42.000000000 +0100
|
||||||
|
+++ src/gui/AutomationPatternView.cpp 2020-06-30 20:54:11.520449601 +0200
|
||||||
|
@@ -25,6 +25,7 @@
|
||||||
|
|
||||||
|
#include <QMouseEvent>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QMenu>
|
||||||
|
|
||||||
|
#include "AutomationEditor.h"
|
||||||
|
--- src/gui/LmmsStyle.cpp 2018-11-03 02:43:42.000000000 +0100
|
||||||
|
+++ src/gui/LmmsStyle.cpp 2020-06-30 22:59:34.411837701 +0200
|
||||||
|
@@ -28,6 +28,7 @@
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QFrame>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QStyleFactory>
|
||||||
|
#include <QStyleOption>
|
||||||
|
|
||||||
|
--- src/gui/editors/AutomationEditor.cpp 2018-11-03 02:43:42.000000000 +0100
|
||||||
|
+++ src/gui/editors/AutomationEditor.cpp 2020-06-30 23:03:53.262851055 +0200
|
||||||
|
@@ -35,6 +35,7 @@
|
||||||
|
#include <QLayout>
|
||||||
|
#include <QMdiArea>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QScrollBar>
|
||||||
|
#include <QStyleOption>
|
||||||
|
#include <QToolTip>
|
||||||
|
--- plugins/Eq/EqSpectrumView.h 2018-11-03 02:43:42.000000000 +0100
|
||||||
|
+++ plugins/Eq/EqSpectrumView.h 2020-06-30 23:07:48.389863185 +0200
|
||||||
|
@@ -24,6 +24,7 @@
|
||||||
|
#define EQSPECTRUMVIEW_H
|
||||||
|
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
|
#include "fft_helpers.h"
|
||||||
|
--- plugins/Eq/EqCurve.h 2018-11-03 02:43:42.000000000 +0100
|
||||||
|
+++ plugins/Eq/EqCurve.h 2020-06-30 23:08:21.792864908 +0200
|
||||||
|
@@ -27,6 +27,7 @@
|
||||||
|
|
||||||
|
#include <QGraphicsItem>
|
||||||
|
#include <QPainter>
|
||||||
|
+#include <QPainterPath>
|
||||||
|
#include <QGraphicsSceneWheelEvent>
|
||||||
|
#include "lmms_math.h"
|
||||||
|
#include "AutomatableModelView.h"
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'lmms'
|
# Template file for 'lmms'
|
||||||
pkgname=lmms
|
pkgname=lmms
|
||||||
version=1.2.1
|
version=1.2.1
|
||||||
revision=4
|
revision=5
|
||||||
archs="~armv6*"
|
archs="~armv6*"
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"
|
configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"
|
||||||
|
@ -21,6 +21,13 @@ checksum=5a6d1e82b00a7f54ffb8cf52eff2e0b3ff87cadbe5691917edebe51f64c26ae8
|
||||||
build_options="sndio"
|
build_options="sndio"
|
||||||
build_options_default="sndio"
|
build_options_default="sndio"
|
||||||
|
|
||||||
|
# No error for several warnings
|
||||||
|
CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-format-truncation"
|
||||||
|
|
||||||
|
#pre_configure() {
|
||||||
|
# grep -rlw QString::null | xargs sed -i -e "s;QString::null;nullptr;g"
|
||||||
|
#}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
rm -f ${DESTDIR}/usr/lib/*.a
|
rm -f ${DESTDIR}/usr/lib/*.a
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue