From b379088c95635fd8e3493b025444234914e2d360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Sun, 9 Jul 2023 14:48:33 +0200 Subject: [PATCH] disable bootstrap patch, fix small error in upstream implementation --- assets/patches.txt | 2 +- patches/relative-bootstrap.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 patches/relative-bootstrap.patch diff --git a/assets/patches.txt b/assets/patches.txt index 1077388..6061d13 100644 --- a/assets/patches.txt +++ b/assets/patches.txt @@ -1,6 +1,5 @@ patches/allow-JXL-in-non-nightly-browser.patch patches/allow-ubo-private-mode.patch -patches/bootstrap-without-vcs.patch patches/context-menu.patch patches/custom-ubo-assets-bootstrap-location.patch patches/dbus_name.patch @@ -11,6 +10,7 @@ patches/librewolf-pref-pane.patch patches/librewolf-prefs.patch patches/mozilla_dirs.patch patches/msix.patch +patches/relative-bootstrap.patch patches/remove_addons.patch patches/sed-patches/allow-searchengines-non-esr.patch patches/sed-patches/disable-pocket.patch diff --git a/patches/relative-bootstrap.patch b/patches/relative-bootstrap.patch new file mode 100644 index 0000000..cb7f1e3 --- /dev/null +++ b/patches/relative-bootstrap.patch @@ -0,0 +1,22 @@ +--- a/python/mozversioncontrol/mozversioncontrol/__init__.py ++++ b/python/mozversioncontrol/mozversioncontrol/__init__.py +@@ -828,7 +828,7 @@ class SrcRepository(Repository): + """ + res = [] + # move away the .git or .hg folder from path to more easily test in a hg/git repo +- for root, dirs, files in os.walk("."): ++ for root, dirs, files in os.walk(path): + for name in files: + res.append(os.path.join(root, name)) + return res +@@ -841,7 +841,9 @@ class SrcRepository(Repository): + import fnmatch + + files = list( +- p.replace("\\", "/").replace("./", "") for p in self.get_files(path) if p ++ (os.path.relpath(p, path)).replace("\\", "/") ++ for p in self.get_files(path) ++ if p + ) + files.sort() + ig = self.git_ignore(path)