From 66113e7871aede225d661473925cea4cce9e6d23 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 May 2024 00:01:30 +0100 Subject: gentoo auto-resync : 16:05:2024 - 00:01:30 --- net-im/Manifest.gz | Bin 9241 -> 9238 bytes net-im/slack/Manifest | 4 +- net-im/slack/slack-4.37.101.ebuild | 114 ---------- net-im/slack/slack-4.38.121.ebuild | 114 ++++++++++ net-im/telegram-desktop/Manifest | 4 +- .../files/tdesktop-5.0.1-qt6-no-wayland.patch | 20 +- .../telegram-desktop-5.0.1-r1.ebuild | 249 +++++++++++++++++++++ .../telegram-desktop/telegram-desktop-5.0.1.ebuild | 249 --------------------- 8 files changed, 377 insertions(+), 377 deletions(-) delete mode 100644 net-im/slack/slack-4.37.101.ebuild create mode 100644 net-im/slack/slack-4.38.121.ebuild create mode 100644 net-im/telegram-desktop/telegram-desktop-5.0.1-r1.ebuild delete mode 100644 net-im/telegram-desktop/telegram-desktop-5.0.1.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index 314e11601481..7b501438fe24 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest index 218baa13330e..ba66b19338e2 100644 --- a/net-im/slack/Manifest +++ b/net-im/slack/Manifest @@ -1,5 +1,5 @@ -DIST slack-desktop-4.37.101-amd64.deb 78933422 BLAKE2B b98574309a07812c9439aa18ce061eac5f8d3a8bbe1ec207b96dcd6ef5d32bb796348ada207123a4c9f75244b65f8de57b2290058b891f026c182e3697959fc9 SHA512 7ade44d443067c3330b28ec2ded8fabe84035c051d5e23e9f9f29a759833f7289491796ad2ca3855c840aa591e092048a2754ff429e7a2502c109577c0cef82d DIST slack-desktop-4.38.115-amd64.deb 79886658 BLAKE2B 6e5d4b8de0c3897650c8cb996008408c907987c08507f3a6ed595cd9ee3a6ac9196b6c4ca3e1b23cc64a118fcf986a5ab55263307d3353ab76d1c660230c6ee3 SHA512 b5699e293fe7e3716e0dce2fdfba39d11512b779740497c0204f403eecea4a45da289fb7aef4695dbd7c3489a7df8df1dca08bc0ffdb7b50b839cf78c6ff7edf -EBUILD slack-4.37.101.ebuild 3391 BLAKE2B c012bc0ba4cfdc15244e94b467dbd1280d91a28d0eb32c5222f73842bc045b918bc7b71405d7984ee7eca4b2f1d9a18b369101dd4cab6f9906a72606cfb076a0 SHA512 1320087d00cc1f7d5eed0026e31d6e4ab663dd74cc441c478583b27f2bd2b3dbd5a56e2aad9847ff1a4e992bd0d3d409bbab52125d447dade961d4ca25d2ded0 +DIST slack-desktop-4.38.121-amd64.deb 79860470 BLAKE2B c6fc7d8afa5ec87be71b5d78b04004e2ee21a3b355499c33bc943e351192024c5f4ae5dea79a396be4b71ab76567dcf22c3c631621bc4085847ebba3e0fda0af SHA512 cadc45f24ce47bc29baef61784e0c68fa932bc151900032e961e106c23c63ca46bce73322e7e2a75e4fa1c1512b4435fba7cb85aab3d526271c4a672cc908903 EBUILD slack-4.38.115.ebuild 3391 BLAKE2B c012bc0ba4cfdc15244e94b467dbd1280d91a28d0eb32c5222f73842bc045b918bc7b71405d7984ee7eca4b2f1d9a18b369101dd4cab6f9906a72606cfb076a0 SHA512 1320087d00cc1f7d5eed0026e31d6e4ab663dd74cc441c478583b27f2bd2b3dbd5a56e2aad9847ff1a4e992bd0d3d409bbab52125d447dade961d4ca25d2ded0 +EBUILD slack-4.38.121.ebuild 3391 BLAKE2B c012bc0ba4cfdc15244e94b467dbd1280d91a28d0eb32c5222f73842bc045b918bc7b71405d7984ee7eca4b2f1d9a18b369101dd4cab6f9906a72606cfb076a0 SHA512 1320087d00cc1f7d5eed0026e31d6e4ab663dd74cc441c478583b27f2bd2b3dbd5a56e2aad9847ff1a4e992bd0d3d409bbab52125d447dade961d4ca25d2ded0 MISC metadata.xml 820 BLAKE2B fbc57502a8a3fd4d5d3c8df0cc4e51b97f2349704fe3d2f53dc1933eb7ea5ddc5579a0cacea547581933a0f24ace33ea003921566e4d71ed275a1058ca80562a SHA512 776c49eef270ac6c837a73b3e2aec3aedf7613af20e37da7c91b8c482d5b957c5a0e66baf28ebc3a1bf0ff70afa46688c6f360a47123905af7537dc1a1a6e0e9 diff --git a/net-im/slack/slack-4.37.101.ebuild b/net-im/slack/slack-4.37.101.ebuild deleted file mode 100644 index 3d7a4b0058ab..000000000000 --- a/net-im/slack/slack-4.37.101.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_64 ) - -inherit desktop multilib-build optfeature pax-utils unpacker xdg - -DESCRIPTION="Team collaboration tool" -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 +seccomp suid wayland" -RESTRICT="bindist mirror" - -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}] - 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/libXdamage:0[${MULTILIB_USEDEP}] - x11-libs/libXext:0[${MULTILIB_USEDEP}] - x11-libs/libXfixes:0[${MULTILIB_USEDEP}] - x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}] - x11-libs/libxkbfile:0[${MULTILIB_USEDEP}] - x11-libs/libXrandr:0[${MULTILIB_USEDEP}] - x11-libs/pango:0[${MULTILIB_USEDEP}] - 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}" - -src_prepare() { - default - - # remove hardcoded path, logging noise (wrt 694058, 711494) - sed -i -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \ - -e '/Exec/s|slack|slack -s|' \ - usr/share/applications/slack.desktop \ - || die "sed failed in Icon for slack.desktop" - - if use appindicator ; then - sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \ - usr/share/applications/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() { - doicon usr/share/pixmaps/slack.png - doicon -s 512 usr/share/pixmaps/slack.png - domenu usr/share/applications/slack.desktop - - 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_pkg_postinst -} diff --git a/net-im/slack/slack-4.38.121.ebuild b/net-im/slack/slack-4.38.121.ebuild new file mode 100644 index 000000000000..3d7a4b0058ab --- /dev/null +++ b/net-im/slack/slack-4.38.121.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MULTILIB_COMPAT=( abi_x86_64 ) + +inherit desktop multilib-build optfeature pax-utils unpacker xdg + +DESCRIPTION="Team collaboration tool" +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 +seccomp suid wayland" +RESTRICT="bindist mirror" + +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}] + 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/libXdamage:0[${MULTILIB_USEDEP}] + x11-libs/libXext:0[${MULTILIB_USEDEP}] + x11-libs/libXfixes:0[${MULTILIB_USEDEP}] + x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}] + x11-libs/libxkbfile:0[${MULTILIB_USEDEP}] + x11-libs/libXrandr:0[${MULTILIB_USEDEP}] + x11-libs/pango:0[${MULTILIB_USEDEP}] + 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}" + +src_prepare() { + default + + # remove hardcoded path, logging noise (wrt 694058, 711494) + sed -i -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \ + -e '/Exec/s|slack|slack -s|' \ + usr/share/applications/slack.desktop \ + || die "sed failed in Icon for slack.desktop" + + if use appindicator ; then + sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \ + usr/share/applications/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() { + doicon usr/share/pixmaps/slack.png + doicon -s 512 usr/share/pixmaps/slack.png + domenu usr/share/applications/slack.desktop + + 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_pkg_postinst +} diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 9a5d016eb20f..7d146eed6190 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,9 +1,9 @@ AUX tdesktop-4.10.0-system-cppgir.patch 1150 BLAKE2B d8a6e1320c2ccfd4f1c3f63bfda11f58a499df3880f262adf3f1b74f217dc8c4cc62a8c250d71ff809fb67c797948b53fac5a4d5c584a116b1609ea432662d73 SHA512 0fd213f9aec3a6ff9be11654934126960309cb8e1241dd694852bffeb7a37a08d3c78a332a5bb7e6529358df69bfddb7ccb58138e6dc331f20dd5337ddc9a1c1 AUX tdesktop-4.10.5-qt_compare.patch 381 BLAKE2B 5a5ceea9163f5c2a4cda0df5d10e4013a9634e11a3a3694e1d09166ec311c1089f75b48fa6d618965b722daae40d1f297484ea954341ef8420c7259425eb0ef8 SHA512 d37fea06e9178c778560d2f46b2953794b1605635bdcbf1343a5077c1270d7ec56e5cbb00bdf6caf7eafe21a3c44faa719b9376b8d317d2a109308107fae4226 AUX tdesktop-4.2.4-jemalloc-only-telegram-r1.patch 1307 BLAKE2B b27f65973a6fa8c83469e0c6419a600ca04ebbf35f6c4a406129867eee644082c4f0164fb71afbc6ae729bb4037d0cf6c68ea1ad78f6268bfe245b83e4290400 SHA512 d2c33dd18e354ebe6cb7143b58e9f61dc4cd664bb1e7ad9c60f562efbb05cc72d5b36270af96b866583b366b59cc34cadee3a62dcbd40433276b80b2511e1fcb -AUX tdesktop-5.0.1-qt6-no-wayland.patch 4071 BLAKE2B 941a0b874ecd5983179586c796990e23548c117a200c0a2ad714046ee6ccfccf9f5427b0a6452517007a1c2569c79cb9728dc056a2559aaacf648081f141b50a SHA512 5e3ce484290d46e9460ace719abc5afb6a33c4c0d4ec4647d3428a31d6b6f7aafead59ee3219e0083ead567467a078ed0aa011d4243fce82636a7319e83430d2 +AUX tdesktop-5.0.1-qt6-no-wayland.patch 3908 BLAKE2B 2b0093b7054660cfbca144b9c133471016dcd5ab66a57acbd007f078bfa851d0fcbef57bb81763a82849df0602486fdd14dc1f8da22b2d6b59970f96ba499826 SHA512 9f0dcd49d56d99133d7b3d5f0055dc7cb1b4491daf3fefe522c74469c60ed82f24fa4464f4976aacc51323af5904d7d111987640889bde0e9b50fb99c2491045 DIST tdesktop-4.15.0-full.tar.gz 68286818 BLAKE2B 2bd4d59370a4f97aa3c1b1d64fa7eea114539edcff46ea30a5361cefeeb1de8a1954be91a1a420ddc1b1a30970944387c2cd3749badaa494e53862066c624ac3 SHA512 95aa5f14a9a88b9c6421049445f59f1c5c5d7ab4ca4e8b8f4ab7389bdb8f3cc6b29fea270574881633035acec769ba271261f84ec269010c63af28a03719da98 DIST tdesktop-5.0.1-full.tar.gz 69454563 BLAKE2B 0bbb0ee0c096a344b00091795c2bfadd71272b01966daed8f44fd7010c4c4ecfb265c80ecd773934dd0636be1e703bbadc0038befdefd6da93dfadea40e53fba SHA512 45b7833f20f01d78c09163e205af7d68afffcfc88075ba6af35dc6cbbce1f0205c0150b137ca09e6bdaf271240e4d1336411ad427bc27a2b2ad42dc435ee0ec2 EBUILD telegram-desktop-4.15.0-r2.ebuild 7396 BLAKE2B f869a09a351aed1d0a9f9978085b2999f5e4150a124d117dc281dce0bd7e0537eed3b6c380ff5c7ebfdd842b54f9dbd6add2fc345ff8e45cfc91d2d842e2618e SHA512 6c4f6571992d97fc4cc54cf4db03ad376affc61a78f137f9a9ca59ab3c44af2a5155261bb523bbfd5ea117b7bd9a99adb649639f20772b2293d73d2611db26b0 -EBUILD telegram-desktop-5.0.1.ebuild 8060 BLAKE2B 088de521ebe31c3cea5b54c9839411d144cb3c678166ad1d604750a6c1c12ee845cebb50aa5d55b7e99903a34a75ba32d2ab3d15cb9cd35ebd0dfe12e478284d SHA512 a9c61e090497346b7dac7b7c819ed39fd01452079b14ef5bb5a2871818bb2315fbc5370cdd65c88fe7ce9b3dbd07d9df80c8c7bcf8043c078bca23f55316e649 +EBUILD telegram-desktop-5.0.1-r1.ebuild 8060 BLAKE2B 088de521ebe31c3cea5b54c9839411d144cb3c678166ad1d604750a6c1c12ee845cebb50aa5d55b7e99903a34a75ba32d2ab3d15cb9cd35ebd0dfe12e478284d SHA512 a9c61e090497346b7dac7b7c819ed39fd01452079b14ef5bb5a2871818bb2315fbc5370cdd65c88fe7ce9b3dbd07d9df80c8c7bcf8043c078bca23f55316e649 MISC metadata.xml 1307 BLAKE2B 13008e6d601f7e537bbfa6c65091f442a68320858ec0f1433f31ef69890dbdd730464a1e9d5dfc125982895a4fdfaa48edb643670fffba538dcdd44ceffa9cf4 SHA512 a7e0db84964fd04ab37641a23d9b722191d1c5731b946d7e4859c6b0dd2f5a53eadb88297fd24dadd66c5ee097aa0622adafae74d8819e940b1aa9e612ab1e38 diff --git a/net-im/telegram-desktop/files/tdesktop-5.0.1-qt6-no-wayland.patch b/net-im/telegram-desktop/files/tdesktop-5.0.1-qt6-no-wayland.patch index 10a8743a0d31..2c10ceb9b388 100644 --- a/net-im/telegram-desktop/files/tdesktop-5.0.1-qt6-no-wayland.patch +++ b/net-im/telegram-desktop/files/tdesktop-5.0.1-qt6-no-wayland.patch @@ -9,8 +9,8 @@ be seen, depending on what upstream thinks about this. https://bugs.gentoo.org/928451 https://github.com/desktop-app/cmake_helpers/commit/a428df5440e76a726abc30924766ac7da0cb381c ---- tdesktop-5.0.1-full.orig/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp -+++ tdesktop-5.0.1-full/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp +--- a/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp ++++ b/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp @@ -15,7 +15,7 @@ namespace base::Platform { @@ -20,14 +20,14 @@ https://github.com/desktop-app/cmake_helpers/commit/a428df5440e76a726abc30924766 const auto window = QGuiApplication::focusWindow(); if (!window) { callback({}); ---- tdesktop-5.0.1-full.orig/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp -+++ tdesktop-5.0.1-full/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp +--- a/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp ++++ b/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp @@ -413,7 +413,7 @@ } #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION -#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) -+#if !defined DESKTOP_APP_DISABLE_X11_INTEGRATION && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) ++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) void ShowWaylandWindowMenu(not_null widget, const QPoint &point) { static const auto wl_proxy_marshal_array = [] { void (*result)( @@ -67,8 +67,8 @@ https://github.com/desktop-app/cmake_helpers/commit/a428df5440e76a726abc30924766 if (::Platform::IsWayland()) { ShowWaylandWindowMenu(widget, point); return; ---- tdesktop-5.0.1-full.orig/cmake/options.cmake -+++ tdesktop-5.0.1-full/cmake/options.cmake +--- a/cmake/options.cmake ++++ b/cmake/options.cmake @@ -23,6 +23,13 @@ ) endif() @@ -76,15 +76,15 @@ https://github.com/desktop-app/cmake_helpers/commit/a428df5440e76a726abc30924766 +if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) + target_compile_definitions(common_options + INTERFACE -+ DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION ++ DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + ) +endif() + if (WIN32) include(cmake/options_win.cmake) elseif (APPLE) ---- tdesktop-5.0.1-full.orig/cmake/variables.cmake -+++ tdesktop-5.0.1-full/cmake/variables.cmake +--- a/cmake/variables.cmake ++++ b/cmake/variables.cmake @@ -21,6 +21,7 @@ option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON) diff --git a/net-im/telegram-desktop/telegram-desktop-5.0.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-5.0.1-r1.ebuild new file mode 100644 index 000000000000..0dfe60495f3e --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-5.0.1-r1.ebuild @@ -0,0 +1,249 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +DESCRIPTION="Official desktop client for Telegram" +HOMEPAGE="https://desktop.telegram.org" + +MY_P="tdesktop-${PV}-full" +SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" +IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X" +REQUIRED_USE=" + qt6-imageformats? ( qt6 ) +" + +KIMAGEFORMATS_RDEPEND=" + media-libs/libavif:= + media-libs/libheif:= + >=media-libs/libjxl-0.8.0:= +" +CDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + >=dev-cpp/glibmm-2.77:2.68 + dev-libs/glib:2 + dev-libs/libdispatch + dev-libs/openssl:= + dev-libs/protobuf + dev-libs/xxhash + media-libs/libjpeg-turbo:= + ~media-libs/libtgvoip-2.4.4_p20221208 + media-libs/openal + media-libs/opus + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] + media-video/ffmpeg:=[opus,vpx] + sys-libs/zlib:=[minizip] + !enchant? ( >=app-text/hunspell-1.7:= ) + enchant? ( app-text/enchant:= ) + jemalloc? ( dev-libs/jemalloc:= ) + !qt6? ( + >=dev-qt/qtcore-5.15:5= + >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] + >=dev-qt/qtimageformats-5.15:5 + >=dev-qt/qtnetwork-5.15:5[ssl] + >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtwidgets-5.15:5[png,X?] + kde-frameworks/kcoreaddons:5 + webkit? ( + >=dev-qt/qtdeclarative-5.15:5 + >=dev-qt/qtwayland-5.15:5[compositor(+)] + ) + ) + qt6? ( + >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + webkit? ( + >=dev-qt/qtdeclarative-6.5:6 + >=dev-qt/qtwayland-6.5:6[compositor,qml] + ) + qt6-imageformats? ( + >=dev-qt/qtimageformats-6.5:6= + ${KIMAGEFORMATS_RDEPEND} + ) + ) + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-keysyms + ) +" +RDEPEND="${CDEPEND} + webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) ) +" +DEPEND="${CDEPEND} + >=dev-cpp/cppgir-2.0_p20240315 + >=dev-cpp/ms-gsl-4 + dev-cpp/expected-lite + dev-cpp/range-v3 +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/cmake-3.16 + >=dev-cpp/cppgir-2.0_p20240315 + dev-util/gdbus-codegen + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch" + "${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch" + "${FILESDIR}/tdesktop-5.0.1-qt6-no-wayland.patch" +) + +pkg_pretend() { + if has ccache ${FEATURES}; then + ewarn "ccache does not work with ${PN} out of the box" + ewarn "due to usage of precompiled headers" + ewarn "check bug https://bugs.gentoo.org/715114 for more info" + ewarn + fi +} + +src_prepare() { + # Bundle kde-frameworks/kimageformats for qt6, since it's impossible to + # build in gentoo right now. + if use qt6-imageformats; then + sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ + cmake/external/kimageformats/CMakeLists.txt || die + printf '%s\n' \ + 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ + 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ + 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ + >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die + fi + # kde-frameworks/kcoreaddons is bundled when using qt6. + + # Happily fail if libraries aren't found... + find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ + \! -path './Telegram/lib_webview/CMakeLists.txt' \ + \! -path './cmake/external/expected/CMakeLists.txt' \ + \! -path './cmake/external/kcoreaddons/CMakeLists.txt' \ + \! -path './cmake/external/qt/package.cmake' \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' || die + # Make sure to check the excluded files for new + # CMAKE_DISABLE_FIND_PACKAGE entries. + + # Control QtDBus dependency from here, to avoid messing with QtGui. + # QtGui will use find_package to find QtDbus as well, which + # conflicts with the -DCMAKE_DISABLE_FIND_PACKAGE method. + if ! use dbus; then + sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \ + -i cmake/external/qt/package.cmake || die + fi + + cmake_src_prepare +} + +src_configure() { + # Having user paths sneak into the build environment through the + # XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir: + # - bug 909038: can't read from flatpak directories (fixed upstream) + # - bug 920819: system-wide directories ignored when variable is set + export XDG_DATA_DIRS="${EPREFIX}/usr/share" + + # Evil flag (bug #919201) + filter-flags -fno-delete-null-pointer-checks + + # The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep + # the same state across both projects. + # See https://bugs.gentoo.org/866055 + append-cppflags '-DNDEBUG' + + local qt=$(usex qt6 6 5) + local mycmakeargs=( + -DQT_VERSION_MAJOR=${qt} + + # Override new cmake.eclass defaults (https://bugs.gentoo.org/921939) + # Upstream never tests this any other way + -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF + + # Control automagic dependencies on certain packages + ## Header-only lib, some git version. + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland) + ## Only used in Telegram/lib_webview/CMakeLists.txt + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit) + ## KF6CoreAddons is currently unavailable in ::gentoo + -DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6) + + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) + -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) + ## Enables enchant and disables hunspell + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) + ## Use system fonts instead of bundled ones + -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) + ) + + if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then + einfo "Found custom API credentials" + mycmakeargs+=( + -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" + -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" + ) + else + # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + # Building with snapcraft API credentials by default + # Custom API credentials can be obtained here: + # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md + # After getting credentials you can export variables: + # export MY_TDESKTOP_API_ID="17349"" + # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" + # and restart the build" + # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop + # portage will use custom variable every build automatically + mycmakeargs+=( + -DTDESKTOP_API_ID="611335" + -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" + ) + fi + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use X && ! use screencast; then + ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" + ewarn + fi + if ! use jemalloc && use elibc_glibc; then + # https://github.com/telegramdesktop/tdesktop/issues/16084 + # https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003 + ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!" + ewarn "Do NOT report issues about RAM usage without enabling this flag first." + ewarn + fi + if use wayland && ! use qt6; then + ewarn "Wayland-specific integrations have been deprecated with Qt5." + ewarn "The app will continue to function under wayland, but some" + ewarn "functionality may be reduced." + ewarn "These integrations are only supported when built with Qt6." + ewarn + fi + if use qt6 && ! use qt6-imageformats; then + elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support" + elog + fi + optfeature_header + if ! use qt6; then + optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl] + fi +} diff --git a/net-im/telegram-desktop/telegram-desktop-5.0.1.ebuild b/net-im/telegram-desktop/telegram-desktop-5.0.1.ebuild deleted file mode 100644 index 0dfe60495f3e..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-5.0.1.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit xdg cmake python-any-r1 optfeature flag-o-matic - -DESCRIPTION="Official desktop client for Telegram" -HOMEPAGE="https://desktop.telegram.org" - -MY_P="tdesktop-${PV}-full" -SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" -IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X" -REQUIRED_USE=" - qt6-imageformats? ( qt6 ) -" - -KIMAGEFORMATS_RDEPEND=" - media-libs/libavif:= - media-libs/libheif:= - >=media-libs/libjxl-0.8.0:= -" -CDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - dev-cpp/abseil-cpp:= - >=dev-cpp/glibmm-2.77:2.68 - dev-libs/glib:2 - dev-libs/libdispatch - dev-libs/openssl:= - dev-libs/protobuf - dev-libs/xxhash - media-libs/libjpeg-turbo:= - ~media-libs/libtgvoip-2.4.4_p20221208 - media-libs/openal - media-libs/opus - media-libs/rnnoise - ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] - media-video/ffmpeg:=[opus,vpx] - sys-libs/zlib:=[minizip] - !enchant? ( >=app-text/hunspell-1.7:= ) - enchant? ( app-text/enchant:= ) - jemalloc? ( dev-libs/jemalloc:= ) - !qt6? ( - >=dev-qt/qtcore-5.15:5= - >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] - >=dev-qt/qtimageformats-5.15:5 - >=dev-qt/qtnetwork-5.15:5[ssl] - >=dev-qt/qtsvg-5.15:5 - >=dev-qt/qtwidgets-5.15:5[png,X?] - kde-frameworks/kcoreaddons:5 - webkit? ( - >=dev-qt/qtdeclarative-5.15:5 - >=dev-qt/qtwayland-5.15:5[compositor(+)] - ) - ) - qt6? ( - >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?] - >=dev-qt/qtimageformats-6.5:6 - >=dev-qt/qtsvg-6.5:6 - webkit? ( - >=dev-qt/qtdeclarative-6.5:6 - >=dev-qt/qtwayland-6.5:6[compositor,qml] - ) - qt6-imageformats? ( - >=dev-qt/qtimageformats-6.5:6= - ${KIMAGEFORMATS_RDEPEND} - ) - ) - X? ( - x11-libs/libxcb:= - x11-libs/xcb-util-keysyms - ) -" -RDEPEND="${CDEPEND} - webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) ) -" -DEPEND="${CDEPEND} - >=dev-cpp/cppgir-2.0_p20240315 - >=dev-cpp/ms-gsl-4 - dev-cpp/expected-lite - dev-cpp/range-v3 -" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-build/cmake-3.16 - >=dev-cpp/cppgir-2.0_p20240315 - dev-util/gdbus-codegen - virtual/pkgconfig - wayland? ( dev-util/wayland-scanner ) -" - -PATCHES=( - "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch" - "${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch" - "${FILESDIR}/tdesktop-5.0.1-qt6-no-wayland.patch" -) - -pkg_pretend() { - if has ccache ${FEATURES}; then - ewarn "ccache does not work with ${PN} out of the box" - ewarn "due to usage of precompiled headers" - ewarn "check bug https://bugs.gentoo.org/715114 for more info" - ewarn - fi -} - -src_prepare() { - # Bundle kde-frameworks/kimageformats for qt6, since it's impossible to - # build in gentoo right now. - if use qt6-imageformats; then - sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ - cmake/external/kimageformats/CMakeLists.txt || die - printf '%s\n' \ - 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ - 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ - 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ - >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die - fi - # kde-frameworks/kcoreaddons is bundled when using qt6. - - # Happily fail if libraries aren't found... - find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ - \! -path './Telegram/lib_webview/CMakeLists.txt' \ - \! -path './cmake/external/expected/CMakeLists.txt' \ - \! -path './cmake/external/kcoreaddons/CMakeLists.txt' \ - \! -path './cmake/external/qt/package.cmake' \ - -print0 | xargs -0 sed -i \ - -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ - -e '/find_package(/s/)/ REQUIRED)/' || die - # Make sure to check the excluded files for new - # CMAKE_DISABLE_FIND_PACKAGE entries. - - # Control QtDBus dependency from here, to avoid messing with QtGui. - # QtGui will use find_package to find QtDbus as well, which - # conflicts with the -DCMAKE_DISABLE_FIND_PACKAGE method. - if ! use dbus; then - sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \ - -i cmake/external/qt/package.cmake || die - fi - - cmake_src_prepare -} - -src_configure() { - # Having user paths sneak into the build environment through the - # XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir: - # - bug 909038: can't read from flatpak directories (fixed upstream) - # - bug 920819: system-wide directories ignored when variable is set - export XDG_DATA_DIRS="${EPREFIX}/usr/share" - - # Evil flag (bug #919201) - filter-flags -fno-delete-null-pointer-checks - - # The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep - # the same state across both projects. - # See https://bugs.gentoo.org/866055 - append-cppflags '-DNDEBUG' - - local qt=$(usex qt6 6 5) - local mycmakeargs=( - -DQT_VERSION_MAJOR=${qt} - - # Override new cmake.eclass defaults (https://bugs.gentoo.org/921939) - # Upstream never tests this any other way - -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF - - # Control automagic dependencies on certain packages - ## Header-only lib, some git version. - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland) - ## Only used in Telegram/lib_webview/CMakeLists.txt - -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit) - ## KF6CoreAddons is currently unavailable in ::gentoo - -DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6) - - -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) - -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) - -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) - ## Enables enchant and disables hunspell - -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) - ## Use system fonts instead of bundled ones - -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) - ) - - if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then - einfo "Found custom API credentials" - mycmakeargs+=( - -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" - -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" - ) - else - # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml - # Building with snapcraft API credentials by default - # Custom API credentials can be obtained here: - # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md - # After getting credentials you can export variables: - # export MY_TDESKTOP_API_ID="17349"" - # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" - # and restart the build" - # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop - # portage will use custom variable every build automatically - mycmakeargs+=( - -DTDESKTOP_API_ID="611335" - -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" - ) - fi - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use X && ! use screencast; then - ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" - ewarn - fi - if ! use jemalloc && use elibc_glibc; then - # https://github.com/telegramdesktop/tdesktop/issues/16084 - # https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003 - ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!" - ewarn "Do NOT report issues about RAM usage without enabling this flag first." - ewarn - fi - if use wayland && ! use qt6; then - ewarn "Wayland-specific integrations have been deprecated with Qt5." - ewarn "The app will continue to function under wayland, but some" - ewarn "functionality may be reduced." - ewarn "These integrations are only supported when built with Qt6." - ewarn - fi - if use qt6 && ! use qt6-imageformats; then - elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support" - elog - fi - optfeature_header - if ! use qt6; then - optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl] - fi -} -- cgit v1.2.3