commit: 07dc90a654db8896908499fb9644a25d4833d679
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Sat Mar 12 19:06:02 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 18:20:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07dc90a6
net-im/telegram-desktop: Drop old
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-im/telegram-desktop/Manifest | 1 -
.../files/tdesktop-3.1.0-fix-openssl3.patch | 19 ---
.../tdesktop-3.1.0-jemalloc-only-telegram.patch | 35 -----
.../telegram-desktop/telegram-desktop-3.3.0.ebuild | 151 ---------------------
4 files changed, 206 deletions(-)
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 51110d19eb56..c9f271d76d39 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,3 +1,2 @@
-DIST tdesktop-3.3.0-full.tar.gz 38662573 BLAKE2B
f6cba2be02faccde77c510742dc57680a2731cd3b2bc4a2d680f6cda7fd1a634e2fa0406855a491241434daa080e782f561e5e472dcc42a8b8376c16e038b6af
SHA512
ff0ac1abe264f19812c2e0b40d4861caddd6c01a3f863ccb68de9c5227282872b2bde878dcf751d7d04d36c6e0e77912619ac7863d54f25f739f3744e9bca53a
DIST tdesktop-3.4.8-full.tar.gz 41220984 BLAKE2B
e75e7d7432a863e7a35b73bb2a378970f8aab74d99a425e631947fd894e51d931ee2390e2f885831d165d73541cf2151840467e2ef02ece175cc6a18f3e2c81c
SHA512
cdeb5a83a375a494d805bf4198beee1c4bfc94bd9626535721a0cf04a590c70bfdb20e76baaa2a4c8c6db54c5813f22ce2a8c6291786b6b6db3dcde10b266fe1
DIST tdesktop-3.5.2-full.tar.gz 41216346 BLAKE2B
5f2570073e02c5aadbf5f9b6251f9b71e9a608d97763bd3a792d3c4836b68245410142face3446660b68e519bd7e71df0319cb1ff1ea1fed24327ac8db0e8d0b
SHA512
adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e
diff --git a/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
b/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
deleted file mode 100644
index 2b92e8adce4f..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix openssl 3.x compatibility
-
-FIPS_mode_set was merely used to clean up resources. This isn't necessary
-anymore on the newer openssl version.
-
-There's still a lot of functions that are used that were deprecated. I hope
-upstream can fix those, as I'm unsure what to do with them.
-
---- tdesktop-3.1.0-full.orig/Telegram/SourceFiles/core/utils.cpp
-+++ tdesktop-3.1.0-full/Telegram/SourceFiles/core/utils.cpp
-@@ -124,7 +124,7 @@
-
- void finish() {
- CRYPTO_cleanup_all_ex_data();
--#ifndef LIBRESSL_VERSION_NUMBER
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x20000000L
- FIPS_mode_set(0);
- #endif
- ENGINE_cleanup();
diff --git
a/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
b/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
deleted file mode 100644
index 7ad3e75e49ba..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Only link jemalloc for the Telegram binary
-
-Some combination of factors is making the different codegen tools hang when
-jemalloc is linked for those, and they're ran under portage's sandbox. Since
-this is only used during build-time, and jemalloc is merely necessary to
-improve runtime memory use, it's unnecessary to use it for anything else.
-
---- tdesktop-3.1.0-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.1.0-full/Telegram/CMakeLists.txt
-@@ -1256,6 +1256,11 @@
- endif()
- endif()
- else()
-+ target_link_libraries(Telegram
-+ PRIVATE
-+ desktop-app::external_jemalloc
-+ )
-+
- if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
- target_link_libraries(Telegram
- PRIVATE
---- tdesktop-3.1.0-full.orig/cmake/options_linux.cmake
-+++ tdesktop-3.1.0-full/cmake/options_linux.cmake
-@@ -45,11 +45,6 @@
- target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g
-flto -fuse-linker-plugin>)
- endif()
-
--target_link_libraries(common_options
--INTERFACE
-- desktop-app::external_jemalloc
--)
--
- if (DESKTOP_APP_USE_ALLOCATION_TRACER)
- target_link_options(common_options
- INTERFACE
diff --git a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
b/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
deleted file mode 100644
index 04a19cbd9bfe..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit xdg cmake python-any-r1 optfeature
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org";
-
-MY_P="tdesktop-${PV}-full"
-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 +hunspell screencast +spell wayland +X"
-REQUIRED_USE="
- spell? (
- ^^ ( enchant hunspell )
- )
-"
-
-RDEPEND="
- !net-im/telegram-desktop-bin
- app-arch/lz4:=
- dev-cpp/abseil-cpp:=
- dev-libs/jemalloc:=[-lazy-lock]
- dev-libs/openssl:=
- dev-libs/xxhash
- >=dev-qt/qtcore-5.15:5
- >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
- >=dev-qt/qtimageformats-5.15:5
- >=dev-qt/qtnetwork-5.15:5[ssl]
- >=dev-qt/qtsvg-5.15:5
- >=dev-qt/qtwidgets-5.15:5[png,X?]
- media-fonts/open-sans
- media-libs/fontconfig:=
- ~media-libs/libtgvoip-2.4.4_p20211129
- media-libs/openal
- media-libs/opus:=
- media-libs/rnnoise
- ~media-libs/tg_owt-0_pre20211207[screencast=,X=]
- media-video/ffmpeg:=[opus]
- sys-libs/zlib:=[minizip]
- dbus? (
- dev-cpp/glibmm:2
- dev-qt/qtdbus:5
- dev-libs/libdbusmenu-qt[qt5(+)]
- )
- enchant? ( app-text/enchant:= )
- 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
-"
-# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
- "${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
- "${FILESDIR}/tdesktop-3.3.0-fix-enchant.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() {
- # 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
-
- # fix linking with missing libdl (introduced in 3.2.0->3.2.4 upgrade,
- # not sure if thanks to removing the -pie flag in the cmakelists...)
- sed -i 's/${JEMALLOC_LINK_LIBRARIES}/& dl/' \
- cmake/external/jemalloc/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_QT6=OFF
-
- -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
- -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
- -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
- -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes) #
enables hunspell (recommended)
- -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # 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
- if ! use X && ! use screencast; then
- elog "both the 'X' and 'screencast' useflags are disabled,
screen sharing won't work!"
- fi
- if has_version '<dev-qt/qtcore-5.15.2-r10'; then
- ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might
cause telegram"
- ewarn "to crash when pasting big images from the clipboard."
- fi
- optfeature_header
- optfeature "shop payment support (requires USE=dbus enabled)"
net-libs/webkit-gtk
-}
