try to build with freetype 2.4 and 2.5

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 58 insertions, 7 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 38db4fc43c62..a64644223678 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/scorched3d
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.90 2013/01/20 01:18:42 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.91 2014/06/13 21:52:24 mr_bones_ Exp $
+
+  13 Jun 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/scorched3d-43.3d-freetype.patch, files/scorched3d-43.3d-fixups.patch,
+  files/scorched3d-43.3d-gcc43.patch, files/scorched3d-43.3d-gcc47.patch,
+  files/scorched3d-43.3d-odbc.patch, files/scorched3d-43.3d-png15.patch,
+  files/scorched3d-43.3d-win32.patch, scorched3d-43.3d.ebuild:
+  try to build with freetype 2.4 and 2.5
 
   20 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
   -files/scorched3d-43.2a-fixups.patch, -files/scorched3d-43.2a-gcc43.patch,
diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-freetype.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-freetype.patch
new file mode 100644
index 000000000000..93c8ca358b31
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-43.3d-freetype.patch
@@ -0,0 +1,45 @@
+--- acinclude.m4.orig
++++ acinclude.m4
+@@ -437,7 +437,7 @@
+    if test "$FT2_CONFIG" = "no" ; then
+      no_ft=yes
+    else
+-     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
++     FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`"
+      FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+      ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+--- src.orig/client/GLEXT/GLFont2dFreeType.h
++++ src/client/GLEXT/GLFont2dFreeType.h
+@@ -23,10 +23,10 @@
+ 

+ #include <GLEXT/GLFont2dStorage.h>

+ #include <ft2build.h>

+-#include <freetype/freetype.h>

+-#include <freetype/ftglyph.h>

+-#include <freetype/ftoutln.h>

+-#include <freetype/fttrigon.h>

++#include <freetype.h>

++#include <ftglyph.h>

++#include <ftoutln.h>

++#include <fttrigon.h>

+ #include <string>

+ 

+ class GLFont2dFreeType

+--- src.orig/launcher/wxdialogs/TrueTypeFont.h
++++ src/launcher/wxdialogs/TrueTypeFont.h
+@@ -25,10 +25,10 @@
+ #include <wx/image.h>

+ #include <ft2build.h>

+ #include <string>

+-#include <freetype/freetype.h>

+-#include <freetype/ftglyph.h>

+-#include <freetype/ftoutln.h>

+-#include <freetype/fttrigon.h>

++#include <freetype.h>

++#include <ftglyph.h>

++#include <ftoutln.h>

++#include <fttrigon.h>

+ 

+ class TrueTypeFont

+ {

diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch
index fffd5c72685c..ceb47bf3e5fd 100644
--- a/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch
+++ b/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch
@@ -7,8 +7,6 @@ Fix build failure against gcc-4.7 (missing <unistd.h> for close())
 ../client/SecureID.cpp:124:12: error: 'close' was not declared in this scope
 
 make[3]: *** [SecureID.o] Error 1
-diff --git a/src/client/client/SecureID.cpp b/src/client/client/SecureID.cpp
-index bc276c4..5eb2f13 100644
 --- a/src/client/client/SecureID.cpp
 +++ b/src/client/client/SecureID.cpp
 @@ -75,6 +75,7 @@ std::string SecureID::GetPrivateKey(void)
diff --git a/games-strategy/scorched3d/scorched3d-43.3d.ebuild b/games-strategy/scorched3d/scorched3d-43.3d.ebuild
index 7a7aa00148a6..a2943c52126a 100644
--- a/games-strategy/scorched3d/scorched3d-43.3d.ebuild
+++ b/games-strategy/scorched3d/scorched3d-43.3d.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.3d.ebuild,v 1.7 2012/08/08 19:53:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.3d.ebuild,v 1.8 2014/06/13 21:52:24 mr_bones_ Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
@@ -42,7 +42,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-odbc.patch \
 		"${FILESDIR}"/${P}-png15.patch \
 		"${FILESDIR}"/${P}-win32.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-freetype.patch
 	eautoreconf
 }