From a1ede4bc976b652af13a38fb3972d257828c5293 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Thu, 23 Aug 2018 15:54:37 -0400
Subject: libre/iceweasel: Pull the branding bits in to their own header
 section

---
 libre/iceweasel/PKGBUILD | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'libre/iceweasel')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 2e4c28c39..35c9171f1 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -38,11 +38,11 @@
 # [1]: https://www.mozilla.org/en-US/foundation/trademarks/policy/
 
 pkgname=iceweasel
+replaces=('firefox')
 epoch=1
 pkgver=61.0.2
-_brandingver=${pkgver%.*}
-_brandingrel=1
-pkgrel=1.parabola1
+pkgrel=1
+pkgrel+=.parabola1
 pkgdesc="Libre standalone web browser based on Mozilla Firefox"
 arch=(x86_64)
 arch+=(i686 armv7h)
@@ -53,24 +53,27 @@ depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffm
 depends+=('icu>=62' 'icu<63')
 makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb
              autoconf2.13 rust mercurial clang llvm jack gtk2 python)
-makedepends+=(mozilla-searchplugins quilt libxslt imagemagick)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
             'speech-dispatcher: Text-to-Speech')
 options=(!emptydirs !makeflags !strip)
-replaces=('firefox')
 _repo=https://hg.mozilla.org/mozilla-unified
 source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
         $pkgname.desktop)
+sha256sums=('SKIP'
+            'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa')
+
+# Branding
+_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}
          libre.patch)
-sha256sums=('SKIP'
-            'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
-            'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e'
-            'SKIP'
-            'f2f3484a5339c7208a2a44b63a185ec5a57f837040627d29cc45b4d1d14ef6c2')
-validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
+sha256sums+=('dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e'
+             'SKIP'
+             'f2f3484a5339c7208a2a44b63a185ec5a57f837040627d29cc45b4d1d14ef6c2')
+validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
 prepare() {
   cd mozilla-unified
-- 
cgit v1.2.2