commit: a0466f136f37558b7d5e1784e0a9c6af894cff87 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Sun Jun 27 22:24:14 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Mon Jun 28 08:38:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0466f13
net-im/telegram-desktop: Drop old Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21450 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> net-im/telegram-desktop/Manifest | 1 - .../telegram-desktop/files/fix-tgcalls-gcc10.patch | 34 ----- ...esktop-2.7.1-fix-disable-dbus-integration.patch | 15 --- .../telegram-desktop-2.7.1-r2.ebuild | 137 --------------------- 4 files changed, 187 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 106a3dc4e8b..96744242fc0 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,2 @@ -DIST tdesktop-2.7.1-full.tar.gz 36770178 BLAKE2B 21379cc970da07725e7a46d18a4f0bc459b1da1b730587595448b8f78133ce701e374e7faefc649a973342c203eee510872b5a4ed2ff6be92daec25157e400a4 SHA512 dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b 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 diff --git a/net-im/telegram-desktop/files/fix-tgcalls-gcc10.patch b/net-im/telegram-desktop/files/fix-tgcalls-gcc10.patch deleted file mode 100644 index ac7e067f3ab..00000000000 --- a/net-im/telegram-desktop/files/fix-tgcalls-gcc10.patch +++ /dev/null @@ -1,34 +0,0 @@ -From eded7cc540123eaf26361958b9a61c65cb2f7cfc Mon Sep 17 00:00:00 2001 -From: John Preston <[email protected]> -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/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch deleted file mode 100644 index 8563ee5fdca..00000000000 --- a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- tdesktop-2.7.1-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp -+++ tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -754,10 +754,12 @@ void InstallLauncher(bool force) { - - void RegisterCustomScheme(bool force) { - try { -+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION - if (InSnap()) { - SnapDefaultHandler(qsl("tg")); - return; - } -+#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION - - if (cExeName().isEmpty()) { - return; diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild deleted file mode 100644 index ef9ecd0fd65..00000000000 --- a/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 2020-2021 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 pulseaudio +spell wayland +X" - -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - dev-cpp/glibmm:2 - 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}" - -PATCHES=( - "${FILESDIR}/tdesktop-2.7.1-fix-disable-dbus-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() { - cd "${S}/Telegram/ThirdParty/tgcalls" || die - eapply "${FILESDIR}/fix-tgcalls-gcc10.patch" - - cd "${S}" || die - # 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" -}
