locales34: merge m99

13 files changed, 135 insertions, 65 deletions

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index 751af3ca687c..b27d483e9e60 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -135,7 +135,7 @@ db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR)
 db_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 CFLAGS+=-D_GLIBCXX_DLL
-db_LIBS+=-lstdc++_s
+db_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS)
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index a5ddbc6af935..ceeb18547305 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -78,7 +78,7 @@ cairo_CC=$(CC) -mthreads
 cairo_CC+=-shared-libgcc
 .ENDIF
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-cairo_LIBS+=-lstdc++_s
+cairo_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 
 CONFIGURE_DIR=
diff --git a/curl/makefile.mk b/curl/makefile.mk
index f4e4c7f8ffd1..cb6ac50dc705 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -91,7 +91,7 @@ curl_CC+=-shared-libgcc
 .ENDIF
 curl_LIBS=-lws2_32 -lwinmm
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-curl_LIBS+=-lstdc++_s
+curl_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 CONFIGURE_DIR=.$/
 #relative to CONFIGURE_DIR
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 7542aeb1ccd1..b4a9d7dd3bbf 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -149,9 +149,9 @@ icu_LDFLAGS+=-shared-libgcc
 icu_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api
 .ENDIF
 icu_LDFLAGS+=-L$(COMPATH)$/lib
-icu_LIBS=-lmingwthrd
+icu_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-icu_LIBS+=-lstdc++_s
+icu_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2
 CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
@@ -253,6 +253,30 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary
 
 .ENDIF
 
+.IF "$(GUI)$(COM)"=="WNTGCC"
+ALLTAR : \
+    $(LB)$/icudata.lib \
+    $(LB)$/icuin$(ICU_BUILD_LIBPOST).lib \
+    $(LB)$/icuuc$(ICU_BUILD_LIBPOST).lib \
+    $(LB)$/icule$(ICU_BUILD_LIBPOST).lib \
+    $(LB)$/icutu$(ICU_BUILD_LIBPOST).lib
+
+$(LB)$/icudata.lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $@
+
+$(LB)$/icuin$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $@
+
+$(LB)$/icuuc$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $@
+
+$(LB)$/icule$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $@
+
+$(LB)$/icutu$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $@
+.ENDIF
+
 # Since you never know what will be in a patch (for example, it may already
 # patch at configure level) or in the case of a binary patch, we remove the
 # entire package directory if a patch is newer.
diff --git a/libxml2/libxml2-xpath.patch b/libxml2/libxml2-xpath.patch
index e02982f16efe..107de91ed862 100644
--- a/libxml2/libxml2-xpath.patch
+++ b/libxml2/libxml2-xpath.patch
@@ -1,6 +1,6 @@
---- misc/libxml2-2.7.6/xpath.c
-+++ misc/build/libxml2-2.7.6/xpath.c
-@@ -8104,9 +8104,17 @@
+--- misc/libxml2-2.7.6/xpath.c	2009-09-24 17:32:00.000000000 +0200
++++ misc/build/libxml2-2.7.6/xpath.c	2011-01-03 17:21:08.788256100 +0100
+@@ -8106,9 +8106,17 @@
  xmlNodePtr
  xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) {
      if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL);
@@ -21,7 +21,7 @@
      if (cur == NULL) return(NULL) ; /* ERROR */
      if (cur->next != NULL) return(cur->next) ;
      do {
-@@ -8160,8 +8168,13 @@
+@@ -8162,8 +8170,13 @@
  xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, xmlNodePtr cur)
  {
      if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL);
@@ -36,7 +36,7 @@
      if (cur == NULL)
  	return (NULL);
      if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE))
-@@ -8205,8 +8218,8 @@
+@@ -8207,8 +8220,8 @@
          cur = ctxt->context->node;
          if (cur == NULL)
              return (NULL);
@@ -47,3 +47,24 @@
          ctxt->ancestor = cur->parent;
      }
      if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE))
+@@ -11737,11 +11750,16 @@
+ 
+ 	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
+ 	        xmlXPathObjectPtr tmp;
+-		/* pop the result */
++		/* pop the result if any */
+ 		tmp = valuePop(ctxt);
+-		xmlXPathReleaseObject(xpctxt, tmp);
+-		/* then pop off contextObj, which will be freed later */
+-		valuePop(ctxt);
++		if (tmp != contextObj) {
++			/*
++			* Free up the result
++			* then pop off contextObj, which will be freed later
++			*/
++			xmlXPathReleaseObject(xpctxt, tmp);
++			valuePop(ctxt);
++		}
+ 		goto evaluation_error;
+ 	    }
+ 
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index b172b9b89b8f..20a22e46fe0f 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -65,7 +65,7 @@ xml2_CC+=-shared-libgcc
 .ENDIF
 xml2_LIBS=-lws2_32
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-xml2_LIBS+=-lstdc++_s
+xml2_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index c4bb5f50977b..d17b2c455f25 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -67,7 +67,7 @@ xslt_CC+=-shared-libgcc
 .ENDIF
 xslt_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-xslt_LIBS+=-lstdc++_s
+xslt_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
diff --git a/neon/makefile.mk b/neon/makefile.mk
index d296db7a3f98..c92a84936f46 100644
--- a/neon/makefile.mk
+++ b/neon/makefile.mk
@@ -46,10 +46,10 @@ TARGET=so_neon
     @echo "neon disabled...."
 .ENDIF
 
-NEON_NAME=neon-0.29.3
+NEON_NAME=neon-0.29.5
 
 TARFILE_NAME=$(NEON_NAME)
-TARFILE_MD5=ba1015b59c112d44d7797b62fe7bee51
+TARFILE_MD5=ff369e69ef0f0143beb5626164e87ae2
 PATCH_FILES=neon.patch
 
 .IF "$(GUI)"=="WNT"
diff --git a/neon/neon.patch b/neon/neon.patch
index 3d4e5019e0b7..51ec3a8d6d0b 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.29.3/src/config.h	2010-03-23 14:47:43.000000000 +0100
-+++ misc/build/neon-0.29.3/src/config.h	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/config.h	2010-12-07 15:53:32.000000000 +0100
++++ misc/build/neon-0.29.5/src/config.h	2010-12-07 13:44:29.000000000 +0100
 @@ -1 +1,488 @@
 -dummy
 +
@@ -304,7 +304,7 @@
 +#define NEON_IS_LIBRARY 1
 +
 +/* Define to be the neon version string */
-+#define NEON_VERSION "0.29.3"
++#define NEON_VERSION "0.29.5"
 +
 +/* Define to enable debugging */
 +/* #undef NE_DEBUGGING */
@@ -363,7 +363,7 @@
 +#define NE_VERSION_MINOR (29)
 +
 +/* Define to be neon library patch version */
-+#define NE_VERSION_PATCH (3)
++#define NE_VERSION_PATCH (5)
 +
 +/* Define to the address where bug reports for this package should be sent. */
 +#define PACKAGE_BUGREPORT "neon@webdav.org"
@@ -372,13 +372,13 @@
 +#define PACKAGE_NAME "neon"
 +
 +/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "neon 0.29.3"
++#define PACKAGE_STRING "neon 0.29.5"
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME "neon"
 +
 +/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.29.3"
++#define PACKAGE_VERSION "0.29.5"
 +
 +/* The size of a `int', as computed by sizeof. */
 +#define SIZEOF_INT 4
@@ -490,8 +490,8 @@
 +#else
 +#define HAVE_NTLM 1
 +#endif
---- misc/neon-0.29.3/src/makefile.mk	2010-03-23 14:47:43.000000000 +0100
-+++ misc/build/neon-0.29.3/src/makefile.mk	2010-03-23 14:45:21.000000000 +0100
+--- misc/neon-0.29.5/src/makefile.mk	2010-12-07 15:53:32.000000000 +0100
++++ misc/build/neon-0.29.5/src/makefile.mk	2010-12-07 13:44:29.000000000 +0100
 @@ -1 +1,102 @@
 -dummy
 +PRJ=..$/..$/..$/..$/..
@@ -596,46 +596,71 @@
 +# --- Targets ------------------------------------------------------
 +DEF1NAME=$(SHL1TARGET)
 +.INCLUDE :  target.mk
---- misc/neon-0.29.3/src/ne_auth.c	2009-12-30 22:29:30.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_auth.c	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_auth.c	2010-10-14 17:00:53.000000000 +0200
++++ misc/build/neon-0.29.5/src/ne_auth.c	2010-12-07 15:39:56.000000000 +0100
 @@ -367,7 +367,7 @@
  static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt,
                             struct auth_challenge *chall, char *pwbuf) 
  {
 -    if (chall->handler->creds(chall->handler->userdata, sess->realm, 
-+    if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm,
++    if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm, 
                                chall->handler->attempt++, sess->username, pwbuf) == 0) {
          return 0;
      } else {
-@@ -617,6 +617,7 @@
-     int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
+@@ -610,10 +610,12 @@
+         return NULL;
+ }
+ 
+-static int continue_sspi(auth_session *sess, int ntlm, const char *hdr)
++static int continue_sspi(auth_session *sess, int ntlm, const char *hdr,
++                         int attempt, struct auth_challenge *parms, ne_buffer **errmsg)
+ {
      int status;
      char *response = NULL;
 +    char password[NE_ABUFSIZ];
      
      NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
      
-@@ -633,8 +634,17 @@
+@@ -630,8 +632,17 @@
              return status;
          }
      }
-+
-+	/* Authentification needs more than one http request.
-+	 * As long as authentification in progress use the existing credentials.
-+	 * Otherwise get new credentials.*/
-+	if (!parms->opaque)
-+		if (get_credentials(sess, errmsg, attempt, parms, password)) {
-+		        /* Failed to get credentials */
-+			    return -1;
-+		}
-     
--    status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response);
-+    status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response, sess->username, password);
+-    
+-    status = ne_sspi_authenticate(sess->sspi_context, hdr, &response);
++   
++    /* Authentification needs more than one http request.
++     * As long as authentification in progress use the existing credentials.
++     * Otherwise get new credentials.*/
++    if (!hdr)
++        if (get_credentials(sess, errmsg, attempt, parms, password)) {
++            /* Failed to get credentials */
++            return -1;
++        } 
++
++    status = ne_sspi_authenticate(sess->sspi_context, hdr, &response, sess->username, password);
      if (status) {
          return status;
      }
---- misc/neon-0.29.3/src/ne_auth.h	2009-09-01 22:13:12.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_auth.h	2010-03-23 12:19:50.000000000 +0100
+@@ -651,7 +662,7 @@
+ {
+     int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
+ 
+-    return continue_sspi(sess, ntlm, parms->opaque);
++    return continue_sspi(sess, ntlm, parms->opaque, attempt, parms, errmsg);
+ }
+ 
+ static int verify_sspi(struct auth_request *req, auth_session *sess,
+@@ -674,7 +685,7 @@
+         return NE_OK;
+     }
+ 
+-    return continue_sspi(sess, ntlm, ptr);
++    return continue_sspi(sess, ntlm, ptr, 0, NULL, NULL);
+ }
+ 
+ #endif
+--- misc/neon-0.29.5/src/ne_auth.h	2009-09-01 22:13:12.000000000 +0200
++++ misc/build/neon-0.29.5/src/ne_auth.h	2010-12-07 13:44:30.000000000 +0100
 @@ -47,8 +47,8 @@
   * Hint: if you just wish to attempt authentication just once (even if
   * the user gets the username/password wrong), have the callback
@@ -647,8 +672,8 @@
  
  /* Set callbacks to provide credentials for server and proxy
   * authentication, using the default set of authentication protocols.
---- misc/neon-0.29.3/src/ne_defs.h	2009-09-02 16:04:43.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_defs.h	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_defs.h	2010-01-11 23:57:34.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_defs.h	2010-12-07 13:44:30.000000000 +0100
 @@ -41,7 +41,7 @@
  #endif
  
@@ -658,8 +683,8 @@
  #define ssize_t int
  #endif
  
---- misc/neon-0.29.3/src/ne_locks.c	2007-02-05 11:09:27.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_locks.c	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_locks.c	2007-02-05 11:09:27.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_locks.c	2010-12-07 13:44:30.000000000 +0100
 @@ -579,6 +579,23 @@
          const char *token = ne_get_response_header(ctx->req, "Lock-Token");
          /* at the root element; retrieve the Lock-Token header,
@@ -726,8 +751,8 @@
  	    ctx->found = 1;
  	}
      }
---- misc/neon-0.29.3/src/ne_locks.h	2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_locks.h	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_locks.h	2006-01-02 12:43:19.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_locks.h	2010-12-07 13:44:30.000000000 +0100
 @@ -22,6 +22,10 @@
  #ifndef NE_LOCKS_H
  #define NE_LOCKS_H
@@ -739,8 +764,8 @@
  #include "ne_request.h" /* for ne_session + ne_request */
  #include "ne_uri.h" /* for ne_uri */
  
---- misc/neon-0.29.3/src/ne_sspi.c	2007-08-10 17:26:08.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_sspi.c	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_sspi.c	2007-08-10 17:26:08.000000000 +0200
++++ misc/build/neon-0.29.5/src/ne_sspi.c	2010-12-07 13:44:31.000000000 +0100
 @@ -206,6 +206,45 @@
  }
  
@@ -826,8 +851,8 @@
  
          securityStatus =
              initializeSecurityContext(&sspiContext->credentials, NULL,
---- misc/neon-0.29.3/src/ne_sspi.h	2006-02-12 13:05:14.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_sspi.h	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_sspi.h	2006-02-12 13:05:14.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_sspi.h	2010-12-07 13:44:31.000000000 +0100
 @@ -41,7 +41,7 @@
  int ne_sspi_clear_context(void *context);
  
@@ -837,8 +862,8 @@
  
  #endif /* HAVE_SSPI */
  
---- misc/neon-0.29.3/src/ne_uri.c	2007-12-05 12:04:47.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_uri.c	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_uri.c	2007-12-05 12:04:47.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_uri.c	2010-12-07 13:44:31.000000000 +0100
 @@ -42,7 +42,7 @@
  #include "ne_alloc.h"
  #include "ne_uri.h"
@@ -884,8 +909,8 @@
  /*   3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU,
  /*   4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL,
  /*   5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US,
---- misc/neon-0.29.3/src/ne_utils.c	2006-03-07 10:36:43.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_utils.c	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_utils.c	2006-03-07 10:36:43.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_utils.c	2010-12-07 13:44:31.000000000 +0100
 @@ -118,6 +118,9 @@
  #ifdef HAVE_GNUTLS
      ", GNU TLS " LIBGNUTLS_VERSION
@@ -915,8 +940,8 @@
          return 1;
  #endif /* NE_HAVE_* */
      default:
---- misc/neon-0.29.3/src/ne_utils.h	2007-07-16 08:54:57.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_utils.h	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_utils.h	2007-07-16 08:54:57.000000000 +0200
++++ misc/build/neon-0.29.5/src/ne_utils.h	2010-12-07 13:44:31.000000000 +0100
 @@ -54,6 +54,7 @@
  #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */
  #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */
diff --git a/neon/neon_exports_unix.patch b/neon/neon_exports_unix.patch
index f5c2ce8afea3..d162a145d707 100644
--- a/neon/neon_exports_unix.patch
+++ b/neon/neon_exports_unix.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.29.3/src/exports.map	2009-09-29 10:28:13.531250000 +0200
-+++ misc/build/neon-0.29.3/src/exports.map	2009-09-21 12:16:53.453125000 +0200
+--- misc/neon-0.29.5/src/exports.map	2009-09-29 10:28:13.531250000 +0200
++++ misc/build/neon-0.29.5/src/exports.map	2009-09-21 12:16:53.453125000 +0200
 @@ -0,0 +1,288 @@
 +UDK_3_0_0 {
 +	global:
diff --git a/neon/neon_exports_win.patch b/neon/neon_exports_win.patch
index 85d73da2b41d..40f130e66da3 100644
--- a/neon/neon_exports_win.patch
+++ b/neon/neon_exports_win.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.29.3/src/exports.map	2009-09-29 10:28:13.531250000 +0200
-+++ misc/build/neon-0.29.3/src/exports.map	2009-09-21 12:16:53.453125000 +0200
+--- misc/neon-0.29.5/src/exports.map	2009-09-29 10:28:13.531250000 +0200
++++ misc/build/neon-0.29.5/src/exports.map	2009-09-21 12:16:53.453125000 +0200
 @@ -0,0 +1,294 @@
 +UDK_3_0_0 {
 +	global:
diff --git a/neon/version.mk b/neon/version.mk
index 418999ff1452..0bac1cd47f05 100644
--- a/neon/version.mk
+++ b/neon/version.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@ NEON_MAJOR=0
 # the minor
 NEON_MINOR=29
 # the micro
-NEON_MICRO=3
+NEON_MICRO=5
 
 # concat
 NEON_VERSION=$(NEON_MAJOR)$(NEON_MINOR)$(NEON_MICRO)
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 34e278c4d84c..c2f0bf5984ca 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -113,7 +113,7 @@ nss_CXX+=-shared-libgcc
 
 nss_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-nss_LIBS+=-lstdc++_s
+nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF