From 9119804f575418a40ff2905b49117ce621969146 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
Date: Sep 12 2021 13:04:52 +0000
Subject: [PATCH 1/2] iceweasel_branding: 91.0


identity-icons-brand.svg has been removed upstream, yet Arch Linux added
it to their VCS repo, to be used as "symbolic" application icon in some
DEs. As it looks like we don't have this icon for Iceweasel, let's just
drop it for now. If anybody is not happy about the missing icon, it can
be added later.

---

diff --git a/release.sh b/release.sh
index ffec563..9c451af 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,7 @@
 set -eu
 
 pkgname=iceweasel
-brandingver=87.0
+brandingver=91.0
 brandingrel=1
 
 srcdir=src
diff --git a/src/branding/content/Makefile.in b/src/branding/content/Makefile.in
index 5035d1b..fb0c68d 100644
--- a/src/branding/content/Makefile.in
+++ b/src/branding/content/Makefile.in
@@ -8,10 +8,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-UNOFFICIAL_BRANDING_FILES = \
-	identity-icons-brand.svg \
-	$(NULL)
-
 misc:: about-logo.png about-logo@2x.png about-wordmark.svg firefox-wordmark.svg about.png icon16.png icon48.png icon64.png $(UNOFFICIAL_BRANDING_FILES)
 GARBAGE += $(CHROME_DEPS)
 
@@ -41,6 +37,3 @@ icon%.png:
 
 ../%.png:
 	$(MAKE) -C .. $(notdir $@)
-
-$(UNOFFICIAL_BRANDING_FILES): %: $(topsrcdir)/browser/branding/unofficial/content/%
-	cp -f $^ $@

From 82fedf3367b6cfab908b8fe4752f0023efa922d7 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
Date: Oct 07 2021 10:51:57 +0000
Subject: [PATCH 2/2] Update to upstream version 93.0


---

diff --git a/release.sh b/release.sh
index 9c451af..e2792a7 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,7 @@
 set -eu
 
 pkgname=iceweasel
-brandingver=91.0
+brandingver=93.0
 brandingrel=1
 
 srcdir=src
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