diff options
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix | 10 | ||||
| -rw-r--r-- | overlays/patches/firefox/beta/D6695.diff | 61 |
2 files changed, 31 insertions, 40 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index fbe684ec5283..a4e98dbdf318 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -58,16 +58,16 @@ rec { }; }; - firefox-beta = firefoxCommon rec { + firefox-beta = (firefoxCommon rec { pname = "firefox"; - ffversion = "66.0b5"; + ffversion = "83.0b10"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2cnv8pnl220dxqfpcdnwibwidc8b9zg3bj9wkzc83r4cdsfcjy3hqyw01gpc30a4qwbbabsgask3hl3dg7d3d8qqw4c588b00z67mvs"; + sha512 = "1div55x8c9qw8ck7njpf1c9kl1l0hi6fn8gnrj2irbiwhvl5cfxqp84sn7yq9saj46wzicxmczn32w3a1vs5xzjfp454zggg8wllhcx"; }; patches = [ - ./no-buildconfig-ffx65.patch + ./no-buildconfig-ffx76.patch ]; meta = firefox.meta // { @@ -77,6 +77,6 @@ rec { attrPath = "firefox-beta"; versionKey = "ffversion"; }; - }; + }).override { pipewireSupport = false; }; } diff --git a/overlays/patches/firefox/beta/D6695.diff b/overlays/patches/firefox/beta/D6695.diff index f8a8deeb8581..9d0c9f9d0cb1 100644 --- a/overlays/patches/firefox/beta/D6695.diff +++ b/overlays/patches/firefox/beta/D6695.diff @@ -1,42 +1,33 @@ diff --git a/toolkit/moz.build b/toolkit/moz.build -index 109fb2c..0b871d9 100644 +index b6f792da7124..672d43957bed 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build -@@ -72,3 +72,5 @@ with Files('mozapps/preferences/**'): - with Files('pluginproblem/**'): - BUG_COMPONENT = ('Core', 'Plug-ins') +@@ -87,3 +87,6 @@ with Files('pluginproblem/**'): + with Files('l10n-registry.manifest'): + BUG_COMPONENT = ('Core', 'Localization') ++ +if CONFIG['ENABLE_TESTS']: + DIRS += ['tests/gtest'] diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index aafe82e..2d850fe 100644 +index 197d29a85106..24b2d00bc8c2 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -390,13 +390,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, +@@ -405,13 +405,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, nsCOMPtr<nsIFile> localDir; rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false); if (NS_SUCCEEDED(rv)) { --#if defined(XP_MACOSX) -- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")); --#else -- rv = localDir->AppendNative(NS_LITERAL_CSTRING(".mozilla")); --#endif +-# if defined(XP_MACOSX) +- rv = localDir->AppendNative("Mozilla"_ns); +-# else +- rv = localDir->AppendNative(".mozilla"_ns); +-# endif - } - if (NS_SUCCEEDED(rv)) { localDir.swap(file); } } -@@ -1238,7 +1231,8 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult, - nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) { - return NS_ERROR_FAILURE; - } -- } else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) { -+ } -+ else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) { - return NS_ERROR_FAILURE; - } - -@@ -1367,6 +1361,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, +@@ -1429,6 +1422,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, NS_ENSURE_SUCCESS(rv, rv); localDir = dirFileMac; @@ -46,7 +37,7 @@ index aafe82e..2d850fe 100644 #elif defined(XP_IOS) nsAutoCString userDir; if (GetUIKitDirectory(aLocal, userDir)) { -@@ -1390,6 +1387,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, +@@ -1452,6 +1448,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, NS_ENSURE_SUCCESS(rv, rv); rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); @@ -56,8 +47,8 @@ index aafe82e..2d850fe 100644 #elif defined(XP_UNIX) const char* homeDir = getenv("HOME"); if (!homeDir || !*homeDir) return NS_ERROR_FAILURE; -@@ -1411,8 +1411,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, - rv = localDir->AppendNative(NS_LITERAL_CSTRING(".cache")); +@@ -1472,8 +1471,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, + if (NS_SUCCEEDED(rv)) rv = localDir->AppendNative(".cache"_ns); } } else { + bool exists; @@ -107,8 +98,8 @@ index aafe82e..2d850fe 100644 + } } #else - #error "Don't know how to get product dir on your platform" -@@ -1523,20 +1566,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) { + # error "Don't know how to get product dir on your platform" +@@ -1594,20 +1636,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) { #if defined(XP_MACOSX) || defined(XP_WIN) @@ -129,7 +120,7 @@ index aafe82e..2d850fe 100644 static const char* const sExtensions = "extensions"; rv = aFile->AppendNative(nsDependentCString(sExtensions)); NS_ENSURE_SUCCESS(rv, rv); -@@ -1554,20 +1589,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionsDevPath(nsIFile* aFile) { +@@ -1625,20 +1659,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionsDevPath(nsIFile* aFile) { #if defined(XP_MACOSX) || defined(XP_WIN) @@ -150,7 +141,7 @@ index aafe82e..2d850fe 100644 static const char* const sExtensions = "systemextensionsdev"; rv = aFile->AppendNative(nsDependentCString(sExtensions)); NS_ENSURE_SUCCESS(rv, rv); -@@ -1625,9 +1652,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { +@@ -1703,9 +1729,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) nsAutoCString folder; @@ -160,7 +151,7 @@ index aafe82e..2d850fe 100644 if (!profile.IsEmpty()) { // Skip any leading path characters -@@ -1647,8 +1671,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { +@@ -1725,8 +1748,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { folder.Append(vendor); ToLowerCase(folder); @@ -176,10 +167,10 @@ index aafe82e..2d850fe 100644 folder.Truncate(); } diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp -index 90e4ec9..8b838ec 100644 +index b8699fecc4b7..a91eba2cbbbd 100644 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp -@@ -247,7 +247,7 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) { +@@ -233,7 +233,7 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) { // GetProductDirectory - Gets the directory which contains the application data // folder // @@ -188,7 +179,7 @@ index 90e4ec9..8b838ec 100644 // WIN : <Application Data folder on user's machine>\Mozilla // Mac : :Documents:Mozilla: //---------------------------------------------------------------------------------------- -@@ -291,19 +291,80 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, +@@ -277,19 +277,80 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, return rv; } #elif defined(XP_UNIX) @@ -251,7 +242,7 @@ index 90e4ec9..8b838ec 100644 + } + } #else - #error dont_know_how_to_get_product_dir_on_your_platform + # error dont_know_how_to_get_product_dir_on_your_platform #endif +#if !defined(XP_UNIX) || defined(XP_MACOSX) @@ -270,7 +261,7 @@ index 90e4ec9..8b838ec 100644 rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { -@@ -323,7 +384,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, +@@ -309,7 +370,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, // GetDefaultUserProfileRoot - Gets the directory which contains each user // profile dir // |