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

1 files changed, 54 insertions, 28 deletions

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