gentoo resync : 29.06.2020

3 files changed, 46 insertions, 2 deletions

diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest
index 885111e8e885..c6c7ed559aaf 100644
--- a/x11-misc/fraqtive/Manifest
+++ b/x11-misc/fraqtive/Manifest
@@ -1,4 +1,5 @@
+AUX fraqtive-0.4.8-qt-5.15.patch 953 BLAKE2B c67c9df040d24bab183ddd92db3457c9a4df9b2c8b6825236db57e88230d0d2c2c81534619be4e6aaea06fa6fa4f3f4666e556906f9dace673bb15146783909b SHA512 b52a1313ae02b9ecda9e508de0db4024e9d6605a255a543e5d4cdf5e927199312ebe4b68ccb107f26403635537c87b871dbdac43fc37ce1b3f817734cf10f519
 AUX fraqtive-0.4.8-qt-includes.patch 438 BLAKE2B 537ab2c470dd14f977cb53278cabf5a4e05e7973b69142f17d4bec1732c588ef181697e1be2c703d273ec1a6d26a53f1374482edb5d422924042c65917d7620f SHA512 0e5ea8dce236a5cdb8086ab0671360aeb15a4d0ac9703969be28373315288d59ccd31b013f932c77bfb5a64faf917f311c30c7cd25c006f08be5a5f40f5735c4
 DIST fraqtive-0.4.8.tar.bz2 260484 BLAKE2B 0bbbd983af324c38fb73db043e808de6cbf8e3e39073163b748215a2a3a374e53e4118b7fb0993685d3eef4ef6b65afcc51c5a7d23f4ab91ffc2dfd41305171d SHA512 8b4be81dd14fe086dbcffda123395ccb30a197e7762e590bc3ab7dc1d0aafb44dc45e1445e2f83198a0c1f4b9ea0d54a7de1989c3b85c0f2e5f474a67255d942
-EBUILD fraqtive-0.4.8-r2.ebuild 1032 BLAKE2B ea808fb80683dfb4ceaa9258918ab3ec84655867c0080fa313b4ee5ad3d61b692037d397f3f36ebd9c43820361e9747f15f5e4623537d3652211ca6ad0a949c3 SHA512 1fe9fa27683261e0630a32609a61f042bef07d22d621733312da13f953f044947cf9c254a8c1cc88dec6cd66f5e6508d417e661575f6b0532b6c82338b56bc31
+EBUILD fraqtive-0.4.8-r2.ebuild 1068 BLAKE2B 6822db66df0b5d35719e2d4c3329d5bc99bf89c4cb9bdeb61eb26ba6af0216229b1eb77a6f61067c8607b79019a03005334d0f83dafa81a550d751e23ceab23f SHA512 1983911ff7cf2b07166d654fefaf018b9b7afcb7e2ff5aaf7c053ac58bb0615ee2f71f3b8c7e3b3837f093f7023f6f606a001f0e5e12ec1abb3fab60a2b6ca18
 MISC metadata.xml 364 BLAKE2B c40b388c714f4e116db4a5dc2292bf9da6bf0906dd3da66add62a5339e157e7ba728e135e58e818fc80d7cb3ed5c4fa72b4675efc15c30eeac9a8badda8a79d9 SHA512 b3343bcc5cf584c4bbacb0d54e353bca91c3112d9d906dc920ead427fc964e7a71bc632e810f6047a293d00325dfafe532067b6d0d5fb9abcb797ae83c587604
diff --git a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch
new file mode 100644
index 000000000000..63c281757096
--- /dev/null
+++ b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch
@@ -0,0 +1,39 @@
+From 34963f986f64d98b6ef82757ca07159a6a059763 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 21 Jun 2020 13:21:15 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/datafunctions.cpp | 2 ++
+ src/shadewidget.cpp   | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/datafunctions.cpp b/src/datafunctions.cpp
+index 3ec1af9..9369299 100644
+--- a/src/datafunctions.cpp
++++ b/src/datafunctions.cpp
+@@ -19,6 +19,8 @@
+ #include "datafunctions.h"
+ #include "fractaldata.h"
+ 
++#include <QPainterPath>
++
+ namespace DataFunctions
+ {
+ 
+diff --git a/src/shadewidget.cpp b/src/shadewidget.cpp
+index 1494b37..3da5c05 100644
+--- a/src/shadewidget.cpp
++++ b/src/shadewidget.cpp
+@@ -19,6 +19,7 @@
+ #include "shadewidget.h"

+ 

+ #include <QPainter>

++#include <QPainterPath>

+ #include <QPaintEvent>

+ #include <QToolTip>

+ 

+-- 
+2.27.0
+
diff --git a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
index 7c98c2069002..0b5059a75c4d 100644
--- a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
+++ b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="Open source, multi-platform generator of the Mandelbrot family fractals"
@@ -25,7 +26,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-qt-includes.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt-includes.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch"
+)
 
 src_configure() {
 	tc-export PKG_CONFIG