commit: 599beaa6d3b62e8849fde028fea9b37f1a183deb Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Thu Apr 22 16:22:00 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Fri Apr 23 19:05:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599beaa6
net-im/telegram-desktop: drop old Bug: https://bugs.gentoo.org/771684 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 | 2 - .../telegram-desktop/files/no-webrtc-build.patch | 96 ------------ net-im/telegram-desktop/metadata.xml | 2 - .../telegram-desktop-2.4.11.ebuild | 174 --------------------- .../telegram-desktop-2.4.7-r1.ebuild | 173 -------------------- 5 files changed, 447 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index dac600068a1..9e1071af1e4 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1 @@ -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/no-webrtc-build.patch b/net-im/telegram-desktop/files/no-webrtc-build.patch deleted file mode 100644 index 8ae4113f440..00000000000 --- a/net-im/telegram-desktop/files/no-webrtc-build.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp -index e99958109..bb7678d3c 100644 ---- a/Telegram/SourceFiles/calls/calls_instance.cpp -+++ b/Telegram/SourceFiles/calls/calls_instance.cpp -@@ -350,8 +350,11 @@ std::shared_ptr<tgcalls::VideoCaptureInterface> Instance::getVideoCapture() { - return result; - } - auto result = std::shared_ptr<tgcalls::VideoCaptureInterface>( -+ #ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION - tgcalls::VideoCaptureInterface::Create( -- Core::App().settings().callVideoInputDeviceId().toStdString())); -+ Core::App().settings().callVideoInputDeviceId().toStdString()) -+ #endif -+ ); - _videoCapture = result; - return result; - } -diff --git Telegram/lib_webrtc/CMakeLists.txt b/CMakeLists.txt -index 47796f1..1f54c21 100644 ---- a/Telegram/lib_webrtc/CMakeLists.txt -+++ b/Telegram/lib_webrtc/CMakeLists.txt -@@ -14,8 +14,10 @@ target_precompile_headers(lib_webrtc PRIVATE ${src_loc}/webrtc/webrtc_pch.h) - nice_target_sources(lib_webrtc ${src_loc} - PRIVATE - webrtc/webrtc_audio_input_tester.cpp -+ webrtc/webrtc_audio_input_tester_dummy.cpp - webrtc/webrtc_audio_input_tester.h - webrtc/webrtc_media_devices.cpp -+ webrtc/webrtc_media_devices_dummy.cpp - webrtc/webrtc_media_devices.h - webrtc/webrtc_video_track.cpp - webrtc/webrtc_video_track.h -@@ -40,10 +42,14 @@ PUBLIC - if (DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION) - remove_target_sources(lib_webrtc ${src_loc} - webrtc/webrtc_video_track.cpp -+ webrtc/webrtc_media_devices.cpp -+ webrtc/webrtc_audio_input_tester.cpp - ) - else() - remove_target_sources(lib_webrtc ${src_loc} - webrtc/webrtc_video_track_dummy.cpp -+ webrtc/webrtc_media_devices_dummy.cpp -+ webrtc/webrtc_audio_input_tester_dummy.cpp - ) - target_link_libraries(lib_webrtc - PRIVATE -diff --git Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h b/webrtc/webrtc_audio_input_tester.h -index 1ae8d30..008df7e 100644 ---- a/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h -+++ b/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h -@@ -20,11 +20,13 @@ public: - [[nodiscard]] float getAndResetLevel(); - - private: -+#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION - class Impl; -- -+#endif - std::shared_ptr<std::atomic<int>> _maxSample; -+#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION - crl::object_on_thread<Impl> _impl; -- -+#endif - }; - - } // namespace Webrtc -diff --git Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester_dummy.cpp b/webrtc/webrtc_audio_input_tester_dummy.cpp -new file mode 100644 -index 0000000..4e47eaa ---- a//dev/null -+++ b/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester_dummy.cpp -@@ -0,0 +1,11 @@ -+#include "webrtc/webrtc_audio_input_tester.h" -+ -+namespace Webrtc { -+AudioInputTester::AudioInputTester(const QString &deviceId) -+: _maxSample(std::make_shared<std::atomic<int>>(0)) {} -+AudioInputTester::~AudioInputTester() {} -+void AudioInputTester::setDeviceId(const QString &deviceId) {}; -+float AudioInputTester::getAndResetLevel() { -+ return _maxSample->exchange(0) / float(INT16_MAX);\ -+} -+} -diff --git Telegram/lib_webrtc/webrtc/webrtc_media_devices_dummy.cpp b/webrtc/webrtc_media_devices_dummy.cpp -new file mode 100644 -index 0000000..8d5d245 ---- a/dev/null -+++ b/Telegram/lib_webrtc/webrtc/webrtc_media_devices_dummy.cpp -@@ -0,0 +1,6 @@ -+#include "webrtc/webrtc_media_devices.h" -+namespace Webrtc { -+std::vector<VideoInput> GetVideoInputList() { return std::vector<VideoInput>(); }; -+std::vector<AudioInput> GetAudioInputList() { return std::vector<AudioInput>(); }; -+std::vector<AudioOutput> GetAudioOutputList() { return std::vector<AudioOutput>(); }; -+} diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml index 81134efc2a6..bb15e2ab9e5 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -12,7 +12,5 @@ <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> - <flag name="lto">Enable Link Time Optimization (LTO / IPO)</flag> - <flag name="webrtc">WebRTC based audio/video call support ( via <pkg>media-libs/tg_owt</pkg> )</flag> </use> </pkgmetadata> diff --git a/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild b/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild deleted file mode 100644 index c0423ed32f1..00000000000 --- a/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild +++ /dev/null @@ -1,174 +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 cmake desktop flag-o-matic ninja-utils python-any-r1 xdg-utils - -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 lto pulseaudio +spell wayland +webrtc +X" - -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - app-arch/xz-utils - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - dev-libs/xxhash - dev-qt/qtcore:5 - dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?] - dev-qt/qtimageformats:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5[png,X(-)?] - media-fonts/open-sans - media-libs/alsa-lib - media-libs/fontconfig:= - ~media-libs/libtgvoip-2.4.4_p20201030[pulseaudio=] - media-libs/openal[alsa] - media-libs/opus:= - media-video/ffmpeg:=[alsa,opus] - sys-libs/zlib[minizip] - virtual/libiconv - x11-libs/libxcb:= - dbus? ( - dev-qt/qtdbus:5 - dev-libs/libdbusmenu-qt[qt5(+)] - ) - enchant? ( app-text/enchant:= ) - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2[jpeg] - x11-libs/gtk+:3[X?] - x11-libs/libX11 - ) - hunspell? ( >=app-text/hunspell-1.7:= ) - !pulseaudio? ( media-sound/apulse[sdk] ) - pulseaudio? ( media-sound/pulseaudio ) - webrtc? ( - media-libs/libjpeg-turbo:= - ~media-libs/tg_owt-0_pre20201112[pulseaudio=] - ) -" - -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} - dev-cpp/range-v3 - =dev-cpp/ms-gsl-3* -" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig - amd64? ( dev-lang/yasm ) -" - -REQUIRED_USE=" - spell? ( - ^^ ( enchant hunspell ) - ) - webrtc? ( !libressl ) -" - -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() { - # conditional patching is bad, but we want vanilla telegram with webrtc. - use webrtc || local PATCHES=( "${FILESDIR}/no-webrtc-build.patch" ) - - # no explicit toggle #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() { - local mycxxflags=( - -Wno-deprecated-declarations - -Wno-error=deprecated-declarations - -Wno-switch - -Wno-unknown-warning-option - ) - - append-cxxflags "${mycxxflags[@]}" - - # TODO: unbundle header-only libs, ofc telegram uses git versions... - # it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots - # EXPECTED VARIANT - # gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595 - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON - -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF - -DDESKTOP_APP_USE_PACKAGED=ON - -DDESKTOP_APP_USE_PACKAGED_FONTS=ON - -DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk OFF ON)" - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended) - -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION="$(usex wayland OFF ON)" - -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION="$(usex webrtc OFF ON)" - -DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell - $(usex lto "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" '') - ) - - 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_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - use gtk || einfo "enable 'gtk' useflag if you have image copy-paste problems" -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-im/telegram-desktop/telegram-desktop-2.4.7-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.4.7-r1.ebuild deleted file mode 100644 index 57c34aa583f..00000000000 --- a/net-im/telegram-desktop/telegram-desktop-2.4.7-r1.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit cmake desktop flag-o-matic ninja-utils python-any-r1 xdg-utils - -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 lto pulseaudio +spell +webrtc +X" - -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - app-arch/xz-utils - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - dev-libs/xxhash - dev-qt/qtcore:5 - dev-qt/qtgui:5[dbus?,jpeg,png,wayland,X(-)?] - dev-qt/qtimageformats:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5[png,X(-)?] - media-fonts/open-sans - media-libs/alsa-lib - media-libs/fontconfig:= - ~media-libs/libtgvoip-2.4.4_p20201030[pulseaudio=] - media-libs/openal[alsa] - media-libs/opus:= - media-video/ffmpeg:=[alsa,opus] - sys-libs/zlib[minizip] - virtual/libiconv - x11-libs/libxcb:= - dbus? ( - dev-qt/qtdbus:5 - dev-libs/libdbusmenu-qt[qt5(+)] - ) - enchant? ( app-text/enchant:= ) - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2[jpeg] - x11-libs/gtk+:3[X?] - x11-libs/libX11 - ) - hunspell? ( >=app-text/hunspell-1.7:= ) - !pulseaudio? ( media-sound/apulse[sdk] ) - pulseaudio? ( media-sound/pulseaudio ) - webrtc? ( - media-libs/libjpeg-turbo:= - ~media-libs/tg_owt-0_pre20201105[pulseaudio=] - ) -" - -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} - dev-cpp/range-v3 - =dev-cpp/ms-gsl-3* -" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig - amd64? ( dev-lang/yasm ) -" - -REQUIRED_USE=" - spell? ( - ^^ ( enchant hunspell ) - ) - webrtc? ( !libressl ) -" - -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() { - # conditional patching is bad, but we want vanilla telegram with webrtc. - use webrtc || local PATCHES=( "${FILESDIR}/no-webrtc-build.patch" ) - - # no explicit toggle #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() { - local mycxxflags=( - -Wno-deprecated-declarations - -Wno-error=deprecated-declarations - -Wno-switch - -Wno-unknown-warning-option - ) - - append-cxxflags "${mycxxflags[@]}" - - # TODO: unbundle header-only libs, ofc telegram uses git versions... - # it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots - # EXPECTED VARIANT - # gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595 - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON - -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF - -DDESKTOP_APP_USE_PACKAGED=ON - -DDESKTOP_APP_USE_PACKAGED_FONTS=ON - -DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk OFF ON)" - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended) - -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION="$(usex webrtc OFF ON)" - -DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell - $(usex lto "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" '') - ) - - 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_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - use gtk || einfo "enable 'gtk' useflag if you have image copy-paste problems" -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -}
