From ab03906f5763def22707f961ead7ae889c9f1fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 24 Feb 2021 04:36:20 +0100 Subject: [PATCH] firefox-esr: update to 78.8.0 --- .../patches/ff85-ppc64-xptcall.patch | 63 ------------------- srcpkgs/firefox-esr/template | 4 +- 2 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 srcpkgs/firefox-esr/patches/ff85-ppc64-xptcall.patch diff --git a/srcpkgs/firefox-esr/patches/ff85-ppc64-xptcall.patch b/srcpkgs/firefox-esr/patches/ff85-ppc64-xptcall.patch deleted file mode 100644 index b270d836f2f..00000000000 --- a/srcpkgs/firefox-esr/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-esr/template b/srcpkgs/firefox-esr/template index e0b2eabade0..56c0ae7cb4b 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n". # pkgname=firefox-esr -version=78.7.1 +version=78.8.0 revision=1 wrksrc="firefox-${version}" build_helper="rust qemu" @@ -22,7 +22,7 @@ maintainer="Jürgen Buchmüller " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/organizations/" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=5042783e2cf94d21dd990d2083800f05bc32f8ba65532a715c7be3cb7716b837 +checksum=1cf2dfdee2e31fd0a5ecced6275a33fa11bee1d2a7c65e23350b26992584a110 lib32disabled=yes conflicts="firefox>=0"