diff --git a/app/mac/mozconfig b/app/mac/mozconfig index b78bb5dec5..1dde8c9923 100644 --- a/app/mac/mozconfig +++ b/app/mac/mozconfig @@ -4,7 +4,7 @@ elif [ "$Z_ARCH" == "aarch64" ]; then ac_add_options --target=aarch64-apple-darwin fi ac_add_options --enable-bootstrap -ac_add_options --with-macos-sdk=$HOME/tmp/MacOSX11.0.sdk +ac_add_options --with-macos-sdk=$HOME/tmp/MacOSX13.3.sdk mk_add_options AUTOCLOBBER=1 @@ -27,4 +27,4 @@ MOZ_REQUIRE_SIGNING= ac_add_options --enable-official-branding # Build updater without MAR signature verification -ac_add_options --disable-verify-mar +ac_add_options --enable-unverified-updates diff --git a/app/mac/mozilla-102.patch b/app/mac/mozilla-115.patch similarity index 78% rename from app/mac/mozilla-102.patch rename to app/mac/mozilla-115.patch index a35ae46351..815d34220a 100644 --- a/app/mac/mozilla-102.patch +++ b/app/mac/mozilla-115.patch @@ -1,7 +1,7 @@ diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp -@@ -149,19 +149,31 @@ static bool IsArg(const char* arg, const +@@ -154,19 +154,31 @@ static bool IsArg(const char* arg, const #endif return false; @@ -34,6 +34,30 @@ diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp appDataFile = argv[2]; char appEnv[MAXPATHLEN]; +diff --git a/python/mozbuild/mozbuild/action/unpack_dmg.py b/python/mozbuild/mozbuild/action/unpack_dmg.py +--- a/python/mozbuild/mozbuild/action/unpack_dmg.py ++++ b/python/mozbuild/mozbuild/action/unpack_dmg.py +@@ -34,18 +34,18 @@ def main(args): + options = parser.parse_args(args) + + dmg_tool = bootstrap_toolchain("dmg/dmg") + hfs_tool = bootstrap_toolchain("dmg/hfsplus") + + dmg.extract_dmg( + dmgfile=Path(options.dmgfile), + output=Path(options.outpath), +- dmg_tool=Path(dmg_tool), +- hfs_tool=Path(hfs_tool), ++ dmg_tool=_path_or_none(dmg_tool), ++ hfs_tool=_path_or_none(hfs_tool), + dsstore=_path_or_none(options.dsstore), + background=_path_or_none(options.background), + icon=_path_or_none(options.icon), + ) + return 0 + + + if __name__ == "__main__": diff --git a/xpcom/build/BinaryPath.h b/xpcom/build/BinaryPath.h --- a/xpcom/build/BinaryPath.h +++ b/xpcom/build/BinaryPath.h @@ -94,7 +118,7 @@ diff --git a/xpcom/build/BinaryPath.h b/xpcom/build/BinaryPath.h if (!libDir) { return NS_ERROR_FAILURE; } -@@ -267,16 +307,29 @@ class BinaryPath { +@@ -283,16 +323,29 @@ class BinaryPath { if (NS_FAILED(Get(path))) { return nullptr; }