commit: 7b717027600427b050577929ee69e323c14db072 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sat Oct 6 15:01:07 2018 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat Oct 6 15:02:00 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b717027
media-gfx/fotowall: fix build with Qt 5.11 Closes: https://bugs.gentoo.org/661596 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 .../fotowall/files/fotowall-1.0-qt-5.11.patch | 28 ++++++++++++++++++++++ media-gfx/fotowall/fotowall-1.0.ebuild | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch b/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch new file mode 100644 index 00000000000..db619771b47 --- /dev/null +++ b/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch @@ -0,0 +1,28 @@ +Fix build with Qt 5.11. + +Bug: https://bugs.gentoo.org/661596 + +--- a/App/tmp/CanvasAppliance.h ++++ b/App/CanvasAppliance.h +@@ -17,6 +17,9 @@ + + #include "Shared/PlugGui/AbstractAppliance.h" + #include "ui_CanvasAppliance.h" ++ ++#include <QActionGroup> ++ + class QMenu; + class AbstractContent; + class Canvas; + +--- a/3rdparty/likebackfrontend/LikeBackDialog.cpp ++++ b/3rdparty/likebackfrontend/LikeBackDialog.cpp +@@ -37,6 +37,7 @@ + #include "LikeBackDialog.h" + + #include <QApplication> ++#include <QButtonGroup> + #include <QLocale> + #include <QMessageBox> + #include <QNetworkAccessManager> + diff --git a/media-gfx/fotowall/fotowall-1.0.ebuild b/media-gfx/fotowall/fotowall-1.0.ebuild index c4b9af4bfab..660c5442ca6 100644 --- a/media-gfx/fotowall/fotowall-1.0.ebuild +++ b/media-gfx/fotowall/fotowall-1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -31,6 +31,8 @@ DEPEND="${RDEPEND} src_prepare() { default + eapply "${FILESDIR}/${P}-qt-5.11.patch" + sed -i -e "s|linux/videodev.h|libv4l1-videodev.h|" \ 3rdparty/videocapture/VideoDevice.h || die
