update to 5.27.23_6

5 files changed, 80 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 903662624e97..4663463df129 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
 pkgbase = google-chat-linux
 	pkgdesc = Unofficial electron-based desktop client for Google Chat, electron not included
-	pkgver = 5.21.19+1
+	pkgver = 5.27.23_6
 	pkgrel = 1
 	url = https://github.com/squalou/google-chat-linux
 	arch = any
-	license = custom:UNKNOWN
-	makedepends = jq
+	license = LicenseRef-unknown
 	makedepends = npm
-	makedepends = nodejs-lts-fermium
-	depends = electron
+	makedepends = nodejs
+	makedepends = git
+	makedepends = gendesk
+	depends = electron27
 	depends = xdg-desktop-portal-impl
-	source = https://github.com/squalou/google-chat-linux/archive/5.21.19-1/google-chat-linux-5.21.19-1.tar.gz
+	source = google-chat-linux.git::git+https://github.com/squalou/google-chat-linux.git#tag=5.27.23-6
 	source = google-chat-linux.sh
-	source = google-chat-linux.desktop
-	source = sandbox.patch
-	sha256sums = 6e40c88c5022210dcceba7fec2385c7e9c54d853883cf99bfcbfa4bef6d8fcdb
-	sha256sums = 5a458e5d7193784383ceda44faf8852410296f310acb5495d53c16bd0ea50059
-	sha256sums = c7fdfa74422ce7900563fd1a0f5d76c4d4cd6d153ca3b28ab5a8912a33cba9c7
-	sha256sums = 3f6513ded0c0da0d1b3ccd3fa08537cdd36a7f0281b66ec1021006565732b9c3
+	sha256sums = SKIP
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = google-chat-linux
diff --git a/PKGBUILD b/PKGBUILD
index 6bfba0d66287..92d3e2ca1b41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,66 @@
-# Maintainer: ml <>
-# Maintainer: vryali@gmail.com
+# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
+# Contributor: ml <>
+# Contributor: vryali@gmail.com
 pkgname=google-chat-linux
-_pkgver='5.21.19-1'
-pkgver=${_pkgver/-/+}
+_pkgname="Google Chat Linux"
+pkgver=5.27.23_6
+_electronversion=27
+_nodeversion=18
 pkgrel=1
 pkgdesc='Unofficial electron-based desktop client for Google Chat, electron not included'
 arch=('any')
 url='https://github.com/squalou/google-chat-linux'
-license=('custom:UNKNOWN')
-depends=('electron' 'xdg-desktop-portal-impl')
-makedepends=('jq' 'npm' 'nodejs-lts-fermium')
-source=("$url/archive/$_pkgver/$pkgname-$_pkgver.tar.gz"
-  google-chat-linux.sh
-  google-chat-linux.desktop
-  sandbox.patch)
-sha256sums=('6e40c88c5022210dcceba7fec2385c7e9c54d853883cf99bfcbfa4bef6d8fcdb'
-            '5a458e5d7193784383ceda44faf8852410296f310acb5495d53c16bd0ea50059'
-            'c7fdfa74422ce7900563fd1a0f5d76c4d4cd6d153ca3b28ab5a8912a33cba9c7'
-            '3f6513ded0c0da0d1b3ccd3fa08537cdd36a7f0281b66ec1021006565732b9c3')
-
-
-_patch_package_json() {
-  mv package.json package.json.orig
-  jq --arg version "$(</usr/lib/electron/version)" -f /dev/stdin package.json.orig <<'EOF' >package.json
-del(.devDependencies.electron) |
-.build *= {
-  "electronDist": "/usr/lib/electron",
-  "electronVersion": $version,
-  "files": [
-    "assets",
-    "src"
-  ]
+license=('LicenseRef-unknown')
+depends=(
+  "electron${_electronversion}"
+  'xdg-desktop-portal-impl'
+)
+makedepends=(
+  'npm'
+  'nodejs'
+  'git'
+  'gendesk'
+)
+source=(
+  "${pkgname}.git::git+${url}.git#tag=${pkgver//_/-}"
+  "${pkgname}.sh"
+)
+sha256sums=('SKIP'
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
+_ensure_local_nvm() {
+  export NVM_DIR="${srcdir}/.nvm"
+  source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+  nvm install "${_nodeversion}"
+  nvm use "${_nodeversion}"
 }
-EOF
-}
-
-_npm() { npm --no-audit --no-fund --no-update-notifier --cache="$srcdir/npm-cache" "$@"; }
-prepare() {
-  cd "$pkgname-$_pkgver"
-  patch -Np1 < ../sandbox.patch
-  _patch_package_json
-  _npm install
-}
-
 build() {
-  cd "$pkgname-$_pkgver"
-  export NODE_ENV=production
-  _npm run-script pack
+  sed -e "s|@electronversion@|${_electronversion}|" \
+      -e "s|@appname@|${pkgname}|g" \
+      -e "s|@runname@|app.asar|g" \
+      -i "${srcdir}/${pkgname}.sh"
+  _ensure_local_nvm
+  gendesk -q -f -n --categories "Network" --name "${pkgname}" --exec "${pkgname} %U"
+  cd "${srcdir}/${pkgname}.git"
+  export npm_config_build_from_source=true
+  export npm_config_cache="${srcdir}/.npm_cache"
+  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+  export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+  export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
+  export ELECTRONVERSION="${_electronversion}"
+  export npm_config_disturl=https://electronjs.org/headers
+  HOME="${srcdir}/.electron-gyp"
+  sed -e '/--no-force-async-hooks-checks/d' -e '/ELECTRON_DISABLE_SANDBOX/d' -i src/index.js
+  sed -e "s|normal-64.png|..\/..\/..\/..\/${pkgname}\/icon\/default\/normal-64.png|g" \
+      -e "s|badge-64.png|..\/..\/..\/..\/${pkgname}\/icon\/default\/badge-64.png|g" \
+      -e "s|offline-64.png|..\/..\/..\/..\/${pkgname}\/icon\/default\/offline-64.png|g" \
+      -i src/paths.js
+  npm install
+  npx electron-builder --linux AppImage
 }
-
 package() {
-  install -Dm755 "$pkgname".sh "$pkgdir"/usr/bin/"$pkgname"
-  install -Dm644 "$pkgname".desktop -t "$pkgdir/usr/share/applications"
-
-  cd "$pkgname-$_pkgver"
-  install -Dm644 dist/linux-unpacked/resources/app.asar "$pkgdir"/usr/lib/"$pkgname".asar
-
-  for i in build/icons/*.png; do
-    : "${i##*/}"
-    install -Dm644 "$i" "$pkgdir/usr/share/icons/hicolor/${_%.png}x${_%.png}/apps/$pkgname.png"
-  done
-  install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname"
-}
+  install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+  cp -r "${srcdir}/${pkgname}.git/dist/linux-"*/resources/icon "${pkgdir}/usr/lib/${pkgname}"
+  install -Dm644 "${srcdir}/${pkgname}.git/build/icons/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
+}
\ No newline at end of file
diff --git a/google-chat-linux.desktop b/google-chat-linux.desktop
deleted file mode 100644
index 8eff95ef9f16..000000000000
--- a/google-chat-linux.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Google Chat
-Comment=Unofficial Google Chat Electron app
-Exec=/usr/bin/google-chat-linux
-Icon=google-chat-linux
-Terminal=false
-StartupNotify=false
-Categories=Application;
diff --git a/google-chat-linux.sh b/google-chat-linux.sh
index a435e2881781..f9ced1432cfc 100644
--- a/google-chat-linux.sh
+++ b/google-chat-linux.sh
@@ -1,2 +1,14 @@
-#!/usr/bin/sh
-exec electron /usr/lib/google-chat-linux.asar "$@"
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_RUNNAME="${_APPDIR}/@runname@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
+cd "${_APPDIR}"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
+else
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file
diff --git a/sandbox.patch b/sandbox.patch
deleted file mode 100644
index 332e793a8b45..000000000000
--- a/sandbox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ura package.orig/src/index.js package.new/src/index.js
---- package.orig/src/index.js	2021-09-03 03:05:58.844183250 +0200
-+++ package.new/src/index.js	2021-09-03 03:06:12.220938939 +0200
-@@ -7,8 +7,6 @@
- const applicationVersion = require('./../package.json').version;
- let mainWindow, systemTrayIcon, config, contextMenu;
- 
--process.env.NODE_OPTIONS="--no-force-async-hooks-checks";
--process.env.ELECTRON_DISABLE_SANDBOX=true;
- process.env.GTK_USE_PORTAL=1;
- 
- process.title = 'Google Chat Linux';