git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21483 from rardiol/freeorion

freeorion: 0.4.5 -> 0.4.6

commit62adccb95638ead2acab28b29f34d9e42fe22ea6 authorMichael Raskin <7c6f434c@mail.ru> dateFri 30 Dec 2016, 22:14 (10 years ago) parentfad0eaee948a6d
3 files changed+17−24
compare with master
unifiedsplit
pkgs/games/freeorion/92455f9.patch−19 pkgs/games/freeorion/default.nix+6−5 pkgs/games/freeorion/fix_rpaths.patch+11
pkgs/games/freeorion/92455f9.patchdeleted−19
@@ -1,19 +0,0 @@
1−diff -Naur GG/src/Font.cpp
2−--- /GG/src/Font.cpp
3−+++ /GG/src/Font.cpp
4−@@ -1586,8 +1586,13 @@
5− using boost::lexical_cast;
6− FT_UInt index = FT_Get_Char_Index(face, ch);
7− if (index) {
8−- if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT))
9−- ThrowBadGlyph("GG::Font::GetGlyphBitmap : Freetype could not load the glyph for character '%1%'", ch);
10−+ if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT)) {
11−+ // loading of a glpyh failed so we replace it with
12−+ // the 'Replacement Character' at codepoint 0xFFFD
13−+ FT_UInt tmp_index = FT_Get_Char_Index(face, 0xFFFD);
14−+ if (FT_Load_Glyph(face, tmp_index, FT_LOAD_DEFAULT))
15−+ ThrowBadGlyph("GG::Font::GetGlyphBitmap : Freetype could not load the glyph for character '%1%'", ch);
16−+ }
17−
18− FT_GlyphSlot glyph = face->glyph;
19−
pkgs/games/freeorion/default.nix+6−5
@@ -2,18 +2,19 @@
22, libxslt, makeWrapper }:
33
44stdenv.mkDerivation rec {
5− version = "0.4.5";
5+ version = "0.4.6";
66 name = "freeorion-${version}";
77
88 src = fetchurl {
9− url = "https://github.com/freeorion/freeorion/releases/download/v0.4.5/FreeOrion_v0.4.5_2015-09-01.f203162_Source.tar.gz";
10− sha256 = "3b99b92eeac72bd059566dbabfab54368989ba83f72e769bc94eb8dd4fe414c0";
9+ url = "https://github.com/freeorion/freeorion/releases/download/v0.4.6/FreeOrion_v0.4.6_2016-09-16.49f9123_Source.tar.gz";
10+ sha256 = "04g3x1cymf7mnmc2f5mm3c2r5izjmy7z3pvk2ykzz8f8b2kz6gry";
1111 };
1212
1313 buildInputs = [ cmake boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew doxygen makeWrapper ];
1414
15− # cherry pick for acceptable performance https://github.com/freeorion/freeorion/commit/92455f97c28055e296718230d2e3744eccd738ec
16− patches = [ ./92455f9.patch ];
15+ patches = [
16+ ./fix_rpaths.patch
17+ ];
1718
1819 enableParallelBuilding = true;
1920
pkgs/games/freeorion/fix_rpaths.patchnew file+11
@@ -0,0 +1,11 @@
1+--- a/CMakeLists.txt
2++++ b/CMakeLists.txt
3+@@ -46,7 +46,7 @@
4+ set(FreeOrion_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/freeorion")
5+ endif()
6+
7+-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${FreeOrion_INSTALL_LIBDIR}")
8++set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}/freeorion")
9+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
10+
11+ if (WIN32)