diff options
Diffstat (limited to 'mail')
5 files changed, 11 insertions, 173 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 2841146fe29..adbacfeec98 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.150 2015/04/25 14:23:28 tnn Exp $ +# $NetBSD: Makefile,v 1.151 2015/05/26 12:34:42 ryoon Exp $ DISTNAME= # empty PKGNAME= thunderbird-${TB_VER} -PKGREVISION= 1 -TB_VER= 31.6.0 +TB_VER= 31.7.0 #LIGHTNINGVER= 1.9 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 28d32492a09..a2472676364 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.157 2015/04/08 18:25:15 ryoon Exp $ +$NetBSD: distinfo,v 1.158 2015/05/26 12:34:42 ryoon Exp $ SHA1 (enigmail-1.7.2.tar.gz) = e72eeff5a47491267981090129b0b2594b5dc96f RMD160 (enigmail-1.7.2.tar.gz) = 1dcd10e758321846eb20ac7f1d3ae6465c47bfe7 Size (enigmail-1.7.2.tar.gz) = 1420346 bytes -SHA1 (thunderbird-31.6.0.source.tar.bz2) = 147ba0f3c7da29a7814ee9ce4265fb107744559e -RMD160 (thunderbird-31.6.0.source.tar.bz2) = 0f4025f36376b1f8c5e72bc64fff388207960287 -Size (thunderbird-31.6.0.source.tar.bz2) = 171089774 bytes +SHA1 (thunderbird-31.7.0.source.tar.bz2) = 90e18f8ecccdaf1ee39493223a7e3ad8b3b7bede +RMD160 (thunderbird-31.7.0.source.tar.bz2) = eae13adba96477ddaa3fa7732d94accdc8dab57f +Size (thunderbird-31.7.0.source.tar.bz2) = 171059989 bytes SHA1 (patch-aa) = 764c6e8955d371d0869a9b145211f0a9d8709708 SHA1 (patch-ak) = b47277baa1137a7610445b7c4dd147b331d5c5e6 SHA1 (patch-al) = 81a733e9b13a47abfef818ecd10d7ef18a191855 @@ -91,11 +91,9 @@ SHA1 (patch-mozilla_ipc_glue_StringUtil.cpp) = f2bfc2a877554d64ab886d0159c9bdb4e SHA1 (patch-mozilla_ipc_ipdl_ipdl_cxx_ast.py) = d2ffbde2fb0744ab7acc279dcc9dfc430fb58dfc SHA1 (patch-mozilla_ipc_ipdl_ipdl_cxx_cgen.py) = 8c63e06ed257d059e9ff4da0b00e752bd694347e SHA1 (patch-mozilla_ipc_ipdl_ipdl_lower.py) = c3e0f719900b515554218b6312055f34ccbf9feb -SHA1 (patch-mozilla_js_src_builtin_TypedObject.cpp) = 6c78f6331c0497663bce1f0c5327044df040b47b SHA1 (patch-mozilla_js_src_ctypes_CTypes.h) = 852b14dc17cc29bdbf0b2cc407ba5780dd568d3a -SHA1 (patch-mozilla_js_src_frontend_BytecodeCompiler.cpp) = 6b63d162ea8feffe819f505258dac694f29be4a7 SHA1 (patch-mozilla_js_src_frontend_ParseMaps.cpp) = d7f45bde1f819786c45225600697f14769bed946 -SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = 48cf2ed708b8156efe978ad50741c123c747ea59 +SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = b09074af9f08c142ba83a634a9c93672c1d9252d SHA1 (patch-mozilla_js_src_jsmath.cpp) = b02ecb4a64c6b486645ffdf0446430db9e2dcd71 SHA1 (patch-mozilla_js_src_vm_SPSProfiler.cpp) = 35df0beb0c2f7d233d21c4214281002412b7d5dd SHA1 (patch-mozilla_media_libcubeb_src_Makefile.in) = 8c809178a1f427302d58fc8776a9371b78a7ca7e diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_builtin_TypedObject.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_builtin_TypedObject.cpp deleted file mode 100644 index 7a040b536ad..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_js_src_builtin_TypedObject.cpp +++ /dev/null @@ -1,146 +0,0 @@ -$NetBSD: patch-mozilla_js_src_builtin_TypedObject.cpp,v 1.1 2014/10/17 16:47:22 joerg Exp $ - ---- mozilla/js/src/builtin/TypedObject.cpp.orig 2014-10-17 09:18:05.000000000 +0000 -+++ mozilla/js/src/builtin/TypedObject.cpp -@@ -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,10 +1407,10 @@ GlobalObject::initTypedObjectModule(JSCo - nullptr, nullptr, - 0)) - { -- return nullptr; -+ return false; - } - -- return module; -+ return module != nullptr; - } - - JSObject * -@@ -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/mail/thunderbird/patches/patch-mozilla_js_src_frontend_BytecodeCompiler.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_frontend_BytecodeCompiler.cpp deleted file mode 100644 index b0aa224c4c8..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_js_src_frontend_BytecodeCompiler.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_js_src_frontend_BytecodeCompiler.cpp,v 1.1 2014/10/17 16:47:22 joerg Exp $ - ---- mozilla/js/src/frontend/BytecodeCompiler.cpp.orig 2014-10-17 09:17:47.000000000 +0000 -+++ mozilla/js/src/frontend/BytecodeCompiler.cpp -@@ -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/mail/thunderbird/patches/patch-mozilla_js_src_gc_Memory.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_gc_Memory.cpp index e7ac36480e7..5eb74343b5a 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_gc_Memory.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_src_gc_Memory.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-mozilla_js_src_gc_Memory.cpp,v 1.1 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_gc_Memory.cpp,v 1.2 2015/05/26 12:34:42 ryoon Exp $ ---- mozilla/js/src/gc/Memory.cpp.orig 2014-07-18 00:05:25.000000000 +0000 +--- mozilla/js/src/gc/Memory.cpp.orig 2015-05-07 18:53:49.000000000 +0000 +++ mozilla/js/src/gc/Memory.cpp -@@ -212,7 +212,7 @@ gc::InitMemorySubsystem(JSRuntime *rt) - static inline void * +@@ -212,7 +212,7 @@ gc::InitMemorySubsystem(JSRuntime* rt) + static inline void* MapMemory(size_t length, int prot, int flags, int fd, off_t offset) { -#if defined(__ia64__) |