1 |
commit: b951f8c8f6b31320104e5bdca3bedeafe24b47ea |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 21 00:37:52 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 21 00:38:31 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b951f8c8 |
7 |
|
8 |
media-gfx/fotowall: Fix build w/ Qt 5.15 |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../fotowall/files/fotowall-1.0-qt-5.11.patch | 2 +- |
14 |
.../fotowall/files/fotowall-1.0-qt-5.15.patch | 24 ++++++++++++++++++++++ |
15 |
media-gfx/fotowall/fotowall-1.0.ebuild | 5 ++++- |
16 |
3 files changed, 29 insertions(+), 2 deletions(-) |
17 |
|
18 |
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 |
19 |
index db619771b47..b3ce481cbf4 100644 |
20 |
--- a/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch |
21 |
+++ b/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch |
22 |
@@ -2,7 +2,7 @@ Fix build with Qt 5.11. |
23 |
|
24 |
Bug: https://bugs.gentoo.org/661596 |
25 |
|
26 |
---- a/App/tmp/CanvasAppliance.h |
27 |
+--- a/App/CanvasAppliance.h |
28 |
+++ b/App/CanvasAppliance.h |
29 |
@@ -17,6 +17,9 @@ |
30 |
|
31 |
|
32 |
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 |
33 |
new file mode 100644 |
34 |
index 00000000000..12f0e988ee2 |
35 |
--- /dev/null |
36 |
+++ b/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch |
37 |
@@ -0,0 +1,24 @@ |
38 |
+From 72f7a502cb2397b0ef459e6e8f429db1d3482be6 Mon Sep 17 00:00:00 2001 |
39 |
+From: Andreas Sturmlechner <asturm@g.o> |
40 |
+Date: Thu, 21 May 2020 02:33:38 +0200 |
41 |
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) |
42 |
+ |
43 |
+--- |
44 |
+ 3rdparty/posterazor/paintcanvas.cpp | 1 + |
45 |
+ 1 file changed, 1 insertion(+) |
46 |
+ |
47 |
+diff --git a/3rdparty/posterazor/paintcanvas.cpp b/3rdparty/posterazor/paintcanvas.cpp |
48 |
+index df33b8a..fd0f319 100644 |
49 |
+--- a/3rdparty/posterazor/paintcanvas.cpp |
50 |
++++ b/3rdparty/posterazor/paintcanvas.cpp |
51 |
+@@ -23,6 +23,7 @@ |
52 |
+ #include "paintcanvas.h" |
53 |
+ #include <QImage> |
54 |
+ #include <QPainter> |
55 |
++#include <QPainterPath> |
56 |
+ |
57 |
+ PaintCanvas::PaintCanvas(QWidget *parent) |
58 |
+ : QWidget(parent) |
59 |
+-- |
60 |
+2.26.2 |
61 |
+ |
62 |
|
63 |
diff --git a/media-gfx/fotowall/fotowall-1.0.ebuild b/media-gfx/fotowall/fotowall-1.0.ebuild |
64 |
index 2b3595f6ceb..2433ced68ec 100644 |
65 |
--- a/media-gfx/fotowall/fotowall-1.0.ebuild |
66 |
+++ b/media-gfx/fotowall/fotowall-1.0.ebuild |
67 |
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND} |
68 |
webcam? ( media-libs/libv4l ) |
69 |
" |
70 |
|
71 |
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) |
72 |
+PATCHES=( |
73 |
+ "${FILESDIR}/${P}-qt-5.11.patch" |
74 |
+ "${FILESDIR}/${P}-qt-5.15.patch" |
75 |
+) |
76 |
|
77 |
src_prepare() { |
78 |
default |