Merge pull request #3438 from amitdo/pango

Raise Minimum required Pango version to 1.38.0

Author: egorpugin

configure.ac

@@ -529,9 +529,9 @@ if !($have_icu_uc && $have_icu_i18n); then
 fi
 
 # Check location of pango headers
-PKG_CHECK_MODULES([pango], [pango >= 1.22.0], [have_pango=true], [have_pango=false])
+PKG_CHECK_MODULES([pango], [pango >= 1.38.0], [have_pango=true], [have_pango=false])
 if !($have_pango); then
-        AC_MSG_WARN([pango 1.22.0 or higher is required, but was not found.])
+        AC_MSG_WARN([pango 1.38.0 or higher is required, but was not found.])
         AC_MSG_WARN([Training tools WILL NOT be built.])
         AC_MSG_WARN([Try to install libpango1.0-dev package.])
         AM_CONDITIONAL([ENABLE_TRAINING], false)

src/training/CMakeLists.txt

@@ -286,7 +286,7 @@ endif()
 if (PKG_CONFIG_FOUND OR SW_BUILD)
 
 if (PKG_CONFIG_FOUND)
-pkg_check_modules(Pango REQUIRED pango>=1.22.0)
+pkg_check_modules(Pango REQUIRED pango>=1.38.0)
 pkg_check_modules(Cairo REQUIRED cairo)
 pkg_check_modules(PangoFt2 REQUIRED pangoft2)
 pkg_check_modules(PangoCairo REQUIRED pangocairo)

src/training/pango/stringrenderer.cpp

@@ -198,13 +198,13 @@ void StringRenderer::SetLayoutProperties() {
     spacing_attr->end_index = static_cast<guint>(-1);
     pango_attr_list_change(attr_list, spacing_attr);
   }
-#if (PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR >= 38)
+
   if (add_ligatures_) {
     set_features("liga, clig, dlig, hlig");
     PangoAttribute *feature_attr = pango_attr_font_features_new(features_.c_str());
     pango_attr_list_change(attr_list, feature_attr);
   }
-#endif
+
   pango_layout_set_attributes(layout_, attr_list);
   pango_attr_list_unref(attr_list);
   // Adjust line spacing