From de461117e7e2858346b1c1194bda9435e862f5ea Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sat, 25 Aug 2018 17:01:52 -0400
Subject: libre/iceweasel: Fix the branding in a patch

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

(limited to 'libre/iceweasel/PKGBUILD')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index abf995707..5ad29d5bf 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -64,6 +64,7 @@ sha256sums=('SKIP'
             'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
             'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e'
             'SKIP'
+            'f2ebd5054b81a0f0f642b523a545145bdd5939e70b79c8129415cd1646cc6d74'
             'b695926b8a1f9560f0e11e0bad2ef42df6152d4f16f95af1027bc12c487c1ede')
 
 # Branding
@@ -71,6 +72,7 @@ _brandingver=$(cut -d. -f1,2<<<"$pkgver")
 _brandingrel=1
 makedepends+=(mozilla-searchplugins quilt libxslt imagemagick)
 source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig}
+         0001-branding-Fix-for-v60-v61.patch
          libre.patch)
 validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
@@ -122,8 +124,9 @@ END
 
   ## Rebranding
   local brandingdir="$srcdir/$pkgname-$_brandingver"
-  sed -i '/lockPref("browser.startup.homepage_override.mstone"/d' \
-      "$brandingdir/branding/firefox-branding.js"
+  pushd "$brandingdir"
+  patch -Np1 -i "$srcdir/0001-branding-Fix-for-v60-v61.patch"
+  popd
   # file dump
   rm -rf -- browser/branding/$pkgname
   cp -aT -- $brandingdir/branding browser/branding/$pkgname
@@ -143,7 +146,8 @@ END
     rsvg-convert -w $i -h $i "$brandingdir/branding/${pkgname}_icon.svg" \
       -o "browser/branding/iceweasel/default$i.png"
   done
-  # Patch and remove anything that's left
+
+  # Remove remaining non-free bits
   patch -Np1 -i "$srcdir/libre.patch"
   sed -i 's/Adobe Flash/SWF Player/g' -- \
     browser/base/content/pageinfo/permissions.js \
-- 
cgit v1.2.3