From a6f8092d405f3fe91f669d857481ce06d2ae96f4 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 1 Dec 2021 18:33:15 +0000 Subject: net-im/signal-desktop-bin: fix glibc[-clone3] dependency We need to consider two cases: - stable users (2.33-r7 right now) who do not have the flag and are therefore fine => -clone3(-) - ~arch users (2.34* right now) who do have the flag and when it doesn't exist for older versions of 2.34, it's on => -clone3(+) Reported-by: Miezhiko Signed-off-by: Sam James --- .../signal-desktop-bin-5.24.0-r1.ebuild | 103 --------------------- .../signal-desktop-bin-5.24.0-r2.ebuild | 103 +++++++++++++++++++++ 2 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 net-im/signal-desktop-bin/signal-desktop-bin-5.24.0-r1.ebuild create mode 100644 net-im/signal-desktop-bin/signal-desktop-bin-5.24.0-r2.ebuild (limited to 'net-im') diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.24.0-r1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.24.0-r1.ebuild deleted file mode 100644 index 916648237a26..000000000000 --- a/net-im/signal-desktop-bin/signal-desktop-bin-5.24.0-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/-bin/}" - -inherit pax-utils unpacker xdg - -DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer" -HOMEPAGE="https://signal.org/ - https://github.com/signalapp/Signal-Desktop" -SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb" -S="${WORKDIR}" - -LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="+sound" -RESTRICT="splitdebug" - -# Drop -clone3(-) from glibc once Electron is updated -# See bug #819045 -RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-accessibility/at-spi2-core:2 - dev-libs/atk - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/mesa[X(+)] - net-print/cups - sys-apps/dbus[X] - sys-libs/glibc[-clone3(-)] - x11-libs/gdk-pixbuf:2 - x11-libs/cairo - x11-libs/gtk+:3[X] - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libxkbcommon - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libxshmfence - x11-libs/pango - sound? ( - || ( - media-sound/pulseaudio - media-sound/apulse - ) - ) -" - -QA_PREBUILT=" - opt/Signal/chrome-sandbox - opt/Signal/libEGL.so - opt/Signal/libGLESv2.so - opt/Signal/libffmpeg.so - opt/Signal/libvk_swiftshader.so - opt/Signal/libvulkan.so.1 - opt/Signal/resources/app.asar.unpacked/node_modules/* - opt/Signal/signal-desktop - opt/Signal/swiftshader/libEGL.so - opt/Signal/swiftshader/libGLESv2.so" - -src_prepare() { - default - sed -e 's| --no-sandbox||g' \ - -i usr/share/applications/signal-desktop.desktop || die - unpack usr/share/doc/signal-desktop/changelog.gz - - rm opt/Signal/resources/app.asar.unpacked/node_modules/{ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/node.napi.armv8.node,ffi-napi/prebuilds/linux-arm64/node.napi.uv1.armv8.node,ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ref-napi/prebuilds/linux-arm64/node.napi.armv8.node} || die -} - -src_install() { - insinto / - dodoc changelog - doins -r opt - 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 - fi - - doins -r usr/share/applications - doins -r usr/share/icons - fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox - fperms u+s /opt/Signal/chrome-sandbox - pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox - - dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN} -} - -pkg_postinst() { - xdg_pkg_postinst - elog "For using the tray icon on compatible desktop environments, start Signal with" - elog " '--start-in-tray' or '--use-tray-icon'." -} diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.24.0-r2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.24.0-r2.ebuild new file mode 100644 index 000000000000..afe06b581e61 --- /dev/null +++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.24.0-r2.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="${PN/-bin/}" + +inherit pax-utils unpacker xdg + +DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer" +HOMEPAGE="https://signal.org/ + https://github.com/signalapp/Signal-Desktop" +SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb" +S="${WORKDIR}" + +LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="+sound" +RESTRICT="splitdebug" + +# Drop -clone3(+) from glibc once Electron is updated +# See bug #819045 +RDEPEND=" + app-accessibility/at-spi2-atk:2 + app-accessibility/at-spi2-core:2 + dev-libs/atk + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/mesa[X(+)] + net-print/cups + sys-apps/dbus[X] + || ( =sys-libs/glibc-2.34[-clone3(+)] ) + x11-libs/gdk-pixbuf:2 + x11-libs/cairo + x11-libs/gtk+:3[X] + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libxkbcommon + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libxshmfence + x11-libs/pango + sound? ( + || ( + media-sound/pulseaudio + media-sound/apulse + ) + ) +" + +QA_PREBUILT=" + opt/Signal/chrome-sandbox + opt/Signal/libEGL.so + opt/Signal/libGLESv2.so + opt/Signal/libffmpeg.so + opt/Signal/libvk_swiftshader.so + opt/Signal/libvulkan.so.1 + opt/Signal/resources/app.asar.unpacked/node_modules/* + opt/Signal/signal-desktop + opt/Signal/swiftshader/libEGL.so + opt/Signal/swiftshader/libGLESv2.so" + +src_prepare() { + default + sed -e 's| --no-sandbox||g' \ + -i usr/share/applications/signal-desktop.desktop || die + unpack usr/share/doc/signal-desktop/changelog.gz + + rm opt/Signal/resources/app.asar.unpacked/node_modules/{ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/node.napi.armv8.node,ffi-napi/prebuilds/linux-arm64/node.napi.uv1.armv8.node,ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ref-napi/prebuilds/linux-arm64/node.napi.armv8.node} || die +} + +src_install() { + insinto / + dodoc changelog + doins -r opt + 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 + fi + + doins -r usr/share/applications + doins -r usr/share/icons + fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox + fperms u+s /opt/Signal/chrome-sandbox + pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox + + dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN} +} + +pkg_postinst() { + xdg_pkg_postinst + elog "For using the tray icon on compatible desktop environments, start Signal with" + elog " '--start-in-tray' or '--use-tray-icon'." +} -- cgit v1.2.3-65-gdbad