From fb4b7ab97a180790b0f3d7afbc00a49656d435bd Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Thu, 19 Jul 2018 00:32:58 +0200
Subject: CMake/MSYS2: Update for enchant-2

Re-enable usage of enchant-2 after
  3f5b88a264397918cf7e1623d0e5e8828a5ceb77

(while not failing completely anymore enchant-2 is still broken
 unfortunately)
---
 CMakeScripts/InstallMSYS2.cmake | 4 ++--
 buildtools/appveyor.sh          | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index 1d80d0863..d0a71f8eb 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -31,7 +31,7 @@ if(WIN32)
     ${MINGW_BIN}/libcdr-0.[0-9]*.dll
     ${MINGW_BIN}/libcroco-0.6-[0-9]*.dll
     ${MINGW_BIN}/libcurl-[0-9]*.dll
-    ${MINGW_BIN}/libenchant.dll
+    ${MINGW_BIN}/libenchant-[0-9]*.dll
     ${MINGW_BIN}/libepoxy-[0-9]*.dll
     ${MINGW_BIN}/libexpat-[0-9]*.dll
     ${MINGW_BIN}/libexslt-[0-9]*.dll
@@ -197,7 +197,7 @@ if(WIN32)
 
   # Aspell backend for Enchant (gtkspell uses Enchant to access Aspell dictionaries)
   install(FILES
-    ${MINGW_LIB}/enchant/libenchant_aspell.dll
+    ${MINGW_LIB}/enchant-2/enchant_aspell.dll
     DESTINATION lib/enchant)
 
   # tcl/tk related files (required for tkinter)
diff --git a/buildtools/appveyor.sh b/buildtools/appveyor.sh
index 33c0f4b11..649de66ba 100644
--- a/buildtools/appveyor.sh
+++ b/buildtools/appveyor.sh
@@ -42,10 +42,6 @@ export CCACHE_DIR=$(cygpath -a ccache/master)
 ccache --max-size=200M
 ccache --set-config=sloppiness=include_file_ctime,include_file_mtime
 
-# temporarily use old enchant (enchant-2 is currently broken)
-wget -nv http://repo.msys2.org/mingw/$MSYSTEM_CARCH/$MINGW_PACKAGE_PREFIX-enchant-1.6.1-1-any.pkg.tar.xz \
-    && pacman -U $MINGW_PACKAGE_PREFIX-enchant-1.6.1-1-any.pkg.tar.xz --noconfirm
-
 
 ### build / test
 
-- 
cgit v1.2.3