From 0338eedbf599b08986535de49ea41467e209e6ca Mon Sep 17 00:00:00 2001 From: Zoddo Date: Fri, 17 Oct 2025 21:30:02 +0200 Subject: [PATCH 1/2] upgpkg: discord 0.0.112-4: fix wayland detection There is a false positive on non-wayland systems because the socket extistance test end up checking whether XDG_RUNTIME_DIR exists (which is always true) --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- discord-launcher.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 34fae09..a4aa35f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord_arch_electron pkgdesc = Discord using system provided electron for increased security and performance pkgver = 0.0.112 - pkgrel = 3 + pkgrel = 4 epoch = 1 url = https://discord.com install = discord_arch_electron.install @@ -22,7 +22,7 @@ pkgbase = discord_arch_electron source = discord-launcher.sh source = krisp-patcher.py sha512sums = 5b37b63c3fbc2ea55a1cfc9c4bfc26f73e896c1978f9dcecf0735d385e76f4ae7f7107947f8939efc0eaac7dca7a951eba13ad953329244a4935cd2b92b8065c - sha512sums = 137daac9ad34a33decbe8d516e05e6e107a70e6424c42ce1254badd17b7dbb3837b7f55cede31b6a55f26d2429714615385eb7c5d99c67b8ba8b15e6b0fb755b + sha512sums = e74f0c8285d628e5b272bad70c90be5d7f7f0c97057ef28b9caed5db25f09c4fe323876686d764ac7ea0375d7856ac3c99ec38de04f66951a1b185646fd6e138 sha512sums = 42cef68c1f7d574b4fbe859a4dc616e8994c7d16f62bcae3ff1f88e1edc58ac37b39c238d7defa9c97ceda417fcd6224cf0a0fd2608b8d18d0877e3c1befa59c pkgname = discord_arch_electron diff --git a/PKGBUILD b/PKGBUILD index 62c8d63..c04b97c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ _pkgname=discord _electron=electron pkgname=${_pkgname}_arch_electron pkgver=0.0.112 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc="Discord using system provided ${_electron} for increased security and performance" arch=('any') @@ -30,7 +30,7 @@ source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.ta 'discord-launcher.sh' 'krisp-patcher.py') # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py sha512sums=('5b37b63c3fbc2ea55a1cfc9c4bfc26f73e896c1978f9dcecf0735d385e76f4ae7f7107947f8939efc0eaac7dca7a951eba13ad953329244a4935cd2b92b8065c' - '137daac9ad34a33decbe8d516e05e6e107a70e6424c42ce1254badd17b7dbb3837b7f55cede31b6a55f26d2429714615385eb7c5d99c67b8ba8b15e6b0fb755b' + 'e74f0c8285d628e5b272bad70c90be5d7f7f0c97057ef28b9caed5db25f09c4fe323876686d764ac7ea0375d7856ac3c99ec38de04f66951a1b185646fd6e138' '42cef68c1f7d574b4fbe859a4dc616e8994c7d16f62bcae3ff1f88e1edc58ac37b39c238d7defa9c97ceda417fcd6224cf0a0fd2608b8d18d0877e3c1befa59c') prepare() { diff --git a/discord-launcher.sh b/discord-launcher.sh index 9e2f189..f42e0b7 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -32,7 +32,7 @@ for line in "${MAPFILE[@]}"; do fi done -if [[ -e "${XDG_RUNTIME_DIR:-}/${WAYLAND_SOCKET:-}" || -e "${WAYLAND_DISPLAY:-}" || "${XDG_SESSION_TYPE:-}" == "wayland" ]]; then +if [[ -S "${XDG_RUNTIME_DIR:-}/${WAYLAND_SOCKET:-}" || -e "${WAYLAND_DISPLAY:-}" || "${XDG_SESSION_TYPE:-}" == "wayland" ]]; then # work around electron's broken wayland detection # TODO: remove when Arch updates to an electron release that includes the fix # https://github.com/electron/electron/pull/48301 From 5671d5834e7a0102d1abe208ed90f08b71f67d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 26 Oct 2025 19:43:09 +0100 Subject: [PATCH 2/2] upgpkg: discord 0.0.112-5: remove workaround Remove Wayland detection workaround again as Electron 38 fix is now upstream --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- discord-launcher.sh | 7 ------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a4aa35f..78e89b9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = discord_arch_electron pkgdesc = Discord using system provided electron for increased security and performance pkgver = 0.0.112 - pkgrel = 4 + pkgrel = 5 epoch = 1 url = https://discord.com install = discord_arch_electron.install @@ -22,7 +22,7 @@ pkgbase = discord_arch_electron source = discord-launcher.sh source = krisp-patcher.py sha512sums = 5b37b63c3fbc2ea55a1cfc9c4bfc26f73e896c1978f9dcecf0735d385e76f4ae7f7107947f8939efc0eaac7dca7a951eba13ad953329244a4935cd2b92b8065c - sha512sums = e74f0c8285d628e5b272bad70c90be5d7f7f0c97057ef28b9caed5db25f09c4fe323876686d764ac7ea0375d7856ac3c99ec38de04f66951a1b185646fd6e138 + sha512sums = 5e2b4bc955606c23d3f788d73e81fbd6e6278b618ad85c5a3edc722428bbb6460c5dc874ad9b6ab893f658e669e1a0aa1a0d0830ddbfc019d01596425903dd57 sha512sums = 42cef68c1f7d574b4fbe859a4dc616e8994c7d16f62bcae3ff1f88e1edc58ac37b39c238d7defa9c97ceda417fcd6224cf0a0fd2608b8d18d0877e3c1befa59c pkgname = discord_arch_electron diff --git a/PKGBUILD b/PKGBUILD index c04b97c..8d57471 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ _pkgname=discord _electron=electron pkgname=${_pkgname}_arch_electron pkgver=0.0.112 -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc="Discord using system provided ${_electron} for increased security and performance" arch=('any') @@ -30,7 +30,7 @@ source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.ta 'discord-launcher.sh' 'krisp-patcher.py') # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py sha512sums=('5b37b63c3fbc2ea55a1cfc9c4bfc26f73e896c1978f9dcecf0735d385e76f4ae7f7107947f8939efc0eaac7dca7a951eba13ad953329244a4935cd2b92b8065c' - 'e74f0c8285d628e5b272bad70c90be5d7f7f0c97057ef28b9caed5db25f09c4fe323876686d764ac7ea0375d7856ac3c99ec38de04f66951a1b185646fd6e138' + '5e2b4bc955606c23d3f788d73e81fbd6e6278b618ad85c5a3edc722428bbb6460c5dc874ad9b6ab893f658e669e1a0aa1a0d0830ddbfc019d01596425903dd57' '42cef68c1f7d574b4fbe859a4dc616e8994c7d16f62bcae3ff1f88e1edc58ac37b39c238d7defa9c97ceda417fcd6224cf0a0fd2608b8d18d0877e3c1befa59c') prepare() { diff --git a/discord-launcher.sh b/discord-launcher.sh index f42e0b7..a914157 100644 --- a/discord-launcher.sh +++ b/discord-launcher.sh @@ -32,13 +32,6 @@ for line in "${MAPFILE[@]}"; do fi done -if [[ -S "${XDG_RUNTIME_DIR:-}/${WAYLAND_SOCKET:-}" || -e "${WAYLAND_DISPLAY:-}" || "${XDG_SESSION_TYPE:-}" == "wayland" ]]; then - # work around electron's broken wayland detection - # TODO: remove when Arch updates to an electron release that includes the fix - # https://github.com/electron/electron/pull/48301 - flags+=("--ozone-platform=wayland") -fi - exec /usr/bin/${electron} \ /usr/share/${name}/resources/app.asar \ "${flags[@]}" "$@"