Hello community,
here is the log from the commit of package openxcom for openSUSE:Factory
checked in at 2018-02-15 13:26:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openxcom (Old)
and /work/SRC/openSUSE:Factory/.openxcom.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openxcom"
Thu Feb 15 13:26:26 2018 rev:5 rq:576500 version:1.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openxcom/openxcom.changes 2016-06-19
10:50:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openxcom.new/openxcom.changes 2018-02-15
13:26:50.285073444 +0100
@@ -1,0 +2,7 @@
+Wed Feb 14 12:10:36 UTC 2018 - tchva...@suse.com
+
+- Add patch fixing build with gcc7 by explicitly stating math
+ includes:
+ * openxcom-math.patch
+
+-------------------------------------------------------------------
New:
----
openxcom-math.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openxcom.spec ++++++
--- /var/tmp/diff_new_pack.MqQkeR/_old 2018-02-15 13:26:55.500883992 +0100
+++ /var/tmp/diff_new_pack.MqQkeR/_new 2018-02-15 13:26:55.504883847 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openxcom
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,8 @@
Source: %{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM: gcc6 compat, taken from git
Patch0: openxcom-abs.patch
+# PATCH-FIX-UPSTREAM include math.h when needed also in git
+Patch1: openxcom-math.patch
BuildRequires: Mesa-devel
BuildRequires: SDL-devel
BuildRequires: SDL_gfx-devel >= 2.0.22
@@ -62,8 +64,7 @@
Documentation files for %{name} game.
%prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
chmod -x LICENSE.txt
sed -i \
++++++ openxcom-math.patch ++++++
Index: openxcom-1.0.0/src/Basescape/BaseInfoState.cpp
===================================================================
--- openxcom-1.0.0.orig/src/Basescape/BaseInfoState.cpp
+++ openxcom-1.0.0/src/Basescape/BaseInfoState.cpp
@@ -18,6 +18,7 @@
*/
#include "BaseInfoState.h"
#include <sstream>
+#include <math.h>
#include "../Engine/Game.h"
#include "../Engine/Action.h"
#include "../Resource/ResourcePack.h"
Index: openxcom-1.0.0/src/Basescape/CraftInfoState.cpp
===================================================================
--- openxcom-1.0.0.orig/src/Basescape/CraftInfoState.cpp
+++ openxcom-1.0.0/src/Basescape/CraftInfoState.cpp
@@ -18,6 +18,7 @@
*/
#include "CraftInfoState.h"
#include <sstream>
+#include <math.h>
#include "../Engine/Game.h"
#include "../Resource/ResourcePack.h"
#include "../Engine/Language.h"
Index: openxcom-1.0.0/src/Engine/OptionInfo.cpp
===================================================================
--- openxcom-1.0.0.orig/src/Engine/OptionInfo.cpp
+++ openxcom-1.0.0/src/Engine/OptionInfo.cpp
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with OpenXcom. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <algorithm>
#include "OptionInfo.h"
#include "Exception.h"
Index: openxcom-1.0.0/src/Engine/Language.cpp
===================================================================
--- openxcom-1.0.0.orig/src/Engine/Language.cpp
+++ openxcom-1.0.0/src/Engine/Language.cpp
@@ -19,6 +19,7 @@
#include "Language.h"
#include <assert.h>
#include <locale>
+#include <algorithm>
#include <fstream>
#include <cassert>
#include "CrossPlatform.h"
Index: openxcom-1.0.0/src/Menu/ListLoadState.cpp
===================================================================
--- openxcom-1.0.0.orig/src/Menu/ListLoadState.cpp
+++ openxcom-1.0.0/src/Menu/ListLoadState.cpp
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with OpenXcom. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <algorithm>
#include "ListLoadState.h"
#include "../Engine/Game.h"
#include "../Engine/Language.h"
Index: openxcom-1.0.0/src/Menu/ListGamesState.cpp
===================================================================
--- openxcom-1.0.0.orig/src/Menu/ListGamesState.cpp
+++ openxcom-1.0.0/src/Menu/ListGamesState.cpp
@@ -18,6 +18,7 @@
*/
#include "ListGamesState.h"
#include <utility>
+#include <algorithm>
#include "../Engine/Logger.h"
#include "../Savegame/SavedGame.h"
#include "../Engine/Game.h"
Index: openxcom-1.0.0/src/Savegame/CraftWeapon.cpp
===================================================================
--- openxcom-1.0.0.orig/src/Savegame/CraftWeapon.cpp
+++ openxcom-1.0.0/src/Savegame/CraftWeapon.cpp
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with OpenXcom. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <cmath>
#include "CraftWeapon.h"
#include "../Ruleset/RuleCraftWeapon.h"
#include "../Ruleset/Ruleset.h"
Index: openxcom-1.0.0/src/Savegame/Craft.cpp
===================================================================
--- openxcom-1.0.0.orig/src/Savegame/Craft.cpp
+++ openxcom-1.0.0/src/Savegame/Craft.cpp
@@ -19,6 +19,7 @@
#define _USE_MATH_DEFINES
#include "Craft.h"
#include <cmath>
+#include <algorithm>
#include <sstream>
#include "../Engine/Language.h"
#include "../Ruleset/RuleCraft.h"
