Date: Thursday, June 11, 2015 @ 11:42:53 Author: foutrelis Revision: 240561
Prepare 38.0.1 release Modified: thunderbird/trunk/PKGBUILD thunderbird/trunk/mozconfig thunderbird/trunk/thunderbird-install-dir.patch Deleted: thunderbird/trunk/thunderbird-31.6.0-libvpx-modern.patch thunderbird/trunk/thunderbird-31.7.0-gcc51.patch ----------------------------------------+ PKGBUILD | 54 +++------ mozconfig | 2 thunderbird-31.6.0-libvpx-modern.patch | 25 ---- thunderbird-31.7.0-gcc51.patch | 177 ------------------------------- thunderbird-install-dir.patch | 11 - 5 files changed, 23 insertions(+), 246 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-11 08:58:22 UTC (rev 240560) +++ PKGBUILD 2015-06-11 09:42:53 UTC (rev 240561) @@ -5,44 +5,34 @@ # Contributor: Anders Bostrom <[email protected]> pkgname=thunderbird -pkgver=31.7.0 -pkgrel=1 +pkgver=38.0.1 +pkgrel=0 pkgdesc="Standalone Mail/News reader" arch=('i686' 'x86_64') license=('MPL' 'GPL') url="http://www.mozilla.org/thunderbird/"; -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') +depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' + 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' + 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite') makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse') optdepends=('libcanberra: for sound support') install=thunderbird.install -source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2{,.asc} +source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 mozconfig 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' - 'SKIP' - '7021a0907ebaffec7cad2928a773d8a0763a9790b9b97b58f72fad52e981296b' +options=('!emptydirs' '!makeflags') +sha256sums=('7655039a9a2d5d169f5b43d2c737007dbaa42fa767f7bfbfde8ae46b05e4ab71' + '867a0caab94eb387f51ca74be61d67dcb54f051239ac25b90749f6fa11c5e767' '3fba13d88aeb003ab0811ef739463858172ce0662a1c7d62835df3d83ddbb8fb' - '9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee' - '0e67b4d46f330b0306e01d4c6876ae5a58a4de6ac50f057e23aac41dec3554ef' - '72c23617cda87ba49dba7a93a649dec8057518e4dd478d4361fc763e098f89ba' + '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d' 'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed') -validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A') prepare() { - cd comm-esr31 + cd comm-esr${pkgver%%.*} patch -Np1 -i ../thunderbird-install-dir.patch - # 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 @@ -51,32 +41,32 @@ } build() { - cd comm-esr31 + cd comm-esr${pkgver%%.*} - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" export PYTHON="/usr/bin/python2" - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" + make -f client.mk build } package() { - cd comm-esr31 - make -j1 -f client.mk DESTDIR="$pkgdir" install + cd comm-esr${pkgver%%.*} + make -f client.mk DESTDIR="$pkgdir" install - install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" + install -Dm644 ../vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \ - "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png" + for i in 16 22 24 32 48 256; do + install -Dm644 other-licenses/branding/thunderbird/mailicon$i.png \ + "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/thunderbird.png" done - install -Dm644 "$srcdir/thunderbird.desktop" \ + install -Dm644 ../thunderbird.desktop \ "$pkgdir/usr/share/applications/thunderbird.desktop" + # Use system-provided dictionaries rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries" ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" - # We don't want the development stuff + # Remove development stuff rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-*,share/idl} } Modified: mozconfig =================================================================== --- mozconfig 2015-06-11 08:58:22 UTC (rev 240560) +++ mozconfig 2015-06-11 09:42:53 UTC (rev 240561) @@ -13,12 +13,12 @@ ac_add_options --with-system-png ac_add_options --with-system-libevent ac_add_options --with-system-libvpx +ac_add_options --with-system-icu ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman -ac_add_options --with-pthreads # Features ac_add_options --enable-official-branding Deleted: thunderbird-31.6.0-libvpx-modern.patch =================================================================== --- thunderbird-31.6.0-libvpx-modern.patch 2015-06-11 08:58:22 UTC (rev 240560) +++ thunderbird-31.6.0-libvpx-modern.patch 2015-06-11 09:42:53 UTC (rev 240561) @@ -1,25 +0,0 @@ -diff -up comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc ---- comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern 2015-04-07 14:30:05.525960513 -0400 -+++ comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-07 14:32:22.478199058 -0400 -@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const Vid - // Creating a wrapper to the image - setting image data to NULL. Actual - // pointer will be set in encode. Setting align to 1, as it is meaningless - // (actual memory is not allocated). -- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height, -+ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height, - 1, NULL); - // populate encoder configuration with default values - if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) { -@@ -349,9 +349,9 @@ int VP8EncoderImpl::Encode(const I420Vid - } - // Image in vpx_image_t format. - // Input image is const. VP8's raw image is not defined as const. -- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane)); -- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane)); -- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane)); -+ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane)); -+ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane)); -+ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane)); - // TODO(mikhal): Stride should be set in initialization. - raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane); - raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane); Deleted: thunderbird-31.7.0-gcc51.patch =================================================================== --- thunderbird-31.7.0-gcc51.patch 2015-06-11 08:58:22 UTC (rev 240560) +++ thunderbird-31.7.0-gcc51.patch 2015-06-11 09:42:53 UTC (rev 240561) @@ -1,177 +0,0 @@ -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); - } Modified: thunderbird-install-dir.patch =================================================================== --- thunderbird-install-dir.patch 2015-06-11 08:58:22 UTC (rev 240560) +++ thunderbird-install-dir.patch 2015-06-11 09:42:53 UTC (rev 240561) @@ -1,14 +1,3 @@ -diff -upr comm-esr31.orig/config/baseconfig.mk comm-esr31/config/baseconfig.mk ---- comm-esr31.orig/config/baseconfig.mk 2014-07-22 09:44:23.000000000 +0300 -+++ comm-esr31/config/baseconfig.mk 2014-07-22 09:46:30.000000000 +0300 -@@ -1,6 +1,6 @@ - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - MOZILLA_SRCDIR = $(topsrcdir)/mozilla - MOZDEPTH = $(DEPTH)/mozilla diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk --- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-07-22 09:44:22.000000000 +0300 +++ comm-esr31/mozilla/config/baseconfig.mk 2014-07-22 09:46:45.000000000 +0300
