[arch-commits] Commit in thunderbird/trunk (PKGBUILD thunderbird-31.7.0-gcc51.patch)

Evangelos Foutras foutrelis at archlinux.org
Sat May 30 03:50:17 UTC 2015


    Date: Saturday, May 30, 2015 @ 05:50:17
  Author: foutrelis
Revision: 239893

Fix build with GCC 5.1

Added:
  thunderbird/trunk/thunderbird-31.7.0-gcc51.patch
Modified:
  thunderbird/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |    5 +
 thunderbird-31.7.0-gcc51.patch |  177 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 182 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-30 03:13:42 UTC (rev 239892)
+++ PKGBUILD	2015-05-30 03:50:17 UTC (rev 239893)
@@ -20,6 +20,7 @@
         thunderbird.desktop
         thunderbird-install-dir.patch
         thunderbird-31.6.0-libvpx-modern.patch
+        thunderbird-31.7.0-gcc51.patch
         vendor.js)
 options=(!emptydirs)
 sha256sums=('dc3a6afaab486ba09745898f55986f98cc9bf7647cd992849f9c7ead563479b7'
@@ -28,6 +29,7 @@
             '3fba13d88aeb003ab0811ef739463858172ce0662a1c7d62835df3d83ddbb8fb'
             '9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee'
             '0e67b4d46f330b0306e01d4c6876ae5a58a4de6ac50f057e23aac41dec3554ef'
+            '72c23617cda87ba49dba7a93a649dec8057518e4dd478d4361fc763e098f89ba'
             'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
@@ -38,6 +40,9 @@
   # Fix build with libvpx 1.4.0 (patch from Fedora)
   patch -Np1 -i ../thunderbird-31.6.0-libvpx-modern.patch
 
+  # Fix build with GCC 5.1
+  patch -Np1 -i ../thunderbird-31.7.0-gcc51.patch
+
   cp "$srcdir/mozconfig" .mozconfig
 
   # configure script misdetects the preprocessor without an optimization level

Added: thunderbird-31.7.0-gcc51.patch
===================================================================
--- thunderbird-31.7.0-gcc51.patch	                        (rev 0)
+++ thunderbird-31.7.0-gcc51.patch	2015-05-30 03:50:17 UTC (rev 239893)
@@ -0,0 +1,177 @@
+diff -upr comm-esr31.orig/mozilla/js/src/builtin/TypedObject.cpp comm-esr31/mozilla/js/src/builtin/TypedObject.cpp
+--- comm-esr31.orig/mozilla/js/src/builtin/TypedObject.cpp	2015-05-07 21:53:49.000000000 +0300
++++ comm-esr31/mozilla/js/src/builtin/TypedObject.cpp	2015-05-30 05:46:46.435915080 +0300
+@@ -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 -upr comm-esr31.orig/mozilla/js/src/frontend/BytecodeCompiler.cpp comm-esr31/mozilla/js/src/frontend/BytecodeCompiler.cpp
+--- comm-esr31.orig/mozilla/js/src/frontend/BytecodeCompiler.cpp	2015-05-07 21:53:49.000000000 +0300
++++ comm-esr31/mozilla/js/src/frontend/BytecodeCompiler.cpp	2015-05-30 05:46:46.442581830 +0300
+@@ -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 -upr comm-esr31.orig/mozilla/netwerk/ipc/NeckoParent.cpp comm-esr31/mozilla/netwerk/ipc/NeckoParent.cpp
+--- comm-esr31.orig/mozilla/netwerk/ipc/NeckoParent.cpp	2015-05-07 21:53:46.000000000 +0300
++++ comm-esr31/mozilla/netwerk/ipc/NeckoParent.cpp	2015-05-30 05:53:34.627785362 +0300
+@@ -359,7 +359,7 @@ NeckoParent::RecvPRtspChannelConstructor
+   RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor);
+   return p->Init(aConnectArgs);
+ #else
+-  return nullptr;
++  return false;
+ #endif
+ }
+ 
+diff -upr comm-esr31.orig/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp comm-esr31/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp
+--- comm-esr31.orig/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp	2015-05-07 21:53:42.000000000 +0300
++++ comm-esr31/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp	2015-05-30 06:10:02.120346406 +0300
+@@ -351,7 +351,7 @@ public:
+         {
+             JSAutoCompartment ac(cx, target);
+             if (!JS_GetClassPrototype(cx, key, protop))
+-                return nullptr;
++                return false;
+         }
+         return JS_WrapObject(cx, protop);
+     }



More information about the arch-commits mailing list