Revision: 75706 http://trac.macports.org/changeset/75706 Author: jeremyhu@macports.org Date: 2011-02-04 15:34:47 -0800 (Fri, 04 Feb 2011) Log Message: ----------- xulrunner-devel: Bump to 2.0b10 Modified Paths: -------------- trunk/dports/devel/xulrunner-devel/Portfile Removed Paths: ------------- trunk/dports/devel/xulrunner-devel/files/PR-623277.patch Modified: trunk/dports/devel/xulrunner-devel/Portfile =================================================================== --- trunk/dports/devel/xulrunner-devel/Portfile 2011-02-04 23:34:35 UTC (rev 75705) +++ trunk/dports/devel/xulrunner-devel/Portfile 2011-02-04 23:34:47 UTC (rev 75706) @@ -7,8 +7,8 @@ name xulrunner-devel set component xulrunner categories devel -version 2.0b9 -set ff_version 4.0b9 +version 2.0b10 +set ff_version 4.0b10 platforms darwin maintainers jeremyhu openmaintainer description Mozilla.org's runtime package that can be used to bootstrap XUL+XPCOM applications @@ -29,9 +29,9 @@ use_bzip2 yes -checksums md5 be58ef0be58cfa3d1efda63bec41fc25 \ - sha1 4de79608d75098d8de86902f83e846747a3c5ce3 \ - rmd160 aedf962bb9e3748d2212b26de83a75df30e04bf4 +checksums md5 cfbd4a465e5aeb5f0a67cb0b3ad92249 \ + sha1 009da818242fc52ed30b30371c299d58d51fb532 \ + rmd160 22973a09320c984744720071e695a06f8229583e worksrcdir mozilla-central @@ -201,9 +201,8 @@ } # plugin-instance-nococoa.patch : https://bugzilla.mozilla.org/show_bug.cgi?id=587370 -# PR-623277.patch : JS_METHODJIT fixup for ppc # PR-623797.patch : #ifdef out features not in mainline cairo when building with system cairo -patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch PR-623277.patch PR-623797.patch +patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch PR-623797.patch post-patch { # https://bugzilla.mozilla.org/show_bug.cgi?id=485857 Deleted: trunk/dports/devel/xulrunner-devel/files/PR-623277.patch =================================================================== --- trunk/dports/devel/xulrunner-devel/files/PR-623277.patch 2011-02-04 23:34:35 UTC (rev 75705) +++ trunk/dports/devel/xulrunner-devel/files/PR-623277.patch 2011-02-04 23:34:47 UTC (rev 75706) @@ -1,80 +0,0 @@ ---- js/src/jsdbgapi.cpp -+++ js/src/jsdbgapi.cpp -@@ -111,37 +111,37 @@ IsScriptLive(JSContext *cx, JSScript *sc - #endif - - JS_PUBLIC_API(void) - JS_SetRuntimeDebugMode(JSRuntime *rt, JSBool debug) - { - rt->debugMode = debug; - } - -+#ifdef JS_METHODJIT - static void - PurgeCallICs(JSContext *cx, JSScript *start) - { --#ifdef JS_METHODJIT - for (JSScript *script = start; - &script->links != &cx->compartment->scripts; - script = (JSScript *)script->links.next) - { - // Debug mode does not use call ICs. - if (script->debugMode) - continue; - - JS_ASSERT(!IsScriptLive(cx, script)); - - if (script->jitNormal) - script->jitNormal->nukeScriptDependentICs(); - if (script->jitCtor) - script->jitCtor->nukeScriptDependentICs(); - } -+} - #endif --} - - JS_FRIEND_API(JSBool) - js_SetDebugMode(JSContext *cx, JSBool debug) - { - cx->compartment->debugMode = debug; - #ifdef JS_METHODJIT - for (JSScript *script = (JSScript *)cx->compartment->scripts.next; - &script->links != &cx->compartment->scripts; ---- js/src/jsinterpinlines.h -+++ js/src/jsinterpinlines.h -@@ -581,17 +581,21 @@ InvokeSessionGuard::invoke(JSContext *cx - { - /* N.B. Must be kept in sync with Invoke */ - - /* Refer to canonical (callee, this) for optimized() sessions. */ - formals_[-2] = savedCallee_; - formals_[-1] = savedThis_; - - void *code; -+#ifdef JS_METHODJIT - if (!optimized() || !(code = script_->getJIT(false /* !constructing */)->invokeEntry)) -+#else -+ if (!optimized()) -+#endif - return Invoke(cx, args_, 0); - - /* Clear any garbage left from the last Invoke. */ - JSStackFrame *fp = frame_.fp(); - fp->clearMissingArgs(); - fp->resetInvokeCallFrame(); - SetValueRangeToUndefined(fp->slots(), script_->nfixed); - ---- js/src/shell/js.cpp.orig 2011-01-10 19:26:08.000000000 -0800 -+++ js/src/shell/js.cpp 2011-01-16 20:02:59.000000000 -0800 -@@ -4249,7 +4249,11 @@ Deserialize(JSContext *cx, uintN argc, j - JSBool - MJitStats(JSContext *cx, uintN argc, jsval *vp) - { -+#ifdef JS_METHODJIT - JS_SET_RVAL(cx, vp, INT_TO_JSVAL(cx->runtime->mjitMemoryUsed)); -+#else -+ JS_SET_RVAL(cx, vp, JSVAL_VOID); -+#endif - return true; - } -