Hello community, here is the log from the commit of package xulrunner for openSUSE:Factory checked in at 2015-06-24 20:51:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xulrunner (Old) and /work/SRC/openSUSE:Factory/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xulrunner" Changes: -------- --- /work/SRC/openSUSE:Factory/xulrunner/xulrunner.changes 2015-05-16 07:14:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner.changes 2015-06-24 20:51:20.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 21 09:39:51 UTC 2015 - [email protected] + +- Fix compilation with GCC5 (bmo#1153109, bmo#1021171) + * add mozilla-fix-compilation-gcc5-bmo-1153109.patch + * add mozilla-fix-compilation-gcc5-bmo-1021171.patch + +------------------------------------------------------------------- New: ---- mozilla-fix-compilation-gcc5-bmo-1021171.patch mozilla-fix-compilation-gcc5-bmo-1153109.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.3Nu20n/_old 2015-06-24 20:51:26.000000000 +0200 +++ /var/tmp/diff_new_pack.3Nu20n/_new 2015-06-24 20:51:26.000000000 +0200 @@ -119,6 +119,8 @@ Patch14: mozilla-libproxy-compat.patch Patch15: mozilla-nullptr-gcc45.patch Patch16: mozilla-idldir.patch +Patch17: mozilla-fix-compilation-gcc5-bmo-1153109.patch +Patch18: mozilla-fix-compilation-gcc5-bmo-1021171.patch # Gecko/Toolkit AArch64 Porting Patch30: mozilla-aarch64-bmo-810631.patch @@ -233,6 +235,8 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 %patch30 -p1 %build ++++++ mozilla-fix-compilation-gcc5-bmo-1021171.patch ++++++ diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp --- a/js/src/builtin/TypedObject.cpp 2015-05-07 20:53:49.000000000 +0200 +++ b/js/src/builtin/TypedObject.cpp 2015-05-21 11:46:13.792908971 +0200 @@ -710,12 +710,12 @@ ArrayMetaTypeDescr::construct(JSContext* contents.append(")"); RootedAtom stringRepr(cx, contents.finishAtom()); if (!stringRepr) - return nullptr; + return false; // Extract ArrayType.prototype RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); if (!arrayTypePrototype) - return nullptr; + return false; // Create the instance of ArrayType Rooted<UnsizedArrayTypeDescr*> obj(cx); @@ -728,7 +728,7 @@ ArrayMetaTypeDescr::construct(JSContext* if (!JSObject::defineProperty(cx, obj, cx->names().length, UndefinedHandleValue, nullptr, nullptr, JSPROP_READONLY | JSPROP_PERMANENT)) - return nullptr; + return false; args.rval().setObject(*obj); return true; @@ -762,7 +762,7 @@ UnsizedArrayTypeDescr::dimension(JSConte if (!size.isValid()) { JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPEDOBJECT_TOO_BIG); - return nullptr; + return false; } // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`: @@ -775,7 +775,7 @@ UnsizedArrayTypeDescr::dimension(JSConte contents.append(")"); RootedAtom stringRepr(cx, contents.finishAtom()); if (!stringRepr) - return nullptr; + return false; // Create the sized type object. Rooted<SizedArrayTypeDescr*> obj(cx); @@ -793,7 +793,7 @@ UnsizedArrayTypeDescr::dimension(JSConte if (!JSObject::defineProperty(cx, obj, cx->names().length, lengthVal, nullptr, nullptr, JSPROP_READONLY | JSPROP_PERMANENT)) - return nullptr; + return false; // Add `unsized` property, which is a link from the sized // array to the unsized array. @@ -801,7 +801,7 @@ UnsizedArrayTypeDescr::dimension(JSConte if (!JSObject::defineProperty(cx, obj, cx->names().unsized, unsizedTypeDescrValue, nullptr, nullptr, JSPROP_READONLY | JSPROP_PERMANENT)) - return nullptr; + return false; args.rval().setObject(*obj); return true; @@ -1253,7 +1253,7 @@ DefineSimpleTypeDescr(JSContext* cx, Rooted<TypedProto*> proto(cx); proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject); if (!proto) - return nullptr; + return false; proto->initTypeDescrSlot(*descr); descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto)); @@ -1358,14 +1358,14 @@ GlobalObject::initTypedObjectModule(JSCo #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_) \ if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_, \ cx->names().name_)) \ - return nullptr; + return false; JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE) #undef BINARYDATA_SCALAR_DEFINE #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_) \ if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_, \ cx->names().name_)) \ - return nullptr; + return false; JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE) #undef BINARYDATA_REFERENCE_DEFINE @@ -1375,14 +1375,14 @@ GlobalObject::initTypedObjectModule(JSCo arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>( cx, global, module, TypedObjectModuleObject::ArrayTypePrototype); if (!arrayType) - return nullptr; + return false; RootedValue arrayTypeValue(cx, ObjectValue(*arrayType)); if (!JSObject::defineProperty(cx, module, cx->names().ArrayType, arrayTypeValue, nullptr, nullptr, JSPROP_READONLY | JSPROP_PERMANENT)) - return nullptr; + return false; // StructType. @@ -1390,14 +1390,14 @@ GlobalObject::initTypedObjectModule(JSCo structType = DefineMetaTypeDescr<StructMetaTypeDescr>( cx, global, module, TypedObjectModuleObject::StructTypePrototype); if (!structType) - return nullptr; + return false; RootedValue structTypeValue(cx, ObjectValue(*structType)); if (!JSObject::defineProperty(cx, module, cx->names().StructType, structTypeValue, nullptr, nullptr, JSPROP_READONLY | JSPROP_PERMANENT)) - return nullptr; + return false; // Everything is setup, install module on the global object: RootedValue moduleValue(cx, ObjectValue(*module)); @@ -1407,7 +1407,7 @@ GlobalObject::initTypedObjectModule(JSCo nullptr, nullptr, 0)) { - return nullptr; + return false; } return module; @@ -2466,7 +2466,7 @@ TypedObject::constructUnsized(JSContext* if (length < 0) { JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS); - return nullptr; + return false; } Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length)); if (!obj) diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp --- a/js/src/frontend/BytecodeCompiler.cpp 2015-05-07 20:53:49.000000000 +0200 +++ b/js/src/frontend/BytecodeCompiler.cpp 2015-05-21 11:24:25.438455753 +0200 @@ -544,7 +544,7 @@ CompileFunctionBody(JSContext* cx, Mutab RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options)); if (!sourceObject) - return nullptr; + return false; ScriptSource* ss = sourceObject->source(); SourceCompressionTask sct(cx); diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp --- a/js/xpconnect/wrappers/XrayWrapper.cpp 2015-05-07 20:53:42.000000000 +0200 +++ b/js/xpconnect/wrappers/XrayWrapper.cpp 2015-05-21 13:11:35.888941574 +0200 @@ -351,7 +351,7 @@ public: { JSAutoCompartment ac(cx, target); if (!JS_GetClassPrototype(cx, key, protop)) - return nullptr; + return false; } return JS_WrapObject(cx, protop); } diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp --- a/netwerk/ipc/NeckoParent.cpp 2015-05-07 20:53:46.000000000 +0200 +++ b/netwerk/ipc/NeckoParent.cpp 2015-05-21 12:52:02.906152377 +0200 @@ -359,7 +359,7 @@ NeckoParent::RecvPRtspChannelConstructor RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor); return p->Init(aConnectArgs); #else - return nullptr; + return false; #endif } ++++++ mozilla-fix-compilation-gcc5-bmo-1153109.patch ++++++ >From 32b9943e0d2c7c28d9d113c0e83d121c356fe5d5 Mon Sep 17 00:00:00 2001 From: Mike Hommey <[email protected]> Date: Fri, 10 Apr 2015 16:53:05 +0900 Subject: [PATCH] Bug 1153109 - Add -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS when building with --enable-stdcxx-compat --- configure.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.in b/configure.in index 95d2a70..6c858b3 100644 --- a/configure.in +++ b/configure.in @@ -7375,16 +7375,18 @@ STDCXX_COMPAT= MOZ_ARG_ENABLE_BOOL(stdcxx-compat, [ --enable-stdcxx-compat Enable compatibility with older libstdc++], STDCXX_COMPAT=1) if test -n "$STDCXX_COMPAT"; then eval $(CXX="$CXX" HOST_CXX="$HOST_CXX" $PYTHON -m mozbuild.configure.libstdcxx) AC_SUBST(MOZ_LIBSTDCXX_TARGET_VERSION) AC_SUBST(MOZ_LIBSTDCXX_HOST_VERSION) + CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" + HOST_CXXFLAGS="$HOST_CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" fi dnl ======================================================== dnl = dnl = Profiling and Instrumenting dnl = dnl ======================================================== MOZ_ARG_HEADER(Profiling and Instrumenting) -- 2.3.5.1.g2355df5
