Decreases the pango cairo dependency.

The dependency's version is decreased to version 1.21.3. This is the
version currently used in XCode (on the Mac). Upgrading there is
troublesome.

This partly reverts 2b939cebc7.

CMakeLists.txt

@@ -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)

INSTALL

@@ -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)

SConstruct

@@ -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 \

changelog

@@ -28,6 +28,7 @@ Version 1.11.4+dev:
    * 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:

src/text.cpp

@@ -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_(),