From 9b5c7a38f4407d69634b931f52b666ead9a830ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 1 Jul 2020 00:20:31 +0200 Subject: [PATCH] lmms: fix build w/ qt5-5.15.0 Also revbump to rebuild just in case. --- srcpkgs/lmms/patches/qt5-5.15.0.patch | 54 +++++++++++++++++++++++++++ srcpkgs/lmms/template | 9 ++++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/lmms/patches/qt5-5.15.0.patch diff --git a/srcpkgs/lmms/patches/qt5-5.15.0.patch b/srcpkgs/lmms/patches/qt5-5.15.0.patch new file mode 100644 index 0000000000..5f0798f778 --- /dev/null +++ b/srcpkgs/lmms/patches/qt5-5.15.0.patch @@ -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 + #include ++#include + #include + + #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 + #include + #include ++#include + #include + #include + +--- 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 + #include + #include ++#include + #include + #include + #include +--- 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 ++#include + #include + + #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 + #include ++#include + #include + #include "lmms_math.h" + #include "AutomatableModelView.h" diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template index 6948d94ce1..317fb476b7 100644 --- a/srcpkgs/lmms/template +++ b/srcpkgs/lmms/template @@ -1,7 +1,7 @@ # Template file for 'lmms' pkgname=lmms version=1.2.1 -revision=4 +revision=5 archs="~armv6*" build_style=cmake configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF" @@ -21,6 +21,13 @@ checksum=5a6d1e82b00a7f54ffb8cf52eff2e0b3ff87cadbe5691917edebe51f64c26ae8 build_options="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() { rm -f ${DESTDIR}/usr/lib/*.a }