From bd9eb1d8ff76108b696a53ceffe60977d9419da7 Mon Sep 17 00:00:00 2001 From: Jehan Date: Mon, 11 Sep 2023 14:45:36 +0200 Subject: [PATCH] meson: requires Pango >= 1.50. New code uses pango_attribute_as_font_desc() which appeared with Pango 1.50. Since it's currently present in Debian stable, I don't bother too much and bump this dependency. Also let's use the same version for pango, pangocairo and pangoft2. They all come from the same project/repository, so we must likely expect them to be equal (if they are not, there is likely a problem). --- INSTALL.in | 4 ++-- meson.build | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/INSTALL.in b/INSTALL.in index 14fb596481..4e4f39350a 100644 --- a/INSTALL.in +++ b/INSTALL.in @@ -77,7 +77,7 @@ help in that regard: 4. You need to have installed GTK version @GTK_REQUIRED_VERSION@ or newer. GIMP also needs a recent version of GLib (>= @GLIB_REQUIRED_VERSION@), GDK-Pixbuf - (>= @GDK_PIXBUF_REQUIRED_VERSION@), and Pango (>= @PANGOCAIRO_REQUIRED_VERSION@). Sources for these can be grabbed + (>= @GDK_PIXBUF_REQUIRED_VERSION@), and Pango (>= @PANGO_REQUIRED_VERSION@). Sources for these can be grabbed from https://download.gnome.org/sources/. 5. We use cairo >= @CAIRO_REQUIRED_VERSION@, which is hosted at @@ -247,7 +247,7 @@ help in that regard: libtiff @LIBTIFF_REQUIRED_VERSION@ Little CMS @LCMS_REQUIRED_VERSION@ mypaint-brushes-1.0 - pangocairo @PANGOCAIRO_REQUIRED_VERSION@ + pangocairo @PANGO_REQUIRED_VERSION@ poppler-data @POPPLER_DATA_REQUIRED_VERSION@ zlib diff --git a/meson.build b/meson.build index ea08bdf2ad..4d3663097f 100644 --- a/meson.build +++ b/meson.build @@ -412,11 +412,12 @@ endif conf.set_quoted('MYPAINT_BRUSHES_DIR', mypaint_brushes_dir) -pangocairo_minver = '1.44.0' -pangocairo = dependency('pangocairo', version: '>='+pangocairo_minver) -pangoft2 = dependency('pangoft2', version: '>=1.29.4') -rsvg_minver = '2.40.6' -rsvg = dependency('librsvg-2.0', version: '>='+rsvg_minver) +pango_minver = '1.50.0' +pangocairo = dependency('pango', version: '>='+pango_minver) +pangocairo = dependency('pangocairo', version: '>='+pango_minver) +pangoft2 = dependency('pangoft2', version: '>='+pango_minver) +rsvg_minver = '2.40.6' +rsvg = dependency('librsvg-2.0', version: '>='+rsvg_minver) conf.set('PANGO_DISABLE_DEPRECATED',pangocairo.version().version_compare('<1.43')) @@ -1696,7 +1697,7 @@ install_conf.set('LIBMYPAINT_REQUIRED_VERSION', libmypaint_minver) install_conf.set('LIBPNG_REQUIRED_VERSION', libpng_minver) install_conf.set('OPENEXR_REQUIRED_VERSION', openexr_minver) install_conf.set('OPENJPEG_REQUIRED_VERSION', openjpeg_minver) -install_conf.set('PANGOCAIRO_REQUIRED_VERSION', pangocairo_minver) +install_conf.set('PANGO_REQUIRED_VERSION', pango_minver) install_conf.set('POPPLER_DATA_REQUIRED_VERSION', poppler_data_minver) install_conf.set('POPPLER_REQUIRED_VERSION', poppler_minver) install_conf.set('PYTHON3_REQUIRED_VERSION', python3_minver)