align with other electron-bin packages

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
author: Yurii Kolesnykov 2021-07-07 14:20:21 +0300
committer: Yurii Kolesnykov 2021-07-07 14:20:21 +0300
commit: cee813cf88eeea8185c6e2c72a9b3517be59413a (patch)
tree: d3b0f11859a17d0ecc16f2138eb2197b87f17e14
parent: 8ebb87ac28a7374bd9d63cd512b90d2f4be7967f (diff)
download: aur-cee813cf88eeea8185c6e2c72a9b3517be59413a.tar.gz
2 files changed, 40 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0a1e58c0f09a..e22ee3f3ccda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electron10-bin
 	pkgdesc = Build cross platform desktop apps with web technologies - version 10 - binary version
 	pkgver = 10.4.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://electronjs.org/
 	arch = x86_64
 	arch = i686
@@ -11,34 +11,34 @@ pkgbase = electron10-bin
 	depends = c-ares
 	depends = ffmpeg
 	depends = gtk3
-	depends = http-parser
 	depends = libevent
+	depends = libnghttp2
 	depends = libxslt
-	depends = libxss
 	depends = minizip
 	depends = nss
 	depends = re2
 	depends = snappy
 	optdepends = kde-cli-tools: file deletion support (kioclient5)
 	optdepends = libappindicator-gtk3: StatusNotifierItem support
+	optdepends = pipewire: WebRTC desktop sharing under Wayland
 	optdepends = trash-cli: file deletion support (trash-put)
 	optdepends = xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)
 	provides = electron10
 	conflicts = electron10
-	source_x86_64 = electron10-bin-chromedriver-10.4.7-1-x86_64.zip::https://github.com/electron/electron/releases/download/v10.4.7/chromedriver-v10.4.7-linux-x64.zip
-	source_x86_64 = electron10-bin-10.4.7-1-x86_64.zip::https://github.com/electron/electron/releases/download/v10.4.7/electron-v10.4.7-linux-x64.zip
+	source_x86_64 = electron10-bin-chromedriver-10.4.7-2-x86_64.zip::https://github.com/electron/electron/releases/download/v10.4.7/chromedriver-v10.4.7-linux-x64.zip
+	source_x86_64 = electron10-bin-10.4.7-2-x86_64.zip::https://github.com/electron/electron/releases/download/v10.4.7/electron-v10.4.7-linux-x64.zip
 	sha256sums_x86_64 = 600954358cb2675cb753048302e9d9b28e3e8d5559cdbda111434a4c46effafd
 	sha256sums_x86_64 = e3ea75fcedce588c6b59cfa3a6e46ba67b789e14dc2e5b9dfe1ddf3f82b0f995
-	source_i686 = electron10-bin-chromedriver-10.4.7-1-i686.zip::https://github.com/electron/electron/releases/download/v10.4.7/chromedriver-v10.4.7-linux-ia32.zip
-	source_i686 = electron10-bin-10.4.7-1-i686.zip::https://github.com/electron/electron/releases/download/v10.4.7/electron-v10.4.7-linux-ia32.zip
+	source_i686 = electron10-bin-chromedriver-10.4.7-2-i686.zip::https://github.com/electron/electron/releases/download/v10.4.7/chromedriver-v10.4.7-linux-ia32.zip
+	source_i686 = electron10-bin-10.4.7-2-i686.zip::https://github.com/electron/electron/releases/download/v10.4.7/electron-v10.4.7-linux-ia32.zip
 	sha256sums_i686 = 93b63c755e392796b51fe50d887595c8f8bf1c8b018c7e32df32aa306e2ad5ba
 	sha256sums_i686 = dd7fde9b3993538333ec701101554050b27d0b680196d0883ab563e8e696fc79
-	source_armv7h = electron10-bin-chromedriver-10.4.7-1-armv7h.zip::https://github.com/electron/electron/releases/download/v10.4.7/chromedriver-v10.4.7-linux-armv7l.zip
-	source_armv7h = electron10-bin-10.4.7-1-armv7h.zip::https://github.com/electron/electron/releases/download/v10.4.7/electron-v10.4.7-linux-armv7l.zip
+	source_armv7h = electron10-bin-chromedriver-10.4.7-2-armv7h.zip::https://github.com/electron/electron/releases/download/v10.4.7/chromedriver-v10.4.7-linux-armv7l.zip
+	source_armv7h = electron10-bin-10.4.7-2-armv7h.zip::https://github.com/electron/electron/releases/download/v10.4.7/electron-v10.4.7-linux-armv7l.zip
 	sha256sums_armv7h = 47af0bf968cd370539b5d9c3bbda6d7a2c0d8fce2cecf94d551c0aeacd79ac75
 	sha256sums_armv7h = 56f11ed14f8a620650d31c21ebd095ce59ef4286c98276802b18f9cc85560ddd
-	source_aarch64 = electron10-bin-chromedriver-10.4.7-1-aarch64.zip::https://github.com/electron/electron/releases/download/v10.4.7/chromedriver-v10.4.7-linux-arm64.zip
-	source_aarch64 = electron10-bin-10.4.7-1-aarch64.zip::https://github.com/electron/electron/releases/download/v10.4.7/electron-v10.4.7-linux-arm64.zip
+	source_aarch64 = electron10-bin-chromedriver-10.4.7-2-aarch64.zip::https://github.com/electron/electron/releases/download/v10.4.7/chromedriver-v10.4.7-linux-arm64.zip
+	source_aarch64 = electron10-bin-10.4.7-2-aarch64.zip::https://github.com/electron/electron/releases/download/v10.4.7/electron-v10.4.7-linux-arm64.zip
 	sha256sums_aarch64 = 3e884d04abf6fbf1cb599e21ed7d64e7955768b9b92c26d7ac2f8266a3a7f835
 	sha256sums_aarch64 = 0550584518c8e98fe1113706c10fd7456ec519f7aa6867fbff17c8913327d758
 
diff --git a/PKGBUILD b/PKGBUILD
index 32157959c783..e0198bd6b3f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,40 +3,39 @@
 
 _projectname=electron
 _major=10
-_pkgname="${_projectname}${_major}"
-_pkgver=10.4.7
-pkgname="$_pkgname-bin"
+_pkgname=${_projectname}${_major}
+_pkgver=${_major}.4.7
 pkgver="${_pkgver/-/.}"
-pkgrel=1
+pkgname=${_pkgname}-bin
+pkgrel=2
 pkgdesc="Build cross platform desktop apps with web technologies - version ${_major} - binary version"
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
-url="https://${_projectname}js.org/"
+url=https://electronjs.org/
 license=('MIT')
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libxslt' 'libxss' 'minizip' 'nss' 're2' 'snappy')
-optdepends=(
-	'kde-cli-tools: file deletion support (kioclient5)'
-	'libappindicator-gtk3: StatusNotifierItem support'
-	'trash-cli: file deletion support (trash-put)'
-	"xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)"
-)
-_releaseurl="https://github.com/$_projectname/$_projectname/releases/download/v$_pkgver"
+provides=(${_pkgname})
+conflicts=(${_pkgname})
+depends=('c-ares' 'ffmpeg' 'gtk3' 'libevent' 'libnghttp2' 'libxslt' 'minizip' 'nss' 're2' 'snappy')
+optdepends=('kde-cli-tools: file deletion support (kioclient5)'
+            'libappindicator-gtk3: StatusNotifierItem support'
+            'pipewire: WebRTC desktop sharing under Wayland'
+            'trash-cli: file deletion support (trash-put)'
+            "xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)")
+_releaseurl="https://github.com/${_projectname}/${_projectname}/releases/download/v${_pkgver}"
 source_x86_64=(
-	"$pkgname-chromedriver-$_pkgver-$pkgrel-x86_64.zip::$_releaseurl/chromedriver-v$_pkgver-linux-x64.zip"
-	"$pkgname-$_pkgver-$pkgrel-x86_64.zip::$_releaseurl/$_projectname-v$_pkgver-linux-x64.zip"
+	"${pkgname}-chromedriver-${pkgver}-${pkgrel}-x86_64.zip::${_releaseurl}/chromedriver-v${_pkgver}-linux-x64.zip"
+	"${pkgname}-${pkgver}-${pkgrel}-x86_64.zip::${_releaseurl}/${_projectname}-v${_pkgver}-linux-x64.zip"
 )
 source_i686=(
-	"$pkgname-chromedriver-$_pkgver-$pkgrel-i686.zip::$_releaseurl/chromedriver-v$_pkgver-linux-ia32.zip"
-	"$pkgname-$_pkgver-$pkgrel-i686.zip::$_releaseurl/$_projectname-v$_pkgver-linux-ia32.zip"
+	"${pkgname}-chromedriver-${pkgver}-${pkgrel}-i686.zip::${_releaseurl}/chromedriver-v${_pkgver}-linux-ia32.zip"
+	"${pkgname}-${pkgver}-${pkgrel}-i686.zip::${_releaseurl}/${_projectname}-v${_pkgver}-linux-ia32.zip"
 )
 source_armv7h=(
-	"$pkgname-chromedriver-$_pkgver-$pkgrel-armv7h.zip::$_releaseurl/chromedriver-v$_pkgver-linux-armv7l.zip"
-	"$pkgname-$_pkgver-$pkgrel-armv7h.zip::$_releaseurl/$_projectname-v$_pkgver-linux-armv7l.zip"
+	"${pkgname}-chromedriver-${pkgver}-${pkgrel}-armv7h.zip::${_releaseurl}/chromedriver-v${_pkgver}-linux-armv7l.zip"
+	"${pkgname}-${pkgver}-${pkgrel}-armv7h.zip::${_releaseurl}/${_projectname}-v${_pkgver}-linux-armv7l.zip"
 )
 source_aarch64=(
-	"$pkgname-chromedriver-$_pkgver-$pkgrel-aarch64.zip::$_releaseurl/chromedriver-v$_pkgver-linux-arm64.zip"
-	"$pkgname-$_pkgver-$pkgrel-aarch64.zip::$_releaseurl/$_projectname-v$_pkgver-linux-arm64.zip"
+	"${pkgname}-chromedriver-${pkgver}-${pkgrel}-aarch64.zip::${_releaseurl}/chromedriver-v${_pkgver}-linux-arm64.zip"
+	"${pkgname}-${pkgver}-${pkgrel}-aarch64.zip::${_releaseurl}/${_projectname}-v${_pkgver}-linux-arm64.zip"
 )
 sha256sums_x86_64=('600954358cb2675cb753048302e9d9b28e3e8d5559cdbda111434a4c46effafd'
                    'e3ea75fcedce588c6b59cfa3a6e46ba67b789e14dc2e5b9dfe1ddf3f82b0f995')
@@ -48,20 +47,19 @@ sha256sums_aarch64=('3e884d04abf6fbf1cb599e21ed7d64e7955768b9b92c26d7ac2f8266a3a
                     '0550584518c8e98fe1113706c10fd7456ec519f7aa6867fbff17c8913327d758')
 
 package() {
-	cd "$srcdir/"
-	install -dm755 "$pkgdir/usr/lib/$_pkgname/"
-	find . -mindepth 1 -maxdepth 1 -type f ! -name "*.zip" ! -name "LICENSE*" -exec cp -r --no-preserve=ownership --preserve=mode -t "$pkgdir/usr/lib/$_pkgname/." {} +
+	install -dm755 "${pkgdir}/usr/lib/${_pkgname}/"
+	find . -mindepth 1 -maxdepth 1 -type f ! -name "*.zip" ! -name "LICENSE*" -exec cp -r --no-preserve=ownership --preserve=mode -t "${pkgdir}/usr/lib/${_pkgname}/." {} +
 
 	for _folder in 'locales' 'resources' 'swiftshader'; do
-		cp -r --no-preserve=ownership --preserve=mode "$_folder/" "$pkgdir/usr/lib/$_pkgname/$_folder/"
+		cp -r --no-preserve=ownership --preserve=mode "${_folder}/" "${pkgdir}/usr/lib/${_pkgname}/${_folder}/"
 	done
 
-	chmod u+s "$pkgdir/usr/lib/$_pkgname/chrome-sandbox"
+	chmod u+s "${pkgdir}/usr/lib/${_pkgname}/chrome-sandbox"
 
-	install -dm755 "$pkgdir/usr/bin"
-	ln -nfs "/usr/lib/$_pkgname/$_projectname" "$pkgdir/usr/bin/$_pkgname"
+	install -dm755 "${pkgdir}/usr/bin"
+	ln -nfs "/usr/lib/${_pkgname}/${_projectname}" "${pkgdir}/usr/bin/${_pkgname}"
 
 	for _license in 'LICENSE' 'LICENSES.chromium.html'; do
-		install -Dm644 "$_license" "$pkgdir/usr/share/licenses/$pkgname/$_license"
+		install -Dm644 "${_license}" "${pkgdir}/usr/share/licenses/${pkgname}/${_license}"
 	done
 }
author	Yurii Kolesnykov	2021-07-07 14:20:21 +0300
committer	Yurii Kolesnykov	2021-07-07 14:20:21 +0300
commit	cee813cf88eeea8185c6e2c72a9b3517be59413a (patch)
tree	d3b0f11859a17d0ecc16f2138eb2197b87f17e14
parent	8ebb87ac28a7374bd9d63cd512b90d2f4be7967f (diff)
download	aur-cee813cf88eeea8185c6e2c72a9b3517be59413a.tar.gz