diff options
| author | grizzlyuser <grizzlyuser@protonmail.com> | 2021-10-07 13:51:57 +0300 |
|---|---|---|
| committer | grizzlyuser <grizzlyuser@protonmail.com> | 2021-10-07 13:51:57 +0300 |
| commit | 82fedf3367b6cfab908b8fe4752f0023efa922d7 (patch) | |
| tree | 9c3e85468ec3cde2e92120dd954a653d0e994047 /src | |
| parent | 9119804f575418a40ff2905b49117ce621969146 (diff) | |
Update to upstream version 93.093.0-1
Diffstat (limited to 'src')
| -rw-r--r-- | src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch | 8 | ||||
| -rw-r--r-- | src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch index 12a4c36..3125ec3 100644 --- a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch +++ b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch @@ -14,13 +14,13 @@ index e205cd4c55..d12adbb558 100644 #else pref("urlclassifier.phishTable", "googpub-phish-proto,moztest-phish-simple"); diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build -index d3eb77d9b6..aea8056cef 100644 +index d9c9384e97..ef67ae371e 100644 --- a/modules/libpref/moz.build +++ b/modules/libpref/moz.build -@@ -171,3 +171,6 @@ else: - - if CONFIG["MOZ_BACKGROUNDTASKS"]: +@@ -174,3 +174,6 @@ if CONFIG["MOZ_BACKGROUNDTASKS"]: DEFINES["MOZ_BACKGROUNDTASKS"] = True + + REQUIRES_UNIFIED_BUILD = True + +if CONFIG['MOZ_OFFICIAL_BRANDING']: + DEFINES['MOZ_OFFICIAL_BRANDING'] = True diff --git a/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch index 6bb47f5..06badf1 100644 --- a/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch +++ b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch @@ -3,9 +3,9 @@ index cffcff1..85d28cc 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -249,13 +249,6 @@ + @RESPATH@/chrome/pdfjs/* + @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest - @RESPATH@/chrome/recording.manifest - @RESPATH@/chrome/recording/* -#ifdef MOZ_GTK -@RESPATH@/browser/chrome/icons/default/default16.png -@RESPATH@/browser/chrome/icons/default/default32.png |