[arch-commits] Commit in thunderbird/trunk (3 files)

[Evangelos Foutras]

    Date: Saturday, April 18, 2015 @ 19:55:07
  Author: foutrelis
Revision: 237402

upgpkg: thunderbird 31.6.0-2

- libvpx 1.4.0 rebuild.
- Drop patch that accepts p11-kit's trust stores; nss 3.18-3 uses the
  same token label as libnssckbi.

Added:
  thunderbird/trunk/thunderbird-31.6.0-libvpx-modern.patch
Modified:
  thunderbird/trunk/PKGBUILD
Deleted:
  thunderbird/trunk/rhbz-966424.patch

----------------------------------------+
 PKGBUILD                               |   18 +++++++++---------
 rhbz-966424.patch                      |   23 -----------------------
 thunderbird-31.6.0-libvpx-modern.patch |   25 +++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-18 11:37:26 UTC (rev 237401)
+++ PKGBUILD	2015-04-18 17:55:07 UTC (rev 237402)
@@ -6,7 +6,7 @@
 
 pkgname=thunderbird
 pkgver=31.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
@@ -19,8 +19,8 @@
         mozconfig
         thunderbird.desktop
         thunderbird-install-dir.patch
-        vendor.js
-        rhbz-966424.patch)
+        thunderbird-31.6.0-libvpx-modern.patch
+        vendor.js)
 options=(!emptydirs)
 sha256sums=('ccbf8cbb740bc1b30ecf4fe39aab226607f9a41e23a07e994c508a90e8b70508'
             'SKIP'
@@ -27,19 +27,19 @@
             '7021a0907ebaffec7cad2928a773d8a0763a9790b9b97b58f72fad52e981296b'
             '3fba13d88aeb003ab0811ef739463858172ce0662a1c7d62835df3d83ddbb8fb'
             '9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee'
-            'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed'
-            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a')
+            '0e67b4d46f330b0306e01d4c6876ae5a58a4de6ac50f057e23aac41dec3554ef'
+            'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 prepare() {
   cd comm-esr31
-  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
+  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
+
   cp "$srcdir/mozconfig" .mozconfig
 
-  # https://bugs.archlinux.org/task/41689
-  patch -Np1 -d mozilla -i ../../rhbz-966424.patch
-
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure

Deleted: rhbz-966424.patch
===================================================================
--- rhbz-966424.patch	2015-04-18 11:37:26 UTC (rev 237401)
+++ rhbz-966424.patch	2015-04-18 17:55:07 UTC (rev 237402)
@@ -1,23 +0,0 @@
---- a/toolkit/modules/CertUtils.jsm
-+++ b/toolkit/modules/CertUtils.jsm
-@@ -170,17 +170,19 @@ this.checkCert =
-   issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
-   var tokenNames = issuerCert.getAllTokenNames({});
- 
-   if (!tokenNames || !tokenNames.some(isBuiltinToken))
-     throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
- }
- 
- function isBuiltinToken(tokenName) {
--  return tokenName == "Builtin Object Token";
-+  return tokenName == "Builtin Object Token" ||
-+         tokenName == "Default Trust" ||
-+         tokenName == "System Trust";
- }
- 
- /**
-  * This class implements nsIBadCertListener.  Its job is to prevent "bad cert"
-  * security dialogs from being shown to the user.  It is better to simply fail
-  * if the certificate is bad. See bug 304286.
-  *
-  * @param  aAllowNonBuiltInCerts (optional)

Added: thunderbird-31.6.0-libvpx-modern.patch
===================================================================
--- thunderbird-31.6.0-libvpx-modern.patch	                        (rev 0)
+++ thunderbird-31.6.0-libvpx-modern.patch	2015-04-18 17:55:07 UTC (rev 237402)
@@ -0,0 +1,25 @@
+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);