summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-08-23 14:39:41 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-08-23 14:39:41 -0400
commit50139b268315cf2746be032203055a37f7e89385 (patch)
treecb06ebd07061bdda30429e7b849e2c3471b394ce
parentd5e6eade753acb1a66420ece1e6c7309a9b1515a (diff)
downloadabslibre-50139b268315cf2746be032203055a37f7e89385.tar.gz
abslibre-50139b268315cf2746be032203055a37f7e89385.tar.bz2
abslibre-50139b268315cf2746be032203055a37f7e89385.zip
libre/iceweasel: Rename _bver→_brandingver; _brel→_brandingrel
-rw-r--r--libre/iceweasel/PKGBUILD14
1 files changed, 7 insertions, 7 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 8ffb5f127..61f9c9b48 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -31,8 +31,8 @@ pkgname=iceweasel
epoch=1
pkgver=61.0.2
pkgrel=0.testing1
-_bver=61.0
-_brel=1
+_brandingver=${pkgver%.*}
+_brandingrel=1
pkgdesc="Libre standalone web browser based on Mozilla Firefox"
arch=(x86_64)
arch+=(i686 armv7h)
@@ -54,7 +54,7 @@ conflicts=("$_pkgname")
# https://archive.mozilla.org/pub/firefox/releases/$pkgver/SOURCE
source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
$pkgname.desktop)
-source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig}
+source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig}
libre.patch)
sha256sums=('0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c'
'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
@@ -127,7 +127,7 @@ END
fi
# perform rebranding
- local brandingdir="$srcdir/$pkgname-$_bver"
+ local brandingdir="$srcdir/$pkgname-$_brandingver"
mkdir -v browser/branding/$pkgname
cp -va $brandingdir/branding/* browser/branding/$pkgname
@@ -144,7 +144,7 @@ END
# produce icons
for i in 128; do
- rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \
+ rsvg-convert -w $i -h $i "$brandingdir/branding/${pkgname}_icon.svg" \
-o "browser/branding/iceweasel/default$i.png"
done
@@ -527,13 +527,13 @@ app.partner.parabola=parabola
END
for i in 16 22 24 32 48 64 128 192 256 384; do
- rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \
+ rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_brandingver/branding/${pkgname}_icon.svg" \
-o "browser/branding/iceweasel/default$i.png"
install -Dm644 "browser/branding/iceweasel/default$i.png" \
"$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
done
- install -Dm644 "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \
+ install -Dm644 "$srcdir/$pkgname-$_brandingver/branding/${pkgname}_icon.svg" \
"$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
install -Dm644 ../$pkgname.desktop \