Work around upstream packaging issue

Upstream doesn't package the assets necessary for rendering their own
plugins in the provided .zip file, but they do on the .deb. As a work
around, we download both and extract the necessary files from the
latter.
This commit is contained in:
Andrés Rodríguez
2019-04-08 14:50:35 -03:00
parent 6f5377399f
commit 5483c884d1
2 changed files with 28 additions and 16 deletions

View File

@@ -1,7 +1,7 @@
pkgbase = brave-bin pkgbase = brave-bin
pkgdesc = Web browser that blocks ads and trackers by default (binary release). pkgdesc = Web browser that blocks ads and trackers by default (binary release).
pkgver = 0.62.51 pkgver = 0.62.51
pkgrel = 1 pkgrel = 2
url = https://brave.com/download url = https://brave.com/download
arch = x86_64 arch = x86_64
license = custom license = custom
@@ -19,11 +19,13 @@ pkgbase = brave-bin
noextract = brave-bin-0.62.51.zip noextract = brave-bin-0.62.51.zip
options = !strip options = !strip
source = brave-bin-0.62.51.zip::https://github.com/brave/brave-browser/releases/download/v0.62.51/brave-v0.62.51-linux-x64.zip source = brave-bin-0.62.51.zip::https://github.com/brave/brave-browser/releases/download/v0.62.51/brave-v0.62.51-linux-x64.zip
source = brave-bin-0.62.51.deb::https://github.com/brave/brave-browser/releases/download/v0.62.51/brave-browser_0.62.51_amd64.deb
source = MPL2::https://raw.githubusercontent.com/brave/brave-browser/master/LICENSE source = MPL2::https://raw.githubusercontent.com/brave/brave-browser/master/LICENSE
source = brave-bin.sh source = brave-bin.sh
source = brave-bin.desktop source = brave-bin.desktop
source = logo.png source = logo.png
sha512sums = 51fd6ea69d1e599944745fe8a89e12a7c9b591430bb2d4aef6038edefbbb2be9c44bc0183ceb5292b32c5b7e1e64a37bfe80c37dafde1bef372a0e0ab2d0ddf5 sha512sums = 51fd6ea69d1e599944745fe8a89e12a7c9b591430bb2d4aef6038edefbbb2be9c44bc0183ceb5292b32c5b7e1e64a37bfe80c37dafde1bef372a0e0ab2d0ddf5
sha512sums = a4445955fd1bdefdedb0ad27b66120de4f0c87f8c9f55120622380ce95597c3358b19df45838398aa555e3bff9aaa4566e989ab963396e9d169d931a67e88a26
sha512sums = b8823586fead21247c8208bd842fb5cd32d4cb3ca2a02339ce2baf2c9cb938dfcb8eb7b24c95225ae625cd0ee59fbbd8293393f3ed1a4b45d13ba3f9f62a791f sha512sums = b8823586fead21247c8208bd842fb5cd32d4cb3ca2a02339ce2baf2c9cb938dfcb8eb7b24c95225ae625cd0ee59fbbd8293393f3ed1a4b45d13ba3f9f62a791f
sha512sums = 20b010e199127fa185da2e78eb97724a1b4d6d279c79b87bb0901ceb832d19ea755485c9039d06d92e6ffd686683990cd1939dc78f37859a798f4a8ba40e05b5 sha512sums = 20b010e199127fa185da2e78eb97724a1b4d6d279c79b87bb0901ceb832d19ea755485c9039d06d92e6ffd686683990cd1939dc78f37859a798f4a8ba40e05b5
sha512sums = c21aecaafec43bc1ce1ea3439667efb4c7ea5e54bfa87346a9ae9650de1e90c80174b1610a9216f936f693593816c9585c6be1875b3bd318d067079c06251e92 sha512sums = c21aecaafec43bc1ce1ea3439667efb4c7ea5e54bfa87346a9ae9650de1e90c80174b1610a9216f936f693593816c9585c6be1875b3bd318d067079c06251e92

View File

@@ -3,33 +3,36 @@
# Contributor: Manuel Mazzuola <origin.of@gmail.com> # Contributor: Manuel Mazzuola <origin.of@gmail.com>
# Contributor: Simón Oroño <simonorono@protonmail.com> # Contributor: Simón Oroño <simonorono@protonmail.com>
# Contributor: now-im <now im 627 @ gmail . com> # Contributor: now-im <now im 627 @ gmail . com>
# Contributor: Giusy Digital <kurmikon at libero dot it>
# Mantainer: Andrés Rodríguez <hello@andres.codes> # Mantainer: Andrés Rodríguez <hello@andres.codes>
# https://aur.archlinux.org/packages/brave-bin/ # https://aur.archlinux.org/packages/brave-bin/
pkgname=brave-bin pkgname=brave-bin
pkgver=0.62.51 pkgver=0.62.51
pkgrel=1 pkgrel=2
pkgdesc='Web browser that blocks ads and trackers by default (binary release).' pkgdesc="Web browser that blocks ads and trackers by default (binary release)."
arch=('x86_64') arch=("x86_64")
url='https://brave.com/download' url="https://brave.com/download"
license=('custom') license=("custom")
depends=('gtk3' 'nss' 'alsa-lib' 'libxss' 'ttf-font') depends=("gtk3" "nss" "alsa-lib" "libxss" "ttf-font")
optdepends=('cups: Printer support' optdepends=("cups: Printer support"
'pepper-flash: Adobe Flash support' "pepper-flash: Adobe Flash support"
'libgnome-keyring: Enable GNOME keyring support') "libgnome-keyring: Enable GNOME keyring support")
provides=("${pkgname-bin}" 'brave-browser') provides=("${pkgname-bin}" "brave-browser")
conflicts=("${pkgname-bin}") conflicts=("${pkgname-bin}")
source=("$pkgname-$pkgver.zip::https://github.com/brave/brave-browser/releases/download/v${pkgver}/brave-v${pkgver}-linux-x64.zip" source=("$pkgname-$pkgver.zip::https://github.com/brave/brave-browser/releases/download/v${pkgver}/brave-v${pkgver}-linux-x64.zip"
"$pkgname-$pkgver.deb::https://github.com/brave/brave-browser/releases/download/v${pkgver}/brave-browser_${pkgver}_amd64.deb"
"MPL2::https://raw.githubusercontent.com/brave/brave-browser/master/LICENSE" "MPL2::https://raw.githubusercontent.com/brave/brave-browser/master/LICENSE"
"$pkgname.sh" "$pkgname.sh"
"$pkgname.desktop" "$pkgname.desktop"
"logo.png") "logo.png")
options=(!strip) options=(!strip)
sha512sums=('51fd6ea69d1e599944745fe8a89e12a7c9b591430bb2d4aef6038edefbbb2be9c44bc0183ceb5292b32c5b7e1e64a37bfe80c37dafde1bef372a0e0ab2d0ddf5' sha512sums=("51fd6ea69d1e599944745fe8a89e12a7c9b591430bb2d4aef6038edefbbb2be9c44bc0183ceb5292b32c5b7e1e64a37bfe80c37dafde1bef372a0e0ab2d0ddf5"
'b8823586fead21247c8208bd842fb5cd32d4cb3ca2a02339ce2baf2c9cb938dfcb8eb7b24c95225ae625cd0ee59fbbd8293393f3ed1a4b45d13ba3f9f62a791f' "a4445955fd1bdefdedb0ad27b66120de4f0c87f8c9f55120622380ce95597c3358b19df45838398aa555e3bff9aaa4566e989ab963396e9d169d931a67e88a26"
'20b010e199127fa185da2e78eb97724a1b4d6d279c79b87bb0901ceb832d19ea755485c9039d06d92e6ffd686683990cd1939dc78f37859a798f4a8ba40e05b5' "b8823586fead21247c8208bd842fb5cd32d4cb3ca2a02339ce2baf2c9cb938dfcb8eb7b24c95225ae625cd0ee59fbbd8293393f3ed1a4b45d13ba3f9f62a791f"
'c21aecaafec43bc1ce1ea3439667efb4c7ea5e54bfa87346a9ae9650de1e90c80174b1610a9216f936f693593816c9585c6be1875b3bd318d067079c06251e92' "20b010e199127fa185da2e78eb97724a1b4d6d279c79b87bb0901ceb832d19ea755485c9039d06d92e6ffd686683990cd1939dc78f37859a798f4a8ba40e05b5"
'd7bef52e336bd908d24bf3a084a1fc480831d27a3c80af4c31872465b6a0ce39bdf298e620ae9865526c974465807559cc75610b835e60b4358f65a8a8ff159e') "c21aecaafec43bc1ce1ea3439667efb4c7ea5e54bfa87346a9ae9650de1e90c80174b1610a9216f936f693593816c9585c6be1875b3bd318d067079c06251e92"
"d7bef52e336bd908d24bf3a084a1fc480831d27a3c80af4c31872465b6a0ce39bdf298e620ae9865526c974465807559cc75610b835e60b4358f65a8a8ff159e")
noextract=("$pkgname-$pkgver.zip") noextract=("$pkgname-$pkgver.zip")
prepare() { prepare() {
@@ -39,6 +42,7 @@ prepare() {
} }
_bsdtardir="brave" _bsdtardir="brave"
_debpack="data.tar.xz"
package() { package() {
install -d -m0755 "$pkgdir/usr/lib" install -d -m0755 "$pkgdir/usr/lib"
@@ -51,4 +55,10 @@ package() {
mv "$pkgdir/usr/lib/$pkgname/"{LICENSE,LICENSES.chromium.html} "$pkgdir/usr/share/licenses/$pkgname" mv "$pkgdir/usr/lib/$pkgname/"{LICENSE,LICENSES.chromium.html} "$pkgdir/usr/share/licenses/$pkgname"
ln -s /usr/lib/PepperFlash "$pkgdir/usr/lib/pepperflashplugin-nonfree" ln -s /usr/lib/PepperFlash "$pkgdir/usr/lib/pepperflashplugin-nonfree"
# Copy resources directory from deb package
ar x $pkgname-$pkgver.deb $_debpack
mkdir deb
tar -C ./deb -xvf $_debpack ./opt/brave.com/brave/resources/
cp -a --reflink=auto deb/opt/brave.com/brave/resources/ "$pkgdir/usr/lib/$pkgname"
} }