diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e4a40864fc6..065f90cdc4a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -466,7 +466,7 @@ if(ENABLE_GAME OR ENABLE_TESTS) find_package(VorbisFile REQUIRED) find_package( PkgConfig REQUIRED ) pkg_check_modules( CAIRO REQUIRED cairo>=1.10 ) - pkg_check_modules( PANGOCAIRO REQUIRED pangocairo>=1.21.3 ) + pkg_check_modules( PANGOCAIRO REQUIRED pangocairo>=1.22.0 ) pkg_check_modules( FONTCONFIG REQUIRED fontconfig>=2.4.1 ) pkg_check_modules( SYSTEMD systemd ) endif(ENABLE_GAME OR ENABLE_TESTS) diff --git a/INSTALL.md b/INSTALL.md index de431f7f4bab..17d036ff217c 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -33,7 +33,7 @@ order to build Wesnoth: * SDL2_ttf >= 2.0.12 * Fontconfig >= 2.4.1 * Cairo >= 1.10.0 - * Pango >= 1.21.3 (with Cairo backend) + * Pango >= 1.22.0 (with Cairo backend) * Vorbisfile * libbz2 * libz diff --git a/SConstruct b/SConstruct index 254dfbccd2b4..74403accb5ca 100755 --- a/SConstruct +++ b/SConstruct @@ -385,7 +385,7 @@ if env["prereqs"]: conf.CheckPNG() & \ conf.CheckJPG() & \ conf.CheckCairo(min_version = "1.10") & \ - conf.CheckPango("cairo", require_version = "1.21.3") & \ + conf.CheckPango("cairo", require_version = "1.22.0") & \ conf.CheckPKG("fontconfig") & \ conf.CheckBoost("program_options", require_version = boost_version) & \ conf.CheckBoost("thread") & \ diff --git a/src/font/text.cpp b/src/font/text.cpp index 3673060e4055..593adf2d007f 100644 --- a/src/font/text.cpp +++ b/src/font/text.cpp @@ -41,12 +41,7 @@ namespace font { pango_text::pango_text() -#if PANGO_VERSION_CHECK(1,22,0) : context_(pango_font_map_create_context(pango_cairo_font_map_get_default()), g_object_unref) -#else - : context_(pango_cairo_font_map_create_context(( - reinterpret_cast(pango_cairo_font_map_get_default()))), g_object_unref) -#endif , layout_(pango_layout_new(context_.get()), g_object_unref) , rect_() , sublayouts_()