From 64f94edaaafa871bd320fa2515ae8c42a3ede300 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Mon, 9 Oct 2023 13:25:50 -0400 Subject: waterfox-g 6.0.2 rc1 --- .../Relax-cargo-version-requirement.patch | 21 +++++++++++++++++++++ .../debian-hacks/Relax-nodejs-minimum-version.patch | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 waterfox-g/debian/patches/debian-hacks/Relax-cargo-version-requirement.patch create mode 100644 waterfox-g/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch (limited to 'waterfox-g/debian/patches/debian-hacks') diff --git a/waterfox-g/debian/patches/debian-hacks/Relax-cargo-version-requirement.patch b/waterfox-g/debian/patches/debian-hacks/Relax-cargo-version-requirement.patch new file mode 100644 index 0000000..313f1d4 --- /dev/null +++ b/waterfox-g/debian/patches/debian-hacks/Relax-cargo-version-requirement.patch @@ -0,0 +1,21 @@ +From: Mike Hommey +Date: Wed, 2 Aug 2023 08:46:33 +0900 +Subject: Relax cargo version requirement + +--- + build/moz.configure/rust.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index 7a2fd1a..9801f82 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -180,7 +180,7 @@ def rust_compiler(rustc_info, cargo_info, target): + ) + ) + rustc_min_version = Version(MINIMUM_RUST_VERSION) +- cargo_min_version = rustc_min_version ++ cargo_min_version = Version("1.65.0") + + version = rustc_info.version + is_nightly = "nightly" in version.version diff --git a/waterfox-g/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch b/waterfox-g/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch new file mode 100644 index 0000000..8839a39 --- /dev/null +++ b/waterfox-g/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch @@ -0,0 +1,21 @@ +From: Mike Hommey +Date: Wed, 21 Sep 2022 08:48:27 +0900 +Subject: Relax nodejs minimum version + +--- + python/mozbuild/mozbuild/nodeutil.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/mozbuild/mozbuild/nodeutil.py b/python/mozbuild/mozbuild/nodeutil.py +index 8ec724a..efc7b7f 100644 +--- a/python/mozbuild/mozbuild/nodeutil.py ++++ b/python/mozbuild/mozbuild/nodeutil.py +@@ -11,7 +11,7 @@ from mozboot.util import get_tools_dir + from mozfile import which + from six import PY3 + +-NODE_MIN_VERSION = StrictVersion("12.22.12") ++NODE_MIN_VERSION = StrictVersion("12.22") + NPM_MIN_VERSION = StrictVersion("6.14.16") + + -- cgit