diff options
author | Miroslav Šulc <fordfrog@gentoo.org> | 2020-06-13 10:57:47 +0200 |
---|---|---|
committer | Miroslav Šulc <fordfrog@gentoo.org> | 2020-06-13 10:58:01 +0200 |
commit | a563f76a35cd106587a432c611587f34106d61c6 (patch) | |
tree | 83e4bcb6d3b5fb058e240f68ca3d418a18a0e4e4 /media-sound | |
parent | app-text/texlive-core: disable xindy-docs (diff) | |
download | gentoo-a563f76a35cd106587a432c611587f34106d61c6.tar.gz gentoo-a563f76a35cd106587a432c611587f34106d61c6.tar.bz2 gentoo-a563f76a35cd106587a432c611587f34106d61c6.zip |
media-sound/lmms: fixed compilation with qt 5.15 in 1.2.1
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch | 61 | ||||
-rw-r--r-- | media-sound/lmms/lmms-1.2.1.ebuild | 6 |
2 files changed, 66 insertions, 1 deletions
diff --git a/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch new file mode 100644 index 000000000000..afade79b0fd8 --- /dev/null +++ b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch @@ -0,0 +1,61 @@ +From 29a5abc30b5d5efa30b7f6b73fe06d76ec851cca Mon Sep 17 00:00:00 2001 +From: Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com> +Date: Mon, 18 May 2020 18:58:48 +0200 +Subject: [PATCH] Fix Qt 5.15 build issues (#5498) + +Add missing QPainterPath includes +--- + plugins/Eq/EqSpectrumView.h | 1 + + src/gui/AutomationPatternView.cpp | 1 + + src/gui/LmmsStyle.cpp | 1 + + src/gui/editors/AutomationEditor.cpp | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h +index cd3f177586..84feeff13e 100644 +--- a/plugins/Eq/EqSpectrumView.h ++++ b/plugins/Eq/EqSpectrumView.h +@@ -24,6 +24,7 @@ + #define EQSPECTRUMVIEW_H + + #include <QPainter> ++#include <QPainterPath> + #include <QWidget> + + #include "fft_helpers.h" +diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp +index 448c233cb4..9889a6b460 100644 +--- a/src/gui/AutomationPatternView.cpp ++++ b/src/gui/AutomationPatternView.cpp +@@ -25,6 +25,7 @@ + + #include <QMouseEvent> + #include <QPainter> ++#include <QPainterPath> + #include <QMenu> + + #include "AutomationEditor.h" +diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp +index e57e29e479..4fe5cb503c 100644 +--- a/src/gui/LmmsStyle.cpp ++++ b/src/gui/LmmsStyle.cpp +@@ -28,6 +28,7 @@ + #include <QApplication> + #include <QFrame> + #include <QPainter> ++#include <QPainterPath> + #include <QStyleFactory> + #include <QStyleOption> + +diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp +index 5e8ea8a0af..74f15d358c 100644 +--- a/src/gui/editors/AutomationEditor.cpp ++++ b/src/gui/editors/AutomationEditor.cpp +@@ -35,6 +35,7 @@ + #include <QLayout> + #include <QMdiArea> + #include <QPainter> ++#include <QPainterPath> + #include <QScrollBar> + #include <QStyleOption> + #include <QToolTip> diff --git a/media-sound/lmms/lmms-1.2.1.ebuild b/media-sound/lmms/lmms-1.2.1.ebuild index e489666c90fe..2f8eba8d8cdd 100644 --- a/media-sound/lmms/lmms-1.2.1.ebuild +++ b/media-sound/lmms/lmms-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -68,6 +68,10 @@ RDEPEND="${COMMON_DEPEND} DOCS=( README.md doc/AUTHORS ) +PATCHES=( + "${FILESDIR}/${P}-add-missing-qpainterpath.patch" +) + src_configure() { local mycmakeargs+=( -DUSE_WERROR=FALSE |