diff options
Diffstat (limited to 'net-im/slack')
| -rw-r--r-- | net-im/slack/Manifest | 4 | ||||
| -rw-r--r-- | net-im/slack/metadata.xml | 12 | ||||
| -rw-r--r-- | net-im/slack/slack-4.38.121.ebuild (renamed from net-im/slack/slack-4.4.2.ebuild) | 96 | ||||
| -rw-r--r-- | net-im/slack/slack-4.38.125.ebuild (renamed from net-im/slack/slack-4.3.2-r2.ebuild) | 83 |
4 files changed, 103 insertions, 92 deletions
diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest index e92becd89ed2..85fa1b40831e 100644 --- a/net-im/slack/Manifest +++ b/net-im/slack/Manifest @@ -1,2 +1,2 @@ -DIST slack-desktop-4.3.2-amd64.deb 54914760 BLAKE2B 218d4ba6cc2057bb92b84bd8bbbf94e70022a9e65363c256190584f0a92e1615642583647af2813e02ec2eb243a3428016b1bff3bfbbc6a98f227aa63a94a967 SHA512 36536be0825e1803704304346ea9db2d1d03baddec954dea0c4560bec2b1800cf3e6d431796d1fcd3b9178e3eb070e9ae6da64e4d3949eff649050cab21d5cb2 -DIST slack-desktop-4.4.2-amd64.deb 54818266 BLAKE2B 12ce6cd423081b64919c511562c0508126d4e10f13168630b00d507c0c4b33f1291d158198ad9050008d43bd69755dd79dfa004443f83495aed7728560f318a6 SHA512 7680116ac8e438cea614484c814ed2903aab5432f8901799fdc2772471ca385a5a93d2dff43abe441ca4d4be0cae5d56c54119fb456483cfbb12c5621955f988 +DIST slack-desktop-4.38.121-amd64.deb 79860470 BLAKE2B c6fc7d8afa5ec87be71b5d78b04004e2ee21a3b355499c33bc943e351192024c5f4ae5dea79a396be4b71ab76567dcf22c3c631621bc4085847ebba3e0fda0af SHA512 cadc45f24ce47bc29baef61784e0c68fa932bc151900032e961e106c23c63ca46bce73322e7e2a75e4fa1c1512b4435fba7cb85aab3d526271c4a672cc908903 +DIST slack-desktop-4.38.125-amd64.deb 79860294 BLAKE2B 66970f854b611ac27411924173dde82452fab0818ec3ad2d80d0805cb8e9b62515cc9621c301b46ae8adba167ae60f5a977cf4329689ac3528a256395e79c8b5 SHA512 a14bbeb94284ebc7ce0588be3b0133536db50a75c1afd9053c1983a4d3c1b3388df1a86b711edeb9b1b105517d021e6ac7719b1ec59ec7f820b7549988b7be07 diff --git a/net-im/slack/metadata.xml b/net-im/slack/metadata.xml index 15eca405ed06..79be733db06d 100644 --- a/net-im/slack/metadata.xml +++ b/net-im/slack/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>spiderx@spiderx.dp.ua</email> <name>Vladimir Pavljuchenkov</name> </maintainer> - <maintainer type="project"> + <maintainer type="person"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> @@ -16,6 +20,6 @@ and people. </longdescription> <upstream> - <doc>https://get.slack.help/hc/en-us</doc> + <doc>https://slack.com/intl/en-us/help</doc> </upstream> </pkgmetadata> diff --git a/net-im/slack/slack-4.4.2.ebuild b/net-im/slack/slack-4.38.121.ebuild index 48b3a778dd01..3d7a4b0058ab 100644 --- a/net-im/slack/slack-4.4.2.ebuild +++ b/net-im/slack/slack-4.38.121.ebuild @@ -1,63 +1,59 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MULTILIB_COMPAT=( abi_x86_64 ) -inherit desktop eutils multilib-build pax-utils unpacker xdg-utils +inherit desktop multilib-build optfeature pax-utils unpacker xdg DESCRIPTION="Team collaboration tool" -HOMEPAGE="https://www.slack.com" -SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb" +HOMEPAGE="https://slack.com" +SRC_URI="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/${PN}-desktop-${PV}-amd64.deb" LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64" -IUSE="appindicator suid" +IUSE="appindicator +seccomp suid wayland" RESTRICT="bindist mirror" -RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}] - app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] - dev-libs/atk:0[${MULTILIB_USEDEP}] +RDEPEND="app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] dev-libs/expat:0[${MULTILIB_USEDEP}] dev-libs/glib:2[${MULTILIB_USEDEP}] dev-libs/nspr:0[${MULTILIB_USEDEP}] dev-libs/nss:0[${MULTILIB_USEDEP}] + dev-libs/wayland[${MULTILIB_USEDEP}] media-libs/alsa-lib:0[${MULTILIB_USEDEP}] media-libs/mesa:0[${MULTILIB_USEDEP}] net-print/cups:0[${MULTILIB_USEDEP}] sys-apps/dbus:0[${MULTILIB_USEDEP}] - sys-apps/util-linux:0[${MULTILIB_USEDEP}] x11-libs/cairo:0[${MULTILIB_USEDEP}] x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] x11-libs/gtk+:3[${MULTILIB_USEDEP}] + x11-libs/libdrm:0[${MULTILIB_USEDEP}] x11-libs/libX11:0[${MULTILIB_USEDEP}] x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}] x11-libs/libXcomposite:0[${MULTILIB_USEDEP}] - x11-libs/libXcursor:0[${MULTILIB_USEDEP}] x11-libs/libXdamage:0[${MULTILIB_USEDEP}] x11-libs/libXext:0[${MULTILIB_USEDEP}] x11-libs/libXfixes:0[${MULTILIB_USEDEP}] - x11-libs/libXi:0[${MULTILIB_USEDEP}] + x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}] x11-libs/libxkbfile:0[${MULTILIB_USEDEP}] x11-libs/libXrandr:0[${MULTILIB_USEDEP}] - x11-libs/libXrender:0[${MULTILIB_USEDEP}] - x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}] - x11-libs/libXtst:0[${MULTILIB_USEDEP}] x11-libs/pango:0[${MULTILIB_USEDEP}] - appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )" - -QA_PREBUILT="/opt/slack/chrome-sandbox - /opt/slack/libEGL.so - /opt/slack/libffmpeg.so - /opt/slack/libGLESv2.so - /opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node - /opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node - /opt/slack/slack - /opt/slack/swiftshader/libEGL.so - /opt/slack/swiftshader/libGLESv2.so - /opt/slack/swiftshader/libvk_swiftshader.so" + appindicator? ( dev-libs/libayatana-appindicator )" + +QA_PREBUILT="opt/slack/chrome-sandbox + opt/slack/chrome_crashpad_handler + opt/slack/libEGL.so + opt/slack/libGLESv2.so + opt/slack/libffmpeg.so + opt/slack/libvk_swiftshader.so + opt/slack/libvulkan.so.1 + opt/slack/resources/app.asar.unpacked/node_modules/* + opt/slack/slack + opt/slack/swiftshader/libEGL.so + opt/slack/swiftshader/libGLESv2.so" S="${WORKDIR}" @@ -73,8 +69,23 @@ src_prepare() { if use appindicator ; then sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \ usr/share/applications/slack.desktop \ - || die "sed failed for slack.desktop" + || die "sed failed for appindicator" fi + + if ! use seccomp ; then + sed -i '/Exec/s/%U/%U --disable-seccomp-filter-sandbox/' \ + usr/share/applications/slack.desktop \ + || die "sed failed for seccomp" + fi + + if use wayland ; then + sed -i '/Exec/s/%U/%U --enable-features=WebRTCPipeWireCapturer/' \ + usr/share/applications/slack.desktop \ + || die "sed failed for wayland" + fi + + rm usr/lib/slack/LICENSE{,S-linux.json} \ + || die "rm licenses failed" } src_install() { @@ -82,35 +93,22 @@ src_install() { doicon -s 512 usr/share/pixmaps/slack.png domenu usr/share/applications/slack.desktop - insinto /opt/slack - doins -r usr/lib/slack/. - - # this really should be done a better way than trying to parse - # the QA_PREBUILT variable - local path - for path in ${QA_PREBUILT}; do - local -a paths=(${D}/${path}) - for path in "${paths[@]}"; do - fperms +x "${path#${D}/}" - done - done + insinto /opt # wrt 720134 + cp -a usr/lib/slack "${ED}"/opt || die "cp failed" use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094 dosym ../../opt/slack/slack usr/bin/slack pax-mark -m "${ED}"/opt/slack/slack + + # https://bugs.gentoo.org/898912 + if use appindicator; then + dosym ../../usr/lib64/libayatana-appindicator3.so /opt/slack/libappindicator3.so + fi } pkg_postinst() { optfeature "storing passwords via gnome-keyring" app-crypt/libsecret - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update + xdg_pkg_postinst } diff --git a/net-im/slack/slack-4.3.2-r2.ebuild b/net-im/slack/slack-4.38.125.ebuild index 01c6e59c2cfb..5ab77e3eaedd 100644 --- a/net-im/slack/slack-4.3.2-r2.ebuild +++ b/net-im/slack/slack-4.38.125.ebuild @@ -1,64 +1,60 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MULTILIB_COMPAT=( abi_x86_64 ) -inherit desktop eutils multilib-build pax-utils unpacker xdg-utils +inherit desktop multilib-build optfeature pax-utils unpacker xdg DESCRIPTION="Team collaboration tool" -HOMEPAGE="https://www.slack.com/" -SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb" +HOMEPAGE="https://slack.com" +SRC_URI="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/${PN}-desktop-${PV}-amd64.deb" +S="${WORKDIR}" LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64" -IUSE="appindicator" +IUSE="appindicator +seccomp suid wayland" RESTRICT="bindist mirror" -RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}] - app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] - dev-libs/atk:0[${MULTILIB_USEDEP}] +RDEPEND="app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] dev-libs/expat:0[${MULTILIB_USEDEP}] dev-libs/glib:2[${MULTILIB_USEDEP}] dev-libs/nspr:0[${MULTILIB_USEDEP}] dev-libs/nss:0[${MULTILIB_USEDEP}] + dev-libs/wayland[${MULTILIB_USEDEP}] media-libs/alsa-lib:0[${MULTILIB_USEDEP}] media-libs/mesa:0[${MULTILIB_USEDEP}] net-print/cups:0[${MULTILIB_USEDEP}] sys-apps/dbus:0[${MULTILIB_USEDEP}] - sys-apps/util-linux:0[${MULTILIB_USEDEP}] x11-libs/cairo:0[${MULTILIB_USEDEP}] x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] x11-libs/gtk+:3[${MULTILIB_USEDEP}] + x11-libs/libdrm:0[${MULTILIB_USEDEP}] x11-libs/libX11:0[${MULTILIB_USEDEP}] x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}] x11-libs/libXcomposite:0[${MULTILIB_USEDEP}] - x11-libs/libXcursor:0[${MULTILIB_USEDEP}] x11-libs/libXdamage:0[${MULTILIB_USEDEP}] x11-libs/libXext:0[${MULTILIB_USEDEP}] x11-libs/libXfixes:0[${MULTILIB_USEDEP}] - x11-libs/libXi:0[${MULTILIB_USEDEP}] + x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}] x11-libs/libxkbfile:0[${MULTILIB_USEDEP}] x11-libs/libXrandr:0[${MULTILIB_USEDEP}] - x11-libs/libXrender:0[${MULTILIB_USEDEP}] - x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}] - x11-libs/libXtst:0[${MULTILIB_USEDEP}] x11-libs/pango:0[${MULTILIB_USEDEP}] - appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )" + appindicator? ( dev-libs/libayatana-appindicator )" -QA_PREBUILT="/opt/slack/chrome-sandbox - opt/slack/slack - opt/slack/resources/app.asar.unpacked/node_modules/* - opt/slack/libffmpeg.so +QA_PREBUILT="opt/slack/chrome-sandbox + opt/slack/chrome_crashpad_handler opt/slack/libEGL.so opt/slack/libGLESv2.so + opt/slack/libffmpeg.so + opt/slack/libvk_swiftshader.so + opt/slack/libvulkan.so.1 + opt/slack/resources/app.asar.unpacked/node_modules/* + opt/slack/slack opt/slack/swiftshader/libEGL.so - opt/slack/swiftshader/libGLESv2.so - opt/slack/swiftshader/libvk_swiftshader.so" - -S="${WORKDIR}" + opt/slack/swiftshader/libGLESv2.so" src_prepare() { default @@ -72,8 +68,23 @@ src_prepare() { if use appindicator ; then sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \ usr/share/applications/slack.desktop \ - || die "sed failed for slack.desktop" + || die "sed failed for appindicator" fi + + if ! use seccomp ; then + sed -i '/Exec/s/%U/%U --disable-seccomp-filter-sandbox/' \ + usr/share/applications/slack.desktop \ + || die "sed failed for seccomp" + fi + + if use wayland ; then + sed -i '/Exec/s/%U/%U --enable-features=WebRTCPipeWireCapturer/' \ + usr/share/applications/slack.desktop \ + || die "sed failed for wayland" + fi + + rm usr/lib/slack/LICENSE{,S-linux.json} \ + || die "rm licenses failed" } src_install() { @@ -81,24 +92,22 @@ src_install() { doicon -s 512 usr/share/pixmaps/slack.png domenu usr/share/applications/slack.desktop - insinto /opt/slack - doins -r usr/lib/slack/. - fperms +x /opt/slack/slack + insinto /opt # wrt 720134 + cp -a usr/lib/slack "${ED}"/opt || die "cp failed" + + use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094 dosym ../../opt/slack/slack usr/bin/slack pax-mark -m "${ED}"/opt/slack/slack + + # https://bugs.gentoo.org/898912 + if use appindicator; then + dosym ../../usr/lib64/libayatana-appindicator3.so /opt/slack/libappindicator3.so + fi } pkg_postinst() { optfeature "storing passwords via gnome-keyring" app-crypt/libsecret - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update + xdg_pkg_postinst } |