upgpkg: discord-electron-openasar 0.0.58+828-1: update electron & openasar, remove makedep

* Update Electron version to 31 again as electron issue #42560 is fixed with 31.1.0
* Remove unnecessary make dependency and keep license files in html format
* Update to latest OpenAsar commit

clonezilla-unstable/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = clonezilla-unstable
 	pkgdesc = ncurses partition and disk imaging/cloning program
-	pkgver = 5.6.9
+	pkgver = 5.6.10
 	pkgrel = 1
 	url = https://clonezilla.org
 	arch = any
@@ -29,9 +29,9 @@ pkgbase = clonezilla-unstable
 	provides = clonezilla
 	conflicts = clonezilla
 	backup = etc/drbl/drbl-ocs.conf
-	source = https://free.nchc.org.tw/drbl-core/src/unstable/clonezilla-5.6.9.tar.xz
+	source = https://free.nchc.org.tw/drbl-core/src/unstable/clonezilla-5.6.10.tar.xz
 	source = usrbin.patch
-	sha512sums = 118324af060ce4967269668979baa8e97ea9bdce67d8dd8bcf470c9a59062ccf45b8e219e4a18511a3a674a1a205ee1990e2493b9fc38fbf7b654aa7643d5f3b
+	sha512sums = 5bbc53035e5141a3bbbee767b64a9c355ee6cde3d73c2be9fc81d1ece1c7f769a71aed1134973a16c5015392856c221991f409760d1652cdfe80e65e57f6cad7
 	sha512sums = 39e63eaa18ffaed7fe9a2dde449c8b57d4a3dc313024213881bd620d0011671bb7f8a0346df7c247c2da94f8d82afb669057cb05dd9cefffafb680826544d6ac
 
 pkgname = clonezilla-unstable

clonezilla-unstable/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=clonezilla-unstable
 _pkgname=clonezilla
-pkgver=5.6.9
+pkgver=5.6.10
 pkgrel=1
 pkgdesc="ncurses partition and disk imaging/cloning program"
 arch=('any')
@@ -16,7 +16,7 @@ conflicts=("${_pkgname}")
 provides=("${_pkgname}")
 source=("https://free.nchc.org.tw/drbl-core/src/unstable/${_pkgname}-${pkgver}.tar.xz"
 	'usrbin.patch')
-sha512sums=('118324af060ce4967269668979baa8e97ea9bdce67d8dd8bcf470c9a59062ccf45b8e219e4a18511a3a674a1a205ee1990e2493b9fc38fbf7b654aa7643d5f3b'
+sha512sums=('5bbc53035e5141a3bbbee767b64a9c355ee6cde3d73c2be9fc81d1ece1c7f769a71aed1134973a16c5015392856c221991f409760d1652cdfe80e65e57f6cad7'
             '39e63eaa18ffaed7fe9a2dde449c8b57d4a3dc313024213881bd620d0011671bb7f8a0346df7c247c2da94f8d82afb669057cb05dd9cefffafb680826544d6ac')
 
 prepare() {

discord-electron-openasar/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = discord-electron-openasar
-	pkgdesc = Discord packaged with OpenAsar using system provided electron (v30) for increased security and performance
+	pkgdesc = Discord packaged with OpenAsar using system provided electron (v31) for increased security and performance
-	pkgver = 0.0.58+827
+	pkgver = 0.0.58+828
 	pkgrel = 1
 	url = https://discord.com
 	install = discord-electron-openasar.install
@@ -10,8 +10,7 @@ pkgbase = discord-electron-openasar
 	makedepends = asar
 	makedepends = nodejs
 	makedepends = curl
-	makedepends = python-html2text
+	depends = electron31
-	depends = electron30
 	depends = libxss
 	depends = unzip
 	optdepends = libpulse: Pulseaudio support
@@ -25,10 +24,10 @@ pkgbase = discord-electron-openasar
 	source = https://dl.discordapp.net/apps/linux/0.0.58/discord-0.0.58.tar.gz
 	source = discord-launcher.sh
 	source = krisp-patcher.py
-	source = git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d
+	source = git+https://github.com/goosemod/openasar.git#commit=5c875eb048e96543f1ec711fae522ace5e4a836c
 	sha512sums = 8efab6f4a476c05b620f3e95c082ae3f5423a2aaab310687f8b67711b0b34e7c82105e8c9ea5d4e0b92fc368443bc6a0e8970143d28ef7cb2d5f9e05f85b038d
 	sha512sums = 4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666
 	sha512sums = 3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f
-	sha512sums = 055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849
+	sha512sums = 36b7747ec2dad8ddcc84533dbe2013eae7166affd9fdaa3b5c8571faf4e1361fda2aadde719df4d4d18a7da513be51fe8e0726dbf589ebe545a0abc12960bb22
 
 pkgname = discord-electron-openasar

discord-electron-openasar/PKGBUILD

@@ -2,10 +2,10 @@
 
 pkgname=discord-electron-openasar
 _pkgname=discord
-pkgver=0.0.58+827
+pkgver=0.0.58+828
 _pkgver=${pkgver%%+*}
 pkgrel=1
-_electronver=30
+_electronver=31
 _electronname="electron${_electronver}"
 pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance"
 arch=('x86_64')
@@ -16,7 +16,7 @@ license=('custom')
 options=('!strip')
 install="$pkgname.install"
 depends=("${_electronname}" 'libxss' 'unzip')
-makedepends=('git' 'asar' 'nodejs' 'curl' 'python-html2text')
+makedepends=('git' 'asar' 'nodejs' 'curl')
 optdepends=(
 	'libpulse: Pulseaudio support'
 	'libappindicator-gtk3: Systray indicator support'
@@ -27,11 +27,11 @@ optdepends=(
 source=("https://dl.discordapp.net/apps/linux/${_pkgver}/${_pkgname}-${_pkgver}.tar.gz"
 	'discord-launcher.sh'
 	'krisp-patcher.py' # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py
-	"git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d")
+	"git+https://github.com/goosemod/openasar.git#commit=5c875eb048e96543f1ec711fae522ace5e4a836c")
 sha512sums=('8efab6f4a476c05b620f3e95c082ae3f5423a2aaab310687f8b67711b0b34e7c82105e8c9ea5d4e0b92fc368443bc6a0e8970143d28ef7cb2d5f9e05f85b038d'
             '4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666'
             '3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f'
-            '055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849')
+            '36b7747ec2dad8ddcc84533dbe2013eae7166affd9fdaa3b5c8571faf4e1361fda2aadde719df4d4d18a7da513be51fe8e0726dbf589ebe545a0abc12960bb22')
 
 # just in case I get the version wrong
 pkgver() {
@@ -50,8 +50,8 @@ prepare() {
 	sed -i -e "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" ${_pkgname^}/$_pkgname.desktop
 
 	# create the license files
-	curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md
+	curl -o LICENSE.html https://discord.com/terms
-	curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md
+	curl -o OSS-LICENSES.html https://discord.com/licenses
 }
 
 build() {
@@ -88,6 +88,6 @@ package() {
 	install -Dm 644 krisp-patcher.py "${pkgdir}"/usr/lib/${_pkgname}/
 
 	# install licenses
-	install -Dm 644 LICENSE.md "${pkgdir}"/usr/share/licenses/$_pkgname/LICENSE.md
+	install -Dm 644 LICENSE.html "${pkgdir}"/usr/share/licenses/$_pkgname/LICENSE.html
-	install -Dm 644 OSS-LICENSES.md "${pkgdir}"/usr/share/licenses/$_pkgname/OSS-LICENSES.md
+	install -Dm 644 OSS-LICENSES.html "${pkgdir}"/usr/share/licenses/$_pkgname/OSS-LICENSES.html
 }

discord-electron/.SRCINFO

@@ -1,15 +1,14 @@
 pkgbase = discord-electron
-	pkgdesc = Discord using system provided electron (v30) for increased security and performance
+	pkgdesc = Discord using system provided electron (v31) for increased security and performance
 	pkgver = 0.0.58
-	pkgrel = 1
+	pkgrel = 2
 	url = https://discord.com
 	install = discord-electron.install
 	arch = x86_64
 	license = custom
 	makedepends = asar
 	makedepends = curl
-	makedepends = python-html2text
+	depends = electron31
-	depends = electron30
 	depends = libxss
 	optdepends = libpulse: Pulseaudio support
 	optdepends = libappindicator-gtk3: Systray indicator support

discord-electron/PKGBUILD

@@ -1,8 +1,8 @@
 pkgname=discord-electron
 _pkgname=discord
 pkgver=0.0.58
-pkgrel=1
+pkgrel=2
-_electronver=30
+_electronver=31
 _electronname="electron${_electronver}"
 pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance"
 arch=('x86_64')
@@ -13,7 +13,7 @@ license=('custom')
 options=('!strip')
 install="$pkgname.install"
 depends=("${_electronname}" 'libxss')
-makedepends=('asar' 'curl' 'python-html2text')
+makedepends=('asar' 'curl')
 optdepends=(
 	'libpulse: Pulseaudio support'
 	'libappindicator-gtk3: Systray indicator support'
@@ -39,8 +39,8 @@ prepare() {
 	sed -i -e "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" ${_pkgname^}/$_pkgname.desktop
 
 	# create the license files
-	curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md
+	curl -o LICENSE.html https://discord.com/terms
-	curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md
+	curl -o OSS-LICENSES.html https://discord.com/licenses
 }
 
 build() {
@@ -78,6 +78,6 @@ package() {
 	install -Dm 644 krisp-patcher.py "${pkgdir}"/usr/lib/${_pkgname}/
 
 	# install licenses
-	install -Dm 644 LICENSE.md "${pkgdir}"/usr/share/licenses/$_pkgname/LICENSE.md
+	install -Dm 644 LICENSE.html "${pkgdir}"/usr/share/licenses/$_pkgname/LICENSE.html
-	install -Dm 644 OSS-LICENSES.md "${pkgdir}"/usr/share/licenses/$_pkgname/OSS-LICENSES.md
+	install -Dm 644 OSS-LICENSES.html "${pkgdir}"/usr/share/licenses/$_pkgname/OSS-LICENSES.html
 }