commit: 5c9fc1812e0f19b6c730883c4a74f6e01e90909a Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Thu Mar 25 17:34:05 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Thu Mar 25 19:29:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c9fc181
net-im/telegram-desktop: Take maintainership, bump to 2.7.1 Bug: https://bugs.gentoo.org/763522 Closes: https://github.com/gentoo/gentoo/pull/20117 Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../telegram-desktop/files/fix-tgcalls-gcc10.patch | 34 ++++++ net-im/telegram-desktop/metadata.xml | 9 +- .../telegram-desktop/telegram-desktop-2.7.1.ebuild | 132 +++++++++++++++++++++ 4 files changed, 175 insertions(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index a4e9ec30a02..dac600068a1 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1,3 @@ DIST tdesktop-2.4.11-full.tar.gz 36405312 BLAKE2B 7c4239d4a2193c910aeb918f40d4c196702bffb4236f7702a5573840b8d4a1a9183e3c91fd97c5d9e4ab5950d96e99b427746ffb18ed5bbef16b240dfc873e2e SHA512 b6452c39ea1b1b794c61ec2fc700356c9ee314250d73b895d297ad66602a93676d3cf74d695ac53965719ddb54da9e290f4f638bbf2e0fb21fec8995b6788a1c DIST tdesktop-2.4.7-full.tar.gz 36355613 BLAKE2B 5b60bddd81d5472aaa303817be280604d5dcb4a5f7260c6b6fbd7ca075a46972adb4439e58e2f5b7877c10b3cb6420a7bc95ffe36ab0b3cf531a46758046f7c1 SHA512 712ab6896f89f7df0c7ac297039ee3b3532c159e17f66e4539b701a35d04d4709b558755d592d3cd91df541a2d2ca9f0485cf073c32f0b69a18848ab2ccd1993 +DIST tdesktop-2.7.1-full.tar.gz 36770178 BLAKE2B 21379cc970da07725e7a46d18a4f0bc459b1da1b730587595448b8f78133ce701e374e7faefc649a973342c203eee510872b5a4ed2ff6be92daec25157e400a4 SHA512 dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b diff --git a/net-im/telegram-desktop/files/fix-tgcalls-gcc10.patch b/net-im/telegram-desktop/files/fix-tgcalls-gcc10.patch new file mode 100644 index 00000000000..ac7e067f3ab --- /dev/null +++ b/net-im/telegram-desktop/files/fix-tgcalls-gcc10.patch @@ -0,0 +1,34 @@ +From eded7cc540123eaf26361958b9a61c65cb2f7cfc Mon Sep 17 00:00:00 2001 +From: John Preston <johnprestonm...@gmail.com> +Date: Mon, 22 Mar 2021 19:24:10 +0400 +Subject: [PATCH] Fix build on GCC 10, second attempt. + +--- + tgcalls/group/StreamingPart.cpp | 1 - + tgcalls/group/StreamingPart.h | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tgcalls/group/StreamingPart.cpp b/tgcalls/group/StreamingPart.cpp +index a7f2e00..6b0206f 100644 +--- a/tgcalls/group/StreamingPart.cpp ++++ b/tgcalls/group/StreamingPart.cpp +@@ -12,7 +12,6 @@ extern "C" { + #include <string> + #include <set> + #include <map> +-#include <stdint.h> + + namespace tgcalls { + +diff --git a/tgcalls/group/StreamingPart.h b/tgcalls/group/StreamingPart.h +index 08859d6..6e0812c 100644 +--- a/tgcalls/group/StreamingPart.h ++++ b/tgcalls/group/StreamingPart.h +@@ -3,6 +3,7 @@ + + #include "absl/types/optional.h" + #include <vector> ++#include <stdint.h> + + namespace tgcalls { + diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml index e70b218c5a4..81134efc2a6 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>esteve.var...@gmail.com</email> + <name>Esteve Varela Colominas</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-ma...@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> <flag name="enchant">Enable the app-text/aspell spell-checking backend</flag> <flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag> diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.1.ebuild new file mode 100644 index 00000000000..fe33f5223ac --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-2.7.1.ebuild @@ -0,0 +1,132 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit xdg cmake python-any-r1 flag-o-matic + +MY_P="tdesktop-${PV}-full" + +DESCRIPTION="Official desktop client for Telegram" +HOMEPAGE="https://desktop.telegram.org"; +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 libressl pulseaudio +spell wayland +X" + +RDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-libs/xxhash + dev-qt/qtcore:5 + dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?] + dev-qt/qtimageformats:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5[png,X(-)?] + media-fonts/open-sans + media-libs/fontconfig:= + media-libs/opus:= + ~media-libs/libtgvoip-2.4.4_p20210302[pulseaudio=] + media-libs/openal[alsa] + ~media-libs/tg_owt-0_pre20210309[pulseaudio=] + media-video/ffmpeg:=[alsa,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?] ) + 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 +" + +REQUIRED_USE=" + spell? ( + ^^ ( enchant hunspell ) + ) +" + +S="${WORKDIR}/${MY_P}" + +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() { + cd "$S/Telegram/ThirdParty/tgcalls" || die + eapply "$FILESDIR/fix-tgcalls-gcc10.patch" + + cd "$S" + # 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 OFF ON) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON) + -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON) + -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON) + -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON) # enables hunspell (recommended) + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF) # 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 || einfo "enable 'gtk' useflag if you have image copy-paste problems" +}
