freeorion: init at 0.4.5

This commit is contained in:
Ricardo Ardissone 2016-04-15 20:37:09 -03:00
parent 551296a1ce
commit 3ce9294eeb
3 changed files with 44 additions and 0 deletions

View file

@ -0,0 +1,19 @@
diff -Naur GG/src/Font.cpp
--- /GG/src/Font.cpp
+++ /GG/src/Font.cpp
@@ -1586,8 +1586,13 @@
using boost::lexical_cast;
FT_UInt index = FT_Get_Char_Index(face, ch);
if (index) {
- if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT))
- ThrowBadGlyph("GG::Font::GetGlyphBitmap : Freetype could not load the glyph for character '%1%'", ch);
+ if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT)) {
+ // loading of a glpyh failed so we replace it with
+ // the 'Replacement Character' at codepoint 0xFFFD
+ FT_UInt tmp_index = FT_Get_Char_Index(face, 0xFFFD);
+ if (FT_Load_Glyph(face, tmp_index, FT_LOAD_DEFAULT))
+ ThrowBadGlyph("GG::Font::GetGlyphBitmap : Freetype could not load the glyph for character '%1%'", ch);
+ }
FT_GlyphSlot glyph = face->glyph;

View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, cmake, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, mesa, glew, doxygen }:
stdenv.mkDerivation rec {
version = "0.4.5";
name = "freeorion-${version}";
src = fetchurl {
url = "https://github.com/freeorion/freeorion/releases/download/v0.4.5/FreeOrion_v0.4.5_2015-09-01.f203162_Source.tar.gz";
sha256 = "3b99b92eeac72bd059566dbabfab54368989ba83f72e769bc94eb8dd4fe414c0";
};
buildInputs = [ cmake boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew doxygen ];
# cherry pick for acceptable performance https://github.com/freeorion/freeorion/commit/92455f97c28055e296718230d2e3744eccd738ec
patches = [ ./92455f9.patch ];
meta = with stdenv.lib; {
description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game";
homepage = "http://www.freeorion.org";
license = [ licenses.gpl2 licenses.cc-by-sa-30 ];
platforms = platforms.linux;
};
}

View file

@ -14686,6 +14686,8 @@ in
freedink = callPackage ../games/freedink { };
freeorion = callPackage ../games/freeorion { };
fsg = callPackage ../games/fsg {
wxGTK = wxGTK28.override { unicode = false; };
};