AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bump Pango dep

Browse Source 
Require Pango 1.49, so we can support new attributes
without too much ifdeffery.
This commit is contained in:
Matthias Clasen 2021-08-22 15:19:18 -04:00
parent 6c19a8352f
commit bea4aa31ea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/test-msys2.sh
View File

@ -40,7 +40,7 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
# https://gitlab.gnome.org/GNOME/gtk/-/issues/2243 # https://gitlab.gnome.org/GNOME/gtk/-/issues/2243
# https://gitlab.gnome.org/GNOME/gtk/-/issues/3002 # https://gitlab.gnome.org/GNOME/gtk/-/issues/3002
if ! pkg-config --atleast-version=2.65.0 glib-2.0; then if ! pkg-config --atleast-version=2.66.0 glib-2.0; then
git clone https://gitlab.gnome.org/GNOME/glib.git _glib git clone https://gitlab.gnome.org/GNOME/glib.git _glib
meson setup _glib_build _glib meson setup _glib_build _glib
meson compile -C _glib_build meson compile -C _glib_build
@ -48,7 +48,7 @@ if ! pkg-config --atleast-version=2.65.0 glib-2.0; then
fi fi
pkg-config --modversion glib-2.0 pkg-config --modversion glib-2.0
if ! pkg-config --atleast-version=1.47.0 pango; then if ! pkg-config --atleast-version=1.49.0 pango; then
git clone https://gitlab.gnome.org/GNOME/pango.git _pango git clone https://gitlab.gnome.org/GNOME/pango.git _pango
meson setup _pango_build _pango meson setup _pango_build _pango
meson compile -C _pango_build meson compile -C _pango_build

2
meson.build
View File

@ -11,7 +11,7 @@ project('gtk', 'c',
license: 'LGPL-2.1-or-later') license: 'LGPL-2.1-or-later')
glib_req = '>= 2.66.0' glib_req = '>= 2.66.0'
pango_req = '>= 1.47.0' # keep this in sync with .gitlab-ci/test-msys.sh pango_req = '>= 1.49.0' # keep this in sync with .gitlab-ci/test-msys.sh
fribidi_req = '>= 0.19.7' fribidi_req = '>= 0.19.7'
cairo_req = '>= 1.14.0' cairo_req = '>= 1.14.0'
gdk_pixbuf_req = '>= 2.30.0' gdk_pixbuf_req = '>= 2.30.0'