From 54a5411cff022a7c9c3ba7d42fe45896a3ff3bac Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Sat, 26 Aug 2017 18:25:19 +0200
Subject: cmake/MSYS2: add missing dependencies

- libidn2 now required by curl
- libraqm (-> libfridi) required by python2-pillow >= 4.2.0
---
 CMakeScripts/InstallMSYS2.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index 0a39882ed..c7ce5b2e6 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -37,6 +37,7 @@ if(WIN32)
     ${MINGW_BIN}/libfftw3-[0-9]*.dll
     ${MINGW_BIN}/libfontconfig-[0-9]*.dll
     ${MINGW_BIN}/libfreetype-[0-9]*.dll
+    ${MINGW_BIN}/libfribidi-[0-9]*.dll
     ${MINGW_BIN}/libgc-[0-9]*.dll
     ${MINGW_BIN}/libgdbm-[0-9]*.dll
     ${MINGW_BIN}/libgdk-3-[0-9]*.dll
@@ -66,6 +67,7 @@ if(WIN32)
     ${MINGW_BIN}/libicuin[0-9]*.dll
     ${MINGW_BIN}/libicuuc[0-9]*.dll
     ${MINGW_BIN}/libidn-[0-9]*.dll
+    ${MINGW_BIN}/libidn2-[0-9]*.dll
     ${MINGW_BIN}/libintl-[0-9]*.dll
     ${MINGW_BIN}/libjpeg-[0-9]*.dll
     ${MINGW_BIN}/liblcms2-[0-9]*.dll
@@ -93,6 +95,7 @@ if(WIN32)
     ${MINGW_BIN}/libpopt-[0-9]*.dll
     ${MINGW_BIN}/libpotrace-[0-9]*.dll
     ${MINGW_BIN}/libquadmath-[0-9]*.dll
+    ${MINGW_BIN}/libraqm-[0-9]*.dll
     ${MINGW_BIN}/libreadline[0-9]*.dll
     ${MINGW_BIN}/librevenge-0.[0-9]*.dll
     ${MINGW_BIN}/librevenge-stream-0.[0-9]*.dll
-- 
cgit v1.2.3


From 01e32517f065cc53dc4ce1bdcadff7bf1c1ab19e Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Sat, 26 Aug 2017 18:28:23 +0200
Subject: CI/AppVeyor: manually install missing dependency

---
 buildtools/appveyor.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/buildtools/appveyor.sh b/buildtools/appveyor.sh
index 738f2b521..5a1f7ab7b 100644
--- a/buildtools/appveyor.sh
+++ b/buildtools/appveyor.sh
@@ -34,9 +34,14 @@ 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
+
 
 ### build / test
 
-- 
cgit v1.2.3