From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4D7A8138334 for ; Sat, 6 Oct 2018 15:02:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A805E0995; Sat, 6 Oct 2018 15:02:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5F8CE0995 for ; Sat, 6 Oct 2018 15:02:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0546335CDD for ; Sat, 6 Oct 2018 15:02:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3B133FB for ; Sat, 6 Oct 2018 15:02:13 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1538838120.7b717027600427b050577929ee69e323c14db072.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/fotowall/files/, media-gfx/fotowall/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch media-gfx/fotowall/fotowall-1.0.ebuild X-VCS-Directories: media-gfx/fotowall/ media-gfx/fotowall/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 7b717027600427b050577929ee69e323c14db072 X-VCS-Branch: master Date: Sat, 6 Oct 2018 15:02:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8f51d689-f66d-4038-8396-30cb61f8ff3b X-Archives-Hash: 28df843e50d75dd49b92ba74665ec49c commit: 7b717027600427b050577929ee69e323c14db072 Author: Michael Palimaka gentoo org> AuthorDate: Sat Oct 6 15:01:07 2018 +0000 Commit: Michael Palimaka gentoo 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 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 ++ + 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 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