rpm/freeciv
SHA256
1
0
Fork 0
forked from pool/freeciv
Code Pull Requests Activity

Accepting request 858077 from home:dirkmueller:branches:games

Browse Source 
- update to 2.6.2.1:
  * Fixed server crash when unit with zero move_rate is transformed
  * Fixed crashes when using Direction objects in lua scripts 
  * Fixed crash when chatline text had opening tag without closing tag
  * Fixes to the Qt client
  * Updated translations
  * Fixed Qt-client build against Qt-5.15 (removes freeciv-qt-5.15.patch )
  * Documentation updates

OBS-URL: https://build.opensuse.org/request/show/858077
OBS-URL: https://build.opensuse.org/package/show/games/freeciv?expand=0&rev=59
This commit is contained in:
Dominique Leuenberger 2020-12-22 10:41:13 +00:00 committed by Git OBS Bridge
parent 5baee8f2c4
commit 9ef87cba34
5 changed files with 19 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freeciv-2.6.2.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bd04ac03c1505582309dd62bcc4710002a3cfb4b2b38c28af33047dd2fb7585e
size 52216084

3
freeciv-2.6.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6181ef3d3c76264383aabbe0eaf1550d8a65ca42639e6c17cc2938165e176c8f
size 52139007

42
freeciv-qt-5.15.patch
View File

@ -1,42 +0,0 @@
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

12
freeciv.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Dec 22 09:03:17 UTC 2020 - Dirk Müller <dmueller@suse.com>
- update to 2.6.2.1:
* Fixed server crash when unit with zero move_rate is transformed
* Fixed crashes when using Direction objects in lua scripts
* Fixed crash when chatline text had opening tag without closing tag
* Fixes to the Qt client
* Updated translations
* Fixed Qt-client build against Qt-5.15 (removes freeciv-qt-5.15.patch )
* Documentation updates
-------------------------------------------------------------------
Thu Jun 4 15:47:41 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

8
freeciv.spec
View File

@ -17,7 +17,7 @@
Name: freeciv
Version: 2.6.2
Version: 2.6.2.1
Release: 0
Summary: Free Civilization Clone
License: GPL-2.0-or-later
@ -31,7 +31,6 @@ 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
@ -47,6 +46,7 @@ BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: update-desktop-files
BuildRequires: xz-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(SDL2_mixer)
BuildRequires: pkgconfig(sdl2)
Requires: freeciv_client-%{version}
@ -72,6 +72,7 @@ Provides: freeciv_client-%{version}
Freeciv executable using Qt library
%package lang
# FIXME: consider using %%lang_package macro
Summary: Translation files for freeciv
Group: Amusements/Games/Strategy/Turn Based
Requires: freeciv = %{version}
@ -91,7 +92,6 @@ Freeciv executable using Gtk3 library
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
export MOCCMD="moc-qt5"
@ -101,7 +101,7 @@ autoreconf -fi
--with-readline \
--disable-static \
--docdir=%{_docdir}/freeciv
make %{?_smp_mflags}
%make_build
%install
%make_install