From 549a7fffb1102443189c1283d67f066ad045af77 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
Date: Nov 21 2023 16:03:36 +0000
Subject: [PATCH 1/2] 120.0


It looks like 115.0 could also be used instead, because the recent
change got removed upstream.

---

diff --git a/release.sh b/release.sh
index d3013af..57edf86 100755
--- a/release.sh
+++ b/release.sh
@@ -7,7 +7,7 @@ SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
 set -eu
 
 pkgname=iceweasel
-brandingver=119.0
+brandingver=120.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 44611ee..2fdab0a 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,14 +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 63c4608a88..96f1712dc2 100644
+index d9c9384e97..ef67ae371e 100644
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -175,3 +175,6 @@ else:
- 
- if CONFIG["MOZ_PHC"]:
-     DEFINES["MOZ_PHC"] = True
+@@ -174,3 +174,6 @@ if CONFIG["MOZ_BACKGROUNDTASKS"]:
+     FINAL_TARGET_PP_FILES += [
+         "greprefs.js",
+     ]
 +
 +if CONFIG['MOZ_OFFICIAL_BRANDING']:
 +    DEFINES['MOZ_OFFICIAL_BRANDING'] = True
-

From 40193834f87e4972926699a34c535c939dd5f4db Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
Date: Feb 19 2024 12:15:16 +0000
Subject: [PATCH 2/2] 123.0


---

diff --git a/release.sh b/release.sh
index 57edf86..ff2d33f 100755
--- a/release.sh
+++ b/release.sh
@@ -7,7 +7,7 @@ SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
 set -eu
 
 pkgname=iceweasel
-brandingver=120.0
+brandingver=123.0
 brandingrel=1
 
 srcdir=src
diff --git a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
index 52cb29b..327fcb0 100644
--- a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
+++ b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
@@ -11,15 +11,15 @@ index 8f699b479c..c930bed678 100644
 --- a/browser/installer/allowed-dupes.mn
 +++ b/browser/installer/allowed-dupes.mn
 @@ -36,9 +36,9 @@ browser/chrome.manifest
- crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
  crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
  
+ #ifndef XP_MACOSX
 -# firefox/firefox-bin is bug 658850
 -@MOZ_APP_NAME@
 -@MOZ_APP_NAME@-bin
 +# Iceweasel branding
 +iceweasel
 +iceweasel-bin
+ #endif
  
  # Row and column icons are duplicated
- res/table-remove-column-active.gif