diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:12:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:12:13 +0000 |
| commit | 22d7c3dd547de54c2828c0ad675a2c2e06041f92 (patch) | |
| tree | f5a90ddb0e0202c5c246973fb218c609f7e67604 /debian/patches | |
| parent | Merging upstream version 115.8.0esr. (diff) | |
| download | firefox-esr-22d7c3dd547de54c2828c0ad675a2c2e06041f92.tar.xz firefox-esr-22d7c3dd547de54c2828c0ad675a2c2e06041f92.zip | |
Merging debian version 115.8.0esr-1~deb12u1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch | 12 | ||||
| -rw-r--r-- | debian/patches/debian-hacks/Set-DPI-to-system-settings.patch | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch b/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch index 8839a39026..cd5517cee3 100644 --- a/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch +++ b/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch @@ -7,15 +7,15 @@ Subject: Relax nodejs minimum version 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 +index 42f2627..c0e766c 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 +@@ -11,7 +11,7 @@ from mozfile import which + from packaging.version import Version from six import PY3 --NODE_MIN_VERSION = StrictVersion("12.22.12") -+NODE_MIN_VERSION = StrictVersion("12.22") - NPM_MIN_VERSION = StrictVersion("6.14.16") +-NODE_MIN_VERSION = Version("12.22.12") ++NODE_MIN_VERSION = Version("12.22") + NPM_MIN_VERSION = Version("6.14.16") diff --git a/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch b/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch index fdd947bd4a..ca1feb9543 100644 --- a/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch +++ b/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch @@ -7,7 +7,7 @@ Subject: Set DPI to system settings 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index ba2705d..c1b0831 100644 +index f32cab1..700dcb4 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -8256,7 +8256,7 @@ |