commit: 189af5cced33632a7fd422fa9301067f609ae647 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Tue Aug 3 21:24:40 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Wed Aug 4 08:29:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=189af5cc
net-im/telegram-desktop: Bump to 2.9.0 inb4 upstream releases a "General system stability improvements to enhance the user's experience." bump. Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21871 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> net-im/telegram-desktop/Manifest | 2 +- ...top-2.9.0-fix-disable-wayland-integration.patch | 11 ++ .../telegram-desktop/telegram-desktop-2.9.0.ebuild | 140 +++++++++++++++++++++ 3 files changed, 152 insertions(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 8aaae69ec84..7bba87ebefe 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,3 @@ DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14 -DIST tdesktop-2.8.1-full.tar.gz 37129127 BLAKE2B 06f2a3050f0e0f321c766c54e19faf3ea172c41088e2ffdbb5928a41ba01de1fc845a84addded17d113316857c68f265642a8ab32feb79a87beef548c739b56c SHA512 df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69 DIST tdesktop-2.8.11-full.tar.gz 37105468 BLAKE2B 1ec5a0003bd1b948b45213509fa0649dfde5ec8e3dff097bf45aa0951c7963930788b0bee853f286d04b008b78704c464b6614b8391350767affebc2623b25af SHA512 a553313b04fbb562745be2381a84117657172952e46e280980a73c9fcfe2a7cf29c0e012e4b1259816d1e6652418e7a1ddfc4e394544fcc3aeb33704cbe80860 +DIST tdesktop-2.9.0-full.tar.gz 37327425 BLAKE2B f47abfd41e71dbf950e6357417fd2725b145286861f6dfc8edc4101b6b232c43ea7a9987d028e57979588bf44919fef2e89b00adae7a9843e52f8f2566013dd8 SHA512 e9be60cdaeffa4efa95ea1e5d8fe50308bff5612b546fa92c02f824f479b42e098fb8fbe713e652578ee2308e3faadaf82e4c101dee0e58b6f3c70d8dcb0bd8e diff --git a/net-im/telegram-desktop/files/tdesktop-2.9.0-fix-disable-wayland-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.9.0-fix-disable-wayland-integration.patch new file mode 100644 index 00000000000..c76bcc06dfd --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.9.0-fix-disable-wayland-integration.patch @@ -0,0 +1,11 @@ +--- tdesktop-2.9.0-full.orig/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp ++++ tdesktop-2.9.0-full/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp +@@ -18,6 +18,8 @@ + WaylandIntegration::WaylandIntegration() { + } + ++WaylandIntegration::~WaylandIntegration() = default; ++ + WaylandIntegration *WaylandIntegration::Instance() { + if (!::Platform::IsWayland()) return nullptr; + static WaylandIntegration instance; diff --git a/net-im/telegram-desktop/telegram-desktop-2.9.0.ebuild b/net-im/telegram-desktop/telegram-desktop-2.9.0.ebuild new file mode 100644 index 00000000000..13da86a6071 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-2.9.0.ebuild @@ -0,0 +1,140 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit xdg cmake python-any-r1 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"; + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" +IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X" +REQUIRED_USE=" + spell? ( + ^^ ( enchant hunspell ) + ) + webkit? ( gtk ) + gtk? ( dbus ) +" + +RDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/glibmm:2 + dev-libs/jemalloc:=[-lazy-lock] + 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_p20210302 + >=media-libs/libtgvoip-2.4.4_p20210302-r2 + media-libs/openal + media-libs/opus:= + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20210626 + media-video/ffmpeg:=[opus] + sys-libs/zlib:=[minizip] + dbus? ( + dev-qt/qtdbus:5 + dev-libs/libdbusmenu-qt[qt5(+)] + ) + enchant? ( app-text/enchant:= ) + gtk? ( x11-libs/gtk+:3[X?,wayland?] ) + hunspell? ( >=app-text/hunspell-1.7:= ) + wayland? ( kde-frameworks/kwayland:= ) + webkit? ( net-libs/webkit-gtk:= ) + 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 +" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch" + "${FILESDIR}/tdesktop-2.9.0-fix-disable-wayland-integration.patch" +) + +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_DISABLE_X11_INTEGRATION=$(usex X) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland) + -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus) + -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk) + -DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit) + -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell) # 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 + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems" +}
