--- layout/style/ServoBindings.toml.orig	2024-01-08 19:43:07 UTC

+++ layout/style/ServoBindings.toml

@@ -364,6 +364,9 @@ opaque-types = [

     "std::namespace::atomic___base", "std::atomic__My_base",

     "std::atomic",

     "std::atomic___base",

+    "std::tuple.*", # Causes "Cannot find type _Pred in this scope" error on mac, like rust-skia#571

+    "std::.*::tuple.*",

+

     # We want everything but FontVariation and Float to be opaque but we don't

     # have negative regexes.

     "mozilla::gfx::(.{0,4}|.{6,12}|.{14,}|([^F][^o][^n][^t][^V][^a][^r][^i][^a][^t][^i][^o][^n])|([^F][^l][^o][^a][^t]))",

@@ -389,8 +392,6 @@ opaque-types = [

                             # for clang.

     "mozilla::SeenPtrs",

     "mozilla::SupportsWeakPtr",

-    "std::tuple",

-    "std::tuple_.*", # Causes "Cannot find type _Pred in this scope" error on mac, like rust-skia#571

     "SupportsWeakPtr",

     "mozilla::detail::WeakReference",

     "mozilla::WeakPtr",

Ensure the build does not use "#pragma GCC visibility push(hidden)" before every

.cpp file, as this no longer works correctly with libc++ 18 and later.

--- build/moz.configure/toolchain.configure.orig	2024-01-18 21:41:20.000000000 +0100

+++ build/moz.configure/toolchain.configure	2024-01-31 11:18:04.902430000 +0100

@@ -2150,7 +2150,7 @@ def visibility_flags(target, env):

 @depends(target, build_environment)

 def visibility_flags(target, env):

     if target.os != "WINNT":

-        if target.kernel == "Darwin":

+        if target.kernel == "Darwin" or target.kernel == "FreeBSD":

             return ("-fvisibility=hidden", "-fvisibility-inlines-hidden")

         return (

             "-I%s/system_wrappers" % os.path.join(env.dist),