Re: [PATCH] Fix DEVEL=1 build

[bill-auger]

the bug was introduced in this commit, which added some language-specific
configs to the 'files-to-append' directory
https://git.savannah.gnu.org/cgit/gnuzilla.git/commit/?id=494f8c518598bfdd1596508e864a527ab677f3ea

the effect seems to be that the 'resistFingerprinting' treatment will be
applied only to that small set of languages - im not sure what was the
motivation for that; but it should probably be done in the makeicecat script,
to apply the change to all installed languages

alternatively, if the intent was to restrict icecat to supporting only that
sub-set of available languages, then makeicecat is downloading too many (all of
them) for no reason, per browser/locales/shipped-locales

this patch is a minimal fix for this bug


From b5683a6bd6e6caf354d10faf06e6c8b5c9a3f874 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Wed, 11 Oct 2023 12:28:47 -0400
Subject: [PATCH 1/2] fix file_to_append language-pack bug in DEVEL mode

---
 makeicecat | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/makeicecat b/makeicecat
index 0de4065..71bc92f 100755
--- a/makeicecat
+++ b/makeicecat
@@ -55,6 +55,7 @@ readonly SOURCEDIR=icecat-${FFVERSION}
 
 # debug/shell options
 readonly DEVEL=0
+readonly ONE_LANG=$( (( ! DEVEL )) || echo es-ES )
 set -euo pipefail
 (( DEVEL )) && set -x
 
@@ -299,10 +300,8 @@ fetch_l10n()
     cd l10n
 
     while read lang; do
-        # download only one language-pack in devel mode
-        ! (( DEVEL )) || [[ "$(echo ${lang} | cut -d' ' -f1)" == "es-ES" ]] ||
continue
-
-        lang=$(echo ${lang} | cut -d' ' -f1)
+        # download only one language-pack in DEVEL mode
+        [[ -z "$ONE_LANG" || "${lang}" == "$ONE_LANG" ]] || continue
 
         # download only language-packs which are not already in the working
directory
         if [[ -n "${lang}" && "${lang}" != 'en-US' && ! -f
${lang}/${L10N_DTD_FILE} ]]
@@ -313,7 +312,7 @@ fetch_l10n()
             touch ${lang}/${L10N_DTD_FILE}
             rm -rf ${lang}/.hg*
         fi
-    done < ../${SOURCEDIR}/browser/locales/shipped-locales
+    done < <(cut -d ' ' -f 1 ../${SOURCEDIR}/browser/locales/shipped-locales)
     cd ..
     cp -a l10n ${SOURCEDIR}/
 
@@ -344,6 +343,9 @@ apply_patches()
     shopt -u nullglob
 
     for file_to_append in $(cd "${DATADIR}"/files-to-append; find . -type f
-print); do
+        [[ "$file_to_append" != ./l10n/* || -z "$ONE_LANG" ]] ||
+        [[ "$file_to_append" == ./l10n/${ONE_LANG}/*       ]] || continue
+
         echo Appending new data to the end of file: $file_to_append
         cat "${DATADIR}"/files-to-append/$file_to_append >> $file_to_append
     done
-- 
2.42.0