From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 21 Jun 2020 17:50:24 +0100
Subject: gentoo resync : 21.06.2020

---
 games-strategy/freeciv/Manifest                    |  3 +-
 .../freeciv/files/freeciv-2.6.2-qt515.patch        | 39 ++++++++++++++++++++++
 games-strategy/freeciv/freeciv-2.6.2.ebuild        |  4 +++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch

(limited to 'games-strategy/freeciv')

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 6a6adcf9a154..552bfe694959 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,5 +1,6 @@
+AUX freeciv-2.6.2-qt515.patch 1069 BLAKE2B 36d66375826386961ef393385f987b146d812c2e9ee31db7545cc7eb79d48ad4ebabc26bcbc606db31c763b5583c359e0b26da1968ba1aa26ead03310d4699ba SHA512 6a35304cb1ef35ebce91cf80f46c1f602e782dba9da4c7a65bcc88ab0dcf1e4e9b59b0df7a90fc562b9448d0b073a25998cb4d4896b3c6853d052d162da95122
 DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665 SHA512 bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
 DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302 SHA512 b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3
 EBUILD freeciv-2.5.12.ebuild 4536 BLAKE2B 2673bcafd06b9c720d3aa62c57f281028ee5b796fa63535bf1ccfd90acaac744fd74c3cd14ce470f8b18f9920a09a7d33b54eb194a41e90af611d7ff3ba39712 SHA512 a6fdaa207990d2fd5521d627a54d24fd2fa62fbe42578e8176f35c598fb2a4149b8ab728f6ac516a63ce3b4923912a54096c87c65f5035a6b1e221e579a8e600
-EBUILD freeciv-2.6.2.ebuild 4743 BLAKE2B a2c22a679a1f38f4cb4014be58c91498e03d13d18caf3a3b00d8ff6cd6f82dbb735cd90c52ad8fa9e7931cef724e58b96b14230337d4f6199e3f59b4aa3dc121 SHA512 10f48189feb3bb70e78e1962f5106a3f63b157526f29a31c0980c9d0f07569179a05a2904dbdc08d085abe64edae1c08fb8b5742b2f427de41351b426be76fae
+EBUILD freeciv-2.6.2.ebuild 4796 BLAKE2B 17e1a8e02ec8605652c624a70c35f3aec2091cbb6d22021527797ec68f6d963178e39eada22e654ef27a943cb53b83abd90fc67bd0f01612dc52119c8a37f76a SHA512 466fe54dcee64f844b234b3cb22fd59d09037b855c285fb84e5c06c1c84ef14f787da4ec2020bd3e2fafb245b0884270a75a3e61d579b3d609a65d4bb5e54733
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch b/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch
new file mode 100644
index 000000000000..db5e657a5850
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch
@@ -0,0 +1,39 @@
+From 87f4abf81d530b825d0af772d95fd1ea78503e64 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Tue, 7 Apr 2020 13:22:14 +0300
+Subject: [PATCH] Include <QPainterPath> where needed
+
+This fixes Qt-client build on OpenEmbedded
+
+See hrm Bug #868060
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+---
+ client/gui-qt/canvas.cpp  | 1 +
+ client/gui-qt/dialogs.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/client/gui-qt/canvas.cpp b/client/gui-qt/canvas.cpp
+index 24291bc183..00fa1b8f52 100644
+--- a/client/gui-qt/canvas.cpp
++++ b/client/gui-qt/canvas.cpp
+@@ -18,6 +18,7 @@
+ // Qt
+ #include <QFontMetrics>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ // qt-client
+ #include "canvas.h"
+diff --git a/client/gui-qt/dialogs.cpp b/client/gui-qt/dialogs.cpp
+index e0f9de31d4..4b3254c496 100644
+--- a/client/gui-qt/dialogs.cpp
++++ b/client/gui-qt/dialogs.cpp
+@@ -24,6 +24,7 @@
+ #include <QMessageBox>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRadioButton>
+ #include <QRect>
+ #include <QSignalMapper>
diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild b/games-strategy/freeciv/freeciv-2.6.2.ebuild
index e81667668342..2b5d791692c3 100644
--- a/games-strategy/freeciv/freeciv-2.6.2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.2.ebuild
@@ -70,6 +70,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-qt515.patch" #728254
+)
+
 pkg_setup() {
 	if use !dedicated && use !server ; then
 		ewarn "Disabling server USE flag will make it impossible"
-- 
cgit v1.2.3