diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-09-30 15:19:29 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-09-30 20:21:17 +0000 |
| commit | cb12c8d28ee46619bac0c519faca2e1114eed9f6 (patch) | |
| tree | 25ff5c4b8ad31470fb64e2ff0b609a159fe41747 | |
| parent | Do not crash if raster image can not be opened by ImageMagick (diff) | |
| download | inkscape-cb12c8d28ee46619bac0c519faca2e1114eed9f6.tar.gz inkscape-cb12c8d28ee46619bac0c519faca2e1114eed9f6.zip | |
MSYS2: use custom ImageMagick build as relocation support is broken
This package was configured `--without-modules` which results in
ImageMagick's "coders" to be compiled directly into the main library
instead of using separate modules (which might not be found).
see
- https://bugs.launchpad.net/inkscape/+bug/1720330
- https://github.com/Alexpux/MINGW-packages/issues/2995
| -rw-r--r-- | buildtools/msys2installdeps.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh index 38c713342..e2b0528e1 100644 --- a/buildtools/msys2installdeps.sh +++ b/buildtools/msys2installdeps.sh @@ -68,14 +68,9 @@ $ARCH-libyaml # or (always!) run pacman with the additional command line switch # --ignore=mingw-w64-*-imagemagick for arch in $(eval echo $ARCH); do - case ${arch} in - mingw-w64-i686) - pacman -U --needed --noconfirm http://repo.msys2.org/mingw/i686/mingw-w64-i686-imagemagick-6.9.3.7-1-any.pkg.tar.xz - ;; - mingw-w64-x86_64) - pacman -U --needed --noconfirm http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-imagemagick-6.9.3.7-1-any.pkg.tar.xz - ;; - esac + wget -nv https://gitlab.com/Ede123/bintray/raw/master/${arch}-imagemagick-6.9.9.15-1-any.pkg.tar.xz \ + && pacman -U --needed --noconfirm ${arch}-imagemagick-6.9.9.15-1-any.pkg.tar.xz \ + && rm ${arch}-imagemagick-6.9.9.15-1-any.pkg.tar.xz done |