Accepting request 811554 from games

Fix build with Qt 5.15 and without ggz

OBS-URL: https://build.opensuse.org/request/show/811554
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freeciv?expand=0&rev=9

freeciv-qt-5.15.patch

@@ -0,0 +1,42 @@
+From a797ed79bd85d25cd4a75d3e7c51d9363582d3d6 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Tue, 7 Apr 2020 13:22:14 +0300
+Subject: [PATCH 2/2] 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>
+-- 
+2.25.1
+

freeciv.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jun  4 15:47:41 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add freeciv-qt-5.15.patch: Fix build with Qt 5.15.
+
+-------------------------------------------------------------------
+Thu Jun  4 13:45:39 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Drop libggz2-devel BuildRequires: ggz has not been supported
+  since freeciv 2.6.0.
+
 -------------------------------------------------------------------
 Fri Mar 27 14:56:42 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
 

freeciv.spec

@@ -31,6 +31,7 @@ Source4:        freeciv-manual
 Source5:        freeciv-manual.desktop
 Source6:        freeciv-manual.png
 Patch0:         freeciv-appdata-desktop-references.patch
+Patch1:         freeciv-qt-5.15.patch
 BuildRequires:  audiofile-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -39,7 +40,6 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gtk3-devel
 BuildRequires:  libbz2-devel
-BuildRequires:  libggz2-devel
 BuildRequires:  libqt5-qtbase-common-devel
 BuildRequires:  libqt5-qtbase-devel
 BuildRequires:  libtool
@@ -91,6 +91,7 @@ Freeciv executable using Gtk3 library
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 export MOCCMD="moc-qt5"