diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /overlays/patches | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'overlays/patches')
| -rw-r--r-- | overlays/patches/firefox/release/D6695.diff | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/overlays/patches/firefox/release/D6695.diff b/overlays/patches/firefox/release/D6695.diff index 9d0c9f9d0cb1..de7eae4741ad 100644 --- a/overlays/patches/firefox/release/D6695.diff +++ b/overlays/patches/firefox/release/D6695.diff @@ -1,16 +1,16 @@ diff --git a/toolkit/moz.build b/toolkit/moz.build -index b6f792da7124..672d43957bed 100644 +index 060a2f4ed9e8..f821576bb62f 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build -@@ -87,3 +87,6 @@ with Files('pluginproblem/**'): +@@ -82,3 +82,6 @@ with Files("pluginproblem/**"): - with Files('l10n-registry.manifest'): - BUG_COMPONENT = ('Core', 'Localization') + with Files("l10n-registry.manifest"): + BUG_COMPONENT = ("Core", "Localization") + -+if CONFIG['ENABLE_TESTS']: -+ DIRS += ['tests/gtest'] ++if CONFIG["ENABLE_TESTS"]: ++ DIRS += ["tests/gtest"] diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index 197d29a85106..24b2d00bc8c2 100644 +index 2760be996403..c56b4a7a9774 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -405,13 +405,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, @@ -167,7 +167,7 @@ index 197d29a85106..24b2d00bc8c2 100644 folder.Truncate(); } diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp -index b8699fecc4b7..a91eba2cbbbd 100644 +index ef974f99048f..b4025f056297 100644 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp @@ -233,7 +233,7 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) { |