From fd07bfd6f253279a4d56e372e3f70154591cebd0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 11 Jun 2015 02:16:59 -0300 Subject: icecat-31.7.0_gnu1-1: updating version --- libre/icecat/PKGBUILD | 22 ++-- libre/icecat/fixing_nullptr_31.7.0.patch | 174 +++++++++++++++++++++++++++++++ libre/icecat/libre.patch | 12 +-- 3 files changed, 192 insertions(+), 16 deletions(-) create mode 100644 libre/icecat/fixing_nullptr_31.7.0.patch (limited to 'libre') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 78fc58fa1..524654a0f 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,9 +13,9 @@ _pgo=true pkgname=icecat -_pkgver=31.6.0-gnu1 +_pkgver=31.7.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=4 +pkgrel=1 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -32,7 +32,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'gst-libav: h.264 video') url="http://www.gnu.org/software/gnuzilla/" install=$pkgname.install -source=("http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2"{,.sig} +source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig} mozconfig mozconfig.pgo libre.patch @@ -41,18 +41,20 @@ source=("http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2 $pkgname-install-dir.patch vendor.js rhbz-966424.patch - $pkgname-fixed-loading-icon.png) -sha256sums=('31386c1ff466cb4676315eda457753260fb3bbf902a7723d619791a7eb1094a8' + $pkgname-fixed-loading-icon.png + fixing_nullptr_31.7.0.patch) +sha256sums=('57ddd9a3b2875dc3f1bfbb0f6d8fd5551775f1f68cc4237f6f4251a7ca954528' 'SKIP' 'e0779596c2aafa0f77f09094a218940b1dc5120cd6425d4ea1e8c96be44711ff' '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4' - 'dd0687b5f73a84f8a2d4ae8480572c04af804dae24a0b3b3292228927b00859c' + '8082a8a5adf21c50fa77650c74adcd6fedbf7bedcdb6b8ae29529ca96adeb05d' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745' '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47' '536e82133ba06faccd31620c742dd2b95f1c2e0331934bb8ff17843436dc2142' 'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233' - '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') + '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' + 'd57d0e4d5bc66323388e8f3c9999ed443abfd304a28a1696cc6f4518ed0d0f2a') validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez prepare() { @@ -71,6 +73,9 @@ prepare() { # https://bugs.archlinux.org/task/41689 patch -Np1 -i "$srcdir/rhbz-966424.patch" + # Patch for GCC 5.1 + patch -Np1 -i "$srcdir/fixing_nullptr_31.7.0.patch" + # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" sed -i '\|return| s|Flash|SWF Player|g; @@ -144,9 +149,6 @@ prepare() { # WebRTC build tries to execute "python" and expects Python 2 ln -s /usr/bin/python2 "$srcdir/path/python" - # Use gold, as Mozilla can use some of its features, such as safe ICF - #ln -s /usr/bin/ld.gold "$srcdir/path/ld" - # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure diff --git a/libre/icecat/fixing_nullptr_31.7.0.patch b/libre/icecat/fixing_nullptr_31.7.0.patch new file mode 100644 index 000000000..ecfca4138 --- /dev/null +++ b/libre/icecat/fixing_nullptr_31.7.0.patch @@ -0,0 +1,174 @@ +--- 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 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().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 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 proto(cx); + proto = NewObjectWithProto(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(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(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( + 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( + 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 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(aActor); + return p->Init(aConnectArgs); + #else +- return nullptr; ++ return false; + #endif + } + diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 9116bc363..16f77f72e 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -726,8 +726,8 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in ---- a/browser/locales/generic/profile/bookmarks.html.in 2014-10-09 12:53:30.000000000 -0200 -+++ b/browser/locales/generic/profile/bookmarks.html.in 2014-10-21 18:02:15.103296484 -0200 +--- a/browser/locales/generic/profile/bookmarks.html.in 2015-06-03 17:49:30.000000000 -0300 ++++ b/browser/locales/generic/profile/bookmarks.html.in 2015-06-10 17:58:30.817963272 -0300 @@ -11,8 +11,20 @@
Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar

@@ -746,10 +746,10 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/ +

+

Free Software Foundation

+

-+

Free Software Foundation -+
LibrePlanet -+
Free addons -+
h-node ++
Free Software Foundation ++
The GNU Operating System and the Free Software Movement ++
LibrePlanet ++
h-node

diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm -- cgit v1.2.3