The package rpms/js.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/js.git/commit/?id=c32559be81b6110....
Change:
-%ifnarch armv7hl
Thanks.
Full change:
============
commit c32559be81b61100bff379b000e94f0f9afecfed
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Jan 31 09:43:16 2020 -0500
moved the last dep off of this, it can sleep now
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 591aa7f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-js-1.7.0.tar.gz
-/js185-1.0.0.tar.gz
-/js185-destdir.patch
diff --git a/0001-Make-js-config.h-multiarch-compatible.patch
b/0001-Make-js-config.h-multiarch-compatible.patch
deleted file mode 100644
index 5f68e6f..0000000
--- a/0001-Make-js-config.h-multiarch-compatible.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 5017afb14474ef104719aaf56992f7c86475c42e Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters(a)verbum.org>
-Date: Mon, 17 Mar 2014 13:48:01 -0400
-Subject: [PATCH] Move JS_BYTES_PER_WORD out of config.h
-
-Instead define it in terms of the already extant GNU C extension
-__SIZEOF_POINTER__. This avoids multiarch conflicts when 32 and 64
-bit packages of js are co-installed.
----
- js/src/configure.in | 9 ---------
- js/src/js-config.h.in | 1 -
- js/src/jstypes.h | 12 ++++++++++++
- 3 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/js/src/configure.in b/js/src/configure.in
-index 0bf9b75..daf53d2 100644
---- a/js/src/configure.in
-+++ b/js/src/configure.in
-@@ -3134,15 +3134,6 @@ else
- [int long 'long long' short])
- fi
-
--MOZ_SIZE_OF_TYPE(JS_BYTES_PER_WORD, void*, 4 8)
--if test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "4"; then
-- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 5)
--elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then
-- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 6)
--else
-- AC_MSG_ERROR([Unexpected JS_BYTES_PER_WORD])
--fi
--
- MOZ_ALIGN_OF_TYPE(JS_ALIGN_OF_POINTER, void*, 2 4 8 16)
- MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 12 14)
-
-diff --git a/js/src/js-config.h.in b/js/src/js-config.h.in
-index e3a5f74..f30d5c3 100644
---- a/js/src/js-config.h.in
-+++ b/js/src/js-config.h.in
-@@ -81,7 +81,6 @@
- #undef JS_INT32_TYPE
- #undef JS_INT64_TYPE
- #undef JS_INTPTR_TYPE
--#undef JS_BYTES_PER_WORD
-
- /* Some mozilla code uses JS-friend APIs that depend on JS_TRACER and
- JS_METHODJIT being correct. */
-diff --git a/js/src/jstypes.h b/js/src/jstypes.h
-index c2103d8..84d402e 100644
---- a/js/src/jstypes.h
-+++ b/js/src/jstypes.h
-@@ -56,6 +56,18 @@
-
- #include <stddef.h>
- #include "js-config.h"
-+#ifndef JS_BYTES_PER_WORD
-+#define JS_BYTES_PER_WORD __SIZEOF_POINTER__
-+#endif
-+#ifndef JS_BITS_PER_WORD_LOG2
-+#if JS_BYTES_PER_WORD == 8
-+#define JS_BITS_PER_WORD_LOG2 6
-+#elif JS_BYTES_PER_WORD == 4
-+#define JS_BITS_PER_WORD_LOG2 5
-+#else
-+#error Unhandled JS_BYTES_PER_WORD
-+#endif
-+#endif
-
- /***********************************************************************
- ** MACROS: JS_EXTERN_API
---
-1.8.3.1
-
diff --git a/aarch64.patch b/aarch64.patch
deleted file mode 100644
index 19d261d..0000000
--- a/aarch64.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/js/src/Makefile.in
-+++ a/js/src/Makefile.in
-@@ -382,7 +382,7 @@ CPPSRCS += checks.cc \
- # END enclude sources for V8 dtoa
- #############################################
-
--ifeq (,$(filter-out powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU)))
-+ifeq (,$(filter-out aarch64 powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU)))
-
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
---- a/js/src/assembler/jit/ExecutableAllocator.h
-+++ a/js/src/assembler/jit/ExecutableAllocator.h
-@@ -391,6 +391,12 @@ public:
- {
- CacheRangeFlush(code, size, CACHE_SYNC_ALL);
- }
-+#elif WTF_CPU_AARCH64 && WTF_PLATFORM_LINUX
-+ static void cacheFlush(void* code, size_t size)
-+ {
-+ intptr_t end = reinterpret_cast<intptr_t>(code) + size;
-+ __builtin___clear_cache(reinterpret_cast<char*>(code),
reinterpret_cast<char*>(end));
-+ }
- #else
- #error "The cacheFlush support is missing on this platform."
- #endif
---- a/js/src/assembler/wtf/Platform.h
-+++ a/js/src/assembler/wtf/Platform.h
-@@ -292,6 +292,10 @@
-
- #endif /* ARM */
-
-+/* CPU(AArch64) - 64-bit ARM */
-+#if defined(__aarch64__)
-+#define WTF_CPU_AARCH64 1
-+#endif
-
-
- /* Operating systems - low-level dependencies */
---- a/js/src/configure.in
-+++ a/js/src/configure.in
-@@ -1534,6 +1534,10 @@ arm*)
- CPU_ARCH=arm
- ;;
-
-+aarch64)
-+ CPU_ARCH=aarch64
-+ ;;
-+
- mips|mipsel)
- CPU_ARCH="mips"
- ;;
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..9354ce1
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+moved the last dep off of this, it can sleep now
diff --git a/js-1.5-va_copy.patch b/js-1.5-va_copy.patch
deleted file mode 100644
index cf64d3a..0000000
--- a/js-1.5-va_copy.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- js/src/config/Linux_All.mk.vacopy 2009-05-29 10:35:14.000000000 +0200
-+++ js/src/config/Linux_All.mk 2009-05-29 10:44:55.000000000 +0200
-@@ -91,8 +91,17 @@ endif
- JS_EDITLINE = 1
-
- ifeq ($(CPU_ARCH),x86_64)
--# Use VA_COPY() standard macro on x86-64
--# FIXME: better use it everywhere
-+# Use va_copy() standard macro on x86-64
-+OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
-+endif
-+
-+ifeq ($(CPU_ARCH),ppc)
-+# Use va_copy() standard macro on ppc too
-+OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
-+endif
-+
-+ifeq (s390,$(findstring s390,$(CPU_ARCH)))
-+# Use va_copy() standard macro on s390/s390x too
- OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
- endif
-
-diff -Naupr js.orig/src/jsprf.c js/src/jsprf.c
---- js.orig/src/jsprf.c 2004-09-24 05:31:15.000000000 +0200
-+++ js/src/jsprf.c 2006-01-26 11:34:52.000000000 +0100
-@@ -55,7 +55,7 @@
- ** and requires array notation.
- */
- #ifdef HAVE_VA_COPY
--#define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar)
-+#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar)
- #elif defined(HAVE_VA_LIST_AS_ARRAY)
- #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0]
- #else
diff --git a/js-1.60-ncurses.patch b/js-1.60-ncurses.patch
deleted file mode 100644
index 6002715..0000000
--- a/js-1.60-ncurses.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
---- js.orig/src/Makefile.ref 2006-08-21 20:58:45.000000000 +0200
-+++ js/src/Makefile.ref 2007-02-02 12:59:06.000000000 +0100
-@@ -132,7 +132,7 @@ endif
- ifdef JS_READLINE
- # For those platforms with the readline library installed.
- DEFINES += -DEDITLINE
--PROG_LIBS += -lreadline -ltermcap
-+PROG_LIBS += -lreadline -lncurses
- else
- ifdef JS_EDITLINE
- # Use the editline library, built locally.
diff --git a/js-1.7.0-threadsafe.patch b/js-1.7.0-threadsafe.patch
deleted file mode 100644
index 55611c6..0000000
--- a/js-1.7.0-threadsafe.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
---- js.orig/src/Makefile.ref 2006-07-26 21:16:47.000000000 +0200
-+++ js/src/Makefile.ref 2007-11-20 22:03:59.000000000 +0100
-@@ -63,11 +63,11 @@ INCLUDES += -I$(OBJDIR)
-
- ifdef JS_THREADSAFE
- DEFINES += -DJS_THREADSAFE
--INCLUDES += -I$(DIST)/include/nspr
-+INCLUDES += $(shell nspr-config --cflags)
- ifdef USE_MSVC
- OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
- else
--OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
-+OTHER_LIBS += $(shell nspr-config --libs)
- endif
- endif
-
diff --git a/js-1.8.5-537701.patch b/js-1.8.5-537701.patch
deleted file mode 100644
index add3e6d..0000000
--- a/js-1.8.5-537701.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up js-1.8.5/js/src/jsval.h.pad-the-structs-and-asserts js-1.8.5/js/src/jsval.h
---- js-1.8.5/js/src/jsval.h.pad-the-structs-and-asserts 2011-11-28 12:46:32.811556132
-0600
-+++ js-1.8.5/js/src/jsval.h 2011-11-28 12:46:43.493448233 -0600
-@@ -343,11 +343,11 @@ typedef union jsval_layout
- uint64 payload47 : 47;
- } debugView;
- struct {
-+ uint32 padding;
- union {
- int32 i32;
- uint32 u32;
- JSWhyMagic why;
-- jsuword word;
- } payload;
- } s;
- double asDouble;
-diff -up js-1.8.5/js/src/jsvalue.h.pad-the-structs-and-asserts js-1.8.5/js/src/jsvalue.h
---- js-1.8.5/js/src/jsvalue.h.pad-the-structs-and-asserts 2011-11-28 12:46:37.246509255
-0600
-+++ js-1.8.5/js/src/jsvalue.h 2011-11-28 12:46:43.495448203 -0600
-@@ -291,7 +291,6 @@ JSVAL_EXTRACT_NON_DOUBLE_TAG_IMPL(jsval_
- }
-
- #ifdef __cplusplus
--JS_STATIC_ASSERT(offsetof(jsval_layout, s.payload) == 0);
- JS_STATIC_ASSERT((JSVAL_TYPE_NONFUNOBJ & 0xF) == JSVAL_TYPE_OBJECT);
- JS_STATIC_ASSERT((JSVAL_TYPE_FUNOBJ & 0xF) == JSVAL_TYPE_OBJECT);
- #endif
-@@ -729,7 +728,11 @@ class Value
- }
-
- const jsuword *payloadWord() const {
-+#if JS_BITS_PER_WORD == 32
- return &data.s.payload.word;
-+#elif JS_BITS_PER_WORD == 64
-+ return &data.asBits;
-+#endif
- }
-
- private:
diff --git a/js-1.8.5-64bit-big-endian.patch b/js-1.8.5-64bit-big-endian.patch
deleted file mode 100644
index 8cf3fc9..0000000
--- a/js-1.8.5-64bit-big-endian.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=627664
-
-diff -up xulrunner-2.0/mozilla-central/js/src/jsval.h.64bit-big-endian
xulrunner-2.0/mozilla-central/js/src/jsval.h
---- xulrunner-2.0/mozilla-central/js/src/jsval.h.64bit-big-endian 2011-01-20
15:59:49.000000000 +0100
-+++ xulrunner-2.0/mozilla-central/js/src/jsval.h 2011-01-20 16:00:21.000000000 +0100
-@@ -347,6 +347,7 @@ typedef union jsval_layout
- int32 i32;
- uint32 u32;
- JSWhyMagic why;
-+ jsuword word;
- } payload;
- } s;
- double asDouble;
diff --git a/js-1.8.5-array-recursion.patch b/js-1.8.5-array-recursion.patch
deleted file mode 100644
index 463eb4e..0000000
--- a/js-1.8.5-array-recursion.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ur js-1.8.5.orig/js/src/jsarray.cpp js-1.8.5/js/src/jsarray.cpp
---- js-1.8.5.orig/js/src/jsarray.cpp 2011-03-31 23:08:36.000000000 +0400
-+++ js-1.8.5/js/src/jsarray.cpp 2015-04-15 01:10:10.662544828 +0300
-@@ -1223,8 +1223,6 @@
- array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
- JSString *sepstr, Value *rval)
- {
-- JS_CHECK_RECURSION(cx, return false);
--
- /* Get characters to use for the separator. */
- static const jschar comma = ',';
- const jschar *sep;
-@@ -1323,6 +1321,8 @@
- static JSBool
- array_toString(JSContext *cx, uintN argc, Value *vp)
- {
-+ JS_CHECK_RECURSION(cx, return false);
-+
- JSObject *obj = ToObject(cx, &vp[1]);
- if (!obj)
- return false;
-@@ -1357,6 +1357,8 @@
- static JSBool
- array_toLocaleString(JSContext *cx, uintN argc, Value *vp)
- {
-+ JS_CHECK_RECURSION(cx, return false);
-+
- JSObject *obj = ToObject(cx, &vp[1]);
- if (!obj)
- return false;
-@@ -1454,6 +1456,8 @@
- static JSBool
- array_join(JSContext *cx, uintN argc, Value *vp)
- {
-+ JS_CHECK_RECURSION(cx, return false);
-+
- JSString *str;
- if (argc == 0 || vp[2].isUndefined()) {
- str = NULL;
-diff --git a/js/src/tests/ecma_5/extensions/array-toString-recursion.js
b/js/src/tests/ecma_5/extensions/array-toString-recursion.js
-new file mode 100644
---- /dev/null
-+++ b/js/src/tests/ecma_5/extensions/array-toString-recursion.js
-@@ -0,0 +1,46 @@
-+/*
-+ * Any copyright is dedicated to the Public Domain.
-+ *
http://creativecommons.org/licenses/publicdomain/
-+ */
-+
-+//-----------------------------------------------------------------------------
-+var BUGNUMBER = 635389;
-+var summary = 'Infinite recursion via [].{toString,toLocaleString,join}';
-+
-+print(BUGNUMBER + ": " + summary);
-+
-+/**************
-+ * BEGIN TEST *
-+ **************/
-+
-+try
-+{
-+ var x = [];
-+ x.join = Array.prototype.toString;
-+ "" + x;
-+ throw new Error("should have thrown");
-+}
-+catch (e)
-+{
-+ assertEq(e instanceof InternalError, true,
-+ "should have thrown for over-recursion");
-+}
-+
-+try
-+{
-+ var x = { toString: Array.prototype.toString, join: Array.prototype.toString };
-+ "" + x;
-+ throw new Error("should have thrown");
-+}
-+catch (e)
-+{
-+ assertEq(e instanceof InternalError, true,
-+ "should have thrown for over-recursion");
-+}
-+
-+/******************************************************************************/
-+
-+if (typeof reportCompare === "function")
-+ reportCompare(true, true);
-+
-+print("All tests passed!");
-diff -ur js-1.8.5.orig/js/src/tests/ecma_5/extensions/jstests.list
js-1.8.5/js/src/tests/ecma_5/extensions/jstests.list
---- js-1.8.5.orig/js/src/tests/ecma_5/extensions/jstests.list 2011-03-31
23:08:36.000000000 +0400
-+++ js-1.8.5/js/src/tests/ecma_5/extensions/jstests.list 2015-04-15 01:15:08.784740028
+0300
-@@ -9,6 +9,7 @@
- script bug472534.js
- script bug496985.js
- script bug566661.js
-+script array-toString-recursion.js
- script eval-native-callback-is-indirect.js
- script extension-methods-reject-null-undefined-this.js
- skip-if(!xulRuntime.shell) script function-definition-with.js # needs evaluate()
diff --git a/js-1.8.5-c++11.patch b/js-1.8.5-c++11.patch
deleted file mode 100644
index ab2181f..0000000
--- a/js-1.8.5-c++11.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -upr a/js/src/jsapi.cpp b/js/src/jsapi.cpp
---- a/js/src/jsapi.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsapi.cpp 2016-02-29 18:10:49.302307353 -0600
-@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob
- AutoIdVector props(cx);
- JSIdArray *ida;
- if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx,
props, &ida))
-- return false;
-+ return NULL;
- for (size_t n = 0; n < size_t(ida->length); ++n)
- JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]);
- return ida;
-diff -upr a/js/src/jsfun.cpp b/js/src/jsfun.cpp
---- a/js/src/jsfun.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsfun.cpp 2016-02-29 18:21:45.249674890 -0600
-@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje
-
- JSString *str = JS_DecompileFunction(cx, fun, indent);
- if (!str)
-- return false;
-+ return NULL;
-
- if (!indent)
- cx->compartment->toSourceCache.put(fun, str);
-@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon
- const Shape *shape = funobj->nativeLookup(id);
- if (!shape) {
- if (!ResolveInterpretedFunctionPrototype(cx, funobj))
-- return false;
-+ return NULL;
- shape = funobj->nativeLookup(id);
- }
- JS_ASSERT(!shape->configurable());
-diff -upr a/js/src/jsiter.cpp b/js/src/jsiter.cpp
---- a/js/src/jsiter.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsiter.cpp 2016-02-29 18:24:22.494659919 -0600
-@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f
- */
- JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
- if (!obj)
-- return false;
-+ return NULL;
- obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
- obj->setMap(cx->compartment->emptyEnumeratorShape);
- return obj;
-diff -upr a/js/src/jsparse.cpp b/js/src/jsparse.cpp
---- a/js/src/jsparse.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsparse.cpp 2016-02-29 18:29:03.997437475 -0600
-@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun
- if (!outertc->inFunction() && bodyLevel && funAtom &&
!lambda && outertc->compiling()) {
- JS_ASSERT(pn->pn_cookie.isFree());
- if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
-- return false;
-+ return NULL;
- }
-
- pn->pn_blockid = outertc->blockid();
-diff -upr a/js/src/jsstr.cpp b/js/src/jsstr.cpp
---- a/js/src/jsstr.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsstr.cpp 2016-02-29 19:01:45.857779836 -0600
-@@ -1734,7 +1734,7 @@ class RegExpGuard
- if (flat) {
- patstr = flattenPattern(cx, fm.patstr);
- if (!patstr)
-- return false;
-+ return NULL;
- } else {
- patstr = fm.patstr;
- }
-@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObje
- UndefinedValue(), NULL, NULL,
- JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0,
0,
- NULL)) {
-- return JS_FALSE;
-+ return NULL;
- }
-
- return proto;
-diff -upr a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
---- a/js/src/jstypedarray.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jstypedarray.cpp 2016-02-29 19:08:53.541136191 -0600
-@@ -1334,7 +1334,7 @@ class TypedArrayTemplate
- if (size != 0 && count >= INT32_MAX / size) {
- JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
- JSMSG_NEED_DIET, "size and count");
-- return false;
-+ return NULL;
- }
-
- int32 bytelen = size * count;
-@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint
-
- default:
- JS_NOT_REACHED("shouldn't have gotten here");
-- return false;
-+ return NULL;
- }
- }
-
-diff -upr a/js/src/jsxml.cpp b/js/src/jsxml.cpp
---- a/js/src/jsxml.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/jsxml.cpp 2016-02-29 19:17:10.363279731 -0600
-@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS
-
- obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass);
- if (!obj)
-- return JS_FALSE;
-+ return NULL;
- JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal()));
- JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal()));
- JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared()));
-@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb
- size_t length = str->length();
- jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
- if (!chars)
-- return JS_FALSE;
-+ return NULL;
- *chars = '@';
- const jschar *strChars = str->getChars(cx);
- if (!strChars) {
-diff -upr a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
---- a/js/src/methodjit/InvokeHelpers.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/methodjit/InvokeHelpers.cpp 2016-02-29 20:34:14.496983346 -0600
-@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx)
- {
- JSStackFrame *fp = cx->fp();
- if (fp->hasImacropc())
-- return false;
-+ return NULL;
-
- JSScript *script = fp->script();
- return script->maybeNativeCodeForPC(fp->isConstructing(),
cx->regs->pc);
-diff -upr a/js/src/nanojit/NativeX64.cpp b/js/src/nanojit/NativeX64.cpp
---- a/js/src/nanojit/NativeX64.cpp 2011-03-31 14:08:36.000000000 -0500
-+++ b/js/src/nanojit/NativeX64.cpp 2016-02-29 20:19:56.487934808 -0600
-@@ -1899,7 +1899,7 @@ namespace nanojit
- }
- }
-
-- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
-+ static const AVMPLUS_ALIGN16(int64_t) negateMask[] =
{int64_t(0x8000000000000000LL),0};
-
- void Assembler::asm_fneg(LIns *ins) {
- Register rr, ra;
diff --git a/js-1.8.5-secondary-jit.patch b/js-1.8.5-secondary-jit.patch
deleted file mode 100644
index 4656129..0000000
--- a/js-1.8.5-secondary-jit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=627668
-
-diff -up xulrunner-2.0/mozilla-central/js/src/Makefile.in.big-endian-jit
xulrunner-2.0/mozilla-central/js/src/Makefile.in
---- xulrunner-2.0/mozilla-central/js/src/Makefile.in.big-endian-jit 2010-11-04
21:05:48.000000000 +0100
-+++ xulrunner-2.0/mozilla-central/js/src/Makefile.in 2010-11-15 14:17:39.000000000 +0100
-@@ -371,7 +371,7 @@ CPPSRCS += checks.cc \
- # END enclude sources for V8 dtoa
- #############################################
-
--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter-out powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU)))
-
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
diff --git a/js-gcc9-fix-on-top-of-other-patches.patch
b/js-gcc9-fix-on-top-of-other-patches.patch
deleted file mode 100644
index f946b80..0000000
--- a/js-gcc9-fix-on-top-of-other-patches.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur js-1.8.5/js/src/methodjit/MethodJIT.cpp
js-1.8.5_patched/js/src/methodjit/MethodJIT.cpp
---- js-1.8.5/js/src/methodjit/MethodJIT.cpp 2019-06-03 13:57:45.044464470 +0200
-+++ js-1.8.5_patched/js/src/methodjit/MethodJIT.cpp 2019-06-03 13:58:24.770675374 +0200
-@@ -189,7 +189,7 @@
- JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF000000000000LL);
- JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x0000FFFFFFFFFFFFLL);
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(JaegerTrampoline) "\n"
- SYMBOL_STRING(JaegerTrampoline) ":" "\n"
-@@ -236,7 +236,7 @@
- "jmp *0(%rsp)" "\n"
- );
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n"
- SYMBOL_STRING(JaegerTrampolineReturn) ":" "\n"
-@@ -256,7 +256,7 @@
- "ret" "\n"
- );
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(JaegerThrowpoline) "\n"
- SYMBOL_STRING(JaegerThrowpoline) ":" "\n"
-@@ -281,7 +281,7 @@
-
- JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38);
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(InjectJaegerReturn) "\n"
- SYMBOL_STRING(InjectJaegerReturn) ":" "\n"
-@@ -309,7 +309,7 @@
- JS_STATIC_ASSERT(offsetof(VMFrame, savedEBX) == 0x2c);
- JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x1C);
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(JaegerTrampoline) "\n"
- SYMBOL_STRING(JaegerTrampoline) ":" "\n"
-@@ -339,7 +339,7 @@
- "jmp *16(%ebp)" "\n"
- );
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n"
- SYMBOL_STRING(JaegerTrampolineReturn) ":" "\n"
-@@ -357,7 +357,7 @@
- "ret" "\n"
- );
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(JaegerThrowpoline) "\n"
- SYMBOL_STRING(JaegerThrowpoline) ":" "\n"
-@@ -388,7 +388,7 @@
-
- JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x1C);
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(InjectJaegerReturn) "\n"
- SYMBOL_STRING(InjectJaegerReturn) ":" "\n"
-@@ -423,7 +423,7 @@
- #define FUNCTION_HEADER_EXTRA
- #endif
-
--asm volatile (
-+asm (
- ".text\n"
- FUNCTION_HEADER_EXTRA
- ".globl " SYMBOL_STRING(InjectJaegerReturn) "\n"
-@@ -436,7 +436,7 @@
- "bx lr" "\n"
- );
-
--asm volatile (
-+asm (
- ".text\n"
- FUNCTION_HEADER_EXTRA
- ".globl " SYMBOL_STRING(JaegerTrampoline) "\n"
-@@ -495,7 +495,7 @@
- " bx r4" "\n"
- );
-
--asm volatile (
-+asm (
- ".text\n"
- FUNCTION_HEADER_EXTRA
- ".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n"
-@@ -515,7 +515,7 @@
- " pop {r4-r11,pc}" "\n"
- );
-
--asm volatile (
-+asm (
- ".text\n"
- FUNCTION_HEADER_EXTRA
- ".globl " SYMBOL_STRING(JaegerThrowpoline) "\n"
-@@ -540,7 +540,7 @@
- " pop {r4-r11,pc}" "\n"
- );
-
--asm volatile (
-+asm (
- ".text\n"
- FUNCTION_HEADER_EXTRA
- ".globl " SYMBOL_STRING(JaegerStubVeneer) "\n"
diff --git a/js-ldflags.patch b/js-ldflags.patch
deleted file mode 100644
index 99ffa0c..0000000
--- a/js-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.ref.orig 2005-04-19 22:14:17.000000000 +0300
-+++ src/Makefile.ref 2005-04-19 22:14:49.000000000 +0300
-@@ -108,7 +108,7 @@
- PERLLDFLAGS := $(subst -rdynamic,-export-dynamic,$(PERLLDFLAGS))
-
- CFLAGS += $(PERLCFLAGS)
--#LDFLAGS += $(PERLLDFLAGS) #PH removed this assgnment
-+LDFLAGS += $(PERLLDFLAGS)
- INCLUDES += -I. #needed for perlconnect/jsperl.c
- endif
-
diff --git a/js-perlconnect.patch b/js-perlconnect.patch
deleted file mode 100644
index 2d84e95..0000000
--- a/js-perlconnect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/perlconnect/jsperl.c.orig
-+++ src/perlconnect/jsperl.c
-@@ -218,7 +218,9 @@
- {
- PerlInterpreter *perl = JS_GetPrivate(cx, obj);
-
-- perl_destruct(perl);
-- perl_free(perl);
-+ if (perl) {
-+ perl_destruct(perl);
-+ perl_free(perl);
-+ }
- /* return JS_TRUE; */
- }
diff --git a/js-shlib.patch b/js-shlib.patch
deleted file mode 100644
index 9a24d20..0000000
--- a/js-shlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Use gcc for linking because of -Wl,... from "perl -MExtUtils::Embed -e
ldopts".
-
---- src/config/Linux_All.mk.orig 2003-05-16 02:21:08.000000000 +0200
-+++ src/config/Linux_All.mk 2004-03-02 03:56:15.000000000 +0100
-@@ -42,7 +42,7 @@
- OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
-
- RANLIB = echo
--MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
-+MKSHLIB = $(CC) -shared -lc -Wl,-soname,libjs.so.1 $(XMKSHLIBOPTS)
-
- #.c.o:
- # $(CC) -c -MD $*.d $(CFLAGS) $<
diff --git a/js.spec b/js.spec
deleted file mode 100644
index bb21c9d..0000000
--- a/js.spec
+++ /dev/null
@@ -1,406 +0,0 @@
-#% global hgdate 51702867d932
-
-Summary: JavaScript interpreter and libraries
-Name: js
-Epoch: 1
-Version: 1.8.5
-Release: 38%{?hgdate:.hg%{hgdate}}%{?dist}
-License: GPLv2+ or LGPLv2+ or MPLv1.1
-URL:
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Re...
-Source0:
http://ftp.mozilla.org/pub/js/js185-1.0.0.tar.gz
-# Initial attempt at Big Endian 64 bit support (revised later)
-Patch0: js-1.8.5-64bit-big-endian.patch
-# make arch conditional list more complete for secondary jit bits
-Patch1: js-1.8.5-secondary-jit.patch
-# handle case where $DESTDIR ends up on both ends of a symbolic link
-#
https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-Patch2: js185-destdir.patch
-# Properly handle 64bit JS_BITS_PER_WORD
-Patch3: js-1.8.5-537701.patch
-# Remove hardcoded flags forcing softfp on arm
-Patch4: js185-arm-nosoftfp.patch
-# Switch from readline to libedit
-Patch5: js185-libedit.patch
-# Move JS_BYTES_PER_WORD out of config.h
-# Instead define it in terms of the already extant GNU C extension
-# __SIZEOF_POINTER__. This avoids multiarch conflicts when 32 and 64
-# bit packages of js are co-installed.
-Patch6: 0001-Make-js-config.h-multiarch-compatible.patch
-# add support for aarch64
-Patch7: aarch64.patch
-# bz#1096135
-Patch8: ppc64le.patch
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1178141
(
http://hg.mozilla.org/mozilla-central/rev/a7b220e7425a)
-Patch9: js-1.8.5-array-recursion.patch
-# Fix various C++11 issues
-Patch10: js-1.8.5-c++11.patch
-# update for 48-bit VA
-Patch11: mozjs1.8.5-tag.patch
-# Fix build with gcc9
-Patch12: js-gcc9-fix-on-top-of-other-patches.patch
-Provides: libjs = %{version}-%{release}
-BuildRequires: nspr-devel >= 4.7
-BuildRequires: perl-devel
-BuildRequires: python2
-BuildRequires: zip
-BuildRequires: libedit-devel
-BuildRequires: ncurses-devel
-BuildRequires: autoconf213
-BuildRequires: gcc-c++
-
-%description
-JavaScript is the Netscape-developed object scripting language used in millions
-of web pages and server applications worldwide. Netscape's JavaScript is a
-super-set of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
-with only mild differences from the published standard.
-
-%package devel
-Summary: Header files, libraries and development documentation for %{name}
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: pkgconfig
-Requires: ncurses-devel readline-devel
-Provides: libjs-devel = %{version}-%{release}
-
-%description devel
-This package contains the header files, static libraries and development
-documentation for %{name}. If you like to develop programs using %{name},
-you will need to install %{name}-devel.
-
-
-%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p2 -b .64bit-big-endian
-%patch1 -p2 -b .secondary-jit
-%patch2 -p0 -b .destdir
-%patch3 -p1 -b .537701
-%patch4 -p1 -b .armhfp
-%patch5 -p1 -b .libedit
-%patch6 -p1 -b .multiarch
-%patch7 -p1 -b .aarch64
-%patch8 -p1 -b .ppc64le
-%patch9 -p1 -b .array-recursion
-%patch10 -p1 -b .c++11
-%patch11 -p1 -b .tag
-%patch12 -p1 -b .gcc9
-
-cd js
-
-# Rm parts with spurios licenses, binaries
-# Some parts under BSD (but different suppliers): src/assembler
-#rm -rf src/assembler src/yarr/yarr src/yarr/pcre src/yarr/wtf src/v8-dtoa
-rm -rf src/ctypes/libffi src/t src/tests/src/jstests.jar src/tracevis src/v8
-
-pushd src
-autoconf-2.13
-popd
-
-# Create pkgconfig file
-cat > libjs.pc << 'EOF'
-prefix=%{_prefix}
-exec_prefix=%{_prefix}
-libdir=%{_libdir}
-includedir=%{_includedir}
-
-Name: libjs
-Description: JS library
-Requires: nspr >= 4.7
-Version: %{version}
-Libs: -L${libdir} -ljs
-Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -I${includedir}/js
-EOF
-
-%build
-cd js/src
-CPPFLAGS="$(pkg-config --cflags libedit)" \
-%configure \
- --with-system-nspr \
- --enable-threadsafe \
- --enable-readline \
- --disable-optimize
-make %{?_smp_mflags}
-
-%install
-cd js
-%make_install -C src
-# We don't want this
-rm -f %{buildroot}%{_bindir}/js-config
-install -m 0755 src/jscpucfg src/shell/js \
- %{buildroot}%{_bindir}/
-rm -rf %{buildroot}%{_libdir}/*.a
-rm -rf %{buildroot}%{_libdir}/*.la
-
-# For compatibility
-# XXX do we really need libjs?!?!?!
-pushd %{buildroot}%{_libdir}
-ln -s libmozjs185.so.1.0 libmozjs.so.1
-ln -s libmozjs185.so.1.0 libjs.so.1
-ln -s libmozjs185.so libmozjs.so
-ln -s libmozjs185.so libjs.so
-popd
-
-install -m 0644 libjs.pc %{buildroot}%{_libdir}/pkgconfig/
-
-%check
-# Unfortunately it fail on arm and I have no machines where I could debug it
unfortunately, so just do not test on it and hope on the best
-%ifnarch armv7hl
-# it fails in strange way initially, so remove
-rm js/src/jit-test/tests/sunspider/check-date-format-tofte.js
-make -C js/src check
-%endif
-
-%files
-%doc js/src/README.html
-%{_bindir}/js
-%{_libdir}/*.so.1*
-
-%files devel
-%{_bindir}/jscpucfg
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.so
-%{_includedir}/js
-
-%changelog
-* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.5-38
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Dec 9 2019 Tom Callaway <spot(a)fedoraproject.org> - 1:1.8.5-37
-- fix soname globbing
-- nuke duplicate install command
-
-* Mon Dec 9 2019 Tom Callaway <spot(a)fedoraproject.org> - 1:1.8.5-36
-- apply all suggested fixes from package review
-
-* Fri Nov 8 2019 Tom Callaway <spot(a)fedoraproject.org> - 1:1.8.5-35
-- revive package
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.5-34
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.5-33
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.5-32
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 15 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 1:1.8.5-31
-- Update Python 2 dependency declarations to new packaging standards
- (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.5-30
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.5-29
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.5-28
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Mar 10 2017 Dan Hork <dan[at]danny.cz> - 1:1.8.5-27
-- add patch for 48-bit VA (#1423793)
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.5-26
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Apr 05 2016 Than Ngo <than(a)redhat.com> - 1:1.8.5-25
-- Disable optimizations which caused regressions with new gcc
- Use fedora default -O2 instead of mozjs -O3
-
-* Tue Mar 01 2016 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:1.8.5-24
-- Fix FTBFS with C++11 (#1307665)
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.5-23
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:1.8.5-22
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Apr 15 2015 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1:1.8.5-21
-- Skip test on arm - it failed in strange way and I have no machines to debug
-- Some cleanup
-
-* Wed Apr 15 2015 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1:1.8.5-20
-- Add Patch9: js-1.8.5-array-recursion.patch (bz#1178141 -
http://hg.mozilla.org/mozilla-central/rev/a7b220e7425a)
-- Add %%check section
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:1.8.5-19
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:1.8.5-18
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed May 14 2014 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1:1.8.5-17
-- Fix bogus dates in changelog.
-- Add Patch8: ppc64le.patch (bz#1096135) to fix compilation on ppc64le arch.
-
-* Wed Mar 26 2014 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 1:1.8.5-16
-- Add patch for AArch64.
-
-* Mon Mar 17 2014 Colin Walters <walters(a)redhat.com> - 1:1.8.5-15
-- Add patch to fix multilib conflict with devel packages
- I am not aware of anyone who actually needs this, but it checks
- a checkbox.
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:1.8.5-14
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:1.8.5-13
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Jan 18 2013 Dennis Gilmore <dennis(a)ausil.us> - 1:1.8.5-12
-- make sure -march=armv7-a is not hardcoded in arm builds
-
-* Sat Nov 17 2012 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1:1.8.5-11
-- Thanks to Ville Skytt (bz#875343) build against libedit instead of readline
- what simplify licensing apparently without any loss of functionality
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:1.8.5-10
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jan 10 2012 Dennis Gilmore <dennis(a)ausil.us> - 1.8.5-9
-- add patch to enable js to build on both hard and soft floating point arm distros
-
-* Fri Dec 02 2011 Karsten Hopp <karsten(a)redhat.com> 1.8.5-8
-- add patch from bugzilla 749604, fixes PPC failures
-
-* Wed Jun 22 2011 Colin Walters <walters(a)verbum.org> - 1:1.8.5-6
-- Include mozjs185.pc, clean up build
-- Based on work from Christopher Aillon <caillon(a)redhat.com>
-- Switch to using make install DESTDIR=, instead of hardcoding build rules.
-- Add DESTDIR= patch from GNOME 3.2 jhbuild
-- Make mozjs185 the canonical target for both libmozjs and libmozjs185.
-
-* Fri May 27 2011 Dan Hork <dan[at]danny.cz> - 1.8.5-5
-- add secondary arch patches from xulrunner
-
-* Tue Apr 12 2011 Christopher Aillon <caillon(a)redhat.com> - 1.8.5-4
-- devel subpackage needs to ask for the newly added epoch
-
-* Tue Apr 12 2011 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.8.5-3
-- Add Epoch: 1 to allow update of 1.70-13 version.
-
-* Sat Apr 9 2011 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.8.5-2
-- Correct symlink to provide backward capabiliies libjs.so.1
-
-* Wed Apr 6 2011 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.8.5-1
-- Update to release.
-- Remove unneeded anymore patches.
-- Add backward capability symlink.
-
-* Sat Feb 12 2011 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.8.5-0.hg51702867d932
-- Build version 1.8.5 by update request - BZ#676441 from Firefox 4.0 mercurial
repository.
-- Gone -DJS_C_STRINGS_ARE_UTF8
-- Add BR autoconf213, change build system to use configure.
-- Adopt patch0 (js-1.7.0-make.patch -> js-1.8.5-make.patch)
-- Adopt patch1 (js-shlib.patch -> js-1.8.5-shlib.patch)
-- Remove Patch2 (js-1.5-va_copy.patch) and Patch3 (js-ldflags.patch)
-- Add BR python, zip.
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.70-13
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Jun 16 2010 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.70-12
-- Add UTF-8 support (add -DJS_C_STRINGS_ARE_UTF8 ) by request Peter Halliday: BZ#576585
-
-* Mon Jun 14 2010 Dan Hork <dan[at]danny.cz> - 1.70-11
-- updated the va_copy patch for s390
-
-* Mon Jan 25 2010 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.70-10
-- Remove static library from -devel - %%{_libdir}/*.a (bz#556057) to meet guidelines.
-
-* Sun Aug 2 2009 Pavel Alexeev <Pahan(a)Hubbitus.info> - 1.70-8
-- Reformat spec with tabs.
-- By report of Thomas Sondergaard (BZ#511162) Add -DXP_UNIX=1 -DJS_THREADSAFE=1 flags and
nspr requires into libjs.pc
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.70-7
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri May 29 2009 Dan Horak <dan[at]danny.cz> 1.70-6
-- update the va_copy patch for s390x
-
-* Thu Apr 9 2009 Matthias Saou <
http://freshrpms.net/> 1.70-5
-- Update description (#487903).
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Jun 4 2008 Jon McCann <jmccann(a)redhat.com> - 1.70-3
-- Add two missing files (#449715)
-
-* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 1.70-2
-- Rebuild for perl 5.10 (again)
-
-* Sun Feb 3 2008 Matthias Saou <
http://freshrpms.net/> 1.70-1
-- Update to 1.7.0, as 1.70 to avoid introducing an epoch for now...
-- Remove no longer provided perlconnect parts.
-
-* Thu Jan 24 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.60-6
-- BR: perl(ExtUtils::Embed)
-
-* Sun Jan 20 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 1.60-5
-- rebuild for new perl
-
-* Wed Aug 22 2007 Matthias Saou <
http://freshrpms.net/> 1.60-4
-- Rebuild for new BuildID feature.
-
-* Mon Aug 6 2007 Matthias Saou <
http://freshrpms.net/> 1.60-3
-- Update License field.
-- Add perl(ExtUtils::MakeMaker) build requirement to pull in perl-devel.
-
-* Fri Feb 2 2007 Matthias Saou <
http://freshrpms.net/> 1.60-2
-- Include jsopcode.tbl and js.msg in devel (#235481).
-- Install static lib mode 644 instead of 755.
-
-* Fri Feb 2 2007 Matthias Saou <
http://freshrpms.net/> 1.60-1
-- Update to 1.60.
-- Rebuild in order to link against ncurses instead of termcap (#226773).
-- Add ncurses-devel build requirement and patch s/termcap/ncurses/ in.
-- Change mode of perl library from 555 to 755 (#224603).
-
-* Mon Aug 28 2006 Matthias Saou <
http://freshrpms.net/> 1.5-6
-- Fix pkgconfig file (#204232 & dupe #204236).
-
-* Mon Jul 24 2006 Matthias Saou <
http://freshrpms.net/> 1.5-5
-- FC6 rebuild.
-- Enable JS_THREADSAFE in the build (#199696), add patch and nspr build req.
-
-* Mon Mar 6 2006 Matthias Saou <
http://freshrpms.net/> 1.5-4
-- FC5 rebuild.
-
-* Thu Feb 9 2006 Matthias Saou <
http://freshrpms.net/> 1.5-3
-- Rebuild for new gcc/glibc.
-
-* Mon Jan 30 2006 Matthias Saou <
http://freshrpms.net/> 1.5-2
-- Fix .pc file.
-
-* Thu Jan 26 2006 Matthias Saou <
http://freshrpms.net/> 1.5-1
-- Update to 1.5.0 final.
-- Spec file cleanups.
-- Move docs from devel to main, since we need the license there.
-- Remove no longer needed js-perlconnect.patch.
-- Update js-1.5-va_copy.patch.
-- Include a pkgconfig file (#178993).
-
-* Tue Apr 19 2005 Ville Skytt <ville.skytta at iki.fi> - 1.5-0.rc6a.6
-- Link shared lib with libperl.
-
-* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* Mon Feb 14 2005 David Woodhouse <dwmw2(a)infradead.org> - 1.5-0.rc6a.4
-- Take js-va_copy.patch out of %%ifarch x86_64 so it fixes the PPC build too
-
-* Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 1.5-0.rc6a.3
-- Add js-va_copy.patch to fix x86_64; Patch was found in a Mandrake srpm
-
-* Sat Dec 11 2004 Ville Skytt <ville.skytta at iki.fi> - 1.5-0.rc6a.2
-- Include perlconnect.
-- Include readline support, rebuild using "--without readline" to disable.
-- Add libjs* provides for upstream compatibility.
-- Install header files in %%{_includedir} instead of %%{_includedir}/js.
-
-* Tue Jun 15 2004 Matthias Saou <
http://freshrpms.net> 1.5-0.rc6a
-- Update to 1.5rc6a.
-
-* Tue Mar 02 2004 Dag Wieers <dag(a)wieers.com> - 1.5-0.rc6
-- Initial package. (using DAR)
-
diff --git a/js185-arm-nosoftfp.patch b/js185-arm-nosoftfp.patch
deleted file mode 100644
index e971a48..0000000
--- a/js185-arm-nosoftfp.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -r -U 2 -p a/js/src/configure b/js/src/configure
---- a/js/src/configure 2011-10-14 18:27:00.000000000 -0400
-+++ b/js/src/configure 2011-10-14 18:37:07.264794994 -0400
-@@ -10741,5 +10741,5 @@ _SAVE_CFLAGS="$CFLAGS"
- if test "$GNU_CC"; then
- # gcc needs -mfpu=neon to recognize NEON instructions
-- CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
-+ CFLAGS="$CFLAGS -mfpu=neon"
- fi
- cat > conftest.$ac_ext <<EOF
-@@ -13407,7 +13407,7 @@ EOF
- EOF
-
-- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-+ CFLAGS="$CFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
-+ CXXFLAGS="$CXXFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
-+ ASFLAGS="$ASFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
- else
- { echo "configure: error: --enable-thumb2 is not supported for non-GNU
toolchains" 1>&2; exit 1; }
-@@ -13426,7 +13426,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
- EOF
-
-- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-+ CFLAGS="$CFLAGS $MOZ_ARM_VFP_FLAGS"
-+ CXXFLAGS="$CXXFLAGS $MOZ_ARM_VFP_FLAGS"
-+ ASFLAGS="$ASFLAGS $MOZ_ARM_VFP_FLAGS"
- else
- { echo "configure: error: --with-cpu-arch=armv7 is not supported for
non-GNU toolchains" 1>&2; exit 1; }
-diff -r -U 2 -p a/js/src/configure.in b/js/src/configure.in
---- a/js/src/configure.in 2011-03-31 15:08:36.000000000 -0400
-+++ b/js/src/configure.in 2011-10-14 18:37:40.496180956 -0400
-@@ -3551,5 +3551,5 @@ _SAVE_CFLAGS="$CFLAGS"
- if test "$GNU_CC"; then
- # gcc needs -mfpu=neon to recognize NEON instructions
-- CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
-+ CFLAGS="$CFLAGS -mfpu=neon"
- fi
- AC_TRY_COMPILE([],
-@@ -4688,7 +4688,7 @@ if test -n "$MOZ_THUMB2"; then
- AC_DEFINE(MOZ_THUMB2)
- AC_DEFINE(MOZ_ARM_ARCH)
-- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-+ CFLAGS="$CFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
-+ CXXFLAGS="$CXXFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
-+ ASFLAGS="$ASFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
- else
- AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
-@@ -4704,7 +4704,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
- if test "$GNU_CC"; then
- AC_DEFINE(MOZ_ARM_ARCH)
-- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp
$MOZ_ARM_VFP_FLAGS"
-+ CFLAGS="$CFLAGS $MOZ_ARM_VFP_FLAGS"
-+ CXXFLAGS="$CXXFLAGS $MOZ_ARM_VFP_FLAGS"
-+ ASFLAGS="$ASFLAGS $MOZ_ARM_VFP_FLAGS"
- else
- AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
diff --git a/js185-destdir.patch b/js185-destdir.patch
deleted file mode 100644
index e28baed..0000000
--- a/js185-destdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# See discussion in
https://bugzilla.mozilla.org/show_bug.cgi?id=628723
-# Patch created by Colin Walters <walters(a)verbum.org>
-
---- js/src/Makefile.in.orig 2011-06-15 19:40:27.447770306 -0400
-+++ js/src/Makefile.in 2011-06-15 19:40:57.013770299 -0400
-@@ -888,8 +888,8 @@
- ifeq (,$(HOST_BIN_SUFFIX))
- mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
-- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
-- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
-+ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
-+ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
- endif
- endif
- ifneq (,$(IMPORT_LIBRARY))
diff --git a/js185-libedit.patch b/js185-libedit.patch
deleted file mode 100644
index 195bdae..0000000
--- a/js185-libedit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- js-1.8.5/js/src/configure.in 2011-03-31 22:08:36.000000000 +0300
-+++ js-1.8.5/js/src/configure.in~ 2012-11-10 17:59:02.222497367 +0200
-@@ -5615,8 +5615,8 @@ esac
-
- if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then
- if test -n "$JS_WANT_READLINE"; then
-- AC_CHECK_LIB(readline, readline,
-- EDITLINE_LIBS="-lreadline",
-+ AC_CHECK_LIB(edit, readline,
-+ EDITLINE_LIBS="$(pkg-config --libs libedit)",
- AC_MSG_ERROR([No system readline library found.]))
- else
- dnl By default, we use editline
diff --git a/mozjs1.8.5-tag.patch b/mozjs1.8.5-tag.patch
deleted file mode 100644
index f4fd188..0000000
--- a/mozjs1.8.5-tag.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up js-1.8.5/js/src/jsval.h.tag js-1.8.5/js/src/jsval.h
---- js-1.8.5/js/src/jsval.h.tag 2017-03-10 16:27:06.000000000 +0100
-+++ js-1.8.5/js/src/jsval.h 2017-03-10 16:30:39.000000000 +0100
-@@ -66,7 +66,7 @@ JS_BEGIN_EXTERN_C
- #endif
-
- #if JS_BITS_PER_WORD == 64
--# define JSVAL_TAG_SHIFT 47
-+# define JSVAL_TAG_SHIFT 48
- #endif
-
- /*
-@@ -135,7 +135,8 @@ JS_STATIC_ASSERT(sizeof(JSValueTag) == 4
- /* Remember to propagate changes to the C defines below. */
- JS_ENUM_HEADER(JSValueTag, uint32)
- {
-- JSVAL_TAG_MAX_DOUBLE = 0x1FFF0,
-+ JSVAL_TAG_DUMMY = 0xFFFFFFFF, /* Make sure the enums cannot fit
16-bits. */
-+ JSVAL_TAG_MAX_DOUBLE = 0xFFF8,
- JSVAL_TAG_INT32 = JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_INT32,
- JSVAL_TAG_UNDEFINED = JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_UNDEFINED,
- JSVAL_TAG_STRING = JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_STRING,
-@@ -196,7 +197,7 @@ typedef uint32 JSValueTag;
- #elif JS_BITS_PER_WORD == 64
-
- typedef uint32 JSValueTag;
--#define JSVAL_TAG_MAX_DOUBLE ((uint32)(0x1FFF0))
-+#define JSVAL_TAG_MAX_DOUBLE ((uint32)(0xFFF8))
- #define JSVAL_TAG_INT32 (uint32)(JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_INT32)
- #define JSVAL_TAG_UNDEFINED (uint32)(JSVAL_TAG_MAX_DOUBLE |
JSVAL_TYPE_UNDEFINED)
- #define JSVAL_TAG_STRING (uint32)(JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_STRING)
-@@ -236,8 +237,8 @@ typedef uint64 JSValueShiftedTag;
-
- #elif JS_BITS_PER_WORD == 64
-
--#define JSVAL_PAYLOAD_MASK 0x00007FFFFFFFFFFFLL
--#define JSVAL_TAG_MASK 0xFFFF800000000000LL
-+#define JSVAL_PAYLOAD_MASK 0x0000FFFFFFFFFFFFLL
-+#define JSVAL_TAG_MASK 0xFFFF000000000000LL
- #define JSVAL_TYPE_TO_TAG(type) ((JSValueTag)(JSVAL_TAG_MAX_DOUBLE | (type)))
- #define JSVAL_TYPE_TO_SHIFTED_TAG(type) (((uint64)JSVAL_TYPE_TO_TAG(type)) <<
JSVAL_TAG_SHIFT)
-
-@@ -297,8 +298,8 @@ typedef union jsval_layout
- #if (!defined(_WIN64) && defined(__cplusplus))
- /* MSVC does not pack these correctly :-( */
- struct {
-- uint64 payload47 : 47;
-- JSValueTag tag : 17;
-+ uint64 payload48 : 48;
-+ JSValueTag tag : 16;
- } debugView;
- #endif
- struct {
-@@ -339,8 +340,8 @@ typedef union jsval_layout
- {
- uint64 asBits;
- struct {
-- JSValueTag tag : 17;
-- uint64 payload47 : 47;
-+ JSValueTag tag : 16;
-+ uint64 payload48 : 48;
- } debugView;
- struct {
- uint32 padding;
-diff -up js-1.8.5/js/src/jsvalue.h.tag js-1.8.5/js/src/jsvalue.h
---- js-1.8.5/js/src/jsvalue.h.tag 2017-03-10 16:27:06.000000000 +0100
-+++ js-1.8.5/js/src/jsvalue.h 2017-03-10 16:27:06.000000000 +0100
-@@ -255,7 +255,7 @@ JSVAL_SAME_TYPE_IMPL(jsval_layout lhs, j
- {
- uint64 lbits = lhs.asBits, rbits = rhs.asBits;
- return (lbits <= JSVAL_TAG_MAX_DOUBLE && rbits <=
JSVAL_TAG_MAX_DOUBLE) ||
-- (((lbits ^ rbits) & 0xFFFF800000000000LL) == 0);
-+ (((lbits ^ rbits) & 0xFFFF000000000000LL) == 0);
- }
-
- static JS_ALWAYS_INLINE jsval_layout
-@@ -277,7 +277,7 @@ JSVAL_TO_PRIVATE_UINT32_IMPL(jsval_layou
- static JS_ALWAYS_INLINE JSValueType
- JSVAL_EXTRACT_NON_DOUBLE_TYPE_IMPL(jsval_layout l)
- {
-- uint64 type = (l.asBits >> JSVAL_TAG_SHIFT) & 0xF;
-+ uint64 type = (l.asBits >> JSVAL_TAG_SHIFT) & 0x7;
- JS_ASSERT(type > JSVAL_TYPE_DOUBLE);
- return (JSValueType)type;
- }
-diff -up js-1.8.5/js/src/methodjit/MethodJIT.cpp.tag
js-1.8.5/js/src/methodjit/MethodJIT.cpp
---- js-1.8.5/js/src/methodjit/MethodJIT.cpp.tag 2011-03-31 21:08:36.000000000 +0200
-+++ js-1.8.5/js/src/methodjit/MethodJIT.cpp 2017-03-10 16:27:06.000000000 +0100
-@@ -186,8 +186,8 @@ JS_STATIC_ASSERT(sizeof(VMFrame) % 16 ==
- JS_STATIC_ASSERT(offsetof(VMFrame, savedRBX) == 0x58);
- JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38);
-
--JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF800000000000LL);
--JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x00007FFFFFFFFFFFLL);
-+JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF000000000000LL);
-+JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x0000FFFFFFFFFFFFLL);
-
- asm volatile (
- ".text\n"
diff --git a/ppc64le.patch b/ppc64le.patch
deleted file mode 100644
index 129997e..0000000
--- a/ppc64le.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naur js-1.8.5.orig/js/src/assembler/wtf/Platform.h
js-1.8.5/js/src/assembler/wtf/Platform.h
---- js-1.8.5.orig/js/src/assembler/wtf/Platform.h
-+++ js-1.8.5/js/src/assembler/wtf/Platform.h
-@@ -129,16 +129,22 @@
- || defined(__POWERPC__) \
- || defined(_M_PPC) \
- || defined(__PPC)
-+#if !defined(__ppc64__) && !defined(__PPC64__)
- #define WTF_CPU_PPC 1
-+#endif
-+#if !defined(__LITTLE_ENDIAN__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
-+#endif
-
- /* CPU(PPC64) - PowerPC 64-bit */
- #if defined(__ppc64__) \
- || defined(__PPC64__)
- #define WTF_CPU_PPC64 1
-+#if !defined(__LITTLE_ENDIAN__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
-+#endif
-
- /* CPU(SH4) - SuperH SH-4 */
- #if defined(__SH4__)
-diff -Naur js-1.8.5.orig/js/src/configure.in js-1.8.5/js/src/configure.in
---- js-1.8.5.orig/js/src/configure.in
-+++ js-1.8.5/js/src/configure.in
-@@ -1498,7 +1498,7 @@
- CPU_ARCH=x86
- ;;
-
--powerpc64 | ppc64)
-+powerpc64 | ppc64 | powerpc64le | ppc64le)
- CPU_ARCH=ppc64
- ;;
-
-diff -Naur js-1.8.5/js/src/Makefile.in.ori js-1.8.5/js/src/Makefile.in
---- js-1.8.5/js/src/Makefile.in.ori
-+++ js-1.8.5/js/src/Makefile.in
-@@ -382,7 +382,7 @@ CPPSRCS += checks.cc \
- # END enclude sources for V8 dtoa
- #############################################
-
--ifeq (,$(filter-out aarch64 powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU)))
-+ifeq (,$(filter-out aarch64 powerpc powerpc64 powerpc64le sparc sparc64 s390
s390x,$(TARGET_CPU)))
-
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
diff --git a/sources b/sources
deleted file mode 100644
index 7927220..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-a4574365938222adca0a6bd33329cb32 js185-1.0.0.tar.gz
-4676f1699cbcfbde4087ff8fd337ccfc js185-destdir.patch