From c69b8ef1269514b3ca94e0b4b2a5c7b09868b8b62d032dd5faa50fad1cc0b086 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 4 Jun 2020 13:57:55 +0000 Subject: [PATCH 1/2] Accepting request 811494 from home:dimstar:Factory - Drop libggz2-devel BuildRequires: ggz has not been supported since freeciv 2.6.0. OBS-URL: https://build.opensuse.org/request/show/811494 OBS-URL: https://build.opensuse.org/package/show/games/freeciv?expand=0&rev=56 --- freeciv.changes | 6 ++++++ freeciv.spec | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/freeciv.changes b/freeciv.changes index 3888554..fcaaaba 100644 --- a/freeciv.changes +++ b/freeciv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 4 13:45:39 UTC 2020 - Dominique Leuenberger + +- Drop libggz2-devel BuildRequires: ggz has not been supported + since freeciv 2.6.0. + ------------------------------------------------------------------- Fri Mar 27 14:56:42 UTC 2020 - Christophe Giboudeaux diff --git a/freeciv.spec b/freeciv.spec index b2b35d1..32bd2bc 100644 --- a/freeciv.spec +++ b/freeciv.spec @@ -39,7 +39,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 From 5baee8f2c4969f610f5e189ce5f8679316af484c335036adcdb7bf2818b156db Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 4 Jun 2020 15:50:45 +0000 Subject: [PATCH 2/2] - Add freeciv-qt-5.15.patch: Fix build with Qt 5.15. OBS-URL: https://build.opensuse.org/package/show/games/freeciv?expand=0&rev=57 --- freeciv-qt-5.15.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ freeciv.changes | 5 +++++ freeciv.spec | 2 ++ 3 files changed, 49 insertions(+) create mode 100644 freeciv-qt-5.15.patch diff --git a/freeciv-qt-5.15.patch b/freeciv-qt-5.15.patch new file mode 100644 index 0000000..d686001 --- /dev/null +++ b/freeciv-qt-5.15.patch @@ -0,0 +1,42 @@ +From a797ed79bd85d25cd4a75d3e7c51d9363582d3d6 Mon Sep 17 00:00:00 2001 +From: Marko Lindqvist +Date: Tue, 7 Apr 2020 13:22:14 +0300 +Subject: [PATCH 2/2] Include where needed + +This fixes Qt-client build on OpenEmbedded + +See hrm Bug #868060 + +Signed-off-by: Marko Lindqvist +--- + 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 + #include ++#include + + // 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 + #include + #include ++#include + #include + #include + #include +-- +2.25.1 + diff --git a/freeciv.changes b/freeciv.changes index fcaaaba..9165522 100644 --- a/freeciv.changes +++ b/freeciv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 4 15:47:41 UTC 2020 - Dominique Leuenberger + +- Add freeciv-qt-5.15.patch: Fix build with Qt 5.15. + ------------------------------------------------------------------- Thu Jun 4 13:45:39 UTC 2020 - Dominique Leuenberger diff --git a/freeciv.spec b/freeciv.spec index 32bd2bc..84e5dd8 100644 --- a/freeciv.spec +++ b/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 @@ -90,6 +91,7 @@ Freeciv executable using Gtk3 library %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export MOCCMD="moc-qt5"