0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2025-01-03 03:10:07 -05:00

updated version and fixed patches with check-patchfail

This commit is contained in:
Bert van der Weerd 2022-05-03 21:02:52 +02:00
parent 2ec2ea138a
commit 2af3b527e1
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
8 changed files with 39 additions and 50 deletions

View file

@ -58,7 +58,7 @@ all : $(lw_source_tarball)
clean : clean :
rm -rf *~ public_key.asc $(ff_source_dir) $(lw_source_dir) $(lw_source_tarball) $(lw_source_tarball).sha256sum rm -rf *~ public_key.asc $(ff_source_dir) $(lw_source_dir) $(lw_source_tarball) $(lw_source_tarball).sha256sum firefox-$(version)
veryclean : clean veryclean : clean
rm -f $(ff_source_tarball) $(ff_source_tarball).asc rm -f $(ff_source_tarball) $(ff_source_tarball).asc

View file

@ -107,7 +107,8 @@ Now change the source tree the way you want, keeping in mind to `git add` new fi
cd firefox-<version> cd firefox-<version>
git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD > ../my-patch-name.patch git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD > ../my-patch-name.patch
``` ```
This ID is the standard ID of any empty git repository. You can now also delete the temporary firefox souce tree. This ID is the hash value of the first commit, which is called `initial`. dont forget to commit
changes before doing this diff, or the patch will be incomplete.
### How to create a patch for problems in Mozilla's [Bugzilla](https://bugzilla.mozilla.org/). ### How to create a patch for problems in Mozilla's [Bugzilla](https://bugzilla.mozilla.org/).

View file

@ -1,10 +1,10 @@
diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py
index 0c5ecbf..d9a6d9d 100644
--- a/python/mozboot/mozboot/bootstrap.py --- a/python/mozboot/mozboot/bootstrap.py
+++ b/python/mozboot/mozboot/bootstrap.py +++ b/python/mozboot/mozboot/bootstrap.py
@@ -548,11 +548,9 @@ def current_firefox_checkout(env, hg: Optional[Path] = None): @@ -550,10 +550,7 @@ def current_firefox_checkout(env, hg: Optional[Path] = None):
if not len(path.parents):
break break
+ path = path.parent path = path.parent
- raise UserError( - raise UserError(
- "Could not identify the root directory of your checkout! " - "Could not identify the root directory of your checkout! "
@ -14,6 +14,8 @@
def update_git_tools(git: Optional[Path], root_state_dir: Path): def update_git_tools(git: Optional[Path], root_state_dir: Path):
diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/mozversioncontrol/mozversioncontrol/__init__.py
index dd31f53..6f0087a 100644
--- a/python/mozversioncontrol/mozversioncontrol/__init__.py --- a/python/mozversioncontrol/mozversioncontrol/__init__.py
+++ b/python/mozversioncontrol/mozversioncontrol/__init__.py +++ b/python/mozversioncontrol/mozversioncontrol/__init__.py
@@ -684,6 +684,29 @@ class GitRepository(Repository): @@ -684,6 +684,29 @@ class GitRepository(Repository):
@ -64,6 +66,8 @@
else: else:
raise MissingVCSInfo("unknown VCS_CHECKOUT_TYPE value: %s" % flavor) raise MissingVCSInfo("unknown VCS_CHECKOUT_TYPE value: %s" % flavor)
diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
index 016578b..7525139 100644
--- a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py --- a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
+++ b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py +++ b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
@@ -168,6 +168,43 @@ class GitRepository(Repository): @@ -168,6 +168,43 @@ class GitRepository(Repository):

View file

@ -1,12 +1,8 @@
diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index 39a139f..c565bce 100644
--- a/browser/base/content/browser-context.inc --- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc +++ b/browser/base/content/browser-context.inc
@@ -102,19 +102,16 @@ @@ -100,9 +100,6 @@
oncommand="gContextMenu.openLinkInPrivateWindow();"/>
<menuseparator id="context-sep-open"/>
<menuitem id="context-bookmarklink"
data-l10n-id="main-context-menu-bookmark-link"
oncommand="gContextMenu.bookmarkLink();"/>
<menuitem id="context-savelink" <menuitem id="context-savelink"
data-l10n-id="main-context-menu-save-link" data-l10n-id="main-context-menu-save-link"
oncommand="gContextMenu.saveLink();"/> oncommand="gContextMenu.saveLink();"/>
@ -16,17 +12,7 @@ diff --git a/browser/base/content/browser-context.inc b/browser/base/content/bro
<menuitem id="context-copyemail" <menuitem id="context-copyemail"
data-l10n-id="main-context-menu-copy-email" data-l10n-id="main-context-menu-copy-email"
oncommand="gContextMenu.copyEmail();"/> oncommand="gContextMenu.copyEmail();"/>
<menuitem id="context-copylink" @@ -256,9 +253,6 @@
data-l10n-id="main-context-menu-copy-link-simple"
oncommand="gContextMenu.copyLink();"/>
<menu id="context-sendlinktodevice"
class="sync-ui-item"
@@ -254,19 +251,16 @@
#ifdef XP_MACOSX
<menuitem id="context-bookmarkpage"
data-l10n-id="main-context-menu-bookmark-add-mac"
oncommand="gContextMenu.bookmarkThisPage();"/>
#endif
<menuitem id="context-savepage" <menuitem id="context-savepage"
data-l10n-id="main-context-menu-page-save" data-l10n-id="main-context-menu-page-save"
oncommand="gContextMenu.savePageAs();"/> oncommand="gContextMenu.savePageAs();"/>
@ -36,8 +22,3 @@ diff --git a/browser/base/content/browser-context.inc b/browser/base/content/bro
<menu id="context-sendpagetodevice" <menu id="context-sendpagetodevice"
class="sync-ui-item" class="sync-ui-item"
data-l10n-id="main-context-menu-send-to-device" data-l10n-id="main-context-menu-send-to-device"
hidden="true">
<menupopup id="context-sendpagetodevice-popup"
onpopupshowing="(() => { gSync.populateSendTabToDevicesMenu(event.target, gBrowser.currentURI.spec, gBrowser.contentTitle); })()"/>
</menu>
<menu id="fill-login" hidden="true">

View file

@ -1,9 +1,9 @@
diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
index 6e7cc5e..8334a49 100644 index d5a3f10..b5efa81 100644
--- a/browser/components/newtab/data/content/activity-stream.bundle.js --- a/browser/components/newtab/data/content/activity-stream.bundle.js
+++ b/browser/components/newtab/data/content/activity-stream.bundle.js +++ b/browser/components/newtab/data/content/activity-stream.bundle.js
@@ -1819,7 +1819,7 @@ class ASRouterAdminInner extends react__WEBPACK_IMPORTED_MODULE_3___default.a.Pu @@ -1577,7 +1577,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", { label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", {
className: "providerUrl", className: "providerUrl",
target: "_blank", target: "_blank",
- href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", - href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records",
@ -11,20 +11,21 @@ index 6e7cc5e..8334a49 100644
rel: "noopener noreferrer" rel: "noopener noreferrer"
}, "nimbus-desktop-experiments"), ")"); }, "nimbus-desktop-experiments"), ")");
} }
@@ -15671,4 +15671,4 @@ TopSiteForm_TopSiteForm.defaultProps = { @@ -14758,5 +14758,4 @@ function renderCache(initialState) {
}; }), document.getElementById("root"));
}
/***/ }) NewtabRenderUtils = __webpack_exports__;
-/******/ ]); -/******/ })()
-;
\ No newline at end of file \ No newline at end of file
+/******/ ]); +/******/ });
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 651d38c..4b99610 100644 index 261e46f..22f8214 100644
--- a/modules/libpref/init/all.js --- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js
@@ -2198,7 +2198,7 @@ pref("security.insecure_field_warning.ignore_local_ip_address", true); @@ -2181,7 +2181,7 @@ pref("security.insecure_field_warning.ignore_local_ip_address", true);
// Remote settings preferences // Remote settings preferences
// Note: if you change this, make sure to also review security.onecrl.maximum_staleness_in_seconds
pref("services.settings.poll_interval", 86400); // 24H pref("services.settings.poll_interval", 86400); // 24H
-pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1"); -pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1");
+pref("services.settings.server", "https://https://f.s.s.%.c.invalid/v1"); +pref("services.settings.server", "https://https://f.s.s.%.c.invalid/v1");
@ -32,10 +33,10 @@ index 651d38c..4b99610 100644
// The percentage of clients who will report uptake telemetry as // The percentage of clients who will report uptake telemetry as
diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
index f91e5dc..910261c 100644 index 2ce9e87..cd132a3 100644
--- a/services/settings/Utils.jsm --- a/services/settings/Utils.jsm
+++ b/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm
@@ -90,7 +90,7 @@ var Utils = { @@ -89,7 +89,7 @@ var Utils = {
get SERVER_URL() { get SERVER_URL() {
return allowServerURLOverride return allowServerURLOverride
? gServerURL ? gServerURL
@ -45,7 +46,7 @@ index f91e5dc..910261c 100644
CHANGES_PATH: "/buckets/monitor/collections/changes/changeset", CHANGES_PATH: "/buckets/monitor/collections/changes/changeset",
diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm
index 41d2a23..448c92a 100644 index 983d567..5fb6ae7 100644
--- a/toolkit/components/search/SearchUtils.jsm --- a/toolkit/components/search/SearchUtils.jsm
+++ b/toolkit/components/search/SearchUtils.jsm +++ b/toolkit/components/search/SearchUtils.jsm
@@ -159,9 +159,9 @@ var SearchUtils = { @@ -159,9 +159,9 @@ var SearchUtils = {

View file

@ -1 +1 @@
4 1

View file

@ -23,18 +23,20 @@ if [ ! -f "$1" ]; then
fi fi
echo "Removing previous firefox folder.."
echo "Extracting '$firefox'..."
rm -rf firefox-$(cat version) rm -rf firefox-$(cat version)
echo "Extracting '$firefox'..."
tar xf $firefox tar xf $firefox
echo "" echo ""
cd firefox-$(cat version) && \ cd firefox-$(cat version) && \
git init && \ git init && \
git add $(grep '+++' "../$1" | awk '{print $2}' | sed s/^b/./) && \ git add $(grep '+++' "../$1" | awk '{print $2}' | sed s/^b/./) && \
git commit -am "original" && \ git commit -am "original"
patch -p1 -i "../$1" && \
git add $(grep '+++' "../$1" | awk '{print $2}' | sed s/^b/./) && \ patch -p1 -i "../$1"
git add $(grep '+++' "../$1" | awk '{print $2}' | sed s/^b/./) && \
git commit -am "patch" && \ git commit -am "patch" && \
echo "" && \ echo "" && \
echo "git-patchtree: Files under git control are: (git ls-tree -r HEAD --name-only)" && \ echo "git-patchtree: Files under git control are: (git ls-tree -r HEAD --name-only)" && \

View file

@ -1 +1 @@
99.0.1 100.0