diff options
Diffstat (limited to 'net-im/telegram-desktop')
6 files changed, 60 insertions, 188 deletions
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 0ae522009d94..85da54cbaf81 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,14 +1,12 @@ AUX tdesktop-3.3.0-fix-enchant.patch 819 BLAKE2B f827deca269c32648e438642a916383e6184ef3fbdb045c8950997b3a30c6231336fe54a3b39ae5b2b93e7c6c72d0080f00a535dcf6932bbe3740041ba79abc8 SHA512 2653dd30699633c55e590744ed1fb2104b473d43e6391ece791bf3543cac7de594a75d303dc66dd9c7b75face5e90615da261d10758e50e1c669ad0b4f27923f -AUX tdesktop-3.4.8-jemalloc-only-telegram.patch 950 BLAKE2B f1dd5f795ad8aa66c9ff00cb1e616789be8b9ef3bcad08f27596d6a7a0364eca4299f02d56179664eb7dbc6552c7cf68ca6ee6f98fcd0171a2ede35f03cf1168 SHA512 c02a1d76378cd18f963ea88b47682237cc4702fda3504ff3ab303a87a60434c38cca866193fdb6e33e5e5afe20bb7ba94f5024b40ad4a42a666713fc079e7c53 AUX tdesktop-3.5.2-jemalloc-only-telegram.patch 1032 BLAKE2B 8220f745febaec55b85f64e25a860f9cfee57bf07496e0bf496857686c5bf7bdfb9c9ede94f9374dea677f1516e8dff39cae5b3a993d1c0fe32d34cf0c91015e SHA512 156a62d5d2145559828466e4c09c23cf8a0cd0cb9d844c27d50945135d854a2e0af45cb3e0dc675e21f74dc2f323574a785e259e86f4120d055aa0e34fd20ea9 AUX tdesktop-3.5.2-jemalloc-optional.patch 2924 BLAKE2B fa0c124fc38d83434eff5c2e03f815d9e32b3af62782401251905db293d8016618f9c51b333a7a4e86e9d529a1e8747495b982ad9e5d6c19c2d9c63b39391461 SHA512 de836736fdc5bcd2f581cd43223dff9ffe82042440e44f6038d2d0278fa94777054badd2870deb1f7c8285a35a5f01cfeccbd76701aeaf5ca9a573d8fbc9ed31 AUX tdesktop-3.5.2-musl.patch 890 BLAKE2B e65419eac920eb7c6929559229e50458fca0e9598b9e173f332b98235dc7d84acd01f5ceb23462b0fb53edbbeec8747e6f27e49cab8bc596b0c1ded205e6358c SHA512 57a811629749c285d3f181ad714afa322e0b65758114283f506319a076aa0410f5e9a75f6fad5642fe5611745c418b404d95a616d53ac8360fbff5cf170627ba AUX tdesktop-3.6.0-jemalloc-only-telegram.patch 1343 BLAKE2B bc257ee3bc3577b05a73b74c6394592b4636e605eb06c25a6749a38f2742104e1d214234524cbd5191bb397b22a4af4ba28c25c01520973a4f10e08bf3ba3bd2 SHA512 00067d388bd75adfcf7f2f460d99c283dd0110d33be5124585665b2566ef5c2b15100e8f86685bde2216083131609918861d7db845f4813ec303a13d8c423ae7 AUX tdesktop-3.6.0-support-ffmpeg5.patch 3142 BLAKE2B f05816a8b26c3061c88b8814adc2402981836ab7853be1dad9c4eb74b621e1084a2167ad5ea86d500c98d627317ffd48288bcb4df897f5ca6858516ecf86c8f0 SHA512 811f42f8372102910be20ac92030b98ad98704cb1378a90d17a01b15dc4a9aa8e9b6bb179a9dc4d09687ad7b60030f0f7367f8058674244b080748bf2c913044 -DIST tdesktop-3.4.8-full.tar.gz 41220984 BLAKE2B e75e7d7432a863e7a35b73bb2a378970f8aab74d99a425e631947fd894e51d931ee2390e2f885831d165d73541cf2151840467e2ef02ece175cc6a18f3e2c81c SHA512 cdeb5a83a375a494d805bf4198beee1c4bfc94bd9626535721a0cf04a590c70bfdb20e76baaa2a4c8c6db54c5813f22ce2a8c6291786b6b6db3dcde10b266fe1 +AUX tdesktop-3.6.1-fix-kwayland-5.93.patch 1835 BLAKE2B dbc414e1543be96faff179288eb4bcc4acdfbe280ae51da11d254054adcc00f4c1387cdc9a24e026e06612d55765a1689b4bfc6381349b75053c4156a0cff71f SHA512 82855396f367f3669a34246a031626bba158d5361ec39e728c2d33f0d5b9ff5196c38a33551614848b5d439e25bbe45eb3795eaf7ca7442f5f27ab0bdeb0e72e DIST tdesktop-3.5.2-full.tar.gz 41216346 BLAKE2B 5f2570073e02c5aadbf5f9b6251f9b71e9a608d97763bd3a792d3c4836b68245410142face3446660b68e519bd7e71df0319cb1ff1ea1fed24327ac8db0e8d0b SHA512 adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba -EBUILD telegram-desktop-3.4.8.ebuild 4642 BLAKE2B aa59d84e4c523b559e1f161fdd9a59eea7c720e6955bf196c5da7a6f504bd912abd4a7c6cecd2b455b5fb0e006f0107883e156f39c1f89591708b726458a6e4e SHA512 fd7f2ec36c03f312a6e5462527872684b5b75dbe2ab4252b6a4051385c8ff13aeda047bb9134da27d07dc16d0899fe0a342279319802bc4028ee7a43d9248471 -EBUILD telegram-desktop-3.5.2-r1.ebuild 4890 BLAKE2B 4752d6368a03bd08fedecd8a5fda8afd3796c3ec0faa65587949079908bddb23e2985423bffdf36be30843aa6c05e0433d8316bcdd5b900c7a9d91ac4a63f47b SHA512 3d83ceb78dd06d47ba9666b90f57dbd1f28b7a6d942232f69ffab4dc51efabc87686e3b27cc9994da3e1f9e908a2afde026df6d9009f853e68ea4eb7237d6902 -EBUILD telegram-desktop-3.6.1.ebuild 4900 BLAKE2B 6a1441f676fc1bb6f3739a4ff32774c4b08db7090be2b18ed56c0c6213f2a3f85c68d57ba45c9b5321610b565b1cce511ec30c54f60d390091ee089fc978c857 SHA512 e671b6439f2cf249a2c5f737e01f8e199d1fa82bf6b42486f2601eb66c4429a3469cd63622cc0a2fd719dd5997edb86f157d641f10069ebc13514afeda6b5cf5 +EBUILD telegram-desktop-3.5.2-r1.ebuild 4944 BLAKE2B 7a9ab13b3120d9ee38c20bd36594f6a1baa5eab19ce8f4191823520b693745fdffaa64d153e72216c02f9272bf0ee461d9ef664f8878323856fe3c812301f04e SHA512 0d48d09e1ebb41c480df1ba0f101b7233c17950430bb15b64a249ff25400b31422f6799c00d6e1191616279b7738e1120caab94f43fb2bc97a8e55459ebc0c3c +EBUILD telegram-desktop-3.6.1.ebuild 4954 BLAKE2B d411d55e4968cac40b000a372949ba7dca6afbcec68a771d417f6fde6ed8498bb9b24551d58ca23c93854879b8f54b3db69509d3e880e842104b0f0809f50d2f SHA512 bede5762e1a5352c01794b5fba1715bb3eab8ebe68e328a17e7302a7db3397e37f133a2b8f93fcba404570eb8ceddd02931ace32979617f9b31b0e793e8e8f48 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e diff --git a/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch deleted file mode 100644 index e99cd2e4bf91..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch +++ /dev/null @@ -1,31 +0,0 @@ -Only link jemalloc for the Telegram binary - -Some combination of factors is making the different codegen tools hang when -jemalloc is linked for those, and they're ran under portage's sandbox. Since -this is only used during build-time, and jemalloc is merely necessary to -improve runtime memory use, it's unnecessary to use it for anything else. - ---- tdesktop-3.4.8-full.orig/Telegram/CMakeLists.txt -+++ tdesktop-3.4.8-full/Telegram/CMakeLists.txt -@@ -1331,6 +1331,11 @@ - endif() - endif() - else() -+ target_link_libraries(Telegram -+ PRIVATE -+ desktop-app::external_jemalloc -+ ) -+ - if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) - target_link_libraries(Telegram - PRIVATE ---- tdesktop-3.4.8-full.orig/cmake/options_linux.cmake -+++ tdesktop-3.4.8-full/cmake/options_linux.cmake -@@ -65,7 +65,6 @@ - - target_link_libraries(common_options - INTERFACE -- desktop-app::external_jemalloc - ${CMAKE_DL_LIBS} - ) - diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch new file mode 100644 index 000000000000..e818ffe46456 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch @@ -0,0 +1,55 @@ +Fix compatibility with kwayland-5.93.0 + +The header files were moved, the include directory wasn't being added correctly. + +https://bugs.gentoo.org/837569 + +--- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp ++++ tdesktop-3.6.1-full/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +@@ -9,10 +9,10 @@ + + #include "base/platform/base_platform_info.h" + +-#include <connection_thread.h> +-#include <registry.h> +-#include <surface.h> +-#include <plasmashell.h> ++#include <KWayland/Client/connection_thread.h> ++#include <KWayland/Client/registry.h> ++#include <KWayland/Client/surface.h> ++#include <KWayland/Client/plasmashell.h> + + using namespace KWayland::Client; + +--- tdesktop-3.6.1-full.orig/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp ++++ tdesktop-3.6.1-full/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp +@@ -13,11 +13,11 @@ + #include <QtCore/QPointer> + #include <QtGui/QWindow> + +-#include <connection_thread.h> +-#include <registry.h> +-#include <surface.h> +-#include <xdgforeign.h> +-#include <idleinhibit.h> ++#include <KWayland/Client/connection_thread.h> ++#include <KWayland/Client/registry.h> ++#include <KWayland/Client/surface.h> ++#include <KWayland/Client/xdgforeign.h> ++#include <KWayland/Client/idleinhibit.h> + + using namespace KWayland::Client; + +--- tdesktop-3.6.1-full.orig/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp ++++ tdesktop-3.6.1-full/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp +@@ -24,8 +24,8 @@ + #include <private/qwaylandwindow_p.h> + #include <private/qwaylandshellsurface_p.h> + +-#include <connection_thread.h> +-#include <registry.h> ++#include <KWayland/Client/connection_thread.h> ++#include <KWayland/Client/registry.h> + + Q_DECLARE_METATYPE(QMargins); + diff --git a/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild b/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild deleted file mode 100644 index ce7da5f009ff..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7..10} ) - -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 ~ppc64 ~riscv" -IUSE="+dbus enchant +hunspell screencast +spell wayland +X" -REQUIRED_USE=" - spell? ( - ^^ ( enchant hunspell ) - ) -" - -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - dev-cpp/abseil-cpp:= - dev-libs/jemalloc:=[-lazy-lock] - dev-libs/libdispatch - dev-libs/openssl:= - dev-libs/xxhash - >=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?] - media-fonts/open-sans - media-libs/fontconfig:= - ~media-libs/libtgvoip-2.4.4_p20211129 - media-libs/openal - media-libs/opus:= - media-libs/rnnoise - ~media-libs/tg_owt-0_pre20211207[screencast=,X=] - media-video/ffmpeg:=[opus] - sys-libs/zlib:=[minizip] - dbus? ( - dev-cpp/glibmm:2 - dev-qt/qtdbus:5 - dev-libs/libdbusmenu-qt[qt5(+)] - ) - enchant? ( app-text/enchant:= ) - hunspell? ( >=app-text/hunspell-1.7:= ) - wayland? ( kde-frameworks/kwayland:= ) - X? ( x11-libs/libxcb:= ) -" -DEPEND="${RDEPEND} - dev-cpp/range-v3 - =dev-cpp/ms-gsl-3* -" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/cmake-3.16 - virtual/pkgconfig -" -# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 - -PATCHES=( - "${FILESDIR}/tdesktop-3.4.8-jemalloc-only-telegram.patch" - "${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch" -) - -# Current desktop-file-utils-0.26 does not understand Version=1.5 -QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop" - -pkg_pretend() { - if has ccache ${FEATURES}; then - ewarn - 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() { - # no explicit toggle, doesn't build with the system one #752417 - sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \ - cmake/external/rlottie/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595 - local mycmakeargs=( - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - -DDESKTOP_APP_QT6=OFF - - -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes) - -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes) - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes) - -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes) # enables hunspell (recommended) - -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell - ) - - 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 - - # Fix for RISCV, as well as any other platforms that might generate libatomic calls - # Upstreamed in >3.4.3 - append-ldflags '-pthread' - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use X && ! use screencast; then - elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!" - fi - if has_version '<dev-qt/qtcore-5.15.2-r10'; then - ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram" - ewarn "to crash when pasting big images from the clipboard." - fi - optfeature_header - optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk -} diff --git a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild index fd97841de5b2..e5bd2fb2c389 100644 --- a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild @@ -73,6 +73,7 @@ PATCHES=( "${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch" "${FILESDIR}/tdesktop-3.5.2-musl.patch" "${FILESDIR}/tdesktop-3.5.2-jemalloc-optional.patch" + "${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch" ) # Current desktop-file-utils-0.26 does not understand Version=1.5 diff --git a/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild index 5d77d8964fd7..d2fc536e145f 100644 --- a/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild @@ -76,6 +76,7 @@ PATCHES=( "${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch" "${FILESDIR}/tdesktop-3.5.2-musl.patch" "${FILESDIR}/tdesktop-3.6.0-support-ffmpeg5.patch" + "${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch" ) # Current desktop-file-utils-0.26 does not understand Version=1.5 |