mr_bones_ 14/06/13 21:52:24 Modified: scorched3d-43.3d-gcc47.patch Added: scorched3d-43.3d-freetype.patch Log: try to build with freetype 2.4 and 2.5 (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch?r1=1.1&r2=1.2 Index: scorched3d-43.3d-gcc47.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scorched3d-43.3d-gcc47.patch 30 May 2012 08:32:59 -0000 1.1 +++ scorched3d-43.3d-gcc47.patch 13 Jun 2014 21:52:24 -0000 1.2 @@ -7,8 +7,6 @@ ../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) 1.1 games-strategy/scorched3d/files/scorched3d-43.3d-freetype.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43.3d-freetype.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/scorched3d/files/scorched3d-43.3d-freetype.patch?rev=1.1&content-type=text/plain Index: scorched3d-43.3d-freetype.patch =================================================================== --- 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 {
