From efe7bceaf5477bb7cb6451bb8b2eb0fbd15c2b62 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:03:56 +0100
Subject: [PATCH] firefox: update to 86.0.

---
 srcpkgs/firefox/files/firefox-wayland         |  2 +-
 .../firefox/patches/ff85-ppc64-xptcall.patch  | 63 -------------------
 srcpkgs/firefox/template                      |  6 +-
 3 files changed, 4 insertions(+), 67 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch

diff --git a/srcpkgs/firefox/files/firefox-wayland b/srcpkgs/firefox/files/firefox-wayland
index 495f901320c..e07fd87b235 100644
--- a/srcpkgs/firefox/files/firefox-wayland
+++ b/srcpkgs/firefox/files/firefox-wayland
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec env MOZ_ENABLE_WAYLAND= /usr/lib/firefox/firefox "$@"
+exec env MOZ_ENABLE_WAYLAND=1 /usr/lib/firefox/firefox "$@"
diff --git a/srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch b/srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch
deleted file mode 100644
index b270d836f2f..00000000000
--- a/srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
---- xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
-+++ xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
-@@ -91,7 +91,13 @@
-         if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) {
-             if (nr_fpr < FPR_COUNT) {
-                 fpregs[nr_fpr++] = s->val.d;
--                nr_gpr++;
-+                // Even if we have enough FPRs, still skip space in
-+                // the parameter area if we ran out of placeholder GPRs.
-+                if (nr_gpr < GPR_COUNT) {
-+                    nr_gpr++;
-+                } else {
-+                    d++;
-+                }
-             } else {
-                 *((double *)d) = s->val.d;
-                 d++;
-@@ -101,7 +107,11 @@
-             if (nr_fpr < FPR_COUNT) {
-                 // Single-precision floats are passed in FPRs too.
-                 fpregs[nr_fpr++] = s->val.f;
--                nr_gpr++;
-+                if (nr_gpr < GPR_COUNT) {
-+                    nr_gpr++;
-+                } else {
-+                    d++;
-+                }
-             } else {
- #ifdef __LITTLE_ENDIAN__
-                 *((float *)d) = s->val.f;
-diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
---- xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
-+++ xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
-@@ -103,7 +103,13 @@
-         if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-             if (nr_fpr < FPR_COUNT) {
-                 dp->val.d = fpregs[nr_fpr++];
--                nr_gpr++;
-+                // Even if we have enough FPRs, still skip space in
-+                // the parameter area if we ran out of placeholder GPRs.
-+                if (nr_gpr < GPR_COUNT) {
-+                    nr_gpr++;
-+                } else {
-+                    ap++;
-+                }
-             } else {
-                 dp->val.d = *(double*)ap++;
-             }
-@@ -113,7 +119,11 @@
-             if (nr_fpr < FPR_COUNT) {
-                 // Single-precision floats are passed in FPRs too.
-                 dp->val.f = (float)fpregs[nr_fpr++];
--                nr_gpr++;
-+                if (nr_gpr < GPR_COUNT) {
-+                    nr_gpr++;
-+                } else {
-+                    ap++;
-+                }
-             } else {
- #ifdef __LITTLE_ENDIAN__
-                 dp->val.f = *(float*)ap++;
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0af96b67505..299eb9d8650 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=85.0.1
+version=86.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e98f586aa4d58e7418da41a2d19cd30030d072f86edd24a3fd6f769284287cee
+checksum=c3ac474a2cf6a8e31a962f57c7357dbe67b5088b6aceea9980f25ce7a99b58dd
 
 lib32disabled=yes
 
@@ -133,7 +133,7 @@ do_build() {
 		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
-		sed -i 's/debug_info = "2"/debug_info = "1"/' \
+		vsed -i 's/debug_info = "2"/debug_info = "0"/' \
 		build/moz.configure/toolchain.configure
 	fi