From 9bb44972189157fda1ae5851946d5fc10318d820 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 27 Nov 2020 16:10:06 +0200
Subject: [PATCH] freeciv: Update to 2.6.2.1

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../freeciv/freeciv/QPainterPathInc.patch     | 36 -------------------
 recipes-games/freeciv/freeciv_2.6.2.1.bb      |  7 +---
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 recipes-games/freeciv/freeciv/QPainterPathInc.patch

diff --git a/recipes-games/freeciv/freeciv/QPainterPathInc.patch b/recipes-games/freeciv/freeciv/QPainterPathInc.patch
deleted file mode 100644
index c459b95..0000000
--- a/recipes-games/freeciv/freeciv/QPainterPathInc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix build with latest Qt
-
-Upstream-Status: Submitted
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-
-diff --git a/client/gui-qt/canvas.cpp b/client/gui-qt/canvas.cpp
-index 4c3ac0c03f..9e230f4c16 100644
---- a/client/gui-qt/canvas.cpp
-+++ b/client/gui-qt/canvas.cpp
-@@ -1,4 +1,4 @@
--/**********************************************************************
-+/***********************************************************************
-  Freeciv - Copyright (C) 1996-2005 - Freeciv Development Team
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -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 b736908bb0..32501f2bbb 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/recipes-games/freeciv/freeciv_2.6.2.1.bb b/recipes-games/freeciv/freeciv_2.6.2.1.bb
index 5f1bd12..0abae34 100644
--- a/recipes-games/freeciv/freeciv_2.6.2.1.bb
+++ b/recipes-games/freeciv/freeciv_2.6.2.1.bb
@@ -3,12 +3,7 @@ require freeciv.inc
 
 SRC_URI += "\
 ${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
-file://QPainterPathInc.patch \
 file://0013-Add-enable-patient-connect-configure-option.patch \
 "
 
-SRC_URI[md5sum] = "2c8b388ff8b814487477793d72462cbb"
-SRC_URI[sha256sum] = "6181ef3d3c76264383aabbe0eaf1550d8a65ca42639e6c17cc2938165e176c8f"
-SRC_URI[sha1sum] = "d459c711a164fbaf215e0083aaf5784253a1492f"
-SRC_URI[sha384sum] = "723cb04256875f9d1e40b34c674529ee00128f7192ddab1a569e6344138c080375b99f9a959fe9ebae890ef210fc1b96"
-SRC_URI[sha512sum] = "b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3"
+SRC_URI[sha256sum] = "bd04ac03c1505582309dd62bcc4710002a3cfb4b2b38c28af33047dd2fb7585e"