media-gfx/fotowall: Fix build w/ Qt 5.15
authorAndreas Sturmlechner <asturm@gentoo.org>
Thu, 21 May 2020 00:37:52 +0000 (02:37 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Thu, 21 May 2020 00:38:31 +0000 (02:38 +0200)
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch
media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch [new file with mode: 0644]
media-gfx/fotowall/fotowall-1.0.ebuild

index db619771b47611159b00511e7f2d1684178b71c5..b3ce481cbf4997973dc296d137a620e485357ebb 100644 (file)
@@ -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 (file)
index 0000000..12f0e98
--- /dev/null
@@ -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
+
index 2b3595f6cebd183fa91e3f24335e86d9a019e27d..2433ced68ec471ec0e6946d232651c10f5e6b738 100644 (file)
@@ -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