From: Michael Palimaka Date: Sat, 6 Oct 2018 15:01:07 +0000 (+1000) Subject: media-gfx/fotowall: fix build with Qt 5.11 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b717027600427b050577929ee69e323c14db072;p=gentoo.git media-gfx/fotowall: fix build with Qt 5.11 Closes: https://bugs.gentoo.org/661596 Signed-off-by: Michael Palimaka Package-Manager: Portage-2.3.49, Repoman-2.3.11 --- 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 000000000000..db619771b476 --- /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 ++ + class QMenu; + class AbstractContent; + class Canvas; + +--- a/3rdparty/likebackfrontend/LikeBackDialog.cpp ++++ b/3rdparty/likebackfrontend/LikeBackDialog.cpp +@@ -37,6 +37,7 @@ + #include "LikeBackDialog.h" + + #include ++#include + #include + #include + #include + diff --git a/media-gfx/fotowall/fotowall-1.0.ebuild b/media-gfx/fotowall/fotowall-1.0.ebuild index c4b9af4bfab4..660c5442ca6f 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