diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 9bbc990b7049f7a923499d06336001e3230a2a08..7f3a2a2a3576e39cdc3eb7f4ef24474175a66b6d 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -122,6 +122,7 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(INKSCAPE_DEP REQUIRED harfbuzz pangocairo>=1.44 + pangocairo<=1.50.11 pangoft2 fontconfig gsl diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh index 92e1d8d5dbb29170273e7b03dcb42a8f62219db4..ac56fa07bfd31fef9b258bff860fb63284471f45 100644 --- a/buildtools/msys2installdeps.sh +++ b/buildtools/msys2installdeps.sh @@ -37,7 +37,7 @@ esac # set default options for invoking pacman (in CI this variable is already set globally) if [ -z $CI ]; then - PACMAN_OPTIONS="--needed --noconfirm" + PACMAN_OPTIONS="--needed --noconfirm --ignore=mingw-w64-*-pango" fi # sync package databases @@ -54,6 +54,14 @@ $ARCH-meson \ $ARCH-ninja \ $ARCH-ccache +# install pinned version of pango +for arch in $(eval echo $ARCH); do + wget -nv https://repo.msys2.org/mingw/x86_64/${arch}-pango-1.50.11-1-any.pkg.tar.zst \ + && pacman -U $PACMAN_OPTIONS ${arch}-pango-1.50.11-1-any.pkg.tar.zst \ + && rm ${arch}-pango-* +done + + # install Inkscape dependencies (required) eval pacman -S $PACMAN_OPTIONS \ $ARCH-double-conversion \