From e8ba96b08f3ee092023d0e74e2d2a0ee8ea9e12b Mon Sep 17 00:00:00 2001
From: Echo J <aidas957@gmail.com>
Date: Fri, 1 Nov 2024 09:46:02 +0200
Subject: [PATCH] Clean up the PKGBUILD a lot

And add a nvchecker file
---
 .SRCINFO        | 31 +++++++++++++++++++++++++++++--
 .nvchecker.toml |  3 +++
 PKGBUILD        | 25 +++++++++++++++++++------
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 .nvchecker.toml

diff --git a/.SRCINFO b/.SRCINFO
index 605615732add..12ea6417187a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,10 +5,37 @@ pkgbase = proton-pass-bin
 	url = https://proton.me/pass
 	arch = x86_64
 	groups = ProtonPass
+	license = MIT
+	license = GPL-3.0-or-later
+	depends = alsa-lib
+	depends = at-spi2-core
+	depends = cairo
+	depends = dbus
+	depends = expat
+	depends = gcc-libs
+	depends = gdk-pixbuf2
+	depends = glib2
+	depends = glibc
+	depends = gtk3
+	depends = libcups
+	depends = libdrm
+	depends = libudev.so
+	depends = libx11
+	depends = libxcb
+	depends = libxcomposite
+	depends = libxdamage
+	depends = libxext
+	depends = libxfixes
+	depends = libxrandr
+	depends = libxkbcommon
+	depends = mesa
+	depends = nspr
+	depends = nss
+	depends = pango
+	provides = proton-pass
+	provides = protonpass
 	conflicts = proton-pass
 	conflicts = protonpass
-	replaces = proton-pass
-	replaces = protonpass
 	source = https://proton.me/download/PassDesktop/linux/x64/proton-pass_1.23.0_amd64.deb
 	sha256sums = 7b0acf937bf58e017ceee63eecff2841d58045cb8529d7e2335073ba530f0698
 
diff --git a/.nvchecker.toml b/.nvchecker.toml
new file mode 100644
index 000000000000..44a33f356fcb
--- /dev/null
+++ b/.nvchecker.toml
@@ -0,0 +1,3 @@
+[proton-pass-bin]
+source = "cmd"
+cmd = "curl -L https://proton.me/download/PassDesktop/linux/x64/version.json | jq -r '.Releases[0].Version'"
diff --git a/PKGBUILD b/PKGBUILD
index 9d1295aa08c3..a331f78813c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Mysti
+# Maintainer: Echo J. <aidas957 at gmail dot com>
+# Contributor: Mysti
 
 pkgname=proton-pass-bin
 pkgver=1.23.0
@@ -6,19 +7,31 @@ pkgrel=1
 pkgdesc="Open-source password manager for effortless protection. Securely store, share and auto-login your accounts with Proton Pass, using end-to-end encryption trusted by millions."
 arch=("x86_64")
 url="https://proton.me/pass"
+license=('MIT') # Bundled Electron
+license+=('GPL-3.0-or-later') # The Proton Pass code itself (https://github.com/ProtonMail/WebClients#license)
 groups=("ProtonPass")
+depends=('alsa-lib' 'at-spi2-core' 'cairo' 'dbus' 'expat' 'gcc-libs' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk3'
+		 'libcups' 'libdrm' 'libudev.so' 'libx11' 'libxcb' 'libxcomposite' 'libxdamage' 'libxext' 'libxfixes'
+		 'libxrandr' 'libxkbcommon' 'mesa' 'nspr' 'nss' 'pango') # Bundled Electron dependencies
+provides=('proton-pass' 'protonpass')
+conflicts=('proton-pass' 'protonpass')
 source=("https://proton.me/download/PassDesktop/linux/x64/proton-pass_${pkgver}_amd64.deb")
 sha256sums=('7b0acf937bf58e017ceee63eecff2841d58045cb8529d7e2335073ba530f0698')
-conflicts=('proton-pass' 'protonpass')
-replaces=('proton-pass' 'protonpass')
 
 package() {
 	tar -xvf data.tar.xz -C "$pkgdir/"
 
-	install -d "$pkgdir/opt/"
-	mv "$pkgdir/usr/lib/proton-pass" "$pkgdir/opt/"
+	install -dm755 "$pkgdir"/opt
+	mv "$pkgdir"/usr/lib/proton-pass "$pkgdir"/opt
+	rmdir "$pkgdir"/usr/lib
 
-	ln -sf "/opt/proton-pass/Proton Pass" "$pkgdir/usr/bin/proton-pass"
+	ln -sf "/opt/proton-pass/Proton Pass" "$pkgdir"/usr/bin/proton-pass
+
+	# Remove world-writable bit from some files
+	chmod -R o-w "$pkgdir"/opt/proton-pass/resources/assets
+
+	# Install bundled Electron license
+	install -Dm644 "$pkgdir"/usr/share/doc/proton-pass/copyright "$pkgdir"/usr/share/licenses/"$pkgname"/copyright
 
 	rm -rf "$pkgdir"/usr/share/{doc,lintian}
 }