63.0.1

3 files changed, 45 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 563435387f6a..a98eeca433ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-wayland
 	pkgdesc = Standalone web browser from mozilla.org with Wayland support enabled
-	pkgver = 63.0
+	pkgver = 63.0.1
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -50,10 +50,12 @@ pkgbase = firefox-wayland
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_63_0_RELEASE
+	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_63_0_1_RELEASE
+	source = 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
 	source = firefox.desktop
 	source = firefox-symbolic.svg
 	sha256sums = SKIP
+	sha256sums = a1e523f830f28217e050991062358c91be254e21732a6391449a8c0e3e0de77f
 	sha256sums = 677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a
 	sha256sums = 9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797
 
diff --git a/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch b/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
new file mode 100644
index 000000000000..6fd00ca1c5ad
--- /dev/null
+++ b/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
@@ -0,0 +1,35 @@
+From e2d8a02d878aa27687f907b64fd41344ad1b2468 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@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
+
diff --git a/PKGBUILD b/PKGBUILD
index 4d1ba2d40585..1176d7c0f724 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Max Liebkies <mail@maxliebkies.de>
 
 pkgname=firefox-wayland
-pkgver=63.0
+pkgver=63.0.1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with Wayland support enabled"
 arch=(x86_64)
@@ -24,8 +24,10 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 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
         firefox.desktop firefox-symbolic.svg)
 sha256sums=('SKIP'
+            'a1e523f830f28217e050991062358c91be254e21732a6391449a8c0e3e0de77f'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797')
 
@@ -45,6 +47,9 @@ prepare() {
   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