Attachment 206260 Details for Bug 239633 – patch

[patch] patch

openxcom.patch (text/plain), 4.99 KB, created by Piotr Kubaj on 2019-08-03 22:37:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2019-08-03 22:37:20 UTC

Size: 4.99 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 507525)
>+++ Makefile	(working copy)
>@@ -15,13 +15,11 @@
> 
> LIB_DEPENDS=	libyaml-cpp.so:devel/yaml-cpp
> 
>-BROKEN_powerpc64=	fails to compile: XcomResourcePack.cpp: undefined reference to YAML::LoadFile
>-
> USE_GITHUB=	yes
> GH_ACCOUNT=	SupSuper
> GH_PROJECT=	OpenXcom
> 
>-USES=		compiler:c++11-lang gmake pkgconfig
>+USES=		compiler:c++11-lang gl gmake pkgconfig sdl
> USE_CXXSTD=	c++11
> USE_SDL=	sdl mixer image gfx
> USE_GL=		gl
>Index: files/patch-src_Engine_Language.cpp
>===================================================================
>--- files/patch-src_Engine_Language.cpp	(nonexistent)
>+++ files/patch-src_Engine_Language.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/Engine/Language.cpp.orig	2019-08-03 22:25:23 UTC
>++++ src/Engine/Language.cpp
>+@@ -17,6 +17,7 @@
>+  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
>+  */
>+ #include "Language.h"
>++#include <algorithm>
>+ #include <assert.h>
>+ #include <locale>
>+ #include <fstream>
>
>Property changes on: files/patch-src_Engine_Language.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_Engine_OptionInfo.cpp
>===================================================================
>--- files/patch-src_Engine_OptionInfo.cpp	(nonexistent)
>+++ files/patch-src_Engine_OptionInfo.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/Engine/OptionInfo.cpp.orig	2019-08-03 22:24:06 UTC
>++++ 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"
>+ 
>
>Property changes on: files/patch-src_Engine_OptionInfo.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_Menu_ListGamesState.cpp
>===================================================================
>--- files/patch-src_Menu_ListGamesState.cpp	(nonexistent)
>+++ files/patch-src_Menu_ListGamesState.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/Menu/ListGamesState.cpp.orig	2019-08-03 22:29:28 UTC
>++++ src/Menu/ListGamesState.cpp
>+@@ -17,6 +17,7 @@
>+  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
>+  */
>+ #include "ListGamesState.h"
>++#include <algorithm>
>+ #include <utility>
>+ #include "../Engine/Logger.h"
>+ #include "../Savegame/SavedGame.h"
>
>Property changes on: files/patch-src_Menu_ListGamesState.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_Menu_ListLoadState.cpp
>===================================================================
>--- files/patch-src_Menu_ListLoadState.cpp	(nonexistent)
>+++ files/patch-src_Menu_ListLoadState.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/Menu/ListLoadState.cpp.orig	2019-08-03 22:27:50 UTC
>++++ 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"
>
>Property changes on: files/patch-src_Menu_ListLoadState.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_Savegame_Craft.cpp
>===================================================================
>--- files/patch-src_Savegame_Craft.cpp	(nonexistent)
>+++ files/patch-src_Savegame_Craft.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/Savegame/Craft.cpp.orig	2019-08-03 22:32:11 UTC
>++++ src/Savegame/Craft.cpp
>+@@ -18,6 +18,7 @@
>+  */
>+ #define _USE_MATH_DEFINES
>+ #include "Craft.h"
>++#include <algorithm>
>+ #include <cmath>
>+ #include <sstream>
>+ #include "../Engine/Language.h"
>
>Property changes on: files/patch-src_Savegame_Craft.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

pkubaj: maintainer-approval? (amdmi3)

Actions: View | Diff

Attachments on bug 239633: 206260