components/desktop/mozjs-24/patches/02-nspr.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Fri, 01 Jul 2016 13:03:40 +0000
changeset 6336 6ba7729e5c3a
permissions -rw-r--r--
23245656 Deliver mozjs-24 24.2.0 in Solaris PSARC/2016/413 GNOME 3 Web Bundle

Not appropriate for upstream; hack to use pkg-config since we don't ship
nspr-config scripts.

--- mozjs-24.2.0/js/src/configure	2013-12-11 14:23:20.000000000 -0800
+++ mozjs-24.2.0/js/src/configure	2015-06-27 16:53:57.146376719 -0700
@@ -12402,7 +12402,7 @@
 	if test "$NSPR_CONFIG" != "no"; then
 		NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
 		NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
-		NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version`	
+		NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --modversion`	
 	elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then
 	    NSPR_CFLAGS="${NO_NSPR_CONFIG_SYSTEM_CFLAGS}"
 		NSPR_LIBS="${NO_NSPR_CONFIG_SYSTEM_LDFLAGS}"
--- mozjs-24.2.0/js/src/configure	2016-06-23 16:01:29.775679815 +0000
+++ mozjs-24.2.0/js/src/configure	2016-06-23 16:13:04.806287066 +0000
@@ -12351,13 +12351,13 @@
 		nspr_config_major_version=`echo $NSPR_VERSION_STRING | \
 			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
 		nspr_config_minor_version=`echo $NSPR_VERSION_STRING | \
-			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+			sed 's/\([0-9]*\).\([0-11]*\).\([0-9]*\)/\2/'`
 		nspr_config_micro_version=`echo $NSPR_VERSION_STRING | \
 			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
 		min_nspr_major_version=`echo $min_nspr_version | \
 			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
 		min_nspr_minor_version=`echo $min_nspr_version | \
-			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+			sed 's/\([0-9]*\).\([0-11]*\).\([0-9]*\)/\2/'`
 		min_nspr_micro_version=`echo $min_nspr_version | \
 			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
 		if test "$nspr_config_major_version" -ne "$min_nspr_major_version"; then