From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- net-im/telegram-desktop/Manifest | 7 +- .../telegram-desktop/files/fix-tgcalls-gcc10.patch | 34 ++++++ net-im/telegram-desktop/metadata.xml | 9 +- .../telegram-desktop-2.4.11.ebuild | 4 +- .../telegram-desktop-2.7.1-r1.ebuild | 133 +++++++++++++++++++++ 5 files changed, 182 insertions(+), 5 deletions(-) create mode 100644 net-im/telegram-desktop/files/fix-tgcalls-gcc10.patch create mode 100644 net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild (limited to 'net-im/telegram-desktop') diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index cc977e4ffb6c..51d0214072f3 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,6 +1,9 @@ +AUX fix-tgcalls-gcc10.patch 949 BLAKE2B 7a065fcbf5b8e7b49b6b866d199c67315484312ca527a517a09f890f09d39fa0c97787c586990ba92c0ce2ee83e7c2387eef100f630a74f003ddc06adb93c379 SHA512 dbc61a8520f3698fdeec6c9849cfd8241b8b778589f89277f82d6c748d8ed7a81db90daa0a69dedc3ab2b81bba848ee68e1df79a9cb3fb055f99bd7d19f46e5d AUX no-webrtc-build.patch 3656 BLAKE2B b8a8da9e4e6762b2901c2e3307a0289eb32447bc8439c4a6e0aac8c11a4636f7b3de5d14aa98ea806003d6856058f4aefb7bbeae67d5235437b3f0918ae4de4c SHA512 26893ffa97538dfd060373dd052637513c6805c1e6b149a63f1c329a0da4f541f7457832d54397f19d5a3d54e1fbe39628697648f170801ed459fa4d84cb75f4 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 -EBUILD telegram-desktop-2.4.11.ebuild 4958 BLAKE2B 2c28fe9a6e28f5eaac308e27dbff4a80ccb68419418c2786070e77ca020f11e6a4c6ea9188be4ac68247fcc39f9246f00ff367b55a1f97b791e2af47a98bc22a SHA512 0fd7bd8e2394ad123ca6d67125d6dd44a8ca575fc1109450e4d883ad8c0d777de603c7d3ae606e1d8681afc741b6d31c85446f2e37e600eda009b55f10f0f278 +DIST tdesktop-2.7.1-full.tar.gz 36770178 BLAKE2B 21379cc970da07725e7a46d18a4f0bc459b1da1b730587595448b8f78133ce701e374e7faefc649a973342c203eee510872b5a4ed2ff6be92daec25157e400a4 SHA512 dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b +EBUILD telegram-desktop-2.4.11.ebuild 4962 BLAKE2B de08c0f5aa2c05e8da4d69383d1a9505d1450dab747a8180b6972f6c911749424aadea83c3c03d6b2dbf180c6db68504b019d330cbbb3d19ddc09c413ca29bd6 SHA512 2cd0787ea12c93115e51daef50b67cd9e4cd419ef59b908c3a960e218301269eef26f57239964cdf043b309d4e2a33bf6f4a69929b047cd14bce0a72f565c04a EBUILD telegram-desktop-2.4.7-r1.ebuild 4879 BLAKE2B 424614c2d79701c27eaa4c4d384511467567a5540bc5bbe46155f9eef2ef8003f5b8436e6dd2bab7b66ea3baa9993675caf1d1b551436bcd4a76f6ea66ba95bc SHA512 8b2d9207c431c98aef31703a2f20364249a8d274e2240255463a72238ab78ba0de4a9b33b0edfadb3477d65118b1997445e63c0f8e1f20d9bb3789ce76b0a2e0 -MISC metadata.xml 517 BLAKE2B fdb6cea13b7c5fd9f81da62386e02e2dfc0552a1e1c712a42d48671cce341ab52389d6b3a73172738faaa336d4915468e1b6f94811c2edcb98e42a8b7fb63812 SHA512 6f3f4600e948e6cd59ee91515dc16285f011d847ee758628ba44c1949b3ed0992c207316785000a2ef60a774e8e75dc99a7281a895409207dddb18090d1c78c1 +EBUILD telegram-desktop-2.7.1-r1.ebuild 3874 BLAKE2B fca84e42647038f6f98d091b0f2f20095bbd8e1a1b4fb6e4ede57fd6792968c1f907f7cf7d89507b13763d1f5f6a43972ecaf2a889dfef81aee7765440e6d6fd SHA512 9fbd445d56b8771a42e9528c444711d1a09b40607100da5a9e5c0431ec13fa49c3e0ef77b94b9a929171a7b29ee629183a0210859138b906806c861cf0c2d1a8 +MISC metadata.xml 759 BLAKE2B b01ed885c14db59c7a87e43dbe333237dc26639588d87a6b3e55ea26370d0d398cd18dbae153785dec857b6335b5c545506ed4f00f80cef22ef6760f0d79e44c SHA512 1a39987adab83f036869008a8aba7769a0f2080fd0337b7a068c17a345038dc4c63086f84629b0da17e6bc858a8fc81e1942a6035ed16eca2ec28126ef4dbac3 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 000000000000..ac7e067f3ab4 --- /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 +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 + #include + #include +-#include + + 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 ++#include + + namespace tgcalls { + diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml index e70b218c5a4b..81134efc2a6b 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -1,7 +1,14 @@ - + + esteve.varela@gmail.com + Esteve Varela Colominas + + + proxy-maint@gentoo.org + Proxy Maintainers + Enable the app-text/aspell spell-checking backend Enable the app-text/hunspell spell-checking backend diff --git a/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild b/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild index 7f66f02025aa..c0423ed32f19 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${ LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="amd64 ~ppc64" IUSE="+dbus enchant +gtk +hunspell libressl lto pulseaudio +spell wayland +webrtc +X" RDEPEND=" diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild new file mode 100644 index 000000000000..ce5a70e6844a --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild @@ -0,0 +1,133 @@ +# 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 libressl 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}" + +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" +} -- cgit v1.2.3