From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1239D138359 for ; Mon, 2 Nov 2020 19:14:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FAD3E0821; Mon, 2 Nov 2020 19:14:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F83DE0821 for ; Mon, 2 Nov 2020 19:14:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D605F335DA1 for ; Mon, 2 Nov 2020 19:14:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 261753F1 for ; Mon, 2 Nov 2020 19:14:53 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1604344469.398c40130021de759ec95b211689e9318c25ece9.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/telegram-desktop/Manifest net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild net-im/telegram-desktop/telegram-desktop-2.2.0-r1.ebuild X-VCS-Directories: net-im/telegram-desktop/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 398c40130021de759ec95b211689e9318c25ece9 X-VCS-Branch: master Date: Mon, 2 Nov 2020 19:14:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 637359c5-e833-40f3-b5da-4738c0cd203c X-Archives-Hash: e1f841cad10a6dacac0b18e374374b97 commit: 398c40130021de759ec95b211689e9318c25ece9 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Nov 2 19:13:57 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Nov 2 19:14:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=398c4013 net-im/telegram-desktop: security cleanup Bug: https://bugs.gentoo.org/749288 Bug: https://bugs.gentoo.org/736774 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 2 - .../telegram-desktop-2.1.13.ebuild | 145 ------------------- .../telegram-desktop-2.2.0-r1.ebuild | 153 --------------------- 3 files changed, 300 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index dc22cd7ef09..726803c3941 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,4 +1,2 @@ -DIST tdesktop-2.1.13-full.tar.gz 36549505 BLAKE2B 48514be8add4ad4491c8e81a868f140228787ee489de7cd90faf31dbee959b0fb87cf2c844bf98c5b62fd6de8e32f504a6d19b071c56e6a4c0cd489d7b283818 SHA512 f28ae7c8c9a9eb8094fc52784742b470235234a3df7487902152858bc7c297b2dcfe5c8b939cdb9653a356b3835609e7289f53cdf7d5fb3f009823d3dbeb1bd8 -DIST tdesktop-2.2.0-full.tar.gz 36612169 BLAKE2B dcc9d81da5d99552bea3139d595c7f1aca75464a19be34c880a93d27ddd8a58a01510efe8fde31104b13d50e34e944b05406e21bc96995e85cb95283ff8de08a SHA512 2aeca83be7bc385bd7537d56ecf66996facedd0af588e743fedbb08c3158fc76436d6cf3b1fb5dd7c8d37b4471f739872ca54ba300aa1d0e0202e87c005703fd DIST tdesktop-2.4.5-full.tar.gz 36354189 BLAKE2B cdf31b5bc1c90e0714fe648929ee18aed29c3ff2b5e6f9dc96b4e9741267aae092415fd1b304a54b98e462a90375f8087d727d067b4865c7a8b3a89a68a59189 SHA512 d0c792fcd890a95b24233f37cdfc34008e814f6f0730722a41916e25d2efff405fd472bd6b45bbfc79787ed117dc5f87271c438d92ec1ce29335cabe76a1062e DIST tdesktop-2.4.6-full.tar.gz 36355592 BLAKE2B 9481158301cec5518182da9cf9739d82126aa2d0941d51eee840d94bc7b561103d6e65439347f6b15ce17970f68e335f177126db0a7fdf81ac6e668f14a3e3db SHA512 922b9d00a90866899c2817aaa24273b2ac8525bb18543598c8f203846d2e2e3849485cfcbce081d4dfbd45ebafe40dd57434f08849781a4f1d011b3518d03a6b diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild deleted file mode 100644 index 2b3dff8e142..00000000000 --- a/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit cmake desktop flag-o-matic 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="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="amd64 ~ppc64" -IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +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[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/fontconfig:= - >=media-libs/libtgvoip-2.4.4_p20200525[alsa(-)?,pulseaudio(-)?] - media-libs/openal[alsa?,pulseaudio?] - media-libs/opus:= - media-video/ffmpeg:=[alsa?,opus,pulseaudio?] - sys-libs/zlib[minizip] - virtual/libiconv - x11-libs/gtk+:3 - dbus? ( - dev-qt/qtdbus:5 - dev-libs/libdbusmenu-qt[qt5(+)] - ) - enchant? ( app-text/enchant:= ) - hunspell? ( >=app-text/hunspell-1.7:= ) - pulseaudio? ( media-sound/pulseaudio ) -" - -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} - dev-cpp/range-v3 - =dev-cpp/ms-gsl-3* -" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig -" - -REQUIRED_USE=" - || ( alsa pulseaudio ) - || ( X wayland ) - 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_configure() { - local mycxxflags=( - -Wno-deprecated-declarations - -Wno-error=deprecated-declarations - -Wno-switch - ) - - 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 - local mycmakeargs=( - -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON - -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF - -DDESKTOP_APP_USE_PACKAGED=ON - -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF - -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF - -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF - -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_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_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-im/telegram-desktop/telegram-desktop-2.2.0-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.2.0-r1.ebuild deleted file mode 100644 index 2db700903fc..00000000000 --- a/net-im/telegram-desktop/telegram-desktop-2.2.0-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit cmake desktop flag-o-matic 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="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" -IUSE="+alsa +dbus enchant +gtk +hunspell libressl pulseaudio +spell +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/fontconfig:= - ~media-libs/libtgvoip-2.4.4_p20200704[alsa?,pulseaudio?] - media-libs/openal[alsa?,pulseaudio?] - media-libs/opus:= - media-video/ffmpeg:=[alsa?,opus,pulseaudio?] - 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,X?] - x11-libs/gtk+:3[X?] - x11-libs/libX11 - ) - hunspell? ( >=app-text/hunspell-1.7:= ) - pulseaudio? ( media-sound/pulseaudio ) -" - -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} - dev-cpp/range-v3 - =dev-cpp/ms-gsl-3* -" - -BDEPEND=" - >=dev-util/cmake-3.16 - virtual/pkgconfig -" - -REQUIRED_USE=" - || ( alsa pulseaudio ) - 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_configure() { - local mycxxflags=( - -Wno-deprecated-declarations - -Wno-error=deprecated-declarations - -Wno-switch - ) - - 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=( - -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON - -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF - -DDESKTOP_APP_USE_PACKAGED=ON - -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF - -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF - -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF - -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_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_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 -}