net-im/signal-desktop-bin: revert bump to 1.40.0

 - this version suffers from a weird problem where profile may(?) get
   corrupted.

Bug: https://bugs.gentoo.org/771363
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

2 files changed, 12 insertions, 12 deletions

diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 221707383d3e..754b09f0a709 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_1.40.0_amd64.deb 109879464 BLAKE2B c7342722b35a71b6fdced5553a3b55c7f1ba110bd73e363652ff0760bb070a4ef40aba18e9850649d62c8107814630d89b29967d279e1b5f13d7e3f428097e01 SHA512 8ad4c2b5a5847f137e9e94dec26d61cf99d6e61f1449296b8b7e0794a89fb0937192b08c325db7eca5b75a2283f3829a1c9b8b3cb329aca961efc9c3ef3ea758
+DIST signal-desktop_1.39.6_amd64.deb 110644720 BLAKE2B be79e5c2145acbd5a8e4ee5e27238ff3f593ca4ac8d5560802ad9cdb4fb945963a693b51871f76245c7ed55157c34c2c805c575cb45b764ac09a34d80f8ed547 SHA512 49fa8745c30d59ba3fc5cb1b0a28117e416d77cf51183f47dce99545b4ee850a92585ef6778c38a8498b1c6dca7f35cacb0babfc4645a8a8b1be4e5ae857e699
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.40.0-r1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.39.6.ebuild
index de02c7ac3f07..8c09f422a51b 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.40.0-r1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.39.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN="${PN/-bin/}"
 
-inherit pax-utils unpacker xdg
+inherit optfeature pax-utils unpacker xdg
 
 DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
 HOMEPAGE="https://signal.org/
@@ -17,6 +17,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64"
 IUSE="+sound"
 
+BDEPEND="app-admin/chrpath"
 RDEPEND="
 	app-accessibility/at-spi2-atk
 	app-accessibility/at-spi2-core
@@ -44,7 +45,6 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
-	x11-libs/libxkbcommon
 	x11-libs/pango
 	sound? (
 		|| (
@@ -62,18 +62,15 @@ QA_PREBUILT="opt/Signal/signal-desktop
 	opt/Signal/libnode.so
 	opt/Signal/libVkICD_mock_icd.so
 	opt/Signal/libvk_swiftshader.so
-	opt/Signal/libvulkan.so
 	opt/Signal/swiftshader/libGLESv2.so
 	opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/electron-v8.5-linux-x64/node_sqlite3.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/build/Release/ffi_bindings.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/8.10.5/lib/libvips-cpp.so.42
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/8.10.5/lib/libvips.so.42
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*
 	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so"
 
 RESTRICT="splitdebug"
@@ -82,9 +79,13 @@ S="${WORKDIR}"
 
 src_prepare() {
 	default
-	sed -e 's| --no-sandbox||g' \
+	sed -e 's|\("/opt/Signal/signal-desktop"\)|\1 --start-in-tray|g' \
+		-e 's| --no-sandbox||g' \
 		-i usr/share/applications/signal-desktop.desktop || die
 	unpack usr/share/doc/signal-desktop/changelog.gz
+	# Fix Bug 706352
+	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libjpeg.so.8.2.2 -r '$ORIGIN:/target/lib' || die
+	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libffi.so.6.0.4 -d || die
 }
 
 src_install() {
@@ -94,7 +95,7 @@ src_install() {
 	insinto /usr/share
 
 	if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then
-		sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop || die
+		sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop
 	fi
 
 	doins -r usr/share/applications
@@ -110,6 +111,5 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	elog "For using the tray icon on compatible desktop environments,"
-	elog "start Signal with '--start-in-tray' or '--use-tray-icon'."
+	optfeature "using the tray icon in Xfce desktop environments" xfce-extra/xfce4-statusnotifier-plugin
 }