[icecat][icedove][icewesel]: minimize diffs across PKGBUILDs

3 files changed, 88 insertions, 56 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 218b87542..7c2ac77bf 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -23,11 +23,13 @@
 # Contributor: grizzlyuser <grizzlyuser@protonmail.com>
 
 
-# parabola changes and rationale
+# parabola changes and rationale:
 # libre:
 # - none
 # technical:
 # - enable the 'sync' feature
+# privacy:
+# - none
 
 
 # NOTE: icecat (60.7 < V <= current) are not complete upstream releases
@@ -451,7 +453,7 @@ END
   esac
 
 
-  ## searchengines ##
+  ## search-engines ##
 
   # let's use icecat's default search-engines
 
@@ -499,6 +501,8 @@ build() {
     export LDFLAGS+=" -Wl,--no-keep-memory " # -Wl,--reduce-memory-overheads -Wl,--max-cache-size=16384000 "
     export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE"
 
+#     export MOZ_MAKE_FLAGS=-j2
+
     # libvpx has some hard-coded compiler flags for MMX, SSE, SSE2, use the correct one
     # per CARCH (75.0 uses an intrisic _mm_empty now, which required the corresponding
     # architecture flag to be preset - before it was merely embedding some assembly
diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 5f6899551..74a989e59 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -13,9 +13,12 @@
 
 
 # parabola changes and rationale:
+# libre:
 #  - rebranded to icedove
+# technical:
 #  - added makedepends for branding: quilt, imagemagick
 #  - use system python packages
+# privacy:
 #  - disabled geo-location
 
 
@@ -84,6 +87,9 @@ prepare() {
 
   echo "${noextract[@]}"
 
+
+  ## technical patching ##
+
   local src
   for src in "${source[@]}"; do
     src="${src%%::*}"
@@ -95,12 +101,17 @@ prepare() {
     patch -Np1 < "../$src"
   done
 
+
+  ## general configuration ##
+
   cp ../mozconfig.cfg .mozconfig
   sed "s|@PWD@|${PWD@Q}|g" -i .mozconfig
 
-  # per-arch config
-  case "${CARCH}" in
-  armv7h|aarch64)
+
+  ## [ARCH-SPECIFIC CONFIG] ##
+
+  case ${CARCH} in
+  aarch64|armv7h)
     if [[ $CARCH == "armv7h" ]]; then
       echo "ac_add_options --disable-elf-hack" >> .mozconfig
       MAKEFLAGS="-j4"
@@ -134,18 +145,25 @@ prepare() {
     ;;
   esac
 
+
+  ## branding ##
+
+  local branding_srcdir="${srcdir}"/${pkgname}-${_brandingver}
+  local branding_destdir="${srcdir}"/${_pkgname}-${pkgver}/comm/mail/branding/${pkgname}
+  local blank_svg='<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"></svg>' # TODO: branding package
+
   # apply branding
-  local branding_indir="${srcdir}"/${pkgname}-${_brandingver}
-  local branding_outdir=comm/mail/branding/${pkgname}
-  export QUILT_PATCHES="${branding_indir}"/patches
+  echo "applying parabola branding"
+  export QUILT_PATCHES="${branding_srcdir}"/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
-  rm -rf -- ${branding_outdir}
-  cp -aT -- "${branding_indir}"/${pkgname}-branding ${branding_outdir}
+  export QUILT_PC="${srcdir}"/.pc
+  rm -rf -- ${branding_destdir}
+  cp -aT -- "${branding_srcdir}"/${pkgname}-branding ${branding_destdir}
   quilt push -av
 
   # customize distribution.ini
-  local branding_gui_ver="(${_brandingver}.${_brandingrel} branding)"
+  local branding_gui_ver="(${_brandingver}-${_brandingrel} branding)"
   sed -i 's|archlinux|parabola|'                     "${srcdir}"/distribution.ini
   sed -i "s|version=.*|version=${branding_gui_ver}|" "${srcdir}"/distribution.ini
   sed -i 's|about=.*|about=Parabola Icedove|'        "${srcdir}"/distribution.ini
@@ -156,38 +174,45 @@ prepare() {
   sed -i 's|=org\.archlinux|=nu.parabola|'                       .mozconfig
   sed -i '/api-keyfile=/d'                                       .mozconfig
   cat >> .mozconfig <<EOF
-ac_add_options --with-branding=${branding_outdir}
+ac_add_options --with-branding=${branding_destdir}
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 EOF
 
   # stage "appdata" file
-  cp "${branding_indir}"/${pkgname}.appdata.xml ${branding_outdir}/
+  cp "${branding_srcdir}"/${pkgname}.appdata.xml ${branding_destdir}/
 
-  # generate icons
+  # generate icons, logos, banners
   for i in 16 22 24 32; do
-    rsvg-convert -w ${i} -h ${i} "${branding_indir}"/app-icons/${pkgname}_small.svg \
-      -o "${branding_outdir}/default${i}.png"
+    rsvg-convert -w ${i} -h ${i} "${branding_srcdir}"/app-icons/${pkgname}_small.svg \
+      -o "${branding_destdir}/default${i}.png"
   done
   for i in 48 64 128 256; do
-    rsvg-convert -w ${i} -h ${i} "${branding_indir}"/app-icons/${pkgname}_big.svg \
-      -o "${branding_outdir}/default${i}.png"
+    rsvg-convert -w ${i} -h ${i} "${branding_srcdir}"/app-icons/${pkgname}_big.svg \
+      -o "${branding_destdir}/default${i}.png"
   done
-  cp "${branding_indir}"/logo/icedove_icon.svg ${branding_outdir}/
-  cp "${branding_indir}"/preview.png comm/mail/themes/linux/mail/preview.png
+  echo "${blank_svg}" > ${branding_destdir}/${pkgname}-symbolic.svg # TODO: branding package
+  cp "${branding_srcdir}"/preview.png comm/mail/themes/linux/mail/preview.png
+
+
+  ## search-engines ##
+
+  pushd comm/mail/components/search/extensions > /dev/null
 
   # Patch search-engines config
-  local search_engines_sed_cmd='s|https://duckduckgo.com/|https://html.duckduckgo.com/html/|'
-  local engines_cfg_dir=comm/mail/components/search/extensions
-  sed -i "${search_engines_sed_cmd}" ${engines_cfg_dir}/ddg/manifest.json
+  sed -i 's|https://duckduckgo.com/|https://html.duckduckgo.com/html/|' ddg/manifest.json
 
   # Delete unused search engine configs
-  find ${engines_cfg_dir} -mindepth 1 -maxdepth 1 \
-                          -not -name ddg          \
-                          -not -name wikipedia    \
-                          -exec rm -rf {} \;
+  find -mindepth 1 -maxdepth 1 \
+       -not -name ddg          \
+       -not -name wikipedia    \
+       -exec rm -frv {} \;
+
+  popd > /dev/null
+
+
+  ## libre patching ##
 
-  # Patch and remove anything that's left
   sed -i '\|Phishing Protection|d
           \|UrlClassifier|d
           \|URLClassifier|d
@@ -223,11 +248,12 @@ package() {
   install -Dm 644 comm/mail/branding/${pkgname}/${pkgname}.appdata.xml \
     "${pkgdir}/usr/share/metainfo/${pkgname}.appdata.xml"
 
+  # NOTE: comm/mail/branding/${pkgname} is $branding_destdir in prepare()
   for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 comm/mail/branding/$pkgname/default${i}.png \
+    install -Dm644 comm/mail/branding/${pkgname}/default${i}.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
-  install -Dm644 comm/mail/branding/$pkgname/${pkgname}_icon.svg \
+  install -Dm644 comm/mail/branding/${pkgname}/${pkgname}-symbolic.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
 
   # Use system-provided dictionaries
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 8dfca100f..ec729d47c 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -23,7 +23,7 @@
 # Contributor: grizzlyuser <grizzlyuser@protonmail.com>
 
 
-# parabola changes and rationale
+# parabola changes and rationale:
 # libre:
 #  - Modify the addons pages to use GNU IceCat plugins sources, rather
 #    than addons.mozilla.org, which hosts non-free addons
@@ -73,7 +73,8 @@ epoch=1
 pkgver=111.0.1
 pkgrel=1
 pkgrel+=.parabola1
-_brandingver=102.0-1
+_brandingver=102.0
+_brandingrel=1
 pkgdesc="Standalone web browser derived from Mozilla Firefox"
 url=https://wiki.parabola.nu/Iceweasel
 arch=(x86_64)
@@ -157,7 +158,7 @@ source=(
 )
 source=(${source[*]/identity-icons-brand.svg/}) # branding over-ride
 source+=(
-  https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig}
+  https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig}
   9001-FSDG-sync-remote-settings-with-local-dump.patch
   9002-FSDG-preference-defaults.patch
   9003-FSDG-urihandlers.patch
@@ -349,6 +350,7 @@ prepare() {
   mkdir mozbuild
   cd firefox-$pkgver
 
+
   ## technical patching ##
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1819374
@@ -560,15 +562,22 @@ END
 
   ## branding ##
 
-  echo "applying parabola branding"
-  local brandingsrcdir="${srcdir}"/${pkgname}-${_brandingver/-*}
-  local brandingdestdir="${srcdir}"/firefox-${pkgver}/browser/branding/${pkgname}
+  local branding_srcdir="${srcdir}"/${pkgname}-${_brandingver}
+  local branding_destdir="${srcdir}"/firefox-${pkgver}/browser/branding/${pkgname}
   local tippytopdir="${srcdir}"/firefox-${pkgver}/browser/components/newtab/data/content/tippytop
-  local blank_svg='<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"></svg>'
-  rm -rf -- ${brandingdestdir}
-  cp -aT -- ${brandingsrcdir}/branding ${brandingdestdir}
+  local blank_svg='<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"></svg>' # TODO: branding package
 
-  pushd "${brandingdestdir}" > /dev/null
+  # apply branding
+  echo "applying parabola branding"
+  export QUILT_PATCHES="${branding_srcdir}"/patches
+  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+  export QUILT_DIFF_ARGS='--no-timestamps'
+  export QUILT_PC="${srcdir}"/.pc
+  rm -rf -- ${branding_destdir}
+  cp -aT -- ${branding_srcdir}/branding ${branding_destdir}
+  quilt push -av
+
+  pushd "${branding_destdir}" > /dev/null
 
   # generate icons, logos, banners
   for size in 16 22 24 32 48 64 128 256
@@ -581,7 +590,7 @@ END
   rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg     -o content/about-logo@2x.png
   cp                                      content/about-logo.png    content/about-logo-private.png
   cp                                      content/about-logo@2x.png content/about-logo-private@2x.png
-  echo ${blank_svg}                                           > content/blank.svg
+  echo "${blank_svg}"                                             > content/$pkgname-symbolic.svg # TODO: branding package
 
   popd > /dev/null
 
@@ -597,16 +606,16 @@ END
   #          and any unused branding components may be deleted from the branding package
   # Put "Start Page" branding images in the source code
   # install -m644 -t browser/base/content/abouthome -- \
-  #   "${brandingsrcdir}/branding"/{drm-free,gnu_headshadow,parabola-banner}.png
+  #   "${branding_srcdir}/branding"/{drm-free,gnu_headshadow,parabola-banner}.png
   # install -m644 -t browser/extensions/onboarding/content/img -- \
-  #   "${brandingsrcdir}/branding/watermark.svg"
+  #   "${branding_srcdir}/branding/watermark.svg"
 
   # process default Top Sites and their icons
   find ${tippytopdir} -type f      \
        -not -name 'wikipedia-org*' \
        -not -name 'top_sites.json' \
        -exec rm -v {} \;
-  for image in "${brandingsrcdir}"/tippytop/*.svg; do
+  for image in "${branding_srcdir}"/tippytop/*.svg; do
     local outname=$(basename -s .svg "${image}")
     local size=$(identify -format '%wx%h' ${tippytopdir}/images/wikipedia-org@2x.png)
     local background=$( [[ "${outname}" == 'gnu' ]] && echo 'white' || echo 'none' )
@@ -621,18 +630,11 @@ END
            "${tippytopdir}/favicons/${outname}.ico"
   done
 
-  # apply branding patches
-  export QUILT_PATCHES="${brandingsrcdir}"/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-  export QUILT_PC="${srcdir}"/.pc
-  quilt push -av
-
   # misc branding
   sed -i "s|({ \$bits }-bit)|($CARCH)|" browser/locales/en-US/browser/aboutDialog.ftl
 
 
-  ## searchengines ##
+  ## search-engines ##
 
   pushd browser/components/search/extensions > /dev/null
 
@@ -674,7 +676,7 @@ END
   #sed -i '/pocket/d'          browser/extensions/moz.build
   #sed -i '/activity-stream/d' browser/extensions/moz.build
 
-  python ../process-json-files.py "${srcdir}"/firefox-${pkgver} "${brandingsrcdir}"
+  python ../process-json-files.py "${srcdir}"/firefox-${pkgver} "${branding_srcdir}"
 
   # disable various phone-home/goelocation anti-featires
   echo "applying 9002-FSDG-preference-defaults.patch"
@@ -848,7 +850,7 @@ END
   install -Dvm644 /dev/stdin "$distini" <<END
 [Global]
 id=parabola
-version=(${_brandingver} branding)
+version=(${_brandingver}-${_brandingrel} branding)
 about=${pkgname^} for Parabola GNU/Linux-libre
 about.en-US=${pkgname^} for Parabola GNU/Linux-libre
 about.eo=${pkgname^} por Parabola GNU/Linux-libre
@@ -862,7 +864,7 @@ app.distributor.channel=$pkgname
 app.partner.parabola=parabola
 END
 
-  # NOTE: browser/branding/$theme is $brandingdestdir in prepare()
+  # NOTE: browser/branding/$theme is $branding_destdir in prepare()
   local i theme=$pkgname
   for i in 16 22 24 32 48 64 128 256; do
     install -Dvm644 browser/branding/$theme/default$i.png \
@@ -874,7 +876,7 @@ END
     "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png"
   install -Dvm644 browser/branding/$theme/content/about-logo.svg \
     "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
-  install -Dvm644 browser/branding/$theme/content/blank.svg \
+  install -Dvm644 browser/branding/$theme/content/$pkgname-symbolic.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
 
   install -Dvm644 ../$pkgname.desktop \