summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgrizzlyuser <grizzlyuser@protonmail.com>2022-07-02 12:16:24 +0200
committergrizzlyuser <grizzlyuser@protonmail.com>2022-07-02 12:16:24 +0200
commit348e36d59484513e7cbb838cf6fd383f9cb3e149 (patch)
tree8eddbf46bc3dc4a8f38748f349dce60faa2dbfe8 /src
parent49b2b07507b846018f1c8079217fc43128164c56 (diff)
102.0, remove conflicting patch102.0-1
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.
Diffstat (limited to 'src')
-rw-r--r--src/patches/iceweasel-branding/enable-object-directory-paths.patch13
-rw-r--r--src/patches/series1
2 files changed, 0 insertions, 14 deletions
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