/pidgin/main: c269ff46a1de: Update SILC to 1.1.12 for the window...

[Daniel Atallah]

Changeset: c269ff46a1de8f545afc1fcc28082ad20896acdf
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2014-12-27 21:37 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/c269ff46a1de

Description:

Update SILC to 1.1.12 for the windows build

diffstat:

 ChangeLog                               |  1 +
 libpurple/protocols/silc/Makefile.mingw |  4 ++--
 libpurple/win32/global.mak              |  2 +-
 pidgin/win32/nsis/pidgin-installer.nsi  |  4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diffs (51 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ version 2.10.12 (MM/DD/YY):
 	Windows-Specific Changes:
 	* Updates to dependencies:
 		* NSS 3.17.3 and NSPR 4.10.7
+		* SILC 1.1.12
 
 version 2.10.11 (11/23/14):
 	General:
diff --git a/libpurple/protocols/silc/Makefile.mingw b/libpurple/protocols/silc/Makefile.mingw
--- a/libpurple/protocols/silc/Makefile.mingw
+++ b/libpurple/protocols/silc/Makefile.mingw
@@ -10,8 +10,8 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
 
 TARGET = libsilc
-NEEDED_DLLS =		$(SILC_TOOLKIT)/bin/libsilc-1-1-2.dll \
-			$(SILC_TOOLKIT)/bin/libsilcclient-1-1-3.dll
+NEEDED_DLLS =		$(SILC_TOOLKIT)/bin/libsilc-1-1-4.dll \
+			$(SILC_TOOLKIT)/bin/libsilcclient-1-1-4.dll
 TYPE = PLUGIN
 
 # Static or Plugin...
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -18,7 +18,7 @@ LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa3
 NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.17.3-nspr-4.10.7
 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
-SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
+SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.12
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
 GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13
 GCC_SSP_TOP ?= $(shell dirname $(shell which $(CC)))
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -641,8 +641,8 @@ Section Uninstall
     Delete "$INSTDIR\libplds4.dll"
     Delete "$INSTDIR\libpurple.dll"
     Delete "$INSTDIR\libsasl.dll"
-    Delete "$INSTDIR\libsilc-1-1-2.dll"
-    Delete "$INSTDIR\libsilcclient-1-1-3.dll"
+    Delete "$INSTDIR\libsilc-1-1-4.dll"
+    Delete "$INSTDIR\libsilcclient-1-1-4.dll"
     Delete "$INSTDIR\libssp-0.dll"
     Delete "$INSTDIR\libxml2-2.dll"
     Delete "$INSTDIR\libymsg.dll"