summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrizzlyuser <grizzlyuser@protonmail.com>2023-10-26 09:00:34 +0200
committerbill-auger <mr.j.spam.me@gmail.com>2024-02-25 11:29:52 -0500
commitcc16863e4756839a1ffc3c4bf4c292892a058d36 (patch)
tree05e1da5bad44461510a02b476410b0e6faca8451
parentd59b3dfab54e2c12f22df3306ea9cccae063893f (diff)
119.0: Update patch to upstream changes119.0-1
-rwxr-xr-xrelease.sh2
-rw-r--r--src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch11
2 files changed, 7 insertions, 6 deletions
diff --git a/release.sh b/release.sh
index fd74ea0..d3013af 100755
--- a/release.sh
+++ b/release.sh
@@ -7,7 +7,7 @@ SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
set -eu
pkgname=iceweasel
-brandingver=115.0
+brandingver=119.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 2fdab0a..44611ee 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,14 @@ 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 d9c9384e97..ef67ae371e 100644
+index 63c4608a88..96f1712dc2 100644
--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
-@@ -174,3 +174,6 @@ if CONFIG["MOZ_BACKGROUNDTASKS"]:
- FINAL_TARGET_PP_FILES += [
- "greprefs.js",
- ]
+@@ -175,3 +175,6 @@ else:
+
+ if CONFIG["MOZ_PHC"]:
+ DEFINES["MOZ_PHC"] = True
+
+if CONFIG['MOZ_OFFICIAL_BRANDING']:
+ DEFINES['MOZ_OFFICIAL_BRANDING'] = True
+