Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

1 files changed, 0 insertions, 174 deletions

diff --git a/libre/icecat/fixing_nullptr_31.7.0.patch b/libre/icecat/fixing_nullptr_31.7.0.patch
deleted file mode 100644
index ecfca4138..000000000
--- a/libre/icecat/fixing_nullptr_31.7.0.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- a/js/src/builtin/TypedObject.cpp    2015-06-03 22:48:47.000000000 +0200
-+++ b/js/src/builtin/TypedObject.cpp    2015-06-08 16:45:30.918154529 +0200
-@@ -710,12 +710,12 @@
-     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 @@
-     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 @@
-     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 @@
-     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 @@
-     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 @@
-     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 @@
-     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 @@
- #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 @@
-     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 @@
-     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 @@
-                                   nullptr, nullptr,
-                                   0))
-     {
--        return nullptr;
-+        return false;
-     }
- 
-     return module;
-@@ -2466,7 +2466,7 @@
-         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)
-
---- a/js/src/frontend/BytecodeCompiler.cpp	2015-06-03 22:48:48.000000000 +0200
-+++ b/js/src/frontend/BytecodeCompiler.cpp	2015-06-08 01:15:08.080302638 +0200
-@@ -544,7 +544,7 @@
- 
-     RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options));
-     if (!sourceObject)
--        return nullptr;
-+        return false;
-     ScriptSource* ss = sourceObject->source();
- 
-     SourceCompressionTask sct(cx);
---- a/js/xpconnect/wrappers/XrayWrapper.cpp	2015-06-03 22:48:45.000000000 +0200
-+++ b/js/xpconnect/wrappers/XrayWrapper.cpp	2015-06-08 01:15:35.672193557 +0200
-@@ -351,7 +351,7 @@
-         {
-             JSAutoCompartment ac(cx, target);
-             if (!JS_GetClassPrototype(cx, key, protop))
--                return nullptr;
-+                return false;
-         }
-         return JS_WrapObject(cx, protop);
-     }
---- a/netwerk/ipc/NeckoParent.cpp	2015-06-03 22:46:41.000000000 +0200
-+++ b/netwerk/ipc/NeckoParent.cpp	2015-06-08 01:16:10.200055747 +0200
-@@ -359,7 +359,7 @@
-   RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor);
-   return p->Init(aConnectArgs);
- #else
--  return nullptr;
-+  return false;
- #endif
- }
-