Bug 1591887 - Uplift NSPR 4.24 RTM, only version number changes. r?jcj a=jcristau
authorKai Engert <kaie@kuix.de>
Mon, 02 Dec 2019 20:27:33 +0200
changeset 566679 f7c6c838e79df777942723c5abdd0662acf8b04d
parent 566678 56717f3c48219bfe7c16934908c674bfd4c720af
child 566680 ee5eb4cfe6414eeea88d2bf7b973b01333de6ae2
push id12373
push userccoroiu@mozilla.com
push dateWed, 04 Dec 2019 10:47:12 +0000
treeherdermozilla-beta@b69378d81dcf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcj, jcristau
bugs1591887
milestone72.0
Bug 1591887 - Uplift NSPR 4.24 RTM, only version number changes. r?jcj a=jcristau UPGRADE_NSPR_RELEASE Differential Revision: https://phabricator.services.mozilla.com//D55523
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_24_BETA1
\ No newline at end of file
+NSPR_4_24_RTM
\ No newline at end of file
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -5,8 +5,9 @@
 
 /*
  * 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.24 Beta"
+#define PR_VERSION  "4.24"
 #define PR_VMAJOR   4
 #define PR_VMINOR   24
 #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
@@ -42,17 +42,17 @@ dnl ====================================
 _SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
 _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
 _SUBDIR_CONFIG_ARGS="$ac_configure_args"
 
 dnl Set the version number of the libs included with mozilla
 dnl ========================================================
 MOZPNG=10635
 NSPR_VERSION=4
-NSPR_MINVER=4.23
+NSPR_MINVER=4.24
 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