Publish version 4.36.136-2 - Fix screen sharing on Wayland

2 files changed, 28 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa187c903f49..11d05b7baefe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = slack-electron
 	pkgdesc = Slack Desktop (Beta) for Linux, using the system Electron package
 	pkgver = 4.36.136
-	pkgrel = 1
+	pkgrel = 2
 	url = https://slack.com/downloads/linux
 	arch = x86_64
 	license = custom:proprietary
@@ -13,6 +13,7 @@ pkgbase = slack-electron
 	optdepends = libappindicator-gtk3: for notification indicator in the status bar on GNOME
 	provides = slack-desktop
 	conflicts = slack-desktop
+	noextract = slack-electron-4.36.136.deb
 	source = slack-electron-4.36.136.deb::https://downloads.slack-edge.com/releases/linux/4.36.136/prod/x64/slack-desktop-4.36.136-amd64.deb
 	source = slack.sh
 	sha256sums = e3cddb6c80a0e22eaaadcb38625277f349915df3374e3ef102c632e7ad40a18f
diff --git a/PKGBUILD b/PKGBUILD
index d53e38ba3ced..582e618e071f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=slack-electron
 pkgver=4.36.136
-pkgrel=1
+pkgrel=2
 pkgdesc="Slack Desktop (Beta) for Linux, using the system Electron package"
 arch=(x86_64)
 url="https://slack.com/downloads/linux"
@@ -23,28 +23,44 @@ conflicts=(slack-desktop)
 
 source=(
   "$pkgname-$pkgver.deb::https://downloads.slack-edge.com/releases/linux/$pkgver/prod/x64/slack-desktop-$pkgver-amd64.deb"
-  'slack.sh'
+  "slack.sh"
 )
+noextract=("$pkgname-$pkgver.deb")
 sha256sums=(
   'e3cddb6c80a0e22eaaadcb38625277f349915df3374e3ef102c632e7ad40a18f'
   '4db11d083626a561129ca40e9cce7cc613c42223f138bb0136c62064c57471fd'
 )
 
+_archive="$pkgname-$pkgver"
+
 prepare() {
-  bsdtar -xf data.tar.xz
+  mkdir -p "$_archive"
+  bsdtar -xf "$pkgname-$pkgver.deb" -C "$_archive"
+  bsdtar -xf "$_archive/data.tar.xz" -C "$_archive"
+
+  cd "$_archive"
 
   # Enable slack silent mode and fix icon
   sed -ri \
     -e 's|^(Exec=.+/slack)(.+)|\1 -s\2|' \
     -e 's/^Icon=.+slack\.png/Icon=slack/' \
-    "usr/share/applications/slack.desktop"
+    usr/share/applications/slack.desktop
+
+  # Slack is hard-coded to disable screen sharing on Wayland - remove this
+  # limitation.
+  sed -i 's|,"WebRTCPipeWireCapturer"|,"xxxxxxxxxxxxxxxxxxxxxx"|' \
+    usr/lib/slack/resources/app.asar
 }
 
 package() {
-  install -Dv "slack.sh" "$pkgdir/usr/bin/slack"
-  install -dv "$pkgdir/usr/lib/slack/"
-  cp -av --no-preserve=ownership usr/lib/slack/resources/* "$pkgdir/usr/lib/slack/"
-  install -Dvm644 "usr/share/applications/slack.desktop" -t "$pkgdir/usr/share/applications"
-  install -Dvm644 "usr/share/pixmaps/slack.png" -t "$pkgdir/usr/share/pixmaps"
-  install -Dvm644 "usr/lib/slack/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
+  cd "$_archive"
+
+  install -dm755 "$pkgdir/usr/lib/slack/"
+  cp --archive --no-preserve=ownership usr/lib/slack/resources/* "$pkgdir/usr/lib/slack/"
+
+  install -Dm755 "$srcdir/slack.sh" "$pkgdir/usr/bin/slack"
+
+  install -Dm644 -t "$pkgdir/usr/share/applications" usr/share/applications/slack.desktop
+  install -Dm644 -t "$pkgdir/usr/share/pixmaps" usr/share/pixmaps/slack.png
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" usr/lib/slack/LICENSE
 }