pidgin.2.x.y: c5b3879b: Upgrade win32 version of enchant to 1.6....

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: c5b3879b829a5067b2189e4393ca3b80f6fd96c3
Parent:   80d36b304e3b986a846331f0b83f248f4bcc9794
Author:   datallah at pidgin.im
Date:     04/02/12 19:36:20
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/c5b3879b829a5067b2189e4393ca3b80f6fd96c3

Changelog: 

Upgrade win32 version of enchant to 1.6.0.  Fixes #11886

Changes against parent 80d36b304e3b986a846331f0b83f248f4bcc9794

  patched  Makefile.mingw
  patched  libpurple/win32/global.mak

-------------- next part --------------
============================================================
--- Makefile.mingw	8c63eb52b1aa5ac7b099b8ae814948b5a02c0c03
+++ Makefile.mingw	93431de0283abd69eae3334055fc73407b9c334d
@@ -94,10 +94,10 @@ endif
 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:
============================================================
--- libpurple/win32/global.mak	af4b8b87e3877e05edfc490a0cd672c7589d2639
+++ libpurple/win32/global.mak	50cc9d1961769f3883c16a338cb33f45bdd063a3
@@ -11,7 +11,7 @@ GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspel
 # 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