From 348e36d59484513e7cbb838cf6fd383f9cb3e149 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Jul 02 2022 10:16:24 +0000 Subject: 102.0, remove conflicting patch I couldn't find the use of it, and it does not apply to 102.0 source tree, so removed. Whoever knows the valid reason to bring it back, please do so. --- diff --git a/release.sh b/release.sh index 4840889..916532c 100755 --- a/release.sh +++ b/release.sh @@ -3,7 +3,7 @@ set -eu pkgname=iceweasel -brandingver=98.0 +brandingver=102.0 brandingrel=1 srcdir=src diff --git a/src/patches/iceweasel-branding/enable-object-directory-paths.patch b/src/patches/iceweasel-branding/enable-object-directory-paths.patch deleted file mode 100644 index 95cbc28..0000000 --- a/src/patches/iceweasel-branding/enable-object-directory-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py -index b48c18a..8665c9c 100644 ---- a/python/mozbuild/mozbuild/frontend/context.py -+++ b/python/mozbuild/mozbuild/frontend/context.py -@@ -927,8 +927,6 @@ class SourcePath(Path): - """Like Path, but limited to paths in the source directory.""" - - def __new__(cls, context, value=None): -- if value.startswith("!"): -- raise ValueError("Object directory paths are not allowed") - if value.startswith("%"): - raise ValueError("Filesystem absolute paths are not allowed") - self = super(SourcePath, cls).__new__(cls, context, value) diff --git a/src/patches/series b/src/patches/series index 834ae52..8c326f9 100644 --- a/src/patches/series +++ b/src/patches/series @@ -2,6 +2,5 @@ iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch iceweasel-branding/MOZ_APP_VENDOR.patch iceweasel-branding/Determine-which-phishing-shavar-to-use.patch iceweasel-branding/Allowed-dupes_for_Iceweasel.patch -iceweasel-branding/enable-object-directory-paths.patch iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch