Discord v0.0.52
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
parent
be6522e518
commit
177876de7d
2 changed files with 58 additions and 57 deletions
87
PKGBUILD
87
PKGBUILD
|
@ -12,8 +12,8 @@
|
||||||
|
|
||||||
pkgname=discord
|
pkgname=discord
|
||||||
_pkgname=discord
|
_pkgname=discord
|
||||||
_electron=22
|
_electron=29
|
||||||
pkgver=0.0.51
|
pkgver=0.0.52
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance"
|
pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
|
@ -23,82 +23,55 @@ url='https://discord.com'
|
||||||
license=('custom')
|
license=('custom')
|
||||||
options=('!strip')
|
options=('!strip')
|
||||||
depends=("electron${_electron}" 'libnotify' 'libxss' 'nspr' 'nss' 'gtk3')
|
depends=("electron${_electron}" 'libnotify' 'libxss' 'nspr' 'nss' 'gtk3')
|
||||||
makedepends=('asar' 'curl' 'python-html2text')
|
makedepends=('asar')
|
||||||
optdepends=(
|
optdepends=(
|
||||||
'libpulse: Pulseaudio support'
|
'libpulse: Pulseaudio support'
|
||||||
'xdg-utils: Open files'
|
'xdg-utils: Open files'
|
||||||
)
|
)
|
||||||
source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz")
|
source=(
|
||||||
sha512sums=('b98072a64cfb593176e7e057b926fcf2d9e1a4aa555a659cebb8abe20fe463ff135a8028fd0fc36dc6c1bd40235da98c7c055c372e707cae00b882c8b0462dd9')
|
"https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz"
|
||||||
|
'discord-launcher.sh'
|
||||||
|
'LICENSE.html::https://discord.com/terms'
|
||||||
|
'OSS-LICENSES.html::https://discord.com/licenses'
|
||||||
|
)
|
||||||
|
sha512sums=(
|
||||||
|
'42ff4b59a0dd846f06a297a1a8b5a1e28f37daa6951b4ce597d103492458c5ae90f69545908cd41238c5ed91b249ad2dd9b9cec3ef4feeb9ad22245c692eaa72'
|
||||||
|
'140b8fd340caf1069fcde0d23c8058488a59518b0b55db70290bd2c50b6c3c1c28978fe7d3a6e8feff65cec990f41e34cf68876acfc0183c51f6a58e9f8cb668'
|
||||||
|
SKIP
|
||||||
|
SKIP
|
||||||
|
)
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
# create launcher script
|
|
||||||
cat >>"${srcdir}"/discord-launcher.sh <<EOF
|
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
# fix the .desktop file
|
# fix the .desktop file
|
||||||
sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop
|
sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop
|
||||||
echo 'Path=/usr/bin' >>Discord/$_pkgname.desktop
|
echo 'Path=/usr/bin' >>Discord/$_pkgname.desktop
|
||||||
|
|
||||||
# create the license files
|
# patch launcher electron version
|
||||||
curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md
|
sed -i "s|@ELECTRON_VER@|${_electron}|" discord-launcher.sh
|
||||||
curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
# create necessary directories
|
|
||||||
install -d "${pkgdir}"/usr/{lib/$_pkgname,bin}
|
|
||||||
install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname}
|
|
||||||
|
|
||||||
cd "${srcdir}/Discord"
|
cd "${srcdir}/Discord"
|
||||||
|
|
||||||
# use system electron
|
# use system electron
|
||||||
asar e resources/app.asar resources/app
|
asar e resources/app.asar resources/app
|
||||||
rm resources/app.asar
|
rm resources/app.asar
|
||||||
sed -i "s|process.resourcesPath|'/usr/lib/${_pkgname}'|" resources/app/app_bootstrap/buildInfo.js
|
sed -i "s|process.resourcesPath|'/usr/share/${_pkgname}/resources'|" resources/app/app_bootstrap/buildInfo.js
|
||||||
sed -i "s|exeDir,|'/usr/share/pixmaps',|" resources/app/app_bootstrap/autoStart/linux.js
|
sed -i "s|exeDir,|'/usr/share/pixmaps',|" resources/app/app_bootstrap/autoStart/linux.js
|
||||||
|
sed -i -E "s|resourcesPath = _path.+;|resourcesPath = '/usr/share/${_pkgname}/resources';|" resources/app/common/paths.js
|
||||||
asar p resources/app resources/app.asar
|
asar p resources/app resources/app.asar
|
||||||
rm -rf resources/app
|
rm -rf resources/app
|
||||||
|
}
|
||||||
|
|
||||||
# copy relevant data
|
package() {
|
||||||
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 the launch script
|
||||||
install -Dm 755 discord-launcher.sh "${pkgdir}"/usr/bin/$_pkgname
|
install -Dm 755 discord-launcher.sh "${pkgdir}/usr/bin/${_pkgname}"
|
||||||
|
|
||||||
|
# copy resources into patched path
|
||||||
|
install -d "${pkgdir}/usr/share/${_pkgname}/resources"
|
||||||
|
cp -r Discord/resources/* "${pkgdir}/usr/share/${_pkgname}/resources/"
|
||||||
|
|
||||||
|
install -Dm 644 Discord/$_pkgname.png "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
|
||||||
|
install -Dm 644 Discord/$_pkgname.desktop "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
|
||||||
|
|
||||||
# install licenses
|
# install licenses
|
||||||
install -Dm 644 LICENSE.md "${pkgdir}"/usr/share/licenses/$_pkgname/
|
install -Dm 644 -t "${pkgdir}/usr/share/licenses/${_pkgname}" LICENSE.html OSS-LICENSES.html
|
||||||
install -Dm 644 OSS-LICENSES.md "${pkgdir}"/usr/share/licenses/$_pkgname/
|
|
||||||
}
|
}
|
||||||
|
|
28
discord-launcher.sh
Normal file
28
discord-launcher.sh
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
electron=electron@ELECTRON_VER@
|
||||||
|
|
||||||
|
if [ "$XDG_SESSION_TYPE" = wayland ]; then
|
||||||
|
# Using wayland
|
||||||
|
exec $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/share/discord/resources/app.asar $@
|
||||||
|
else
|
||||||
|
# Using x11
|
||||||
|
exec $electron \
|
||||||
|
--enable-accelerated-mjpeg-decode \
|
||||||
|
--enable-accelerated-video \
|
||||||
|
--ignore-gpu-blacklist \
|
||||||
|
--enable-native-gpu-memory-buffers \
|
||||||
|
--enable-gpu-rasterization \
|
||||||
|
--enable-gpu \
|
||||||
|
/usr/share/discord/resources/app.asar $@
|
||||||
|
fi
|
Loading…
Reference in a new issue