0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:wesnoth/wesnoth-old

Browse source
This commit is contained in:
JaMiT 2013-06-03 21:49:52 -05:00
commit 59c597ea04
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -477,7 +477,7 @@ if(ENABLE_GAME OR ENABLE_TESTS)
if(NOT MSVC)
find_package( PkgConfig REQUIRED )
pkg_check_modules( PANGOCAIRO REQUIRED pangocairo>=1.24.4 )
pkg_check_modules( PANGOCAIRO REQUIRED pangocairo>=1.21.3 )
pkg_check_modules( FONTCONFIG REQUIRED fontconfig>=2.4.1 )
pkg_check_modules( SYSTEMD systemd )
endif(NOT MSVC)

2
INSTALL
View file

@ -17,7 +17,7 @@ You'll need to have these libraries and their development headers to build Wesno
boost_system >= 1.36.0
boost_thread >= 1.36.0
libfontconfig >= 2.4.1
libpango (with cairo backend) >= 1.24.4
libpango (with cairo backend) >= 1.21.3
libsdl >= 1.2.7
libsdl-image >= 1.2 (with png support)
libsdl-mixer >= 1.2 (with Vorbis support)

2
SConstruct
View file

@ -333,7 +333,7 @@ if env["prereqs"]:
conf = client_env.Configure(**configure_args)
have_client_prereqs = have_server_prereqs and \
CheckAsio(conf) and \
conf.CheckPango("cairo", require_version = "1.24.4") and \
conf.CheckPango("cairo", require_version = "1.21.3") and \
conf.CheckPKG("fontconfig") and \
conf.CheckBoost("program_options", require_version="1.35.0") and \
conf.CheckBoost("regex", require_version = "1.35.0") and \

9
changelog
View file

@ -20,16 +20,17 @@ Version 1.11.4+dev:
* Added notification support for Windows
* Made it so that the "Back to Turn X" and "Back to Start" menu items work
with .bz2 saves
* Miscellaneous and bug fixes
* Added a new playlist FULL_MUSIC_PLAYLIST, which contains all Wesnoth tracks
in alphabetical order
* Added -Wno-null-conversion to the CMake pedantic flags.
* WML engine:
* Added new aspect 'advancements' which with lua engine can handle a
function return type of the form f(x, y) -> String. 'advancements'
tells the AI to what unit a given unit should advance to.
* Fix "Shuffle sides" incorrect behaviour: children inside [side] were also
swapped.
* Miscellaneous and bug fixes
* Added a new playlist FULL_MUSIC_PLAYLIST, which contains all Wesnoth tracks
in alphabetical order
* Added -Wno-null-conversion to the CMake pedantic flags.
* Changed: Decreased the pango cairo dependency to version 1.21.3.
Version 1.11.4:
* AI:

5
src/text.cpp
View file

@ -81,7 +81,12 @@ std::string escape_text(const std::string& text)
}
ttext::ttext() :
#if PANGO_VERSION_CHECK(1,22,0)
context_(pango_font_map_create_context(pango_cairo_font_map_get_default())),
#else
context_(pango_cairo_font_map_create_context((
reinterpret_cast<PangoCairoFontMap*>(pango_cairo_font_map_get_default())))),
#endif
layout_(pango_layout_new(context_)),
rect_(),
surface_(),