branch gnuzilla-updates updated: gnu: icedove: Fix the build.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mhw pushed a commit to branch gnuzilla-updates
in repository guix.

The following commit(s) were added to refs/heads/gnuzilla-updates by this push:
     new 3bfb0955ec gnu: icedove: Fix the build.
3bfb0955ec is described below

commit 3bfb0955ecdeacd75e7c44032d2f1fc6057624f8
Author: Mark H Weaver <mhw@netris.org>
AuthorDate: Tue Sep 26 18:46:06 2023 -0400

    gnu: icedove: Fix the build.
    
    This is a followup to commit f60972bb6036b20e7f6ca435a69c669c83f79436.
    
    * gnu/packages/patches/icecat-102-makeicecat.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/gnuzilla.scm (icecat-102-source): Use it.
---
 gnu/local.mk                                     |  1 +
 gnu/packages/gnuzilla.scm                        |  2 +-
 gnu/packages/patches/icecat-102-makeicecat.patch | 51 ++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index bfa816d717..7f9fde5ead 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1404,6 +1404,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/hwloc-1-test-btrfs.patch                        \
   %D%/packages/patches/i7z-gcc-10.patch                                \
   %D%/packages/patches/icecat-makeicecat.patch                 \
+  %D%/packages/patches/icecat-102-makeicecat.patch             \
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch    \
   %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch      \
   %D%/packages/patches/icecat-use-system-media-libs.patch      \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 53abe4a386..32f61f18c1 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1308,7 +1308,7 @@ standards of the IceCat project.")
          ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
          (makeicecat-patch
           (local-file (assume-valid-file-name
-                       (search-patch "icecat-makeicecat.patch")))))
+                       (search-patch "icecat-102-makeicecat.patch")))))
 
     (origin
       (method computed-origin-method)
diff --git a/gnu/packages/patches/icecat-102-makeicecat.patch 
b/gnu/packages/patches/icecat-102-makeicecat.patch
new file mode 100644
index 0000000000..940ca36b6c
--- /dev/null
+++ b/gnu/packages/patches/icecat-102-makeicecat.patch
@@ -0,0 +1,51 @@
+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*'.
+
+diff --git a/makeicecat b/makeicecat
+index bf2b7a6..bc3b19b 100755
+--- a/makeicecat
++++ b/makeicecat
+@@ -56,7 +56,7 @@ readonly SOURCEDIR=icecat-${FFVERSION}
+ # debug/shell options
+ readonly DEVEL=0
+ set -euo pipefail
+-(( DEVEL )) && set -x
++set -x
+ 
+ 
+ 
###############################################################################
+@@ -455,7 +455,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()
+@@ -837,12 +837,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
+@@ -854,4 +854,4 @@ prepare_macos_packaging
+ configure_extensions
+ configure_onboarding
+ apply_bugfixes
+-finalize_sourceball
++# finalize_sourceball