# HG changeset patch # User Wolfgang Rosenauer # Date 1336651453 -7200 # Node ID b8a9179c123d9aa2dc74e7112feb71a1a68fe2ee # Parent de015e47b365772ccaf991d2f3335c1b68ac19fa - 13.0b3 + mozilla-nsSound.patch diff -r de015e47b365 -r b8a9179c123d MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sun Apr 29 09:41:12 2012 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Thu May 10 14:04:13 2012 +0200 @@ -49,7 +49,7 @@ BuildRequires: nss-shared-helper-devel Version: %{mainver} Release: 0 -%define releasedate 2012042500 +%define releasedate 2012050900 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -95,6 +95,7 @@ Patch17: mozilla-revert_621446.patch Patch18: mozilla-libnotify.patch Patch19: mozilla-gcc47.patch +Patch20: mozilla-nsSound.patch # Firefox/browser Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch @@ -232,6 +233,7 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 # %patch31 -p1 %patch32 -p1 diff -r de015e47b365 -r b8a9179c123d MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Sun Apr 29 09:41:12 2012 +0200 +++ b/MozillaFirefox/create-tar.sh Thu May 10 14:04:13 2012 +0200 @@ -2,7 +2,7 @@ CHANNEL="beta" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_13_0b1_RELEASE" +RELEASE_TAG="FIREFOX_13_0b3_RELEASE" VERSION="12.99" # mozilla diff -r de015e47b365 -r b8a9179c123d MozillaFirefox/mozilla-nsSound.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/mozilla-nsSound.patch Thu May 10 14:04:13 2012 +0200 @@ -0,0 +1,1 @@ +../mozilla-nsSound.patch \ No newline at end of file diff -r de015e47b365 -r b8a9179c123d mozilla-nsSound.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-nsSound.patch Thu May 10 14:04:13 2012 +0200 @@ -0,0 +1,43 @@ + +# HG changeset patch +# User Wolfgang Rosenauer +# Date 1336632642 -7200 +# Node ID 56cc5a3c431612fa98f0550f02a9f34b566e1d9b +# Parent 307671d73258761245d165e43591d885c7f68b73 +Bug 749739 - New email sound notification file cannot contain spaces (Linux - Thunderbird 12). r=karlt, a=lsblakk (upstream in FF14) + +diff --git a/widget/gtk2/nsSound.cpp b/widget/gtk2/nsSound.cpp +--- a/widget/gtk2/nsSound.cpp ++++ b/widget/gtk2/nsSound.cpp +@@ -353,23 +353,28 @@ NS_METHOD nsSound::Play(nsIURL *aURL) + bool isFile; + nsresult rv = aURL->SchemeIs("file", &isFile); + if (NS_SUCCEEDED(rv) && isFile) { + ca_context* ctx = ca_context_get_default(); + if (!ctx) { + return NS_ERROR_OUT_OF_MEMORY; + } + +- nsCAutoString path; +- rv = aURL->GetPath(path); ++ nsCAutoString spec; ++ rv = aURL->GetSpec(spec); + if (NS_FAILED(rv)) { + return rv; + } ++ gchar *path = g_filename_from_uri(spec.get(), NULL, NULL); ++ if (!path) { ++ return NS_ERROR_FILE_UNRECOGNIZED_PATH; ++ } + +- ca_context_play(ctx, 0, "media.filename", path.get(), NULL); ++ ca_context_play(ctx, 0, "media.filename", path, NULL); ++ g_free(path); + } else { + nsCOMPtr loader; + rv = NS_NewStreamLoader(getter_AddRefs(loader), aURL, this); + } + + return rv; + } + diff -r de015e47b365 -r b8a9179c123d mozilla-yarr-pcre.patch --- a/mozilla-yarr-pcre.patch Sun Apr 29 09:41:12 2012 +0200 +++ b/mozilla-yarr-pcre.patch Thu May 10 14:04:13 2012 +0200 @@ -1,40 +1,42 @@ -# HG changeset patch -# Parent 58dd942011a81f3149d9bc34e808806bda099056 -# User Landry Breuil -Use YARR interpreter instead of PCRE on platforms where YARR JIT is not -supported - diff --git a/js/src/Makefile.in b/js/src/Makefile.in --- a/js/src/Makefile.in +++ b/js/src/Makefile.in -@@ -335,25 +335,29 @@ CPPSRCS += checks.cc \ +@@ -332,30 +332,33 @@ CPPSRCS += checks.cc \ + platform.cc \ + utils.cc \ + $(NONE) + + # # END enclude sources for V8 dtoa ############################################# - # For architectures without YARR JIT, PCRE is faster than the YARR - # interpreter (bug 684559). - +-# 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 \ -+VPATH += $(srcdir)/assembler \ -+ $(srcdir)/assembler/wtf \ -+ $(srcdir)/yarr \ ++VPATH += $(srcdir)/assembler \ ++ $(srcdir)/assembler/wtf \ ++ $(srcdir)/assembler/jit \ ++ $(srcdir)/yarr \ $(NULL) - CPPSRCS += \ +-CPPSRCS += \ - pcre_compile.cpp \ - pcre_exec.cpp \ - pcre_tables.cpp \ - pcre_xclass.cpp \ - pcre_ucp_searchfuncs.cpp \ -+ OSAllocatorOS2.cpp \ -+ OSAllocatorPosix.cpp \ -+ OSAllocatorWin.cpp \ -+ PageBlock.cpp \ -+ YarrInterpreter.cpp \ -+ YarrPattern.cpp \ -+ YarrSyntaxChecker.cpp \ ++CPPSRCS += ExecutableAllocator.cpp \ ++ ExecutableAllocatorPosix.cpp \ ++ OSAllocatorOS2.cpp \ ++ OSAllocatorPosix.cpp \ ++ OSAllocatorWin.cpp \ ++ PageBlock.cpp \ ++ YarrInterpreter.cpp \ ++ YarrPattern.cpp \ ++ YarrSyntaxChecker.cpp \ $(NULL) else @@ -43,203 +45,32 @@ # ENABLE_YARR_JIT = 1 -@@ -878,20 +882,20 @@ endif - - ############################################### - # BEGIN kludges for the Nitro assembler - # - - # Needed to "configure" it correctly. Unfortunately these - # flags wind up being applied to all code in js/src, not just - # the code in js/src/assembler. --CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 - - ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_METHODJIT)) --CXXFLAGS += -DENABLE_JIT=1 -+CXXFLAGS += -DENABLE_JIT=1 -DENABLE_ASSEMBLER=1 - endif - - INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr - - ifdef ENABLE_METHODJIT - # Build a standalone test program that exercises the assembler - # sources a bit. - TESTMAIN_OBJS = \ -diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp ---- a/js/src/jsapi.cpp -+++ b/js/src/jsapi.cpp -@@ -696,17 +696,19 @@ JS_IsBuiltinFunctionConstructor(JSFuncti - static JSBool js_NewRuntimeWasCalled = JS_FALSE; - - JSRuntime::JSRuntime() - : atomsCompartment(NULL), - #ifdef JS_THREADSAFE - ownerThread_(NULL), +diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h +--- a/js/src/assembler/jit/ExecutableAllocator.h ++++ b/js/src/assembler/jit/ExecutableAllocator.h +@@ -462,18 +462,16 @@ public: + : "r" (code), "r" (reinterpret_cast(code) + size) + : "r0", "r1", "r2"); + } + #elif WTF_CPU_SPARC + static void cacheFlush(void* code, size_t size) + { + sync_instruction_memory((caddr_t)code, size); + } +-#else +- #error "The cacheFlush support is missing on this platform." #endif - tempLifoAlloc(TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE), -+#if ENABLE_ASSEMBLER - execAlloc_(NULL), -+#endif - bumpAlloc_(NULL), - nativeStackBase(0), - nativeStackQuota(0), - interpreterFrames(NULL), - cxCallback(NULL), - compartmentCallback(NULL), - activityCallback(NULL), - activityCallbackArg(NULL), -@@ -851,17 +853,19 @@ JSRuntime::init(uint32_t maxbytes) - nativeStackBase = GetNativeStackBase(); - return true; - } - - JSRuntime::~JSRuntime() - { - JS_ASSERT(onOwnerThread()); - -+#if ENABLE_ASSEMBLER - delete_(execAlloc_); -+#endif - delete_(bumpAlloc_); - - #ifdef DEBUG - /* Don't hurt everyone in leaky ol' Mozilla with a fatal JS_ASSERT! */ - if (!JS_CLIST_IS_EMPTY(&contextList)) { - JSContext *cx, *iter = NULL; - uintN cxcount = 0; - while ((cx = js_ContextIterator(this, JS_TRUE, &iter)) != NULL) { -diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp ---- a/js/src/jscntxt.cpp -+++ b/js/src/jscntxt.cpp -@@ -100,19 +100,21 @@ JSRuntime::sizeOfExcludingThis(JSMallocS - if (normal) - *normal = mallocSizeOf(dtoaState); - - if (temporary) - *temporary = tempLifoAlloc.sizeOfExcludingThis(mallocSizeOf); - - if (regexpCode) { - size_t method = 0, regexp = 0, unused = 0; -+#if ENABLE_ASSEMBLER - if (execAlloc_) - execAlloc_->sizeOfCode(&method, ®exp, &unused); - JS_ASSERT(method == 0); /* this execAlloc is only used for regexp code */ -+#endif - *regexpCode = regexp + unused; - } - - if (stackCommitted) - *stackCommitted = stackSpace.sizeOfCommitted(); - } - - JS_FRIEND_API(void) -@@ -124,33 +126,37 @@ JSRuntime::triggerOperationCallback() - */ - JS_ATOMIC_SET(&interrupt, 1); - } - void - JSRuntime::setJitHardening(bool enabled) - { - jitHardening = enabled; -+#if ENABLE_ASSEMBLER - if (execAlloc_) - execAlloc_->setRandomize(enabled); -+#endif - } - -+#if ENABLE_ASSEMBLER - JSC::ExecutableAllocator * - JSRuntime::createExecutableAllocator(JSContext *cx) - { - JS_ASSERT(!execAlloc_); - JS_ASSERT(cx->runtime == this); - - JSC::AllocationBehavior randomize = - jitHardening ? JSC::AllocationCanRandomize : JSC::AllocationDeterministic; - execAlloc_ = new_(randomize); - if (!execAlloc_) - js_ReportOutOfMemory(cx); - return execAlloc_; - } -+#endif - - WTF::BumpPointerAllocator * - JSRuntime::createBumpPointerAllocator(JSContext *cx) - { - JS_ASSERT(!bumpAlloc_); - JS_ASSERT(cx->runtime == this); - - bumpAlloc_ = new_(); -diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h ---- a/js/src/jscntxt.h -+++ b/js/src/jscntxt.h -@@ -219,26 +219,32 @@ struct JSRuntime : js::RuntimeFriendFiel - static const size_t TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE = 1 << 12; - js::LifoAlloc tempLifoAlloc; + private: - private: - /* - * Both of these allocators are used for regular expression code which is shared at the - * thread-data level. - */ -+#if ENABLE_ASSEMBLER - JSC::ExecutableAllocator *execAlloc_; -+#endif - WTF::BumpPointerAllocator *bumpAlloc_; - -+#if ENABLE_ASSEMBLER - JSC::ExecutableAllocator *createExecutableAllocator(JSContext *cx); -+#endif - WTF::BumpPointerAllocator *createBumpPointerAllocator(JSContext *cx); - - public: -+#if ENABLE_ASSEMBLER - JSC::ExecutableAllocator *getExecutableAllocator(JSContext *cx) { - return execAlloc_ ? execAlloc_ : createExecutableAllocator(cx); - } -+#endif - WTF::BumpPointerAllocator *getBumpPointerAllocator(JSContext *cx) { - return bumpAlloc_ ? bumpAlloc_ : createBumpPointerAllocator(cx); - } - - /* Base address of the native stack for the current thread. */ - uintptr_t nativeStackBase; - - /* The native stack size limit that runtime should not exceed. */ -diff --git a/js/src/jsprvtd.h b/js/src/jsprvtd.h ---- a/js/src/jsprvtd.h -+++ b/js/src/jsprvtd.h -@@ -313,22 +313,23 @@ typedef Handle Handl - typedef Handle HandleTypeObject; - typedef Handle HandleString; - typedef Handle HandleAtom; - typedef Handle HandleId; - typedef Handle HandleValue; - - } /* namespace js */ - -+#if ENABLE_ASSEMBLER - namespace JSC { - - class ExecutableAllocator; - - } /* namespace JSC */ -- -+#endif - namespace WTF { - - class BumpPointerAllocator; - - } /* namespace WTF */ - - } /* export "C++" */ + #if ENABLE_ASSEMBLER_WX_EXCLUSIVE + static void reprotectRegion(void*, size_t, ProtectionSetting); + #endif diff --git a/js/src/vm/RegExpObject-inl.h b/js/src/vm/RegExpObject-inl.h --- a/js/src/vm/RegExpObject-inl.h +++ b/js/src/vm/RegExpObject-inl.h -@@ -132,26 +132,28 @@ RegExpObject::setMultiline(bool enabled) +@@ -132,16 +132,17 @@ RegExpObject::setMultiline(bool enabled) } inline void @@ -257,17 +88,6 @@ return cx->methodJitEnabled; #else return true; - #endif - } -+#endif - - inline bool - RegExpToShared(JSContext *cx, JSObject &obj, RegExpGuard *g) - { - JS_ASSERT(ObjectClassIs(obj, ESClass_RegExp, cx)); - if (obj.isRegExp()) - return obj.asRegExp().getShared(cx, g); - return Proxy::regexp_toShared(cx, &obj, g); diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp --- a/js/src/vm/RegExpObject.cpp +++ b/js/src/vm/RegExpObject.cpp @@ -289,7 +109,7 @@ JS_NOT_REACHED("Called reportYarrError with value for no error"); return; #define COMPILE_EMSG(__code, __msg) \ -@@ -194,73 +193,36 @@ RegExpCode::reportYarrError(JSContext *c +@@ -194,52 +193,16 @@ RegExpCode::reportYarrError(JSContext *c COMPILE_EMSG(QuantifierTooLarge, JSMSG_BAD_QUANTIFIER); COMPILE_EMSG(EscapeUnterminated, JSMSG_TRAILING_SLASH); #undef COMPILE_EMSG @@ -335,97 +155,13 @@ -#endif /* ENABLE_YARR_JIT */ - bool - RegExpCode::compile(JSContext *cx, JSLinearString &pattern, uintN *parenCount, RegExpFlag flags) + RegExpCode::compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags) { --#if ENABLE_YARR_JIT + #if ENABLE_YARR_JIT /* Parse the pattern. */ ErrorCode yarrError; YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag), &yarrError); - if (yarrError) { - reportYarrError(cx, NULL, yarrError); - return false; - } - *parenCount = yarrPattern.m_numSubpatterns; - - /* - * The YARR JIT compiler attempts to compile the parsed pattern. If - * it cannot, it informs us via |codeBlock.isFallBack()|, in which - * 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) { - js_ReportOutOfMemory(cx); - return false; - } - - JSGlobalData globalData(execAlloc); -@@ -271,58 +233,41 @@ RegExpCode::compile(JSContext *cx, JSLin - #endif - - WTF::BumpPointerAllocator *bumpAlloc = cx->runtime->getBumpPointerAllocator(cx); - if (!bumpAlloc) { - js_ReportOutOfMemory(cx); - 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 - RegExpCode::execute(JSContext *cx, const jschar *chars, size_t length, size_t start, - int *output, size_t outputCount) - { - int result; - #if ENABLE_YARR_JIT - (void) cx; /* Unused. */ - if (codeBlock.isFallBack()) - result = JSC::Yarr::interpret(byteCode, chars, start, length, output); - 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; - } - - /* RegExpObject */ - - static void - regexp_trace(JSTracer *trc, JSObject *obj) diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h --- a/js/src/vm/RegExpObject.h +++ b/js/src/vm/RegExpObject.h @@ -451,91 +187,6 @@ * * RegExpObject - The JS-visible object whose .[[Class]] equals "RegExp" * -@@ -107,78 +105,61 @@ class RegExpObjectBuilder - - JSObject * - CloneRegExpObject(JSContext *cx, JSObject *obj, JSObject *proto); - - 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; -+#endif - BytecodePattern *byteCode; --#else -- JSRegExp *compiled; --#endif - - public: - RegExpCode() - : - #if ENABLE_YARR_JIT - codeBlock(), -+#endif - byteCode(NULL) --#else -- compiled(NULL) --#endif - { } - - ~RegExpCode() { - #if ENABLE_YARR_JIT - codeBlock.release(); -+#endif - if (byteCode) - Foreground::delete_(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); -+#endif - static void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error); --#else -- static void reportPCREError(JSContext *cx, int error); --#endif - - 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, uintN *parenCount, RegExpFlag flags); - - - RegExpRunStatus - execute(JSContext *cx, const jschar *chars, size_t length, size_t start, - int *output, size_t outputCount); diff --git a/js/src/yarr/wtfbridge.h b/js/src/yarr/wtfbridge.h --- a/js/src/yarr/wtfbridge.h +++ b/js/src/yarr/wtfbridge.h diff -r de015e47b365 -r b8a9179c123d series --- a/series Sun Apr 29 09:41:12 2012 +0200 +++ b/series Thu May 10 14:04:13 2012 +0200 @@ -17,11 +17,12 @@ mozilla-sle11.patch mozilla-linux3.patch mozilla-disable-neon-option.patch +#mozilla-yarr-pcre.patch mozilla-system-nspr.patch mozilla-revert_621446.patch mozilla-libnotify.patch mozilla-gcc47.patch -#mozilla-yarr-pcre.patch +mozilla-nsSound.patch # Firefox patches firefox-browser-css.patch diff -r de015e47b365 -r b8a9179c123d xulrunner/create-tar.sh --- a/xulrunner/create-tar.sh Sun Apr 29 09:41:12 2012 +0200 +++ b/xulrunner/create-tar.sh Thu May 10 14:04:13 2012 +0200 @@ -2,7 +2,7 @@ CHANNEL="beta" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_13_0b1_RELEASE" +RELEASE_TAG="FIREFOX_13_0b3_RELEASE" VERSION="12.99" # mozilla diff -r de015e47b365 -r b8a9179c123d xulrunner/mozilla-disable-neon-option.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xulrunner/mozilla-disable-neon-option.patch Thu May 10 14:04:13 2012 +0200 @@ -0,0 +1,1 @@ +../mozilla-disable-neon-option.patch \ No newline at end of file diff -r de015e47b365 -r b8a9179c123d xulrunner/mozilla-nsSound.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xulrunner/mozilla-nsSound.patch Thu May 10 14:04:13 2012 +0200 @@ -0,0 +1,1 @@ +../mozilla-nsSound.patch \ No newline at end of file diff -r de015e47b365 -r b8a9179c123d xulrunner/mozilla-system-nspr.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xulrunner/mozilla-system-nspr.patch Thu May 10 14:04:13 2012 +0200 @@ -0,0 +1,1 @@ +../mozilla-system-nspr.patch \ No newline at end of file diff -r de015e47b365 -r b8a9179c123d xulrunner/xulrunner.changes --- a/xulrunner/xulrunner.changes Sun Apr 29 09:41:12 2012 +0200 +++ b/xulrunner/xulrunner.changes Thu May 10 14:04:13 2012 +0200 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 10 12:00:04 UTC 2012 - wr@rosenauer.org + +- update to 13.0beta (20120509) + ------------------------------------------------------------------- Sat Apr 21 10:03:42 UTC 2012 - wr@rosenauer.org diff -r de015e47b365 -r b8a9179c123d xulrunner/xulrunner.spec --- a/xulrunner/xulrunner.spec Sun Apr 29 09:41:12 2012 +0200 +++ b/xulrunner/xulrunner.spec Thu May 10 14:04:13 2012 +0200 @@ -46,7 +46,7 @@ BuildRequires: mozilla-nss-devel >= 3.13.4 Version: 12.99 Release: 0 -%define releasedate 2012042500 +%define releasedate 2012050900 %define version_internal 13.0 %define apiversion 13 %define uaweight 1300000 @@ -73,17 +73,18 @@ Patch3: idldir.patch Patch4: mozilla-nongnome-proxies.patch Patch5: mozilla-prefer_plugin_pref.patch -Patch9: mozilla-language.patch -Patch11: mozilla-ntlm-full-path.patch -Patch12: mozilla-dump_syms-static.patch -Patch13: mozilla-sle11.patch -Patch14: mozilla-linux3.patch -Patch15: mozilla-arm-cpu-detection.patch -Patch16: mozilla-system-nspr.patch -Patch17: mozilla-revert_621446.patch -Patch18: mozilla-yarr-pcre.patch -Patch19: mozilla-libnotify.patch -Patch20: mozilla-gcc47.patch +Patch6: mozilla-language.patch +Patch7: mozilla-ntlm-full-path.patch +Patch8: mozilla-dump_syms-static.patch +Patch9: mozilla-sle11.patch +Patch10: mozilla-linux3.patch +Patch11: mozilla-disable-neon-option.patch +Patch12: mozilla-system-nspr.patch +Patch13: mozilla-revert_621446.patch +Patch14: mozilla-yarr-pcre.patch +Patch15: mozilla-libnotify.patch +Patch16: mozilla-gcc47.patch +Patch17: mozilla-nsSound.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js = %{version} Requires(post): update-alternatives coreutils @@ -93,13 +94,17 @@ %define has_system_nss 1 %define has_system_cairo 0 %define localize 0 -%ifarch ppc ppc64 s390 s390x ia64 +%ifarch ppc ppc64 s390 s390x ia64 %arm %define crashreporter 0 %define plugincontainer 0 %else %define crashreporter 1 %define plugincontainer 1 %endif +# temporary gcc 4.7 +%if %suse_version > 1210 +%define crashreporter 0 +%endif ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} @@ -165,7 +170,7 @@ Summary: Extra translations for XULRunner Group: System/Localization Requires: %{name} = %{version} -Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -194,19 +199,20 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%if %suse_version < 1120 %patch9 -p1 +%endif +%patch10 -p1 %patch11 -p1 %patch12 -p1 -%if %suse_version < 1120 -%patch13 -p1 -%endif -%patch14 -p1 +#%patch13 -p1 +#%patch14 -p1 %patch15 -p1 %patch16 -p1 -#%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 +%patch17 -p1 %build # no need to add build time to binaries @@ -301,17 +307,7 @@ # ARM %ifarch %arm cat << EOF >> $MOZCONFIG -%ifarch armv7l -ac_add_options --with-arch=armv7-a -ac_add_options --with-float-abi=hard -ac_add_options --with-fpu=vfpv3-d16 -ac_add_options --with-thumb=yes -%endif -%ifarch armv5tel -ac_add_options --with-arch=armv5te -ac_add_options --with-float-abi=soft -ac_add_options --with-thumb=no -%endif +ac_add_options --disable-neon EOF %endif make -f client.mk build