From dba047e4e0d27df67593158dab56ce5047c03b39 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 2 Nov 2018 07:43:02 -0700 Subject: Updated to 63.0.1 --- ...a-release-building-with-newer-cbindgen-ve.patch | 35 ++++++++++++++++++++++ PKGBUILD | 14 +++++---- vendor.js | 10 ++++++- 3 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch 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 0000000..6fd00ca --- /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?= +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 ed0adec..8a74df5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,9 +12,9 @@ # Arch version doesn't support alsa pkgname=firefox -pkgver=63.0 +pkgver=63.0.1 bz2ver=$(echo $pkgver | sed 's/\./_/g') -pkgrel=2 +pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64) license=(MPL GPL LGPL) @@ -30,18 +30,22 @@ optdepends=('networkmanager: Location detection via available WiFi networks' options=(!emptydirs !makeflags !strip) source=(firefox-$pkgver.tar.bz2::https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${bz2ver}_RELEASE.tar.bz2 $pkgname.desktop firefox-symbolic.svg + 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch vendor.js package-manifest.diff) -sha256sums=('0b2c5dd6d74a742efbad9406c7c28a1194b3375687ea9dfd7b7f8274b1ee81ec' +sha256sums=('87eb045d6eb9d46f76a96d91b2138d584f3dc88f1e6e6989774bc988dc14197d' '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a' '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797' - 'e93611c0a0a20da6e28c3fc5c59398cdee91e52a64888c60a38783cf555817d6' + 'a1e523f830f28217e050991062358c91be254e21732a6391449a8c0e3e0de77f' + '08f344956146b273dabdfe2451a21c216ed76eb3cfad2e2b3f018f3991d0bb80' '28e5db73f04ce8794f68822deda5512c64f832e542ad58fb7e40cad9e4785664') prepare() { mkdir mozbuild cd mozilla-release-FIREFOX_${bz2ver}_RELEASE - + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1503401 + patch -Np1 -i ../0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch cat >$srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/.mozconfig <