[gentoo-commits] repo/gentoo:master commit in: media-gfx/fotowall/files/, media-gfx/fotowall/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/fotowall/files/, media-gfx/fotowall/

[Michael Palimaka]

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
 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/fotowall/files/, media-gfx/fotowall/

[Andreas Sturmlechner]

commit:     b951f8c8f6b31320104e5bdca3bedeafe24b47ea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 21 00:37:52 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 <asturm@gentoo.org>
+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 <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ 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