Wed Feb 26 17:48:58 2020 UTC ()
firefox: limit what is noted as being a hack for NetBSD to NetBSD.

This is causing problems on fedora 31 which gets a function prototype
mismatch from this somehow.


(maya)
diff -r1.382 -r1.383 pkgsrc/www/firefox/distinfo
diff -r1.2 -r1.3 pkgsrc/www/firefox/patches/patch-config__make_system_wrappers.py
cvs diff -r1.382 -r1.383 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2020/02/21 15:13:12 1.382
+++ pkgsrc/www/firefox/distinfo 2020/02/26 17:48:58 1.383
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.382 2020/02/21 15:13:12 ryoon Exp $ 1$NetBSD: distinfo,v 1.383 2020/02/26 17:48:58 maya Exp $
2 2
3SHA1 (firefox-73.0.1.source.tar.xz) = 27948432e868f68951f885394c1165739d6902b3 3SHA1 (firefox-73.0.1.source.tar.xz) = 27948432e868f68951f885394c1165739d6902b3
4RMD160 (firefox-73.0.1.source.tar.xz) = d95068e78604695e399b0cf7fa988869a5a33ac7 4RMD160 (firefox-73.0.1.source.tar.xz) = d95068e78604695e399b0cf7fa988869a5a33ac7
5SHA512 (firefox-73.0.1.source.tar.xz) = 89fac2c50e092f2805f48399f68cdf0793324e1dce89266f62b76e9b335dfc553ae54a36738992630b6035a52cd65b9aa774e7e54cea2e3ec7d609d9219cdf76 5SHA512 (firefox-73.0.1.source.tar.xz) = 89fac2c50e092f2805f48399f68cdf0793324e1dce89266f62b76e9b335dfc553ae54a36738992630b6035a52cd65b9aa774e7e54cea2e3ec7d609d9219cdf76
6Size (firefox-73.0.1.source.tar.xz) = 326596084 bytes 6Size (firefox-73.0.1.source.tar.xz) = 326596084 bytes
7SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7 7SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7
8SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e 8SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e
9SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8 9SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
10SHA1 (patch-config__make_system_wrappers.py) = 4e0a23d5b1f3a4fcb358ce319f6a2421be535375 10SHA1 (patch-config__make_system_wrappers.py) = c17e03e6c0599f2d14de3688af8552c12bbc61ed
11SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 11SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
12SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a 12SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a
13SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 13SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
14SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef 14SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
15SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad 15SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
16SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 243333d8a091e98ace0fd4a94df7c2d37e3b2aad 16SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 243333d8a091e98ace0fd4a94df7c2d37e3b2aad
17SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = d84d9b4d416e049423120dcbf9199644ce1c93ab 17SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = d84d9b4d416e049423120dcbf9199644ce1c93ab
18SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c 18SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
19SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 19SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
20SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 25e24743060acf10c776c6b3b3660f52a2e9fbe8 20SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 25e24743060acf10c776c6b3b3660f52a2e9fbe8
21SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = f8d155ee66008b7cc4052b6a889327543b89e0bb 21SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = f8d155ee66008b7cc4052b6a889327543b89e0bb
22SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836 22SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
23SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35 23SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35
cvs diff -r1.2 -r1.3 pkgsrc/www/firefox/patches/Attic/patch-config__make_system_wrappers.py (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-config__make_system_wrappers.py 2019/12/03 14:21:20 1.2
+++ pkgsrc/www/firefox/patches/Attic/patch-config__make_system_wrappers.py 2020/02/26 17:48:58 1.3
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: patch-config__make_system_wrappers.py,v 1.2 2019/12/03 14:21:20 ryoon Exp $ 1$NetBSD: patch-config__make_system_wrappers.py,v 1.3 2020/02/26 17:48:58 maya Exp $
2 2
3This is a workaround for building firefox with clang from base, 3This is a workaround for building firefox with clang from base,
4with a conflict with __isinf(__x) in libc++ vs netbsd headers. 4with a conflict with __isinf(__x) in libc++ vs netbsd headers.
5 5
6--- config/make-system-wrappers.py.orig 2019-12-02 12:22:52.000000000 +0000 6--- config/make-system-wrappers.py.orig 2019-12-02 12:22:52.000000000 +0000
7+++ config/make-system-wrappers.py 7+++ config/make-system-wrappers.py
8@@ -7,6 +7,7 @@ import os 8@@ -7,6 +7,9 @@ import os
9 from mozbuild.util import FileAvoidWrite 9 from mozbuild.util import FileAvoidWrite
10  10
11 header_template = '''#pragma GCC system_header 11 header_template = '''#pragma GCC system_header
 12+#ifdef __NetBSD__
12+#define __isinf(x) __builtin_isinf(x) 13+#define __isinf(x) __builtin_isinf(x)
 14+#endif
13 #pragma GCC visibility push(default) 15 #pragma GCC visibility push(default)
14 {includes} 16 {includes}
15 #pragma GCC visibility pop 17 #pragma GCC visibility pop