Compare commits
No commits in common. "rawhide" and "f15" have entirely different histories.
20 changed files with 12010 additions and 1 deletions
32
.gitignore
vendored
Normal file
32
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
xulrunner-1.9.2.7.source.tar.bz2
|
||||
xulrunner-1.9.3.0b3.source.tar.bz2
|
||||
/xulrunner-1.9.3.0b4.source.tar.bz2
|
||||
/xulrunner-2.0b6.source.tar.bz2
|
||||
/xulrunner-4.0b7.source.tar.bz2
|
||||
/xulrunner-2.0b7.source.tar.bz2
|
||||
/xulrunner-2.0b8.source.tar.bz2
|
||||
/xulrunner-2.0b9.source.tar.bz2
|
||||
/xulrunner-2.0b10.source.tar.bz2
|
||||
/xulrunner-2.0b11.source.tar.bz2
|
||||
/xulrunner-2.0b12.source.tar.bz2
|
||||
/xulrunner-2.0rc1.source.tar.bz2
|
||||
/xulrunner-2.0rc2.source.tar.bz2
|
||||
/xulrunner-2.0.source.tar.bz2
|
||||
/xulrunner-2.0.1.source.tar.bz2
|
||||
/xulrunner-5.0.source.tar.bz2
|
||||
/xulrunner-6.0.source.tar.bz2
|
||||
/xulrunner-6.0.2.source.tar.bz2
|
||||
/xulrunner-7.0.source.tar.bz2
|
||||
/xulrunner-7.0.1.source.tar.bz2
|
||||
/xulrunner-8.0.source.tar.bz2
|
||||
/xulrunner-9.0.source.tar.bz2
|
||||
/xulrunner-9.0.1.source.tar.bz2
|
||||
/xulrunner-10.0b6.source.tar.bz2
|
||||
/xulrunner-10.0.source.tar.bz2
|
||||
/xulrunner-10.0.1.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
|
||||
/xulrunner-13.0.1.source.tar.bz2
|
||||
/xulrunner-14.0.1.source.tar.bz2
|
||||
8842
add-gtkmozembed-11.0.patch
Normal file
8842
add-gtkmozembed-11.0.patch
Normal file
File diff suppressed because it is too large
Load diff
11
crashreporter-remove-static.patch
Normal file
11
crashreporter-remove-static.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
|
||||
--- mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-06-23 19:47:11.000000000 +0200
|
||||
+++ mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-07-12 15:51:41.000000000 +0200
|
||||
@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1
|
||||
|
||||
#XXX: bug 554854 causes us to be unable to run binaries on the build slaves
|
||||
# due to them having an older libstdc++
|
||||
-HOST_LDFLAGS += -static
|
||||
+#HOST_LDFLAGS += -static
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
@ -1 +0,0 @@
|
|||
This package is no longer supported by upstream
|
||||
32
mozilla-193-pkgconfig.patch
Normal file
32
mozilla-193-pkgconfig.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in
|
||||
--- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in.pk 2010-08-06 03:09:24.000000000 +0200
|
||||
+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in 2010-08-16 11:12:32.000000000 +0200
|
||||
@@ -6,5 +6,6 @@ idldir=%idldir%
|
||||
Name: libxul-embedding
|
||||
Description: Static library for version-independent embedding of the Mozilla runtime
|
||||
Version: %MOZILLA_VERSION%
|
||||
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
|
||||
Libs: -L${sdkdir}/lib -lxpcomglue -ldl
|
||||
Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
|
||||
diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in
|
||||
--- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in.pk 2010-08-06 03:09:24.000000000 +0200
|
||||
+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in 2010-08-16 11:07:52.000000000 +0200
|
||||
@@ -2,6 +2,7 @@ prefix=%prefix%
|
||||
sdkdir=%sdkdir%
|
||||
includedir=%includedir%
|
||||
idldir=%idldir%
|
||||
+libdir=%libdir%
|
||||
|
||||
Name: libxul
|
||||
Description: The Mozilla Runtime and Embedding Engine
|
||||
diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in
|
||||
--- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in.pk 2010-08-16 11:07:52.000000000 +0200
|
||||
+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in 2010-08-16 11:07:52.000000000 +0200
|
||||
@@ -116,6 +116,7 @@ endif
|
||||
-e "s|%includedir%|$(includedir)|" \
|
||||
-e "s|%idldir%|$(idldir)|" \
|
||||
-e "s|%sdkdir%|$(sdkdir)|" \
|
||||
+ -e "s|%libdir%|$(installdir)|" \
|
||||
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
|
||||
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
|
||||
-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
|
||||
15
mozilla-639554.patch
Normal file
15
mozilla-639554.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
--- a/toolkit/mozapps/installer/packager.mk
|
||||
+++ b/toolkit/mozapps/installer/packager.mk
|
||||
@@ -621,10 +621,12 @@ ifdef INSTALL_SDK # Here comes the hard
|
||||
(cd $(DESTDIR)$(idldir) && tar -xf -)
|
||||
# SDK directory is the libs + a bunch of symlinks
|
||||
$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
|
||||
+ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
|
||||
if test -f $(DIST)/include/xpcom-config.h; then \
|
||||
$(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
|
||||
fi
|
||||
(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
|
||||
+ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
|
||||
$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
|
||||
ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
|
||||
ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
|
||||
288
mozilla-691898.patch
Normal file
288
mozilla-691898.patch
Normal file
|
|
@ -0,0 +1,288 @@
|
|||
diff -up xulrunner-14.0.1/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 xulrunner-14.0.1/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h
|
||||
--- xulrunner-14.0.1/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 2012-07-13 23:42:56.000000000 +0200
|
||||
+++ xulrunner-14.0.1/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h 2012-07-16 13:46:03.512655482 +0200
|
||||
@@ -468,8 +468,6 @@ public:
|
||||
{
|
||||
sync_instruction_memory((caddr_t)code, size);
|
||||
}
|
||||
-#else
|
||||
- #error "The cacheFlush support is missing on this platform."
|
||||
#endif
|
||||
|
||||
private:
|
||||
diff -up xulrunner-14.0.1/mozilla-release/js/src/Makefile.in.691898 xulrunner-14.0.1/mozilla-release/js/src/Makefile.in
|
||||
--- xulrunner-14.0.1/mozilla-release/js/src/Makefile.in.691898 2012-07-13 23:42:56.000000000 +0200
|
||||
+++ xulrunner-14.0.1/mozilla-release/js/src/Makefile.in 2012-07-16 13:48:34.039399155 +0200
|
||||
@@ -320,20 +320,22 @@ endif
|
||||
|
||||
endif
|
||||
|
||||
-# For architectures without YARR JIT, PCRE is faster than the YARR
|
||||
-# interpreter (bug 684559).
|
||||
-
|
||||
ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
|
||||
|
||||
-VPATH += $(srcdir)/yarr/pcre \
|
||||
- $(NULL)
|
||||
+VPATH += $(srcdir)/assembler \
|
||||
+ $(srcdir)/assembler/wtf \
|
||||
+ $(srcdir)/assembler/jit \
|
||||
+ $(srcdir)/yarr \
|
||||
|
||||
-CPPSRCS += \
|
||||
- pcre_compile.cpp \
|
||||
- pcre_exec.cpp \
|
||||
- pcre_tables.cpp \
|
||||
- pcre_xclass.cpp \
|
||||
- pcre_ucp_searchfuncs.cpp \
|
||||
+CPPSRCS += ExecutableAllocator.cpp \
|
||||
+ ExecutableAllocatorPosix.cpp \
|
||||
+ OSAllocatorOS2.cpp \
|
||||
+ OSAllocatorPosix.cpp \
|
||||
+ OSAllocatorWin.cpp \
|
||||
+ PageBlock.cpp \
|
||||
+ YarrInterpreter.cpp \
|
||||
+ YarrPattern.cpp \
|
||||
+ YarrSyntaxChecker.cpp \
|
||||
$(NULL)
|
||||
else
|
||||
|
||||
@@ -903,4 +905,3 @@ endif
|
||||
#
|
||||
# END kludges for the Nitro assembler
|
||||
###############################################
|
||||
-
|
||||
diff -up xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.cpp
|
||||
--- xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.cpp.691898 2012-07-13 23:42:59.000000000 +0200
|
||||
+++ xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.cpp 2012-07-16 13:46:03.897657354 +0200
|
||||
@@ -168,7 +168,6 @@ MatchPairs::checkAgainst(size_t inputLen
|
||||
|
||||
/* detail::RegExpCode */
|
||||
|
||||
-#if ENABLE_YARR_JIT
|
||||
void
|
||||
RegExpCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
|
||||
{
|
||||
@@ -200,46 +199,9 @@ RegExpCode::reportYarrError(JSContext *c
|
||||
}
|
||||
}
|
||||
|
||||
-#else /* !ENABLE_YARR_JIT */
|
||||
-
|
||||
-void
|
||||
-RegExpCode::reportPCREError(JSContext *cx, int error)
|
||||
-{
|
||||
-#define REPORT(msg_) \
|
||||
- JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_ERROR, js_GetErrorMessage, NULL, msg_); \
|
||||
- return
|
||||
- switch (error) {
|
||||
- case -2: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
|
||||
- case 0: JS_NOT_REACHED("Precondition violation: an error must have occurred.");
|
||||
- case 1: REPORT(JSMSG_TRAILING_SLASH);
|
||||
- case 2: REPORT(JSMSG_TRAILING_SLASH);
|
||||
- case 3: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
|
||||
- case 4: REPORT(JSMSG_BAD_QUANTIFIER);
|
||||
- case 5: REPORT(JSMSG_BAD_QUANTIFIER);
|
||||
- case 6: REPORT(JSMSG_BAD_CLASS_RANGE);
|
||||
- case 7: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
|
||||
- case 8: REPORT(JSMSG_BAD_CLASS_RANGE);
|
||||
- case 9: REPORT(JSMSG_BAD_QUANTIFIER);
|
||||
- case 10: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN);
|
||||
- case 11: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
|
||||
- case 12: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN);
|
||||
- case 13: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
|
||||
- case 14: REPORT(JSMSG_MISSING_PAREN);
|
||||
- case 15: REPORT(JSMSG_BAD_BACKREF);
|
||||
- case 16: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
|
||||
- case 17: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
|
||||
- default:
|
||||
- JS_NOT_REACHED("Precondition violation: unknown PCRE error code.");
|
||||
- }
|
||||
-#undef REPORT
|
||||
-}
|
||||
-
|
||||
-#endif /* ENABLE_YARR_JIT */
|
||||
-
|
||||
bool
|
||||
RegExpCode::compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags)
|
||||
{
|
||||
-#if ENABLE_YARR_JIT
|
||||
/* Parse the pattern. */
|
||||
ErrorCode yarrError;
|
||||
YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
|
||||
@@ -256,7 +218,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) {
|
||||
@@ -277,21 +239,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
|
||||
@@ -306,19 +258,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-14.0.1/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.h
|
||||
--- xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.h.691898 2012-07-13 23:42:59.000000000 +0200
|
||||
+++ xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.h 2012-07-16 13:46:03.897657354 +0200
|
||||
@@ -52,10 +52,8 @@
|
||||
#include "yarr/Yarr.h"
|
||||
#if ENABLE_YARR_JIT
|
||||
#include "yarr/YarrJIT.h"
|
||||
-#include "yarr/YarrSyntaxChecker.h"
|
||||
-#else
|
||||
-#include "yarr/pcre/pcre.h"
|
||||
#endif
|
||||
+#include "yarr/YarrSyntaxChecker.h"
|
||||
|
||||
/*
|
||||
* JavaScript Regular Expressions
|
||||
@@ -113,68 +111,51 @@ namespace detail {
|
||||
|
||||
class RegExpCode
|
||||
{
|
||||
-#if ENABLE_YARR_JIT
|
||||
typedef JSC::Yarr::BytecodePattern BytecodePattern;
|
||||
typedef JSC::Yarr::ErrorCode ErrorCode;
|
||||
+ typedef JSC::Yarr::YarrPattern YarrPattern;
|
||||
+#if ENABLE_YARR_JIT
|
||||
typedef JSC::Yarr::JSGlobalData JSGlobalData;
|
||||
typedef JSC::Yarr::YarrCodeBlock YarrCodeBlock;
|
||||
- typedef JSC::Yarr::YarrPattern YarrPattern;
|
||||
|
||||
/* Note: Native code is valid only if |codeBlock.isFallBack() == false|. */
|
||||
YarrCodeBlock codeBlock;
|
||||
- BytecodePattern *byteCode;
|
||||
-#else
|
||||
- JSRegExp *compiled;
|
||||
#endif
|
||||
+ BytecodePattern *byteCode;
|
||||
|
||||
public:
|
||||
RegExpCode()
|
||||
:
|
||||
#if ENABLE_YARR_JIT
|
||||
codeBlock(),
|
||||
- byteCode(NULL)
|
||||
-#else
|
||||
- compiled(NULL)
|
||||
#endif
|
||||
+ byteCode(NULL)
|
||||
{ }
|
||||
|
||||
~RegExpCode() {
|
||||
#if ENABLE_YARR_JIT
|
||||
codeBlock.release();
|
||||
+#endif
|
||||
if (byteCode)
|
||||
Foreground::delete_<BytecodePattern>(byteCode);
|
||||
-#else
|
||||
- if (compiled)
|
||||
- jsRegExpFree(compiled);
|
||||
-#endif
|
||||
}
|
||||
|
||||
static bool checkSyntax(JSContext *cx, TokenStream *tokenStream, JSLinearString *source) {
|
||||
-#if ENABLE_YARR_JIT
|
||||
ErrorCode error = JSC::Yarr::checkSyntax(*source);
|
||||
if (error == JSC::Yarr::NoError)
|
||||
return true;
|
||||
|
||||
reportYarrError(cx, tokenStream, error);
|
||||
return false;
|
||||
-#else
|
||||
-# error "Syntax checking not implemented for !ENABLE_YARR_JIT"
|
||||
-#endif
|
||||
}
|
||||
|
||||
#if ENABLE_YARR_JIT
|
||||
static inline bool isJITRuntimeEnabled(JSContext *cx);
|
||||
- static void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error);
|
||||
-#else
|
||||
- static void reportPCREError(JSContext *cx, int error);
|
||||
#endif
|
||||
+ static void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error);
|
||||
|
||||
static size_t getOutputSize(size_t pairCount) {
|
||||
-#if ENABLE_YARR_JIT
|
||||
return pairCount * 2;
|
||||
-#else
|
||||
- return pairCount * 3; /* Should be x2, but PCRE has... needs. */
|
||||
-#endif
|
||||
}
|
||||
|
||||
bool compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags);
|
||||
diff -up xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject-inl.h
|
||||
--- xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 2012-07-13 23:42:59.000000000 +0200
|
||||
+++ xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject-inl.h 2012-07-16 13:46:03.898657360 +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::RegExpCode::isJITRuntimeEnabled(JSContext *cx)
|
||||
@@ -147,6 +148,7 @@ detail::RegExpCode::isJITRuntimeEnabled(
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
+#endif
|
||||
|
||||
inline bool
|
||||
RegExpToShared(JSContext *cx, JSObject &obj, RegExpGuard *g)
|
||||
diff -up xulrunner-14.0.1/mozilla-release/js/src/yarr/wtfbridge.h.691898 xulrunner-14.0.1/mozilla-release/js/src/yarr/wtfbridge.h
|
||||
--- xulrunner-14.0.1/mozilla-release/js/src/yarr/wtfbridge.h.691898 2012-07-13 23:42:59.000000000 +0200
|
||||
+++ xulrunner-14.0.1/mozilla-release/js/src/yarr/wtfbridge.h 2012-07-16 13:46:03.898657360 +0200
|
||||
@@ -49,9 +49,7 @@
|
||||
#include "jsprvtd.h"
|
||||
#include "vm/String.h"
|
||||
#include "assembler/wtf/Platform.h"
|
||||
-#if ENABLE_YARR_JIT
|
||||
#include "assembler/jit/ExecutableAllocator.h"
|
||||
-#endif
|
||||
|
||||
namespace JSC { namespace Yarr {
|
||||
|
||||
35
mozilla-746112.patch
Normal file
35
mozilla-746112.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
Index: xulrunner-10.0.1/mozilla-release/js/src/yarr/YarrInterpreter.h
|
||||
===================================================================
|
||||
--- xulrunner-10.0.1.orig/mozilla-release/js/src/yarr/YarrInterpreter.h
|
||||
+++ xulrunner-10.0.1/mozilla-release/js/src/yarr/YarrInterpreter.h
|
||||
@@ -167,7 +167,7 @@ struct ByteTerm {
|
||||
inputPosition = inputPos;
|
||||
}
|
||||
|
||||
- ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos)
|
||||
+ ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) __attribute__((noinline))
|
||||
: type(type)
|
||||
, m_capture(capture)
|
||||
, m_invert(false)
|
||||
@@ -188,7 +188,7 @@ struct ByteTerm {
|
||||
atom.quantityCount = 1;
|
||||
}
|
||||
|
||||
- ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos)
|
||||
+ ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) __attribute__((noinline))
|
||||
: type(type)
|
||||
, m_capture(capture)
|
||||
, m_invert(invert)
|
||||
Index: xulrunner-10.0.1/mozilla-release/js/src/yarr/YarrPattern.h
|
||||
===================================================================
|
||||
--- xulrunner-10.0.1.orig/mozilla-release/js/src/yarr/YarrPattern.h
|
||||
+++ xulrunner-10.0.1/mozilla-release/js/src/yarr/YarrPattern.h
|
||||
@@ -171,7 +171,7 @@ struct PatternTerm {
|
||||
quantityCount = 1;
|
||||
}
|
||||
|
||||
- PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false)
|
||||
+ PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) __attribute__((noinline))
|
||||
: type(type)
|
||||
, m_capture(capture)
|
||||
, m_invert(invert)
|
||||
22
mozilla-build.patch
Normal file
22
mozilla-build.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff -up mozilla-beta/security/manager/Makefile.in.build mozilla-beta/security/manager/Makefile.in
|
||||
--- mozilla-beta/security/manager/Makefile.in.build 2012-03-09 01:39:56.000000000 +0100
|
||||
+++ mozilla-beta/security/manager/Makefile.in 2012-03-09 13:56:28.612328083 +0100
|
||||
@@ -174,7 +174,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
|
||||
DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
|
||||
DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
|
||||
DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
|
||||
-DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
|
||||
DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)"
|
||||
ifndef MOZ_NATIVE_SQLITE
|
||||
DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3
|
||||
diff -up mozilla-beta/security/manager/ssl/src/Makefile.in.build mozilla-beta/security/manager/ssl/src/Makefile.in
|
||||
--- mozilla-beta/security/manager/ssl/src/Makefile.in.build 2012-03-09 01:39:56.000000000 +0100
|
||||
+++ mozilla-beta/security/manager/ssl/src/Makefile.in 2012-03-09 13:57:37.055657208 +0100
|
||||
@@ -116,7 +116,6 @@ CSRCS += md4.c
|
||||
EXTRA_DEPS = $(NSS_DEP_LIBS)
|
||||
|
||||
DEFINES += \
|
||||
- -DNSS_ENABLE_ECC \
|
||||
-DDLL_PREFIX=\"$(DLL_PREFIX)\" \
|
||||
-DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
|
||||
$(NULL)
|
||||
1
sources
Normal file
1
sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
c2f884f0f6c41c65cf20f678a1ee7191 xulrunner-14.0.1.source.tar.bz2
|
||||
13
xulrunner-10.0-gcc47.patch
Normal file
13
xulrunner-10.0-gcc47.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
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
|
||||
@@ -69,6 +69,9 @@ CPPSRCS = \
|
||||
$(STDCXX_COMPAT) \
|
||||
$(NULL)
|
||||
|
||||
+# Needed for moz_free
|
||||
+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
|
||||
+
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
CPPSRCS += crashreporter_win.cpp
|
||||
LIBS += \
|
||||
14
xulrunner-12.0-jemalloc-ppc.patch
Normal file
14
xulrunner-12.0-jemalloc-ppc.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
Index: xulrunner-11.0/mozilla-release/memory/jemalloc/jemalloc.c
|
||||
===================================================================
|
||||
--- xulrunner-11.0.orig/mozilla-release/memory/jemalloc/jemalloc.c
|
||||
+++ xulrunner-11.0/mozilla-release/memory/jemalloc/jemalloc.c
|
||||
@@ -1089,7 +1089,9 @@ static unsigned ncpus;
|
||||
* controlling the malloc behavior are defined as compile-time constants
|
||||
* for best performance and cannot be altered at runtime.
|
||||
*/
|
||||
+#if !(defined(__powerpc__))
|
||||
#define MALLOC_STATIC_SIZES 1
|
||||
+#endif
|
||||
|
||||
#ifdef MALLOC_STATIC_SIZES
|
||||
|
||||
33
xulrunner-2.0-chromium-types.patch
Normal file
33
xulrunner-2.0-chromium-types.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
Bug 627669 - add support for s390(x) and ppc(64)
|
||||
|
||||
diff -up mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types mozilla-release/gfx/ycbcr/chromium_types.h
|
||||
--- mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types 2011-06-15 23:57:26.000000000 +0200
|
||||
+++ mozilla-release/gfx/ycbcr/chromium_types.h 2011-06-30 10:04:25.105032221 +0200
|
||||
@@ -61,7 +61,11 @@ typedef PRInt16 int16;
|
||||
#define ARCH_CPU_ARM_FAMILY 1
|
||||
#define ARCH_CPU_ARMEL 1
|
||||
#define ARCH_CPU_32_BITS 1
|
||||
-#elif defined(__ppc__) || defined(__powerpc) || defined(__PPC__)
|
||||
+#elif defined(__ppc64__) || defined(__powerpc64__)
|
||||
+#define ARCH_CPU_PPC_FAMILY 1
|
||||
+#define ARCH_CPU_PPC 1
|
||||
+#define ARCH_CPU_64_BITS 1
|
||||
+#elif defined(__ppc__) || defined(__powerpc__) || defined(__PPC__)
|
||||
#define ARCH_CPU_PPC_FAMILY 1
|
||||
#define ARCH_CPU_PPC 1
|
||||
#define ARCH_CPU_32_BITS 1
|
||||
@@ -73,6 +77,14 @@ typedef PRInt16 int16;
|
||||
#define ARCH_CPU_SPARC_FAMILY 1
|
||||
#define ARCH_CPU_SPARC 1
|
||||
#define ARCH_CPU_64_BITS 1
|
||||
+#elif defined(__s390x__)
|
||||
+#define ARCH_CPU_S390_FAMILY 1
|
||||
+#define ARCH_CPU_S390 1
|
||||
+#define ARCH_CPU_64_BITS 1
|
||||
+#elif defined(__s390__)
|
||||
+#define ARCH_CPU_S390_FAMILY 1
|
||||
+#define ARCH_CPU_S390 1
|
||||
+#define ARCH_CPU_32_BITS 1
|
||||
#else
|
||||
#warning Please add support for your architecture in chromium_types.h
|
||||
#endif
|
||||
43
xulrunner-mozconfig
Normal file
43
xulrunner-mozconfig
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
. $topsrcdir/xulrunner/config/mozconfig
|
||||
# --with-system-png is disabled because Mozilla requires APNG support in libpng
|
||||
#ac_add_options --with-system-png
|
||||
|
||||
ac_add_options --prefix="$PREFIX"
|
||||
ac_add_options --libdir="$LIBDIR"
|
||||
ac_add_options --with-system-jpeg
|
||||
ac_add_options --with-system-zlib
|
||||
ac_add_options --with-system-bz2
|
||||
ac_add_options --with-system-libvpx
|
||||
ac_add_options --enable-system-hunspell
|
||||
ac_add_options --with-pthreads
|
||||
ac_add_options --disable-strip
|
||||
ac_add_options --disable-tests
|
||||
ac_add_options --disable-mochitest
|
||||
ac_add_options --disable-installer
|
||||
ac_add_options --enable-xinerama
|
||||
ac_add_options --enable-default-toolkit=cairo-gtk2
|
||||
ac_add_options --enable-pango
|
||||
ac_add_options --enable-svg
|
||||
ac_add_options --enable-canvas
|
||||
ac_add_options --disable-javaxpcom
|
||||
ac_add_options --disable-crashreporter
|
||||
ac_add_options --enable-safe-browsing
|
||||
ac_add_options --enable-extensions=default
|
||||
ac_add_options --enable-libnotify
|
||||
ac_add_options --disable-necko-wifi
|
||||
ac_add_options --enable-startup-notification
|
||||
ac_add_options --disable-cpp-exceptions
|
||||
ac_add_options --enable-shared-js
|
||||
ac_add_options --enable-url-classifier
|
||||
ac_add_options --enable-gio
|
||||
ac_add_options --disable-gnomevfs
|
||||
ac_add_options --disable-updater
|
||||
ac_add_options --enable-chrome-format=omni
|
||||
|
||||
export BUILD_OFFICIAL=1
|
||||
export MOZILLA_OFFICIAL=1
|
||||
export MOZ_UA_BUILDID=20100101
|
||||
|
||||
mk_add_options BUILD_OFFICIAL=1
|
||||
mk_add_options MOZILLA_OFFICIAL=1
|
||||
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
|
||||
5
xulrunner-mozconfig-debuginfo
Normal file
5
xulrunner-mozconfig-debuginfo
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
# For mozilla's debuginfo:
|
||||
export CFLAGS="$CFLAGS -gdwarf-2"
|
||||
export CXXFLAGS="$CXXFLAGS -gdwarf-2"
|
||||
export MOZ_DEBUG_SYMBOLS=1
|
||||
ac_add_options --enable-crashreporter
|
||||
1324
xulrunner-omnijar-5.patch
Normal file
1324
xulrunner-omnijar-5.patch
Normal file
File diff suppressed because it is too large
Load diff
8
xulrunner-redhat-default-prefs.js
Normal file
8
xulrunner-redhat-default-prefs.js
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
pref("app.update.enabled", false);
|
||||
pref("app.update.autoInstallEnabled", false);
|
||||
pref("general.smoothScroll", true);
|
||||
pref("intl.locale.matchOS", true);
|
||||
pref("network.manage-offline-status", true);
|
||||
pref("toolkit.storage.synchronous", 0);
|
||||
pref("toolkit.networkmanager.disable", false);
|
||||
pref("offline.autoDetect", true);
|
||||
13
xulrunner-version.patch
Normal file
13
xulrunner-version.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff -up mozilla/toolkit/mozapps/update/src/updater/module.ver mozilla/toolkit/mozapps/update/src/updater/module
|
||||
diff -up mozilla/xulrunner/installer/Makefile.in.ver mozilla/xulrunner/installer/Makefile.in
|
||||
--- mozilla/xulrunner/installer/Makefile.in.ver 2007-12-14 09:51:34.000000000 +0100
|
||||
+++ mozilla/xulrunner/installer/Makefile.in 2007-12-14 09:52:03.000000000 +0100
|
||||
@@ -44,6 +44,8 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
+MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__"
|
||||
+
|
||||
NO_PKG_FILES = \
|
||||
xulrunner-config \
|
||||
regchrome* \
|
||||
69
xulrunner.sh.in
Normal file
69
xulrunner.sh.in
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
|
||||
##
|
||||
## Usage:
|
||||
##
|
||||
## $ xulrunner
|
||||
##
|
||||
## This script is meant to run a xulrunner program from the xulrunner
|
||||
## rpm installation.
|
||||
##
|
||||
|
||||
cmdname=`basename $0`
|
||||
|
||||
##
|
||||
## Variables
|
||||
##
|
||||
XUL_ARCH=$(uname -m)
|
||||
case $XUL_ARCH in
|
||||
x86_64 | ia64 | s390 )
|
||||
XUL_LIB_DIR="/usr/lib64"
|
||||
SECONDARY_LIB_DIR="/usr/lib"
|
||||
;;
|
||||
* )
|
||||
XUL_LIB_DIR="/usr/lib"
|
||||
SECONDARY_LIB_DIR="/usr/lib64"
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ ! -x $XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner ]; then
|
||||
if [ ! -x $SECONDARY_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner ]; then
|
||||
echo "Error: $XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner not found"
|
||||
if [ -d $SECONDARY_LIB_DIR ]; then
|
||||
echo " $SECONDARY_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner not found"
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
XUL_LIB_DIR="$SECONDARY_LIB_DIR"
|
||||
fi
|
||||
XUL_DIST_BIN="$XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION"
|
||||
XUL_PROGRAM="$XUL_DIST_BIN/xulrunner"
|
||||
|
||||
##
|
||||
## Enable WebGL
|
||||
##
|
||||
MOZ_GLX_IGNORE_BLACKLIST=1
|
||||
export MOZ_GLX_IGNORE_BLACKLIST
|
||||
|
||||
|
||||
exec $XUL_PROGRAM "$@"
|
||||
1210
xulrunner.spec
Normal file
1210
xulrunner.spec
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue