CVS commit: pkgsrc/www/firefox

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Jun 15 13:54:20 UTC 2021

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo
Added Files:
        pkgsrc/www/firefox/patches: patch-js_src_jit_arm64_Architecture-arm64.h

Log Message:
firefox: fix 64-bit ARM build

The code in question has changed in the repo since, so the patch can probably
be removed in the next major update.


To generate a diff of this commit:
cvs rdiff -u -r1.480 -r1.481 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.436 -r1.437 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-js_src_jit_arm64_Architecture-arm64.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.480 pkgsrc/www/firefox/Makefile:1.481
--- pkgsrc/www/firefox/Makefile:1.480   Mon May 24 19:55:14 2021
+++ pkgsrc/www/firefox/Makefile Tue Jun 15 13:54:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.480 2021/05/24 19:55:14 wiz Exp $
+# $NetBSD: Makefile,v 1.481 2021/06/15 13:54:20 bsiegert Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            88.0
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.436 pkgsrc/www/firefox/distinfo:1.437
--- pkgsrc/www/firefox/distinfo:1.436   Wed May 12 13:31:44 2021
+++ pkgsrc/www/firefox/distinfo Tue Jun 15 13:54:20 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.436 2021/05/12 13:31:44 ryoon Exp $
+$NetBSD: distinfo,v 1.437 2021/06/15 13:54:20 bsiegert Exp $
 
 SHA1 (firefox-88.0.1.source.tar.xz) = 4cce4f21eda3fe9982e18358507890c409744549
 RMD160 (firefox-88.0.1.source.tar.xz) = a6602d8717088fccdd7b9a808325643a58252fd2
@@ -24,6 +24,7 @@ SHA1 (patch-ipc_chromium_src_base_platfo
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
 SHA1 (patch-js_public_ErrorReport.h) = 6b96a09acb9d7ee2a85539d827ba46e7a1a062e8
 SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = fad103cc698f9828ad58f742231984ec2bc27605
+SHA1 (patch-js_src_jit_arm64_Architecture-arm64.h) = 7b83b343f80a572c96298ca56294643370cbe704
 SHA1 (patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp) = fdc522e3fb626b1b8a2ebf19ad60bfc25dfa4183
 SHA1 (patch-js_src_jsfriendapi.h) = b5cb687dbbda314fe0f16521c1c042c105c4bbe4
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba

Added files:

Index: pkgsrc/www/firefox/patches/patch-js_src_jit_arm64_Architecture-arm64.h
diff -u /dev/null pkgsrc/www/firefox/patches/patch-js_src_jit_arm64_Architecture-arm64.h:1.1
--- /dev/null   Tue Jun 15 13:54:20 2021
+++ pkgsrc/www/firefox/patches/patch-js_src_jit_arm64_Architecture-arm64.h      Tue Jun 15 13:54:20 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-js_src_jit_arm64_Architecture-arm64.h,v 1.1 2021/06/15 13:54:20 bsiegert Exp $
+
+Fix build on aarch64; MOZ_CRASH cannot be in a constexpr function.
+
+--- js/src/jit/arm64/Architecture-arm64.h.orig 2021-05-04 18:59:04.000000000 +0000
++++ js/src/jit/arm64/Architecture-arm64.h
+@@ -580,7 +580,7 @@ struct FloatRegister {
+     MOZ_ASSERT(kind_ == FloatRegisters::Simd128);
+     return 16;
+ #else
+-    MOZ_CRASH("No SIMD support");
++    return 16;
+ #endif
+   }
+