# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1333409780 0
# Node ID 2908b16efa070107ff541d4694795c02c298e246
# Parent  f7ed013982231ff0f5b05d3cd9eded7db09fc094
Upgrade win32 version of enchant to 1.6.0.  Fixes #11886

diff -r f7ed01398223 -r 2908b16efa07 Makefile.mingw
--- a/Makefile.mingw	Mon Mar 26 17:33:24 2012 +0000
+++ b/Makefile.mingw	Mon Apr 02 23:36:20 2012 +0000
@@ -94,10 +94,10 @@
 endif
 	$(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) install
 	$(MAKE) -C share/sounds -f $(MINGW_MAKEFILE) install
-	mkdir -p $(PIDGIN_INSTALL_DIR)/spellcheck
+	mkdir -p $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
 	cp $(GTKSPELL_TOP)/bin/libgtkspell-0.dll $(PIDGIN_INSTALL_DIR)/spellcheck
 	cp $(ENCHANT_TOP)/bin/libenchant.dll $(PIDGIN_INSTALL_DIR)/spellcheck
-	cp -R $(ENCHANT_TOP)/lib $(PIDGIN_INSTALL_DIR)/spellcheck
+	cp -R $(ENCHANT_TOP)/lib/enchant/*.dll $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
 	cp $(WIN32_DEV_TOP)/pidgin-inst-deps-20100315/exchndl.dll $(PIDGIN_INSTALL_DIR)
 
 pidgin/win32/nsis/gtk-runtime-$(GTK_BUNDLE_VERSION).zip:
diff -r f7ed01398223 -r 2908b16efa07 libpurple/win32/global.mak
--- a/libpurple/win32/global.mak	Mon Mar 26 17:33:24 2012 +0000
+++ b/libpurple/win32/global.mak	Mon Apr 02 23:36:20 2012 +0000
@@ -11,7 +11,7 @@
 # Locations of our various dependencies
 WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev
 GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.16
-ENCHANT_TOP ?= $(WIN32_DEV_TOP)/enchant_1.5.0-2_win32
+ENCHANT_TOP ?= $(WIN32_DEV_TOP)/enchant_1.6.0_win32
 GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0-2.14
 GTK_BIN ?= $(GTK_TOP)/bin
 BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK