diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/patches/icecat-makeicecat.patch | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
| download | guix-839bb4616f13171a23ad7937bf57d0a01d61d42a.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in: gnu/packages/ibus.scm gnu/packages/image.scm gnu/packages/lisp.scm gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/patches/icecat-makeicecat.patch')
| -rw-r--r-- | gnu/packages/patches/icecat-makeicecat.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index c46cb27ff6..940ca36b6c 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -6,7 +6,7 @@ diff --git a/makeicecat b/makeicecat index bf2b7a6..bc3b19b 100755 --- a/makeicecat +++ b/makeicecat -@@ -58,7 +58,7 @@ readonly SOURCEDIR=icecat-${FFVERSION} +@@ -56,7 +56,7 @@ readonly SOURCEDIR=icecat-${FFVERSION} # debug/shell options readonly DEVEL=0 set -euo pipefail @@ -15,8 +15,8 @@ index bf2b7a6..bc3b19b 100755 ############################################################################### -@@ -459,7 +459,7 @@ configure_search() - sed 's|ddg@|ddg-html@|' -i browser/components/search/extensions/ddg-html/manifest.json +@@ -455,7 +455,7 @@ configure_search() + # Process various JSON pre-configuration dumps. - python3 ../../tools/process-json-files.py . browser/components/extensions/schemas/ @@ -24,7 +24,7 @@ index bf2b7a6..bc3b19b 100755 } configure_mobile() -@@ -855,12 +855,12 @@ finalize_sourceball() +@@ -837,12 +837,12 @@ finalize_sourceball() # entry point ############################################################################### @@ -43,7 +43,7 @@ index bf2b7a6..bc3b19b 100755 apply_patches configure configure_search -@@ -872,4 +872,4 @@ prepare_macos_packaging +@@ -854,4 +854,4 @@ prepare_macos_packaging configure_extensions configure_onboarding apply_bugfixes |