Bug 1293329, Upgrade Firefox 51 to NSPR 4.13, finalizing version numbers, no code change, reusing r=ted
authorKai Engert <kaie@kuix.de>
Tue, 27 Sep 2016 03:34:52 +0200
changeset 315624 a31fd577c38a7b771fcb95711be4ed891f73d4f5
parent 315623 db9a86ba0a4dccc83de49febad5ccb67639d8ad0
child 315625 83f3a00b2a1905bfbad4dd74358423969ed181d0
push idunknown
push userunknown
push dateunknown
reviewersted
bugs1293329
milestone52.0a1
Bug 1293329, Upgrade Firefox 51 to NSPR 4.13, finalizing version numbers, no code change, reusing r=ted
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/pr/include/prinit.h
old-configure.in
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1,1 +1,1 @@
-NSPR_4_13_BETA3
+NSPR_4_13_RTM
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -5,9 +5,8 @@
 
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
-
--- a/nsprpub/pr/include/prinit.h
+++ b/nsprpub/pr/include/prinit.h
@@ -26,21 +26,21 @@ PR_BEGIN_EXTERN_C
 /*
 ** NSPR's version is used to determine the likelihood that the version you
 ** used to build your component is anywhere close to being compatible with
 ** what is in the underlying library.
 **
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.13 Beta"
+#define PR_VERSION  "4.13"
 #define PR_VMAJOR   4
 #define PR_VMINOR   13
 #define PR_VPATCH   0
-#define PR_BETA     PR_TRUE
+#define PR_BETA     PR_FALSE
 
 /*
 ** PRVersionCheck
 **
 ** The basic signature of the function that is called to provide version
 ** checking. The result will be a boolean that indicates the likelihood
 ** that the underling library will perform as the caller expects.
 **
--- a/old-configure.in
+++ b/old-configure.in
@@ -43,17 +43,17 @@ dnl ====================================
 _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
 _SUBDIR_CONFIG_ARGS="$ac_configure_args"
 
 dnl Set the version number of the libs included with mozilla
 dnl ========================================================
 MOZJPEG=62
 MOZPNG=10625
 NSPR_VERSION=4
-NSPR_MINVER=4.12
+NSPR_MINVER=4.13
 NSS_VERSION=3
 
 dnl Set the minimum version of toolkit libs used by mozilla
 dnl ========================================================
 GLIB_VERSION=2.22
 # 2_26 is the earliest version we can set GLIB_VERSION_MIN_REQUIRED.
 # The macro won't be used when compiling with earlier versions anyway.
 GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26