diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-09-06 19:35:39 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-09-06 19:35:39 +0000 |
| commit | c6ca1727bc540ef2f8a05274d644b48503878c81 (patch) | |
| tree | beb48e6ea18771cd8009dc565e2bf44f94b02230 /buildtools | |
| parent | Minor code cleanup. (diff) | |
| download | inkscape-c6ca1727bc540ef2f8a05274d644b48503878c81.tar.gz inkscape-c6ca1727bc540ef2f8a05274d644b48503878c81.zip | |
CI/AppVeyor: Fix build
- patched cairo merged upstream
- updated python2-pillow merged upstream
- poppler >= 0.58 introduced incompatible API changes so use
old version until compatibility is restored
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/appveyor.sh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/buildtools/appveyor.sh b/buildtools/appveyor.sh index 5a1f7ab7b..41182405b 100644 --- a/buildtools/appveyor.sh +++ b/buildtools/appveyor.sh @@ -31,16 +31,9 @@ export CCACHE_DIR=$(cygpath -a ccache/master) ccache --max-size=200M ccache --set-config=sloppiness=include_file_ctime,include_file_mtime -# patched cairo to avoid crash when printing -# - https://bugs.launchpad.net/inkscape/+bug/1665768 -# - https://bugs.freedesktop.org/show_bug.cgi?id=101833 -# - https://github.com/Alexpux/MINGW-packages/pull/2825 -wget -nv https://gitlab.com/Ede123/bintray/raw/master/$MINGW_PACKAGE_PREFIX-cairo-1.15.6-1-any.pkg.tar.xz \ - && pacman -U $MINGW_PACKAGE_PREFIX-cairo-1.15.6-1-any.pkg.tar.xz --noconfirm - -# missing dependency for python2-pillow -# - https://github.com/Alexpux/MINGW-packages/pull/2824 -pacman -S $MINGW_PACKAGE_PREFIX-libraqm --needed --noconfirm --noprogressbar +# temporarily use old poppler (versions >= 0.58 need compatibilty fixes due to changed "Object" API) +wget -nv http://repo.msys2.org/mingw/$MSYSTEM_CARCH/$MINGW_PACKAGE_PREFIX-poppler-0.55.0-1-any.pkg.tar.xz \ + && pacman -U $MINGW_PACKAGE_PREFIX-poppler-0.55.0-1-any.pkg.tar.xz --noconfirm ### build / test |