From f277aa9dbd30661fac95bf97fea96fe14e461204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 3 Apr 2023 08:32:00 +0200 Subject: [PATCH] Rename package to discord-electron, PKGBUILD refactor --- discord-electron-bin/.SRCINFO | 20 ------ discord-electron-bin/PKGBUILD | 102 -------------------------- discord-electron/.SRCINFO | 27 +++---- discord-electron/.gitignore | 6 -- discord-electron/PKGBUILD | 132 ++++++++++++++++++++++------------ discord-electron/discord.sh | 2 - 6 files changed, 95 insertions(+), 194 deletions(-) delete mode 100644 discord-electron-bin/.SRCINFO delete mode 100644 discord-electron-bin/PKGBUILD delete mode 100644 discord-electron/.gitignore delete mode 100644 discord-electron/discord.sh diff --git a/discord-electron-bin/.SRCINFO b/discord-electron-bin/.SRCINFO deleted file mode 100644 index 919b0f7..0000000 --- a/discord-electron-bin/.SRCINFO +++ /dev/null @@ -1,20 +0,0 @@ -pkgbase = discord-electron-bin - pkgdesc = Discord using system provided electron (v22) for increased security and performance - pkgver = 0.0.26 - pkgrel = 1 - url = https://discord.com - arch = x86_64 - license = custom - makedepends = asar - makedepends = curl - makedepends = python-html2text - depends = electron22 - optdepends = libpulse: Pulseaudio support - optdepends = xdg-utils: Open files - provides = discord - conflicts = discord - options = !strip - source = https://dl.discordapp.net/apps/linux/0.0.26/discord-0.0.26.tar.gz - sha512sums = 65477c2c033f30850a699706a6502ff4f4af8838185716d968d641fdab3033555139b04bf91a111a847aca14113e33ba6248d49ba317fd43cbacb099e974117b - -pkgname = discord-electron-bin diff --git a/discord-electron-bin/PKGBUILD b/discord-electron-bin/PKGBUILD deleted file mode 100644 index c153bda..0000000 --- a/discord-electron-bin/PKGBUILD +++ /dev/null @@ -1,102 +0,0 @@ -# Maintainer: Manuel Hüsers -# Contributor: Stick -# Contributor: johnnyapol -# Contributor: huyizheng -# Contributor: Filipe Laíns (FFY00) -# Contributor: Morgan - -# Based off the discord_arch_electron_wayland PKGBUILD from Stick -# Based off the discord_arch_electron PKGBUILD from johnnyapol and huyizheng -# Based off the discord community repo PKGBUILD by Filipe Laíns (FFY00) - -pkgname=discord-electron-bin -_pkgname=discord -_electron=22 -pkgver=0.0.26 -pkgrel=1 -pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" -arch=('x86_64') -provides=("${_pkgname}") -conflicts=("${_pkgname}") -url='https://discord.com' -license=('custom') -options=('!strip') -depends=("electron${_electron}") -makedepends=('asar' 'curl' 'python-html2text') -optdepends=( - 'libpulse: Pulseaudio support' - 'xdg-utils: Open files' -) -source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz") -sha512sums=('65477c2c033f30850a699706a6502ff4f4af8838185716d968d641fdab3033555139b04bf91a111a847aca14113e33ba6248d49ba317fd43cbacb099e974117b') - -_tarname='Discord' - -prepare() { - # create launcher script - cat >> "${srcdir}"/discord-launcher.sh <> $_tarname/$_pkgname.desktop - - # create the license files - curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md - curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md - - # use system electron - asar e $_tarname/resources/app.asar $_tarname/resources/app - rm $_tarname/resources/app.asar - sed -i "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" $_tarname/resources/app/app_bootstrap/buildInfo.js - sed -i "s|exeDir,|'/usr/share/pixmaps',|" $_tarname/resources/app/app_bootstrap/autoStart/linux.js - asar p $_tarname/resources/app $_tarname/resources/app.asar --unpack-dir '**' - rm -rf $_tarname/resources/app -} - -package() { - # create necessary directories - install -d "${pkgdir}"/usr/{lib/$_pkgname,bin} - install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname} - - # copy relevant data - cp -r $_tarname/resources/* "${pkgdir}"/usr/lib/$_pkgname/ - - # install the binary - install -Dm 755 discord-launcher.sh "${pkgdir}"/usr/bin/$_pkgname - - cp $_tarname/$_pkgname.png \ - "${pkgdir}"/usr/share/pixmaps/$_pkgname.png - cp $_tarname/$_pkgname.desktop \ - "${pkgdir}"/usr/share/applications/$_pkgname.desktop - - # license - install -Dm 644 LICENSE.md "${pkgdir}"/usr/share/licenses/$_pkgname/ - install -Dm 644 OSS-LICENSES.md "${pkgdir}"/usr/share/licenses/$_pkgname/ -} diff --git a/discord-electron/.SRCINFO b/discord-electron/.SRCINFO index 0b75bf1..3eb5b1c 100644 --- a/discord-electron/.SRCINFO +++ b/discord-electron/.SRCINFO @@ -1,27 +1,20 @@ pkgbase = discord-electron - pkgdesc = All-in-one voice and text chat for gamers that's free and secure. - pkgver = 0.0.15 + pkgdesc = Discord using system provided electron (v22) for increased security and performance + pkgver = 0.0.26 pkgrel = 1 - url = https://discordapp.com + url = https://discord.com arch = x86_64 license = custom makedepends = asar - depends = electron - depends = libnotify - depends = libxss - depends = nspr - depends = nss - depends = gtk3 + makedepends = curl + makedepends = python-html2text + depends = electron22 optdepends = libpulse: Pulseaudio support optdepends = xdg-utils: Open files + provides = discord conflicts = discord - source = https://dl.discordapp.net/apps/linux/0.0.15/discord-0.0.15.tar.gz - source = discord.sh - source = LICENSE.html::https://discordapp.com/terms - source = OSS-LICENSES.html::https://discordapp.com/licenses - sha512sums = 4f220ecd0e0c9fcd793ed065055479391506d9401b75ca541cde4136d0290f2720fccca87139091faf269fdb2c020adb5b7333710a31ca603ce8552f3dd4841b - sha512sums = b5fe7bfd31ae1867f3392605bd52ac155c6c02c4a2a132419d9806c08e61715461818919c2e480ba8e7f14b51aefcd588dcaa247f15d24286e177e45f43e17f9 - sha512sums = 6a2ebf7aadf06ba804c1c6f10677a014b2b9eb17a2bb34538426bf4c76686c4c11976bd682610965535f7a5d4a2f6b36dfa5aa875578defef1213ed866acb530 - sha512sums = f6d46b7a2dd6c8475625a988f36419788ab90149317c9a4e5e8ffea8613f27d0746c1557467332770c033349abd370bf721990ecadc383b4aee63cb8b74a280c + options = !strip + source = https://dl.discordapp.net/apps/linux/0.0.26/discord-0.0.26.tar.gz + sha512sums = 65477c2c033f30850a699706a6502ff4f4af8838185716d968d641fdab3033555139b04bf91a111a847aca14113e33ba6248d49ba317fd43cbacb099e974117b pkgname = discord-electron diff --git a/discord-electron/.gitignore b/discord-electron/.gitignore deleted file mode 100644 index 11fb5a8..0000000 --- a/discord-electron/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -pkg -src -*.tar.gz -*.pkg.tar.zst -LICENSE.html -OSS-LICENSES.html diff --git a/discord-electron/PKGBUILD b/discord-electron/PKGBUILD index 77301fa..3e5f331 100644 --- a/discord-electron/PKGBUILD +++ b/discord-electron/PKGBUILD @@ -1,65 +1,103 @@ -# Maintainer: Dušan Simić +# Maintainer: Manuel Hüsers +# Contributor: Stick +# Contributor: johnnyapol +# Contributor: huyizheng +# Contributor: Filipe Laíns (FFY00) +# Contributor: Morgan + +# Based off the discord_arch_electron_wayland PKGBUILD from Stick +# Based off the discord_arch_electron PKGBUILD from johnnyapol and huyizheng +# Based off the discord community repo PKGBUILD by Filipe Laíns (FFY00) -_electron=electron pkgname=discord-electron _pkgname=discord -_Pkgname=Discord -pkgver=0.0.15 +_electron=22 +pkgver=0.0.26 pkgrel=1 -pkgdesc="All-in-one voice and text chat for gamers that's free and secure." +pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance" arch=('x86_64') -url='https://discordapp.com' +provides=("${_pkgname}") +conflicts=("${_pkgname}") +url='https://discord.com' license=('custom') -depends=("$_electron" 'libnotify' 'libxss' 'nspr' 'nss' 'gtk3') -makedepends=('asar') -optdepends=('libpulse: Pulseaudio support' - 'xdg-utils: Open files') -conflicts=(discord) -source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" - 'discord.sh' - 'LICENSE.html::https://discordapp.com/terms' - 'OSS-LICENSES.html::https://discordapp.com/licenses') -sha512sums=('4f220ecd0e0c9fcd793ed065055479391506d9401b75ca541cde4136d0290f2720fccca87139091faf269fdb2c020adb5b7333710a31ca603ce8552f3dd4841b' - 'b5fe7bfd31ae1867f3392605bd52ac155c6c02c4a2a132419d9806c08e61715461818919c2e480ba8e7f14b51aefcd588dcaa247f15d24286e177e45f43e17f9' - '6a2ebf7aadf06ba804c1c6f10677a014b2b9eb17a2bb34538426bf4c76686c4c11976bd682610965535f7a5d4a2f6b36dfa5aa875578defef1213ed866acb530' - 'f6d46b7a2dd6c8475625a988f36419788ab90149317c9a4e5e8ffea8613f27d0746c1557467332770c033349abd370bf721990ecadc383b4aee63cb8b74a280c') +options=('!strip') +depends=("electron${_electron}") +makedepends=('asar' 'curl' 'python-html2text') +optdepends=( + 'libpulse: Pulseaudio support' + 'xdg-utils: Open files' +) +source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz") +sha512sums=('65477c2c033f30850a699706a6502ff4f4af8838185716d968d641fdab3033555139b04bf91a111a847aca14113e33ba6248d49ba317fd43cbacb099e974117b') prepare() { - cd "$_Pkgname" + # create launcher script + cat >> "${srcdir}"/discord-launcher.sh <> "$_pkgname.desktop" +if [ "\$XDG_SESSION_TYPE" = wayland ]; then + # Using wayland + exec electron${_electron} \\ + --enable-features=UseOzonePlatform \\ + --ozone-platform=wayland \\ + --enable-accelerated-mjpeg-decode \\ + --enable-accelerated-video \\ + --ignore-gpu-blacklist \\ + --enable-native-gpu-memory-buffers \\ + --enable-gpu-rasterization \\ + --enable-gpu \\ + --enable-features=WebRTCPipeWireCapturer \\ + /usr/lib/discord/app.asar \$@ +else + # Using x11 + exec electron${_electron} \\ + --enable-accelerated-mjpeg-decode \\ + --enable-accelerated-video \\ + --ignore-gpu-blacklist \\ + --enable-native-gpu-memory-buffers \\ + --enable-gpu-rasterization \\ + --enable-gpu \\ + /usr/lib/discord/app.asar \$@ +fi +EOF - # Change resource path in asar archive - asar extract resources/app.asar resources/app.asar.dest - sed -i "s|process\.resourcesPath|'/', 'opt', '$pkgname'|" resources/app.asar.dest/app_bootstrap/buildInfo.js - asar pack resources/app.asar.dest resources/app.asar - # Cleanup unpacked files - rm -r resources/app.asar.dest + # fix the .desktop file + sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop + echo 'Path=/usr/bin' >> Discord/$_pkgname.desktop - cd "$srcdir" - - # Set electron version in startup script - sed -i "s|@ELECTRON@|$_electron|" "$_pkgname.sh" + # create the license files + curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md + curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md } package() { - # Install the app - install -d "$pkgdir/opt/$pkgname" - cp -a "$_Pkgname/resources/." "$pkgdir/opt/$pkgname" + # create necessary directories + install -d "${pkgdir}"/usr/{lib/$_pkgname,bin} + install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname} - # Install startup script - install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$pkgname" - ln -s "/usr/bin/$pkgname" "$pkgdir/usr/bin/$_pkgname" + cd "${srcdir}/Discord" - # Install icon and desktop file - install -Dm644 "$_Pkgname/$_pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "$_Pkgname/$_pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + # use system electron + asar e resources/app.asar resources/app + rm resources/app.asar + sed -i "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" resources/app/app_bootstrap/buildInfo.js + sed -i "s|exeDir,|'/usr/share/pixmaps',|" resources/app/app_bootstrap/autoStart/linux.js + asar p resources/app resources/app.asar + rm -rf resources/app - # Licenses - install -Dm644 LICENSE.html "$pkgdir/usr/share/licenses/$pkgname/LICENSE.html" - install -Dm644 OSS-LICENSES.html "$pkgdir/usr/share/licenses/$pkgname/OSS-LICENSES.html" + # copy relevant data + cp -r resources/* "${pkgdir}"/usr/lib/$_pkgname/ + cp $_pkgname.png \ + "${pkgdir}"/usr/share/pixmaps/$_pkgname.png + cp $_pkgname.desktop \ + "${pkgdir}"/usr/share/applications/$_pkgname.desktop + + cd "${srcdir}" + + # install the launch script + install -Dm 755 discord-launcher.sh "${pkgdir}"/usr/bin/$_pkgname + + # install licenses + install -Dm 644 LICENSE.md "${pkgdir}"/usr/share/licenses/$_pkgname/ + install -Dm 644 OSS-LICENSES.md "${pkgdir}"/usr/share/licenses/$_pkgname/ } - diff --git a/discord-electron/discord.sh b/discord-electron/discord.sh deleted file mode 100644 index 87f5542..0000000 --- a/discord-electron/discord.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec @ELECTRON@ /opt/discord-electron/app.asar --disable-dev-mode "$@"