[arch-commits] Commit in firefox/trunk (2 files)

[Jan Steffens]

    Date: Thursday, November 1, 2018 @ 19:53:52
  Author: heftig
Revision: 337700

63.0.1-1

Added:
  firefox/trunk/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
Modified:
  firefox/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch |   35 ++++++++++
 PKGBUILD                                                        |    9 ++
 2 files changed, 42 insertions(+), 2 deletions(-)

Added: 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
===================================================================
--- 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch	                        (rev 0)
+++ 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch	2018-11-01 19:53:52 UTC (rev 337700)
@@ -0,0 +1,35 @@
+From e2d8a02d878aa27687f907b64fd41344ad1b2468 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio at crisal.io>
+Date: Tue, 30 Oct 2018 22:21:52 +0100
+Subject: [PATCH] Keep mozilla-release building with newer cbindgen versions.
+
+---
+ servo/components/style/cbindgen.toml | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/servo/components/style/cbindgen.toml b/servo/components/style/cbindgen.toml
+index 46162e43db5e..1df99ffc5160 100644
+--- a/servo/components/style/cbindgen.toml
++++ b/servo/components/style/cbindgen.toml
+@@ -23,11 +23,17 @@ derive_helper_methods = true
+ 
+ [export]
+ prefix = "Style"
+ include = [
+   "StyleAppearance",
+   "StyleDisplay",
+   "StyleDisplayMode",
+   "StyleFillRule",
+-  "StylePathCommand"
++  "StylePathCommand",
++
++  "Appearance",
++  "Display",
++  "DisplayMode",
++  "FillRule",
++  "PathCommand"
+ ]
+ item_types = ["enums", "structs", "typedefs"]
+-- 
+2.17.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-01 17:20:54 UTC (rev 337699)
+++ PKGBUILD	2018-11-01 19:53:52 UTC (rev 337700)
@@ -3,8 +3,8 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=63.0
-pkgrel=2
+pkgver=63.0.1
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -21,8 +21,10 @@
 options=(!emptydirs !makeflags !strip)
 _repo=https://hg.mozilla.org/mozilla-unified
 source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
+        0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
         $pkgname.desktop firefox-symbolic.svg)
 sha256sums=('SKIP'
+            'a1e523f830f28217e050991062358c91be254e21732a6391449a8c0e3e0de77f'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797')
 
@@ -42,6 +44,9 @@
   mkdir mozbuild
   cd mozilla-unified
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1503401
+  patch -Np1 -i ../0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key