[xulrunner] Update to 13.0
Martin Stransky
stransky at fedoraproject.org
Mon Jun 4 08:55:49 UTC 2012
commit fa53a9add9ee9e0131c3dcaa6930ba1fd59fac36
Author: Martin Stransky <stransky at anakreon.cz>
Date: Mon Jun 4 10:55:40 2012 +0200
Update to 13.0
.gitignore | 1 +
mozilla-691898.patch | 201 ++++++++++++------------
mozilla-724615.patch | 24 ---
mozilla-734335.patch | 212 -------------------------
mozilla-746112-1.patch | 18 --
mozilla-file.patch | 26 ---
sources | 2 +-
xulrunner-10.0-gcc47.patch | 12 --
xulrunner-8.0-fix-maemo-checks-in-npapi.patch | 21 ---
xulrunner.spec | 18 +--
10 files changed, 109 insertions(+), 426 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f743ac..6fe5798 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ xulrunner-1.9.3.0b3.source.tar.bz2
/xulrunner-11.0b7.source.tar.bz2
/xulrunner-11.0.source.tar.bz2
/xulrunner-12.0.source.tar.bz2
+/xulrunner-13.0.source.tar.bz2
diff --git a/mozilla-691898.patch b/mozilla-691898.patch
index 71220a7..441862d 100644
--- a/mozilla-691898.patch
+++ b/mozilla-691898.patch
@@ -1,7 +1,7 @@
-diff -up xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h
---- xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 2012-04-21 00:03:53.000000000 +0200
-+++ xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h 2012-05-04 10:23:50.000000000 +0200
-@@ -445,8 +445,6 @@ public:
+diff -up xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h
+--- xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 2012-06-01 14:04:02.000000000 +0200
++++ xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h 2012-06-04 10:43:23.694175924 +0200
+@@ -467,8 +467,6 @@ public:
{
sync_instruction_memory((caddr_t)code, size);
}
@@ -10,10 +10,10 @@ diff -up xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator
#endif
private:
-diff -up xulrunner-12.0/mozilla-release/js/src/Makefile.in.691898 xulrunner-12.0/mozilla-release/js/src/Makefile.in
---- xulrunner-12.0/mozilla-release/js/src/Makefile.in.691898 2012-04-21 00:03:53.000000000 +0200
-+++ xulrunner-12.0/mozilla-release/js/src/Makefile.in 2012-05-04 11:09:57.000000000 +0200
-@@ -349,20 +349,23 @@ CPPSRCS += checks.cc \
+diff -up xulrunner-13.0/mozilla-release/js/src/Makefile.in.691898 xulrunner-13.0/mozilla-release/js/src/Makefile.in
+--- xulrunner-13.0/mozilla-release/js/src/Makefile.in.691898 2012-06-01 14:04:02.000000000 +0200
++++ xulrunner-13.0/mozilla-release/js/src/Makefile.in 2012-06-04 10:45:57.023808537 +0200
+@@ -337,20 +337,23 @@ CPPSRCS += checks.cc \
# END enclude sources for V8 dtoa
#############################################
@@ -47,25 +47,30 @@ diff -up xulrunner-12.0/mozilla-release/js/src/Makefile.in.691898 xulrunner-12.0
$(NULL)
else
-diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp
---- xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 2012-04-21 00:03:56.000000000 +0200
-+++ xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp 2012-05-04 11:13:37.000000000 +0200
-@@ -392,7 +392,6 @@ Class js::RegExpClass = {
- regexp_trace
- };
+@@ -918,4 +921,3 @@ endif
+ #
+ # END kludges for the Nitro assembler
+ ###############################################
+-
+diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp
+--- xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 2012-06-01 14:04:05.000000000 +0200
++++ xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp 2012-06-04 10:43:23.695175928 +0200
+@@ -167,7 +167,6 @@ MatchPairs::checkAgainst(size_t inputLen
+
+ /* detail::RegExpCode */
-#if ENABLE_YARR_JIT
void
- RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
+ RegExpCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
{
-@@ -424,42 +423,6 @@ RegExpPrivateCode::reportYarrError(JSCon
+@@ -199,46 +198,9 @@ RegExpCode::reportYarrError(JSContext *c
}
}
-#else /* !ENABLE_YARR_JIT */
-
-void
--RegExpPrivateCode::reportPCREError(JSContext *cx, int error)
+-RegExpCode::reportPCREError(JSContext *cx, int error)
-{
-#define REPORT(msg_) \
- JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_ERROR, js_GetErrorMessage, NULL, msg_); \
@@ -99,11 +104,69 @@ diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrun
-#endif /* ENABLE_YARR_JIT */
-
bool
- js::ParseRegExpFlags(JSContext *cx, JSString *flagStr, RegExpFlag *flagsOut)
+ RegExpCode::compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags)
{
-diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h
---- xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 2012-04-21 00:03:56.000000000 +0200
-+++ xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h 2012-05-04 11:20:17.000000000 +0200
+-#if ENABLE_YARR_JIT
+ /* Parse the pattern. */
+ ErrorCode yarrError;
+ YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
+@@ -255,7 +217,7 @@ RegExpCode::compile(JSContext *cx, JSLin
+ * case we have to bytecode compile it.
+ */
+
+-#ifdef JS_METHODJIT
++#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
+ if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
+ JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
+ if (!execAlloc) {
+@@ -276,21 +238,11 @@ RegExpCode::compile(JSContext *cx, JSLin
+ return false;
+ }
+
++#if ENABLE_YARR_JIT
+ codeBlock.setFallBack(true);
++#endif
+ byteCode = byteCompile(yarrPattern, bumpAlloc).get();
+ return true;
+-#else /* !defined(ENABLE_YARR_JIT) */
+- int error = 0;
+- compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
+- ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
+- multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
+- parenCount, &error);
+- if (error) {
+- reportPCREError(cx, error);
+- return false;
+- }
+- return true;
+-#endif
+ }
+
+ RegExpRunStatus
+@@ -305,19 +257,12 @@ RegExpCode::execute(JSContext *cx, const
+ else
+ result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
+ #else
+- result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
++ result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
+ #endif
+
+ if (result == -1)
+ return RegExpRunStatus_Success_NotFound;
+
+-#if !ENABLE_YARR_JIT
+- if (result < 0) {
+- reportPCREError(cx, result);
+- return RegExpRunStatus_Error;
+- }
+-#endif
+-
+ JS_ASSERT(result >= 0);
+ return RegExpRunStatus_Success;
+ }
+diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h
+--- xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h.691898 2012-06-01 14:04:05.000000000 +0200
++++ xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h 2012-06-04 10:47:03.609081248 +0200
@@ -51,10 +51,8 @@
#include "yarr/Yarr.h"
#if ENABLE_YARR_JIT
@@ -114,11 +177,11 @@ diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunne
#endif
+#include "yarr/YarrSyntaxChecker.h"
- namespace js {
+ /*
+ * JavaScript Regular Expressions
+@@ -112,68 +110,51 @@ namespace detail {
-@@ -242,68 +240,51 @@ static const jschar GreedyStarChars[] =
- /* Abstracts away the gross |RegExpPrivate| backend details. */
- class RegExpPrivateCode
+ class RegExpCode
{
-#if ENABLE_YARR_JIT
typedef JSC::Yarr::BytecodePattern BytecodePattern;
@@ -138,7 +201,7 @@ diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunne
+ BytecodePattern *byteCode;
public:
- RegExpPrivateCode()
+ RegExpCode()
:
#if ENABLE_YARR_JIT
codeBlock(),
@@ -149,7 +212,7 @@ diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunne
+ byteCode(NULL)
{ }
- ~RegExpPrivateCode() {
+ ~RegExpCode() {
#if ENABLE_YARR_JIT
codeBlock.release();
+#endif
@@ -190,89 +253,29 @@ diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunne
-#endif
}
- inline bool compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount,
-diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h
---- xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 2012-04-21 00:03:56.000000000 +0200
-+++ xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h 2012-05-04 11:17:01.000000000 +0200
-@@ -357,6 +357,7 @@ detail::RegExpPrivate::create(JSContext
- return RetType(priv);
+ bool compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags);
+diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h
+--- xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 2012-06-01 14:04:05.000000000 +0200
++++ xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h 2012-06-04 10:43:23.695175928 +0200
+@@ -137,6 +137,7 @@ RegExpObject::setSticky(bool enabled)
+ setSlot(STICKY_FLAG_SLOT, BooleanValue(enabled));
}
+#if ENABLE_YARR_JIT
/* This function should be deleted once bad Android platforms phase out. See bug 604774. */
inline bool
- detail::RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
-@@ -367,12 +368,12 @@ detail::RegExpPrivateCode::isJITRuntimeE
+ detail::RegExpCode::isJITRuntimeEnabled(JSContext *cx)
+@@ -147,6 +148,7 @@ detail::RegExpCode::isJITRuntimeEnabled(
return true;
#endif
}
+#endif
inline bool
- detail::RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts,
- uintN *parenCount, RegExpFlag flags)
- {
--#if ENABLE_YARR_JIT
- /* Parse the pattern. */
- ErrorCode yarrError;
- YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
-@@ -389,7 +390,7 @@ detail::RegExpPrivateCode::compile(JSCon
- * case we have to bytecode compile it.
- */
-
--#ifdef JS_METHODJIT
-+#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
- if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
- JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
- if (!execAlloc) {
-@@ -410,21 +411,11 @@ detail::RegExpPrivateCode::compile(JSCon
- return false;
- }
-
-+#if ENABLE_YARR_JIT
- codeBlock.setFallBack(true);
-+#endif
- byteCode = byteCompile(yarrPattern, bumpAlloc).get();
- return true;
--#else /* !defined(ENABLE_YARR_JIT) */
-- int error = 0;
-- compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
-- ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
-- multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
-- parenCount, &error);
-- if (error) {
-- reportPCREError(cx, error);
-- return false;
-- }
-- return true;
--#endif
- }
-
- inline bool
-@@ -466,19 +457,12 @@ detail::RegExpPrivateCode::execute(JSCon
- else
- result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
- #else
-- result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
-+ result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
- #endif
-
- if (result == -1)
- return RegExpRunStatus_Success_NotFound;
-
--#if !ENABLE_YARR_JIT
-- if (result < 0) {
-- reportPCREError(cx, result);
-- return RegExpRunStatus_Error;
-- }
--#endif
--
- JS_ASSERT(result >= 0);
- return RegExpRunStatus_Success;
- }
-diff -up xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h.691898 xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h
---- xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h.691898 2012-04-21 00:03:56.000000000 +0200
-+++ xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h 2012-05-04 10:23:50.000000000 +0200
+ RegExpToShared(JSContext *cx, JSObject &obj, RegExpGuard *g)
+diff -up xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h.691898 xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h
+--- xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h.691898 2012-06-01 14:04:05.000000000 +0200
++++ xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h 2012-06-04 10:43:23.696175932 +0200
@@ -49,9 +49,7 @@
#include "jsprvtd.h"
#include "vm/String.h"
diff --git a/sources b/sources
index d040718..3c6eae1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80c3e5927274de7f181fb5f931ac5fd4 xulrunner-12.0.source.tar.bz2
+f50ca7656eec47030b396f39075fa980 xulrunner-13.0.source.tar.bz2
diff --git a/xulrunner-10.0-gcc47.patch b/xulrunner-10.0-gcc47.patch
index 91a948a..093357b 100644
--- a/xulrunner-10.0-gcc47.patch
+++ b/xulrunner-10.0-gcc47.patch
@@ -1,15 +1,3 @@
-diff -up mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 mozilla-beta/ipc/chromium/src/base/time_posix.cc
---- mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 2012-01-24 03:00:00.000000000 -0500
-+++ mozilla-beta/ipc/chromium/src/base/time_posix.cc 2012-01-30 14:12:49.198472212 -0500
-@@ -14,6 +14,8 @@
- #include <time.h>
- #endif
-
-+#include <unistd.h>
-+
- #include <limits>
-
- #include "base/basictypes.h"
diff -up mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-beta/toolkit/crashreporter/client/Makefile.in
--- mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 2012-01-30 14:41:14.475441039 -0500
+++ mozilla-beta/toolkit/crashreporter/client/Makefile.in 2012-01-30 14:43:03.587646656 -0500
diff --git a/xulrunner.spec b/xulrunner.spec
index b0d47fa..2dc9514 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -72,8 +72,8 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
-Version: 12.0
-Release: 7%{?pre_tag}%{?dist}
+Version: 13.0
+Release: 1%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -100,15 +100,9 @@ Patch20: mozilla-193-pkgconfig.patch
Patch24: crashreporter-remove-static.patch
# Upstream patches
-# https://bugzilla.mozilla.org/show_bug.cgi?id=707993
-Patch39: xulrunner-8.0-fix-maemo-checks-in-npapi.patch
-Patch43: mozilla-file.patch
-Patch46: mozilla-724615.patch
Patch47: mozilla-691898.patch
-Patch48: mozilla-734335.patch
%ifarch ppc ppc64
Patch49: mozilla-746112.patch
-Patch50: mozilla-746112-1.patch
%endif
# ---------------------------------------------------
@@ -246,14 +240,9 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
%patch20 -p2 -b .pk
%patch24 -p1 -b .static
-%patch39 -p1 -b .707993
-%patch43 -p1 -b .file
-%patch46 -p1 -b .724615
%patch47 -p2 -b .691898
-%patch48 -p2 -b .734335
%ifarch ppc ppc64
%patch49 -p2 -b .746112
-%patch50 -p1 -b .746112-1
%endif
%{__rm} -f .mozconfig
@@ -512,6 +501,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Mon Jun 4 2012 Martin Stransky <stransky at redhat.com> - 13.0-1
+- Update to 13.0
+
* Mon May 28 2012 Martin Stransky <stransky at redhat.com> - 12.0-7
- More ppc(64) fixes - mozbz#746112
More information about the scm-commits
mailing list