1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
| | Make some of the changes needed to the 'makeicecat' script, to allow it to run
in a snippet without network access. After this patch is applied, some
additional changes will be made using 'substitute*'.
The settings.js hunk below has been submitted upstream (see:
https://issues.guix.gnu.org/61495).
diff --git a/data/settings.js b/data/settings.js
index 0fe5956..0bb2af1 100644
--- a/data/settings.js
+++ b/data/settings.js
@@ -30,8 +30,10 @@ pref("privacy.firstparty.isolate", true);
// Extensions cannot be updated without permission
pref("extensions.update.enabled", false);
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
+
+// Set the default locale to that of the operating system.
+pref("intl.locale.requested", "");
+
// Allow unsigned langpacks
pref("extensions.langpacks.signatures.required", false);
// Disable default browser checking.
diff --git a/makeicecat b/makeicecat
index 63eb2f0..f7d3ccd 100755
--- a/makeicecat
+++ b/makeicecat
@@ -58,7 +58,7 @@ readonly SOURCEDIR=icecat-${FFVERSION}
# debug/shell options
readonly DEVEL=0
set -euo pipefail
-(( DEVEL )) && set -x
+set -x
###############################################################################
@@ -473,7 +473,7 @@ configure_search()
# Process various JSON pre-configuration dumps.
- python3 ../../tools/process-json-files.py . browser/components/extensions/schemas/
+ python3 "${DATADIR}"/../tools/process-json-files.py . browser/components/extensions/schemas/
}
configure_mobile()
@@ -855,12 +855,12 @@ finalize_sourceball()
# entry point
###############################################################################
-validate_env || exit 1
-prepare_env
-fetch_source
-verify_sources
-extract_sources
-fetch_l10n
+# validate_env || exit 1
+# prepare_env
+# fetch_source
+# verify_sources
+# extract_sources
+# fetch_l10n
apply_patches
configure
configure_search
@@ -872,4 +872,4 @@ prepare_macos_packaging
configure_extensions
configure_onboarding
apply_bugfixes
-finalize_sourceball
+# finalize_sourceball
|