upgrade to JavaScript 1.6 as contained in Mozilla Firefox 1.5.0.5

js/js.patch

@@ -1,6 +1,6 @@
 Index: JavaScript-0.55/JavaScript.xs
 --- JavaScript-0.55/JavaScript.xs.orig	2005-06-29 21:07:06 +0200
-+++ JavaScript-0.55/JavaScript.xs	2006-03-06 22:39:04 +0100
++++ JavaScript-0.55/JavaScript.xs	2006-06-29 19:20:44 +0200
 @@ -6,7 +6,7 @@
  #else
  #include <jsapi.h>
@@ -12,7 +12,7 @@ Index: JavaScript-0.55/JavaScript.xs
  
 Index: JavaScript-0.55/Makefile.PL
 --- JavaScript-0.55/Makefile.PL.orig	2005-06-28 23:49:03 +0200
-+++ JavaScript-0.55/Makefile.PL	2006-03-06 22:39:04 +0100
++++ JavaScript-0.55/Makefile.PL	2006-06-29 19:20:44 +0200
 @@ -10,30 +10,13 @@
  	$define .= " -DXP_UNIX";
  }
@@ -47,8 +47,8 @@ Index: JavaScript-0.55/Makefile.PL
  WriteMakefile(
      'NAME'		=> 'JavaScript',
 Index: JavaScript-SpiderMonkey-0.16/Makefile.PL
---- JavaScript-SpiderMonkey-0.16/Makefile.PL.orig	2006-02-28 18:13:08 +0100
-+++ JavaScript-SpiderMonkey-0.16/Makefile.PL	2006-03-06 22:39:27 +0100
+--- JavaScript-SpiderMonkey-0.16/Makefile.PL.orig	2006-06-13 13:59:05 +0200
++++ JavaScript-SpiderMonkey-0.16/Makefile.PL	2006-06-29 19:20:44 +0200
 @@ -108,7 +108,6 @@
      'NAME'		=> 'JavaScript::SpiderMonkey',
      'VERSION_FROM'	=> 'SpiderMonkey.pm', # finds $VERSION
@@ -58,8 +58,8 @@ Index: JavaScript-SpiderMonkey-0.16/Makefile.PL
                             }, # e.g., Module::Name => 1.1
      ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
 Index: JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm
---- JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm.orig	2006-03-06 17:48:27 +0100
-+++ JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm	2006-03-06 22:39:04 +0100
+--- JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm.orig	2006-06-13 15:46:00 +0200
++++ JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm	2006-06-29 19:20:44 +0200
 @@ -75,7 +75,6 @@
  use strict;
  use warnings;
@@ -84,10 +84,51 @@ Index: JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm
  }
  
  1;
+Index: js/src/config.mk
+--- js/src/config.mk.orig	2003-11-15 01:10:55 +0100
++++ js/src/config.mk	2006-06-29 19:20:44 +0200
+@@ -114,7 +114,7 @@
+ 
+ ifdef BUILD_OPT
+ OPTIMIZER  = -O
+-DEFINES    += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)
++DEFINES    += -UDEBUG -DNDEBUG
+ OBJDIR_TAG = _OPT
+ else
+ ifdef USE_MSVC
+@@ -122,7 +122,7 @@
+ else
+ OPTIMIZER  = -g
+ endif
+-DEFINES    += -DDEBUG -DDEBUG_$(shell whoami)
++DEFINES    += -DDEBUG
+ OBJDIR_TAG = _DBG
+ endif
+ 
+Index: js/src/config/SunOS5.10_i86pc.mk
+--- /dev/null	2006-06-29 19:26:24 +0200
++++ js/src/config/SunOS5.10_i86pc.mk	2006-06-29 19:20:44 +0200
+@@ -0,0 +1,16 @@
++
++CC          = gcc
++LD          = ld
++CCC         = g++
++CFLAGS      += -Wall -Wno-format
++MKSHLIB     = $(LD) -shared $(XMKSHLIBOPTS)
++RANLIB      = echo
++CPU_ARCH    = $(shell uname -m)
++GFX_ARCH    = x
++OS_CFLAGS   = -DXP_UNIX -DSVR4 -DSYSV -DSOLARIS -DHAVE_LOCALTIME_R -DHAVE_VA_COPY -DVA_COPY=va_copy -DPIC -fPIC
++OS_LIBS     = -lsocket -lnsl -ldl
++LDFLAGS     = 
++NOSUCHFILE  = /solaris-rm-f-sucks
++JS_EDITLINE = 1
++OS_TEST     = i86pc
++
 Index: js/src/jsapi.c
---- js/src/jsapi.c.orig	2005-10-22 12:19:14 +0200
-+++ js/src/jsapi.c	2006-03-06 22:39:04 +0100
-@@ -125,7 +125,7 @@
+--- js/src/jsapi.c.orig	2006-06-16 04:01:22 +0200
++++ js/src/jsapi.c	2006-06-29 19:20:44 +0200
+@@ -130,7 +130,7 @@
  
  static JSBool
  TryArgumentFormatter(JSContext *cx, const char **formatp, JSBool fromJS,
@@ -96,7 +137,7 @@ Index: js/src/jsapi.c
  {
      const char *format;
      JSArgumentFormatMap *map;
-@@ -263,8 +263,7 @@
+@@ -259,8 +259,7 @@
              break;
            default:
              format--;
@@ -106,7 +147,7 @@ Index: js/src/jsapi.c
                  return JS_FALSE;
              }
              /* NB: the formatter already updated sp, so we continue here. */
-@@ -366,8 +365,7 @@
+@@ -362,8 +361,7 @@
              break;
            default:
              format--;
@@ -116,31 +157,10 @@ Index: js/src/jsapi.c
                  goto bad;
              }
              /* NB: the formatter already updated sp, so we continue here. */
-@@ -2211,7 +2209,7 @@
-     JSAtom *atom;
- 
-     if (attrs & JSPROP_INDEX) {
--        id = INT_TO_JSVAL((jsint)name);
-+        id = INT_TO_JSVAL(name);
-         atom = NULL;
-         attrs &= ~JSPROP_INDEX;
-     } else {
-Index: js/src/jscntxt.c
---- js/src/jscntxt.c.orig	2004-08-19 19:57:36 +0200
-+++ js/src/jscntxt.c	2006-03-06 22:39:04 +0100
-@@ -334,7 +334,7 @@
- {
-     const JSResolvingKey *key = (const JSResolvingKey *)ptr;
- 
--    return ((JSDHashNumber)key->obj >> JSVAL_TAGBITS) ^ key->id;
-+    return ((JSDHashNumber)JS_PTR_TO_UINT32(key->obj) >> JSVAL_TAGBITS) ^ key->id;
- }
- 
- JS_PUBLIC_API(JSBool)
 Index: js/src/jsdtoa.c
---- js/src/jsdtoa.c.orig	2004-04-04 00:11:11 +0200
-+++ js/src/jsdtoa.c	2006-03-06 22:39:04 +0100
-@@ -257,7 +257,7 @@
+--- js/src/jsdtoa.c.orig	2005-07-23 23:17:40 +0200
++++ js/src/jsdtoa.c	2006-06-29 19:20:44 +0200
+@@ -247,7 +247,7 @@
  #define word1(x)        JSDOUBLE_LO32(x)
  #define set_word1(x, y) JSDOUBLE_SET_LO32(x, y)
  
@@ -149,26 +169,7 @@ Index: js/src/jsdtoa.c
  
  /* #define P DBL_MANT_DIG */
  /* Ten_pmax = floor(P*log(2)/log(5)) */
-@@ -989,7 +989,8 @@
- static double ulp(double x)
- {
-     register Long L;
--    double a;
-+    double a = 0.;	/* only need to initialize to calm the compiler.
-+			 * set_word0 and set_word1 set a, but in two stages */
- 
-     L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
- #ifndef Sudden_Underflow
-@@ -1020,7 +1021,7 @@
- {
-     ULong *xa, *xa0, w, y, z;
-     int32 k;
--    double d;
-+    double d = 0.;
- #define d0 word0(d)
- #define d1 word1(d)
- #define set_d0(x) set_word0(d, x)
-@@ -1836,6 +1837,7 @@
+@@ -1826,6 +1826,7 @@
      }
  #ifdef Avoid_Underflow
      if (scale) {
@@ -177,19 +178,20 @@ Index: js/src/jsdtoa.c
          set_word1(rv0, 0);
          if ((word0(rv) & Exp_mask) <= P*Exp_msk1
 Index: js/src/jsinterp.c
---- js/src/jsinterp.c.orig	2004-09-24 04:16:49 +0200
-+++ js/src/jsinterp.c	2006-03-06 22:39:04 +0100
-@@ -1741,11 +1741,11 @@
+--- js/src/jsinterp.c.orig	2006-06-16 03:28:02 +0200
++++ js/src/jsinterp.c	2006-06-29 19:24:50 +0200
+@@ -1740,12 +1740,12 @@
      void *mark;
-     jsbytecode *pc, *pc2, *endpc;
+     jsbytecode *endpc, *pc2;
      JSOp op, op2;
 -    const JSCodeSpec *cs;
 +    const JSCodeSpec *cs = NULL;
+     jsatomid atomIndex;
      JSAtom *atom;
      uintN argc, slot, attrs;
      jsval *vp, lval, rval, ltmp, rtmp;
 -    jsid id;
-+    jsid id = -1L; /* initialize to something awful */
++    jsid id = -1L;
      JSObject *withobj, *origobj, *propobj;
      jsval iter_state;
      JSProperty *prop;
@@ -202,26 +204,18 @@ Index: js/src/jsinterp.c
  #endif
  #if JS_HAS_EXPORT_IMPORT
      JSIdArray *ida;
-@@ -1834,6 +1834,7 @@
-         !JS_CHECK_STACK_SIZE(cx, stackDummy)) {
-         JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
+@@ -5526,6 +5526,7 @@
+         if (printable)
+             js_ReportIsNotDefined(cx, printable);
          ok = JS_FALSE;
 +        sp = NULL;
          goto out;
      }
- 
-@@ -1843,6 +1844,7 @@
-     newsp = js_AllocRawStack(cx, (uintN)(2 * depth), &mark);
-     if (!newsp) {
-         ok = JS_FALSE;
-+        sp = NULL;
-         goto out;
-     }
-     sp = newsp + depth;
+ }
 Index: js/src/jsosdep.h
---- js/src/jsosdep.h.orig	2003-11-15 01:10:59 +0100
-+++ js/src/jsosdep.h	2006-03-06 22:39:04 +0100
-@@ -101,7 +101,7 @@
+--- js/src/jsosdep.h.orig	2005-07-08 00:35:39 +0200
++++ js/src/jsosdep.h	2006-06-29 19:20:44 +0200
+@@ -86,7 +86,7 @@
  #elif defined(SOLARIS)
  #define JS_HAVE_LONG_LONG
  
@@ -231,9 +225,9 @@ Index: js/src/jsosdep.h
  
  #elif defined(SUNOS4)
 Index: js/src/jspubtd.h
---- js/src/jspubtd.h.orig	2004-06-15 18:38:43 +0200
-+++ js/src/jspubtd.h	2006-03-06 22:39:04 +0100
-@@ -531,7 +531,7 @@
+--- js/src/jspubtd.h.orig	2005-10-22 01:30:23 +0200
++++ js/src/jspubtd.h	2006-06-29 19:20:44 +0200
+@@ -561,7 +561,7 @@
  typedef JSBool
  (* JS_DLL_CALLBACK JSArgumentFormatter)(JSContext *cx, const char *format,
                                          JSBool fromJS, jsval **vpp,
@@ -242,32 +236,9 @@ Index: js/src/jspubtd.h
  #endif
  
  typedef JSBool
-Index: js/src/jstypes.h
---- js/src/jstypes.h.orig	2003-11-15 01:11:04 +0100
-+++ js/src/jstypes.h	2006-03-06 22:39:04 +0100
-@@ -203,6 +203,19 @@
- #define JS_BITMASK(n)   (JS_BIT(n) - 1)
- 
- /***********************************************************************
-+** MACROS:      JS_PTR_TO_INT32
-+**              JS_PTR_TO_UINT32
-+**              JS_INT32_TO_PTR
-+**              JS_UINT32_TO_PTR
-+** DESCRIPTION:
-+** Integer to pointer and pointer to integer conversion macros.
-+***********************************************************************/
-+#define JS_PTR_TO_INT32(x)  ((jsint)((char *)(x) - (char *)0))
-+#define JS_PTR_TO_UINT32(x) ((jsuint)((char *)(x) - (char *)0))
-+#define JS_INT32_TO_PTR(x)  ((void *)((char *)0 + (jsint)(x)))
-+#define JS_UINT32_TO_PTR(x) ((void *)((char *)0 + (jsuint)(x)))
-+
-+/***********************************************************************
- ** MACROS:      JS_HOWMANY
- **              JS_ROUNDUP
- **              JS_MIN
 Index: js/src/perlconnect/JS.xs
---- js/src/perlconnect/JS.xs.orig	2005-02-12 21:10:34 +0100
-+++ js/src/perlconnect/JS.xs	2006-03-06 22:39:04 +0100
+--- js/src/perlconnect/JS.xs.orig	2005-11-25 09:16:37 +0100
++++ js/src/perlconnect/JS.xs	2006-06-29 19:20:44 +0200
 @@ -61,7 +61,7 @@
  
  #include <jsapi.h>
@@ -279,7 +250,7 @@ Index: js/src/perlconnect/JS.xs
  /* #include <stdio.h>  */
 Index: js/src/rules.mk
 --- js/src/rules.mk.orig	2003-11-15 01:11:04 +0100
-+++ js/src/rules.mk	2006-03-06 22:39:04 +0100
++++ js/src/rules.mk	2006-06-29 19:20:44 +0200
 @@ -58,7 +58,7 @@
  # TARGETS = $(LIBRARY)   # $(PROGRAM) not supported for MSVC yet
  TARGETS += $(SHARED_LIBRARY) $(PROGRAM)  # it is now
@@ -289,44 +260,3 @@ Index: js/src/rules.mk
  endif
  
  all:
-Index: js/src/config/SunOS5.10_i86pc.mk
---- js/src/config/SunOS5.10_i86pc.mk.orig	2006-06-06 14:24:18.124955215 +0200
-+++ js/src/config/SunOS5.10_i86pc.mk	2006-06-06 14:24:07.034374207 +0200
-@@ -0,0 +1,16 @@
-+
-+CC          = gcc
-+LD          = ld
-+CCC         = g++
-+CFLAGS      += -Wall -Wno-format
-+MKSHLIB     = $(LD) -shared $(XMKSHLIBOPTS)
-+RANLIB      = echo
-+CPU_ARCH    = $(shell uname -m)
-+GFX_ARCH    = x
-+OS_CFLAGS   = -DXP_UNIX -DSVR4 -DSYSV -DSOLARIS -DHAVE_LOCALTIME_R -DHAVE_VA_COPY -DVA_COPY=va_copy -DPIC -fPIC
-+OS_LIBS     = -lsocket -lnsl -ldl
-+LDFLAGS     = 
-+NOSUCHFILE  = /solaris-rm-f-sucks
-+JS_EDITLINE = 1
-+OS_TEST     = i86pc
-+
-Index: js/src/config.mk
---- js/src/config.mk.orig	2003-11-15 01:10:55.000000000 +0100
-+++ js/src/config.mk	2006-06-06 14:32:09.769085477 +0200
-@@ -114,7 +114,7 @@
- 
- ifdef BUILD_OPT
- OPTIMIZER  = -O
--DEFINES    += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)
-+DEFINES    += -UDEBUG -DNDEBUG
- OBJDIR_TAG = _OPT
- else
- ifdef USE_MSVC
-@@ -122,7 +122,7 @@
- else
- OPTIMIZER  = -g
- endif
--DEFINES    += -DDEBUG -DDEBUG_$(shell whoami)
-+DEFINES    += -DDEBUG
- OBJDIR_TAG = _DBG
- endif
- 

js/js.spec

@@ -23,7 +23,8 @@
 ##
 
 #   package version
-%define       V_js                      1.5
+%define       V_js                      1.6
+%define       V_js_snapshot             firefox-1.5.0.5
 %define       V_javascript              0.55
 %define       V_javascript_spidermonkey 0.16
 %define       V_javascript_squish       0.05
@@ -47,7 +48,7 @@ Release:      20060629
 %option       with_perl  no
 
 #   list of sources
-Source0:      http://ftp.mozilla.org/pub/mozilla.org/js/js-%{V_js}.tar.gz
+Source0:      ftp://ftp.openpkg.org/sources/CPY/mozilla/js-%{V_js}-%{V_js_snapshot}.tar.gz
 Source1:      http://www.cpan.org/modules/by-module/JavaScript/JavaScript-%{V_javascript}.tar.gz
 Source2:      http://www.cpan.org/modules/by-module/JavaScript/JavaScript-SpiderMonkey-%{V_javascript_spidermonkey}.tar.gz
 Source3:      http://www.cpan.org/modules/by-module/JavaScript/JavaScript-Squish-%{V_javascript_squish}.tar.gz
@@ -78,8 +79,8 @@ AutoReqProv:  no
 
 %track
     prog js = {
-        version   = %{V_js}
-        url       = http://ftp.mozilla.org/pub/mozilla.org/js/
+        version   = %{V_js}-%{V_js_snapshot}
+        url       = ftp://ftp.openpkg.org/sources/CPY/mozilla/
         regex     = js-(__VER__)\.tar\.gz
     }
     prog js:JavaScript = {