mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update Firefox patch and mozconfig for Firefox 115

Browse source
This commit is contained in:
Dan Stillman 2024-03-31 02:37:10 -04:00
parent a45be190ea
commit f86d1e1d07
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/mac/mozconfig
View file

@ -4,7 +4,7 @@ elif [ "$Z_ARCH" == "aarch64" ]; then
ac_add_options --target=aarch64-apple-darwin ac_add_options --target=aarch64-apple-darwin
fi fi
ac_add_options --enable-bootstrap 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 mk_add_options AUTOCLOBBER=1
@ -27,4 +27,4 @@ MOZ_REQUIRE_SIGNING=
ac_add_options --enable-official-branding ac_add_options --enable-official-branding
# Build updater without MAR signature verification # Build updater without MAR signature verification
ac_add_options --disable-verify-mar ac_add_options --enable-unverified-updates

28
app/mac/mozilla-102.patch → app/mac/mozilla-115.patch
View file

@ -1,7 +1,7 @@
diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
--- a/browser/app/nsBrowserApp.cpp --- a/browser/app/nsBrowserApp.cpp
+++ b/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 #endif
return false; return false;
@ -34,6 +34,30 @@ diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
appDataFile = argv[2]; appDataFile = argv[2];
char appEnv[MAXPATHLEN]; 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 diff --git a/xpcom/build/BinaryPath.h b/xpcom/build/BinaryPath.h
--- a/xpcom/build/BinaryPath.h --- a/xpcom/build/BinaryPath.h
+++ b/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) { if (!libDir) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
@@ -267,16 +307,29 @@ class BinaryPath { @@ -283,16 +323,29 @@ class BinaryPath {
if (NS_FAILED(Get(path))) { if (NS_FAILED(Get(path))) {
return nullptr; return nullptr;
} }