changeset 15076:7ca4a6820154

[gaim-migrate @ 17860] Upgrade NSS/NSPR for wingaim - we were using relatively old versions. There have been some occasional crashes that may have been caused by some old bugs. I've been using this for a week or so and haven't had any problems. committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Fri, 01 Dec 2006 04:16:34 +0000
parents 2c93b0620065
children e02355d52752
files gaim-installer.nsi libgaim/plugins/ssl/Makefile.mingw libgaim/win32/global.mak
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gaim-installer.nsi	Thu Nov 30 17:45:28 2006 +0000
+++ b/gaim-installer.nsi	Fri Dec 01 04:16:34 2006 +0000
@@ -697,6 +697,7 @@
     Delete "$INSTDIR\sounds\gaim\send.wav"
     RMDir "$INSTDIR\sounds\gaim"
     RMDir "$INSTDIR\sounds"
+    Delete "$INSTDIR\freebl3.dll"
     Delete "$INSTDIR\gaim.exe"
     Delete "$INSTDIR\gtkgaim.dll"
     Delete "$INSTDIR\idletrack.dll"
--- a/libgaim/plugins/ssl/Makefile.mingw	Thu Nov 30 17:45:28 2006 +0000
+++ b/libgaim/plugins/ssl/Makefile.mingw	Fri Dec 01 04:16:34 2006 +0000
@@ -13,7 +13,9 @@
 TARGET = ssl
 TARGET_NSS = ssl-nss
 
-NEEDED_DLLS =		$(NSS_TOP)/lib/nss3.dll \
+NEEDED_DLLS = \
+			$(NSS_TOP)/lib/freebl3.dll \
+			$(NSS_TOP)/lib/nss3.dll \
 			$(NSS_TOP)/lib/nssckbi.dll \
 			$(NSS_TOP)/lib/softokn3.dll \
 			$(NSS_TOP)/lib/ssl3.dll \
--- a/libgaim/win32/global.mak	Thu Nov 30 17:45:28 2006 +0000
+++ b/libgaim/win32/global.mak	Fri Dec 01 04:16:34 2006 +0000
@@ -14,8 +14,8 @@
 HOWL_TOP := $(WIN32_DEV_TOP)/howl-1.0.0
 LIBXML2_TOP := $(WIN32_DEV_TOP)/libxml2
 MEANWHILE_TOP := $(WIN32_DEV_TOP)/meanwhile-1.0.2
-NSPR_TOP := $(WIN32_DEV_TOP)/nspr-4.4.1
-NSS_TOP := $(WIN32_DEV_TOP)/nss-3.9
+NSPR_TOP := $(WIN32_DEV_TOP)/nspr-4.6.4
+NSS_TOP := $(WIN32_DEV_TOP)/nss-3.11.4
 PERL_LIB_TOP := $(WIN32_DEV_TOP)/perl58
 SILC_TOOLKIT := $(WIN32_DEV_TOP)/silc-toolkit-1.0.2
 TCL_LIB_TOP := $(WIN32_DEV_TOP)/tcl-8.4.5