Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Eric Sandall (94b8e92b3a1b85a08d719aa5c884bf78673d21f1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Eric Sandall (94b8e92b3a1b85a08d719aa5c884bf78673d21f1)
  • Date: Mon, 26 Apr 2010 22:36:13 -0500

GIT changes to master games grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

games-libs/libwfut/HISTORY | 5 +++++
games-libs/libwfut/PRE_BUILD | 3 ++-
games-libs/libwfut/gcc44.patch | 33 +++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit 94b8e92b3a1b85a08d719aa5c884bf78673d21f1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libwfut: Fix compilation with GCC 4.4
Patch from upstream git 2d433839174f9b128485298e8c5753c532e89ef

diff --git a/games-libs/libwfut/HISTORY b/games-libs/libwfut/HISTORY
index 5c1e5b2..7582c95 100644
--- a/games-libs/libwfut/HISTORY
+++ b/games-libs/libwfut/HISTORY
@@ -1,3 +1,8 @@
+2010-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc44.patch
+ * gcc44.patch: Fix compilation with GCC 4.4
+ Patch from upstream git 2d433839174f9b128485298e8c5753c532e89ef
+
2009-04-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.2.1
* PRE_BUILD: No longer apply gcc43.patch
diff --git a/games-libs/libwfut/PRE_BUILD b/games-libs/libwfut/PRE_BUILD
index 749187d..054332c 100755
--- a/games-libs/libwfut/PRE_BUILD
+++ b/games-libs/libwfut/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/includefix.patch
+patch -p1 < $SCRIPT_DIRECTORY/includefix.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc44.patch
diff --git a/games-libs/libwfut/gcc44.patch b/games-libs/libwfut/gcc44.patch
new file mode 100644
index 0000000..85ce17d
--- /dev/null
+++ b/games-libs/libwfut/gcc44.patch
@@ -0,0 +1,33 @@
+From: alex <alex AT alex.tortilla.ru>
+Date: Fri, 27 Feb 2009 21:56:12 +0000 (+0300)
+Subject: Fixing build on recent compilers.
+X-Git-Url:
http://git.worldforge.org/?p=libwfut.git;a=commitdiff_plain;h=a2d433839174f9b128485298e8c5753c532e89ef
+
+Fixing build on recent compilers.
+---
+
+diff --git a/libwfut/Encoder.cpp b/libwfut/Encoder.cpp
+index 179a90f..4b8081c 100644
+--- a/libwfut/Encoder.cpp
++++ b/libwfut/Encoder.cpp
+@@ -2,6 +2,8 @@
+ // the GNU Lesser General Public License (See COPYING for details).
+ // Copyright (C) 2007 Simon Goodall
+
++#include <cstdio>
++
+ #include "libwfut/Encoder.h"
+
+ namespace WFUT {
+diff --git a/tools/wfut.cpp b/tools/wfut.cpp
+index 7078119..ced901f 100644
+--- a/tools/wfut.cpp
++++ b/tools/wfut.cpp
+@@ -13,6 +13,7 @@
+ #include <sys/types.h>
+
+ #include <algorithm>
++#include <cstdio>
+
+ #include <sigc++/bind.h>
+



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (94b8e92b3a1b85a08d719aa5c884bf78673d21f1), Eric Sandall, 04/26/2010

Archive powered by MHonArc 2.6.24.

Top of Page