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 824FD13835A for ; Thu, 21 May 2020 00:38:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0B4DE09D8; Thu, 21 May 2020 00:38:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 83A82E09D8 for ; Thu, 21 May 2020 00:38:45 +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 5FD0C34F3B1 for ; Thu, 21 May 2020 00:38:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8F2C250 for ; Thu, 21 May 2020 00:38:42 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1590021511.b951f8c8f6b31320104e5bdca3bedeafe24b47ea.asturm@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/files/fotowall-1.0-qt-5.15.patch media-gfx/fotowall/fotowall-1.0.ebuild X-VCS-Directories: media-gfx/fotowall/files/ media-gfx/fotowall/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b951f8c8f6b31320104e5bdca3bedeafe24b47ea X-VCS-Branch: master Date: Thu, 21 May 2020 00:38:42 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4fe8aae0-2b41-4126-834c-9273c1915530 X-Archives-Hash: 5db9c55a38678fbaf82486fe044fee2e commit: b951f8c8f6b31320104e5bdca3bedeafe24b47ea Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 21 00:37:52 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 21 00:38:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b951f8c8 media-gfx/fotowall: Fix build w/ Qt 5.15 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../fotowall/files/fotowall-1.0-qt-5.11.patch | 2 +- .../fotowall/files/fotowall-1.0-qt-5.15.patch | 24 ++++++++++++++++++++++ media-gfx/fotowall/fotowall-1.0.ebuild | 5 ++++- 3 files changed, 29 insertions(+), 2 deletions(-) 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 index db619771b47..b3ce481cbf4 100644 --- a/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch +++ b/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch @@ -2,7 +2,7 @@ Fix build with Qt 5.11. Bug: https://bugs.gentoo.org/661596 ---- a/App/tmp/CanvasAppliance.h +--- a/App/CanvasAppliance.h +++ b/App/CanvasAppliance.h @@ -17,6 +17,9 @@ diff --git a/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch b/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch new file mode 100644 index 00000000000..12f0e988ee2 --- /dev/null +++ b/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch @@ -0,0 +1,24 @@ +From 72f7a502cb2397b0ef459e6e8f429db1d3482be6 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 21 May 2020 02:33:38 +0200 +Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) + +--- + 3rdparty/posterazor/paintcanvas.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/3rdparty/posterazor/paintcanvas.cpp b/3rdparty/posterazor/paintcanvas.cpp +index df33b8a..fd0f319 100644 +--- a/3rdparty/posterazor/paintcanvas.cpp ++++ b/3rdparty/posterazor/paintcanvas.cpp +@@ -23,6 +23,7 @@ + #include "paintcanvas.h" + #include + #include ++#include + + PaintCanvas::PaintCanvas(QWidget *parent) + : QWidget(parent) +-- +2.26.2 + diff --git a/media-gfx/fotowall/fotowall-1.0.ebuild b/media-gfx/fotowall/fotowall-1.0.ebuild index 2b3595f6ceb..2433ced68ec 100644 --- a/media-gfx/fotowall/fotowall-1.0.ebuild +++ b/media-gfx/fotowall/fotowall-1.0.ebuild @@ -28,7 +28,10 @@ DEPEND="${RDEPEND} webcam? ( media-libs/libv4l ) " -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) +PATCHES=( + "${FILESDIR}/${P}-qt-5.11.patch" + "${FILESDIR}/${P}-qt-5.15.patch" +) src_prepare() { default