unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
blob bc179726b10d123c65d91b53ff9b0ccab6eaddf9 2077 bytes (raw)
name: gnu/packages/patches/icecat-makeicecat.patch 	 # note: path name is non-authoritative(*)

 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

debug log:

solving bc179726b1 ...
found bc179726b1 in https://yhetil.org/guix-bugs/20230214015555.8643-11-maxim.cournoyer@gmail.com/
found c46cb27ff6 in https://git.savannah.gnu.org/cgit/guix.git
preparing index
index prepared:
100644 c46cb27ff6c85bfd45d4c126fd00ce1e66b6379f	gnu/packages/patches/icecat-makeicecat.patch

applying [1/1] https://yhetil.org/guix-bugs/20230214015555.8643-11-maxim.cournoyer@gmail.com/
diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch
index c46cb27ff6..bc179726b1 100644

1:17: trailing whitespace.
 
1:42: trailing whitespace.
 
Checking patch gnu/packages/patches/icecat-makeicecat.patch...
Applied patch gnu/packages/patches/icecat-makeicecat.patch cleanly.
warning: 2 lines add whitespace errors.

index at:
100644 bc179726b10d123c65d91b53ff9b0ccab6eaddf9	gnu/packages/patches/icecat-makeicecat.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).