13.1.6

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

2 files changed, 92 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d074ed046cc0..94a0d3556402 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,45 @@
 pkgbase = electron-bin
-	pkgdesc = Framework for writing cross-platform desktop applications using JavaScript, HTML and CSS.
-	pkgver = 1.3.3
+	pkgdesc = Build cross platform desktop apps with web technologies – binary version
+	pkgver = 13.1.6
 	pkgrel = 1
-	url = https://github.com/electron/electron
-	arch = arm
-	arch = i686
+	url = https://electronjs.org/
 	arch = x86_64
+	arch = i686
+	arch = armv7h
+	arch = aarch64
 	license = MIT
-	depends = libgcrypt15
-	depends = libnotify
-	depends = gconf
-	depends = alsa-lib
+	depends = c-ares
+	depends = ffmpeg
+	depends = gtk3
+	depends = libevent
+	depends = libnghttp2
+	depends = libxslt
+	depends = minizip
 	depends = nss
-	depends = libxtst
-	depends = gtk2
-	depends = libgnome-keyring
-	optdepends = nodejs
+	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 = electron
 	conflicts = electron
-	replaces = atom-shell
-	source = https://github.com/electron/electron/releases/download/v1.3.3/electron-v1.3.3-linux-arm.zip
-	source = https://github.com/electron/electron/releases/download/v1.3.3/electron-v1.3.3-linux-ia32.zip
-	source = https://github.com/electron/electron/releases/download/v1.3.3/electron-v1.3.3-linux-x64.zip
-	sha256sums = 24dd633ffde02a8291488d0c32602cedd97c17383b340b8b976aa24feccafd2b
-	sha256sums = a2832f06215df2f32754000087c106018f99895136f1e4faf574d0705da27197
-	sha256sums = 277727209f60987aacb86227bf0e5cf6f9dca0a53476521d887f8944090ea53d
+	source_x86_64 = electron-bin-chromedriver-13.1.6-1-x86_64.zip::https://github.com/electron/electron/releases/download/v13.1.6/chromedriver-v13.1.6-linux-x64.zip
+	source_x86_64 = electron-bin-13.1.6-1-x86_64.zip::https://github.com/electron/electron/releases/download/v13.1.6/electron-v13.1.6-linux-x64.zip
+	sha256sums_x86_64 = 79cde197476655f08dfca3c390708609dfe6a9ab4c7d9097ab3b1d775a89f08b
+	sha256sums_x86_64 = 6f28af0a3ccb20b0d2e4f26ea4698d5b89b81e860cbd40a446c2a8223fdf0101
+	source_i686 = electron-bin-chromedriver-13.1.6-1-i686.zip::https://github.com/electron/electron/releases/download/v13.1.6/chromedriver-v13.1.6-linux-ia32.zip
+	source_i686 = electron-bin-13.1.6-1-i686.zip::https://github.com/electron/electron/releases/download/v13.1.6/electron-v13.1.6-linux-ia32.zip
+	sha256sums_i686 = fabfbb1a055ee9d9ea8688327bbfb743721c64743212b10517767a7a1455343e
+	sha256sums_i686 = 7c266148fba83c3eb912c5ccd7cd7c24829bc93b380378cba0480b02c38f5d42
+	source_armv7h = electron-bin-chromedriver-13.1.6-1-armv7h.zip::https://github.com/electron/electron/releases/download/v13.1.6/chromedriver-v13.1.6-linux-armv7l.zip
+	source_armv7h = electron-bin-13.1.6-1-armv7h.zip::https://github.com/electron/electron/releases/download/v13.1.6/electron-v13.1.6-linux-armv7l.zip
+	sha256sums_armv7h = 870c921b8bb0b9296f1ab22cd881aa68cbe7db2f93b6c2374bd92849dc52d88f
+	sha256sums_armv7h = 8d54ec6babc06b118038d2d4f49cab84ec6d5617c645266b88dd829c02354e77
+	source_aarch64 = electron-bin-chromedriver-13.1.6-1-aarch64.zip::https://github.com/electron/electron/releases/download/v13.1.6/chromedriver-v13.1.6-linux-arm64.zip
+	source_aarch64 = electron-bin-13.1.6-1-aarch64.zip::https://github.com/electron/electron/releases/download/v13.1.6/electron-v13.1.6-linux-arm64.zip
+	sha256sums_aarch64 = 8273da5463bf717357bf6a5881b150f8dfc3c2f044aca50d3507f1c2e156996d
+	sha256sums_aarch64 = d24ba0e3f8624ec611fb2e9165c08b227ba799196b0f2787cad8c60f1cc23b5b
 
 pkgname = electron-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index d9d60359b339..b160dbe03118 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,65 @@
-# Maintainer: Piotr Mrożek <dnadesigned@gmail.com>
-# Contributor: /dev/rs0 <rs0@secretco.de.com>
-# Contributor: Daniel Perez <tuvistavie@gmail.com>
+# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
+# based on aur electron8-bin: Tom Vincent <http://tlvince.com/contact/>
 
-pkgname=electron-bin
-pkgver=1.3.3
+_projectname=electron
+_major=13
+_pkgname=${_projectname}
+_pkgver=${_major}.1.6
+pkgver="${_pkgver/-/.}"
+pkgname=${_pkgname}-bin
 pkgrel=1
-pkgdesc="Framework for writing cross-platform desktop applications using JavaScript, HTML and CSS."
-
-arch=('arm' 'i686' 'x86_64')
-url="https://github.com/electron/electron"
+pkgdesc="Build cross platform desktop apps with web technologies – binary version"
+arch=('x86_64' 'i686' 'armv7h' 'aarch64')
+url=https://electronjs.org/
 license=('MIT')
-
-replaces=('atom-shell')
-provides=('electron')
-conflicts=('electron')
-
-optdepends=('nodejs')
-depends=('libgcrypt15' 'libnotify' 'gconf' 'alsa-lib' 'nss' 'libxtst' 'gtk2' 'libgnome-keyring')
-
-case $CARCH in
-  'arm'   ) _arch='arm' ; sha256sums=('24dd633ffde02a8291488d0c32602cedd97c17383b340b8b976aa24feccafd2b');;
-  'i686'  ) _arch='ia32'; sha256sums=('a2832f06215df2f32754000087c106018f99895136f1e4faf574d0705da27197');;
-  'x86_64') _arch='x64' ; sha256sums=('277727209f60987aacb86227bf0e5cf6f9dca0a53476521d887f8944090ea53d');;
-esac
-
-_zipname="electron-v${pkgver}-linux-${_arch}.zip"
-
-source=("https://github.com/electron/electron/releases/download/v${pkgver}/${_zipname}")
+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"
+)
+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"
+)
+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"
+)
+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"
+)
+sha256sums_x86_64=('79cde197476655f08dfca3c390708609dfe6a9ab4c7d9097ab3b1d775a89f08b'
+                   '6f28af0a3ccb20b0d2e4f26ea4698d5b89b81e860cbd40a446c2a8223fdf0101')
+sha256sums_i686=('fabfbb1a055ee9d9ea8688327bbfb743721c64743212b10517767a7a1455343e'
+                 '7c266148fba83c3eb912c5ccd7cd7c24829bc93b380378cba0480b02c38f5d42')
+sha256sums_armv7h=('870c921b8bb0b9296f1ab22cd881aa68cbe7db2f93b6c2374bd92849dc52d88f'
+                   '8d54ec6babc06b118038d2d4f49cab84ec6d5617c645266b88dd829c02354e77')
+sha256sums_aarch64=('8273da5463bf717357bf6a5881b150f8dfc3c2f044aca50d3507f1c2e156996d'
+                    'd24ba0e3f8624ec611fb2e9165c08b227ba799196b0f2787cad8c60f1cc23b5b')
 
 package() {
-  install -d "${pkgdir}/usr/lib/electron"
-  cp -a "${srcdir}/." "${pkgdir}/usr/lib/electron"
-  rm "${pkgdir}/usr/lib/electron/${_zipname}"
+	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}/"
+	done
 
-  install -d "${pkgdir}/usr/bin"
-  ln -s "/usr/lib/electron/electron" "${pkgdir}/usr/bin/electron"
+	chmod u+s "${pkgdir}/usr/lib/${_pkgname}/chrome-sandbox"
 
-  install -Dm644 "${pkgdir}/usr/lib/electron/LICENSE" "${pkgdir}/usr/share/licenses/electron/LICENSE"
-  install -Dm644 "${pkgdir}/usr/lib/electron/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/electron/LICENSES.chromium.html"
-  rm "${pkgdir}/usr/lib/electron/LICENSE"
-  rm "${pkgdir}/usr/lib/electron/LICENSES.chromium.html"
-  ln -sf "/usr/lib/libgcrypt.so.11" "${pkgdir}/usr/lib/electron/libgcrypt.so.11"
-  ln -sf "/usr/lib/libnotify.so.4" "${pkgdir}/usr/lib/electron/libnotify.so.4"
-  ln -sf "/usr/lib/libudev.so" "${pkgdir}/usr/lib/electron/libudev.so.0"
+	install -dm755 "${pkgdir}/usr/bin"
+	ln -nfs "/usr/lib/${_pkgname}/${_projectname}" "${pkgdir}/usr/bin/${_pkgname}"
 
-  find "${pkgdir}" -type d -exec chmod 755 {} +
-  find "${pkgdir}" -type f -exec chmod 644 {} +
-  chmod 755 "${pkgdir}/usr/lib/electron/electron"
+	for _license in 'LICENSE' 'LICENSES.chromium.html'; do
+		install -Dm644 "${_license}" "${pkgdir}/usr/share/licenses/${pkgname}/${_license}"
+	done
 }