experimental/firefox-esr: bump to 60.6.1, fix building with rust 1.33.0

3 files changed, 47 insertions, 3 deletions

diff --git a/experimental/firefox-esr/APKBUILD b/experimental/firefox-esr/APKBUILD
index b13698697..c172b43ac 100644
--- a/experimental/firefox-esr/APKBUILD
+++ b/experimental/firefox-esr/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=firefox-esr
-pkgver=60.5.0
+pkgver=60.6.1
 pkgrel=0
 pkgdesc="Firefox web browser"
 url="https://www.mozilla.org/en-US/firefox/organizations/faq/"
@@ -15,7 +15,7 @@ depends_dev="alsa-lib-dev bzip2-dev dbus-glib-dev gconf-dev gtk+2.0-dev
 	pulseaudio-dev sqlite-dev startup-notification-dev wireless-tools-dev"
 makedepends="$depends_dev autoconf2.13 automake libtool
 	bsd-compat-headers cmd:which nss-static openssl-dev sed yasm zip
-	cargo clang llvm6-dev rust"
+	cargo clang llvm7-dev rust"
 subpackages=""
 _py2ver=2.7.15
 source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz
@@ -33,12 +33,14 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
 
 	bad-google-code.patch
 	cmsghdr.patch
+	disable-gecko-profiler.patch
 	endian-gfx.patch
 	endianness-js.patch
 	fix-bug-1261392.patch
 	fix-mutex-build.patch
 	proper-system-hunspell.patch
 	rust-config.patch
+	rust-1.33.0.patch
 	shut-up-warning.patch
 	skia.patch
 	stackwalk-x86-ppc.patch
@@ -50,6 +52,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
 	https://www.python.org/ftp/python/$_py2ver/Python-$_py2ver.tar.xz"
 
 builddir="$srcdir"/firefox-$pkgver
+_mozappdir=/usr/lib/firefox
 ldpath="$_mozappdir"
 
 unpack() {
@@ -142,7 +145,7 @@ package() {
 	EOF
 }
 
-sha512sums="dd47e38a87a1339b733c06ea3f235576bf8dce414194ab308d0dda07bf15290afbbad92b8484732daa53cf6a48b57412f7f41e30ae0ac21144c8657b86047aec  firefox-60.5.0esr.source.tar.xz
+sha512sums="a1683e9ad551c2aa6b84013216393fe1f7107728c253ed8e5700d419cf0956513110ed4e1b5dbac3e3bc23930e3024706f1b24d405b6edcdf8c175b03ab241ed  firefox-60.6.1esr.source.tar.xz
 76e3e6f64f4dd1206106b2b73cca3ccd312a8d907010c382ab9e2f0a497fed297abf0654d4dd90c563e6dde6403e3f9084ce927bb275fec95be87bed8adf9257  mozconfig
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
 09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5  fix-fortify-inline.patch
@@ -154,12 +157,14 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb1
 6beba471b6a7fc229a9c105d58137f80cec07219e52bb9a666c787b37ca88635d6ec2eba651eccb5096429c2965709c9475c89839c255c3545f8c96c5d40f403  missing-header-s390x.patch
 ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613  bad-google-code.patch
 61c7117345b4bcb045ce0287aa368d90dffd7331347021ff345d5a7c46097ffd2575f38711309ce7bdbbbec15561e03fdabcb16235ed8a325ccc8c9d5bba35a6  cmsghdr.patch
+03597515a38f54aa973d2209ca7fbf7348f9843c4dd0481fae747ac06b35fc7e5c61b2e17ab6e3677e479901e8e12c58e961eb1cc861af7cfd2a8488d4dcde72  disable-gecko-profiler.patch
 11361b009d708e80afcf2eca8b02381be0c8314421eb439200c674cfa4e4bca15127f2d0dd11bf36f48d0e309d4424f949caf588f08458f8e9ba6812b83023ab  endian-gfx.patch
 363f1df1a78799783b4e9f887dc85d83ec83c6ec392aeacbd98dc89e543d0cd3b9d1964ce274142b44847a03c47f845cbf6fa7fa17a04b25bbaa37fc5d714730  endianness-js.patch
 a50b412edf9573a0bd04a43578b1c927967a616b73a5995eefb15bfa78fd2bd14e36ec05315a0703f6370ecd524e6bcb012e7285beb1245e9add9b8553acb79e  fix-bug-1261392.patch
 d5d3ec190b1916d5c06f466a72124a3d438d90ea40d54e894105a9faf2aa2a6ce9cc21a0a80bd4408f7be867e5a660ee3d8aed40c8d1fb511cfb947739f45240  fix-mutex-build.patch
 1a88c21c39d5878e2018463fe08dd3a960cdf10e650e06ef3e4f089a431800b50267d8749a7acde196bb47c45aa66058a6ed4fb4d60de2ab69e8a48cd5a109bc  proper-system-hunspell.patch
 fd3b165e26ab931dd7eaf220d578c30b8772eab0a870710d59403c9823c2233ef941cd7eb25d1625d705de9e8a7138d0e8c4e227a185e9b687553132da96d81a  rust-config.patch
+7450eeb7ca48ce632fb7379aec6018012a0db5efd8afaee2708501e6c72273ba238922696da584a73b7fa82dc202470aba9ef5df20c230c9e21087436e68e4b8  rust-1.33.0.patch
 21100340ff03f4257fa6a4b59e206d4d1b71c074ebae392ba616f9e6e6d4988a22eec69b40534221f9453ec3a58397fa4ab99b87abdcb7d22fabb13f9cc577d2  shut-up-warning.patch
 8ef2bc4404601f66c7505f3e0a2f6d1d11e8f11e5a888dce4942cf27c86fbdbcdd66cb3d98738b7d9e25538793986140e75d51a893d22c70714ed98ef50a9894  skia.patch
 e196c998a4029e4fc134fbe4b7455abb4b93644f7f07b88faef4eda900de225e72b124b5a9ab3492cbe398e17f8390d29b769a2544744a106bba6a5def540973  stackwalk-x86-ppc.patch
diff --git a/experimental/firefox-esr/disable-gecko-profiler.patch b/experimental/firefox-esr/disable-gecko-profiler.patch
new file mode 100644
index 000000000..42bb22633
--- /dev/null
+++ b/experimental/firefox-esr/disable-gecko-profiler.patch
@@ -0,0 +1,13 @@
+--- a/toolkit/moz.configure
++++ b/toolkit/moz.configure
+@@ -35,10 +35,6 @@
+     if value:
+         return True
+ 
+-set_config('MOZ_GECKO_PROFILER', gecko_profiler_define)
+-set_define('MOZ_GECKO_PROFILER', gecko_profiler_define)
+-
+-
+ option('--enable-dmd', env='MOZ_DMD',
+        help='Enable Dark Matter Detector (heap profiler). '
+             'Also enables jemalloc, replace-malloc and profiling')
diff --git a/experimental/firefox-esr/rust-1.33.0.patch b/experimental/firefox-esr/rust-1.33.0.patch
new file mode 100644
index 000000000..d74ade170
--- /dev/null
+++ b/experimental/firefox-esr/rust-1.33.0.patch
@@ -0,0 +1,26 @@
+Fix build error resulting from missing macro documentation when building with
+rust 1.33.0.
+
+diff -urw firefox-60.6.1-old/servo/components/style/lib.rs firefox-60.6.1/servo/components/style/lib.rs
+--- firefox-60.6.1-old/servo/components/style/lib.rs	2019-03-22 05:01:07.000000000 +0000
++++ firefox-60.6.1/servo/components/style/lib.rs	2019-04-18 18:17:26.229986934 +0000
+@@ -23,7 +23,6 @@
+ //! [cssparser]: ../cssparser/index.html
+ //! [selectors]: ../selectors/index.html
+ 
+-#![deny(missing_docs)]
+ 
+ extern crate app_units;
+ extern crate arrayvec;
+diff -urw firefox-60.6.1-old/servo/components/style_traits/lib.rs firefox-60.6.1/servo/components/style_traits/lib.rs
+--- firefox-60.6.1-old/servo/components/style_traits/lib.rs	2019-03-22 05:01:07.000000000 +0000
++++ firefox-60.6.1/servo/components/style_traits/lib.rs	2019-04-18 18:17:18.439987016 +0000
+@@ -9,7 +9,7 @@
+ #![crate_name = "style_traits"]
+ #![crate_type = "rlib"]
+ 
+-#![deny(unsafe_code, missing_docs)]
++#![deny(unsafe_code)]
+ 
+ extern crate app_units;
+ #[macro_use] extern crate bitflags;