From 428222bea9a5db8d6a58ca4252876de804e8139c Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Fri, 16 Oct 2020 18:28:01 -0400
Subject: [iceweasel]: housekeeping

---
 libre/iceweasel/PKGBUILD | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'libre')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 060d831b1..24f639c4b 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -217,12 +217,12 @@ END
 
       # readelf: Error: Unable to seek to 0x801db328 for section headers
       echo "applying avoid-libxul-OOM-python-check.patch"
-      patch -p1 -i "${srcdir}"/avoid-libxul-OOM-python-check.patch
+      patch -p1 -i ../avoid-libxul-OOM-python-check.patch
 
       # test failure in rust code (complaining about network functions) when PGO is used,
       # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757
       echo "applying rust-static-disable-network-test-on-static-libraries.patch"
-      patch -p1 -i "${srcdir}"/rust-static-disable-network-test-on-static-libraries.patch
+      patch -p1 -i ../rust-static-disable-network-test-on-static-libraries.patch
     ;;
     x86_64)
     ;;
@@ -234,14 +234,12 @@ END
   ## branding ##
 
   echo "applying parabola branding"
-  local brandingsrcdir="${srcdir}/${pkgname}-${_brandingver}"
+  local brandingsrcdir="${srcdir}"/${pkgname}-${_brandingver}
   local brandingdestdir=browser/branding/${pkgname}
   rm -rf -- ${brandingdestdir}
   cp -aT -- ${brandingsrcdir}/branding ${brandingdestdir}
-  # TODO: dont know what aboutlogins.svg is supposed to be or where it is presented
-  #         but it seems to be essential
-  tee "${brandingdestdir}/content/aboutlogins.svg" \
-      "${brandingdestdir}/content/about-logo.svg" < ${brandingdestdir}/iceweasel_logo.svg >/dev/null
+  cp "${brandingdestdir}"/iceweasel_logo.svg "${brandingdestdir}"/content/aboutlogins.svg
+  cp "${brandingdestdir}"/iceweasel_logo.svg "${brandingdestdir}"/content/about-logo.svg
 
   # custom new tab page
   # FIXME: the newtab page (aka "Start Page") has changed significantly
@@ -277,7 +275,7 @@ END
 
   # Remove remaining non-free bits
   echo "applying libre.patch"
-  patch -Np1 -i "${srcdir}/libre.patch"
+  patch -Np1 -i ../libre.patch
 
   # Disable various components at the source level
   sed -i 's/;1/;0/' toolkit/components/telemetry/components.conf
@@ -298,7 +296,7 @@ END
 #   local remove_engines_sed='s|.*oogle.*|          "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-en", "searx", "wikipedia", "yacy"|g'
   local remove_engines_sed='s|.*oogle.*|          "ddg", "wikipedia"|g'
   echo "applying libre-searchengines.patch"
-  patch -Np1 -i "{$srcdir}/libre-searchengines.patch"
+  patch -Np1 -i ../libre-searchengines.patch
   pushd browser/components/search/extensions
   sed -i "${remove_engines_sed}" list.json
   sed -i 's|https://duckduckgo.com/|https://html.duckduckgo.com/html/|' ddg/manifest.json
-- 
cgit v1.2.3