[Gaim-commits] SF.net SVN: gaim: [17860] trunk

[<dat...@us...>]

Revision: 17860
          http://svn.sourceforge.net/gaim/?rev=17860&view=rev
Author:   datallah
Date:     2006-11-30 20:16:34 -0800 (Thu, 30 Nov 2006)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/gaim-installer.nsi
    trunk/libgaim/plugins/ssl/Makefile.mingw
    trunk/libgaim/win32/global.mak

Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi	2006-11-30 17:45:28 UTC (rev 17859)
+++ trunk/gaim-installer.nsi	2006-12-01 04:16:34 UTC (rev 17860)
@@ -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"

Modified: trunk/libgaim/plugins/ssl/Makefile.mingw
===================================================================
--- trunk/libgaim/plugins/ssl/Makefile.mingw	2006-11-30 17:45:28 UTC (rev 17859)
+++ trunk/libgaim/plugins/ssl/Makefile.mingw	2006-12-01 04:16:34 UTC (rev 17860)
@@ -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 \

Modified: trunk/libgaim/win32/global.mak
===================================================================
--- trunk/libgaim/win32/global.mak	2006-11-30 17:45:28 UTC (rev 17859)
+++ trunk/libgaim/win32/global.mak	2006-12-01 04:16:34 UTC (rev 17860)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.