diff -Nru mozjs-1.8.5-1.0.0+dfsg/debian/changelog mozjs-1.8.5-1.0.0+dfsg/debian/changelog --- mozjs-1.8.5-1.0.0+dfsg/debian/changelog 2016-09-25 12:38:22.000000000 +0000 +++ mozjs-1.8.5-1.0.0+dfsg/debian/changelog 2016-12-12 06:01:03.000000000 +0000 @@ -1,3 +1,28 @@ +mozjs (1.8.5-1.0.0+dfsg-6) unstable; urgency=medium + + * QA upload + * Remove Modify_tagged_pointer_structure_js1.8.5.patch, which causes an + ABI change and would therefore require a soname bump (Closes: #847747) + + -- Ben Hutchings Mon, 12 Dec 2016 06:01:03 +0000 + +mozjs (1.8.5-1.0.0+dfsg-5.2) unstable; urgency=medium + + * Non-maintainer upload. + * Update debian/libmozjs185-1.0.symbols for m68k. + + -- John Paul Adrian Glaubitz Fri, 09 Dec 2016 12:50:35 +0100 + +mozjs (1.8.5-1.0.0+dfsg-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add Modify_tagged_pointer_structure_js1.8.5.patch to modify tagged + pointer to use 48 bit virtual address space (Closes: #839048). + * Add M68k-alignment-fixes.patch to enforce 32-bit alignment + on m68k for some StackSegment, JSStackFrame and JSScript. + + -- John Paul Adrian Glaubitz Fri, 09 Dec 2016 02:53:56 +0100 + mozjs (1.8.5-1.0.0+dfsg-5) unstable; urgency=medium * QA upload. diff -Nru mozjs-1.8.5-1.0.0+dfsg/debian/libmozjs185-1.0.symbols mozjs-1.8.5-1.0.0+dfsg/debian/libmozjs185-1.0.symbols --- mozjs-1.8.5-1.0.0+dfsg/debian/libmozjs185-1.0.symbols 2016-09-25 11:55:23.000000000 +0000 +++ mozjs-1.8.5-1.0.0+dfsg/debian/libmozjs185-1.0.symbols 2016-12-09 11:50:16.000000000 +0000 @@ -569,13 +569,13 @@ _Z22js_GetGCThingTraceKindPv@Base 1.8.5-1.0.0+dfsg _Z22js_GetScriptLineExtentP8JSScript@Base 1.8.5-1.0.0+dfsg _Z24js_DateGetMsecSinceEpochP9JSContextP8JSObject@Base 1.8.5-1.0.0+dfsg - (arch=!s390 !s390x !sh4)_Z24js_InitTypedArrayClassesP9JSContextP8JSObject@Base 1.8.5-1.0.0+dfsg + (arch=!m68k !s390 !s390x !sh4)_Z24js_InitTypedArrayClassesP9JSContextP8JSObject@Base 1.8.5-1.0.0+dfsg _Z24js_IsDensePrimitiveArrayP8JSObject@Base 1.8.5-1.0.0+dfsg (subst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_Z25js_GetterOnlyPropertyStubP9JSContextP8JSObjectiiP{uint64_t}@Base 1.8.5-1.0.0+dfsg (subst|arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64 mips64el ppc64 ppc64el s390x sparc64)_Z25js_GetterOnlyPropertyStubP9JSContextP8JSObjectliP{uint64_t}@Base 1.8.5-1.0.0+dfsg _Z27js_CloneDensePrimitiveArrayP9JSContextP8JSObjectPS2_@Base 1.8.5-1.0.0+dfsg _Z27js_ReportAllocationOverflowP9JSContext@Base 1.8.5-1.0.0+dfsg - (arch=!alpha !arm64 !hppa !ia64 !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390 !s390x !sh4 !sparc64)_Z27js_SetTraceableNativeFailedP9JSContext@Base 1.8.5-1.0.0+dfsg + (arch=!alpha !arm64 !hppa !ia64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390 !s390x !sh4 !sparc64)_Z27js_SetTraceableNativeFailedP9JSContext@Base 1.8.5-1.0.0+dfsg _Z28js_CreateTypedArrayWithArrayP9JSContextiP8JSObject@Base 1.8.5-1.0.0+dfsg _Z28js_ReparentTypedArrayToScopeP9JSContextP8JSObjectS2_@Base 1.8.5-1.0.0+dfsg _Z29js_CreateTypedArrayWithBufferP9JSContextiP8JSObjectii@Base 1.8.5-1.0.0+dfsg @@ -723,7 +723,7 @@ _ZN2js21OuterWindowProxyClassE@Base 1.8.5-1.0.0+dfsg _ZN2js24TriggerOperationCallbackEP9JSContext@Base 1.8.5-1.0.0+dfsg _ZN2js28IsBuiltinFunctionConstructorEP10JSFunction@Base 1.8.5-1.0.0+dfsg - (arch=!alpha !arm64 !hppa !ia64 !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390 !s390x !sparc64 !sh4)_ZN2js8DeepBailEP9JSContext@Base 1.8.5-1.0.0+dfsg + (arch=!alpha !arm64 !hppa !ia64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390 !s390x !sparc64 !sh4)_ZN2js8DeepBailEP9JSContext@Base 1.8.5-1.0.0+dfsg _ZN2js8FixProxyEP9JSContextP8JSObjectPi@Base 1.8.5-1.0.0+dfsg _ZN2js8GCMarker19markDelayedChildrenEv@Base 1.8.5-1.0.0+dfsg _ZN8JSObject18copyPropertiesFromEP9JSContextPS_@Base 1.8.5-1.0.0+dfsg diff -Nru mozjs-1.8.5-1.0.0+dfsg/debian/patches/M68k-alignment-fixes.patch mozjs-1.8.5-1.0.0+dfsg/debian/patches/M68k-alignment-fixes.patch --- mozjs-1.8.5-1.0.0+dfsg/debian/patches/M68k-alignment-fixes.patch 1970-01-01 00:00:00.000000000 +0000 +++ mozjs-1.8.5-1.0.0+dfsg/debian/patches/M68k-alignment-fixes.patch 2016-12-09 01:53:10.000000000 +0000 @@ -0,0 +1,48 @@ +Index: mozjs-1.8.5-1.0.0+dfsg/js/src/jscntxt.h +=================================================================== +--- mozjs-1.8.5-1.0.0+dfsg.orig/js/src/jscntxt.h ++++ mozjs-1.8.5-1.0.0+dfsg/js/src/jscntxt.h +@@ -419,7 +419,11 @@ class StackSegment + #ifdef DEBUG + JS_REQUIRES_STACK bool contains(const JSStackFrame *fp) const; + #endif ++#if !defined(__mc68000__) + }; ++#else ++} __attribute__ ((aligned(4))); /* enforce 32-bit alignment on m68k */ ++#endif + + static const size_t VALUES_PER_STACK_SEGMENT = sizeof(StackSegment) / sizeof(Value); + JS_STATIC_ASSERT(sizeof(StackSegment) % sizeof(Value) == 0); +Index: mozjs-1.8.5-1.0.0+dfsg/js/src/jsinterp.h +=================================================================== +--- mozjs-1.8.5-1.0.0+dfsg.orig/js/src/jsinterp.h ++++ mozjs-1.8.5-1.0.0+dfsg/js/src/jsinterp.h +@@ -791,7 +791,11 @@ struct JSStackFrame + /* Poison scopeChain value set before a frame is flushed. */ + static JSObject *const sInvalidScopeChain; + #endif ++#if !defined(__mc68000__) + }; ++#else ++} __attribute__ ((aligned(4))); /* enforce 32-bit alignment on m68k */ ++#endif + + namespace js { + +Index: mozjs-1.8.5-1.0.0+dfsg/js/src/jsscript.h +=================================================================== +--- mozjs-1.8.5-1.0.0+dfsg.orig/js/src/jsscript.h ++++ mozjs-1.8.5-1.0.0+dfsg/js/src/jsscript.h +@@ -579,7 +579,11 @@ struct JSScript { + } + + void copyClosedSlotsTo(JSScript *other); ++#if !defined(__mc68000__) + }; ++#else ++} __attribute__ ((aligned(4))); /* enforce 32-bit alignment on m68k */ ++#endif + + #define SHARP_NSLOTS 2 /* [#array, #depth] slots if the script + uses sharp variables */ diff -Nru mozjs-1.8.5-1.0.0+dfsg/debian/patches/series mozjs-1.8.5-1.0.0+dfsg/debian/patches/series --- mozjs-1.8.5-1.0.0+dfsg/debian/patches/series 2016-09-25 11:58:51.000000000 +0000 +++ mozjs-1.8.5-1.0.0+dfsg/debian/patches/series 2016-12-12 05:59:43.000000000 +0000 @@ -10,3 +10,4 @@ autoconf.patch disable-nanojit-on-sparc64.patch fix-811665.patch +M68k-alignment-fixes.patch