From 06e707925bb5a7892a7f414d2ed35bc5d30d2328 Mon Sep 17 00:00:00 2001 From: Esteve Varela Colominas Date: Sun, 31 Oct 2021 23:11:18 +0100 Subject: [PATCH] net-im/telegram-desktop: Bump to 3.1.11, drop old Closes: https://bugs.gentoo.org/813408 Signed-off-by: Esteve Varela Colominas --- net-im/telegram-desktop/Manifest | 2 +- ....ebuild => telegram-desktop-3.1.11.ebuild} | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) rename net-im/telegram-desktop/{telegram-desktop-2.9.3-r1.ebuild => telegram-desktop-3.1.11.ebuild} (86%) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index cee361d221ee5..88ea9c202b399 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,3 @@ -DIST tdesktop-2.9.3-full.tar.gz 37335782 BLAKE2B 197583ba6568c455218c51f590c1ba1a3f10c390caa4fd03657098f499ce113a4f5f57ca9dd53bc4baba31992d4229768ed35e68ad6b0685010bc335817edcac SHA512 810cfac5d7e6ce9413b1b2406927e89c1383ea5b725233a68b2cb29dd374b4c3386c22186640afde4492c844516c88889a5db8e5b167a09d6d6c1270ac965ac4 DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447 +DIST tdesktop-3.1.11-full.tar.gz 38541579 BLAKE2B 0c0c5d9591a6f517d3859ecc1bc6a8410c76a46b03db7267dec3354d54382c590bda86aff46e4cda518a512ae5539815553defc8b4b20929894324fee876b826 SHA512 7d67f2895797d4f7f1edd5e5e7e8509044fad5d5cfe6bbdb5613689da9519dab2fde707a452aad6788193addf84f2ebcc69342955607e0be8507397c22557709 DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09 diff --git a/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild similarity index 86% rename from net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild rename to net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild index eda146962285b..65f4899c98bfd 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..10} ) -inherit xdg cmake python-any-r1 flag-o-matic +inherit xdg cmake python-any-r1 DESCRIPTION="Official desktop client for Telegram" HOMEPAGE="https://desktop.telegram.org" @@ -15,22 +15,19 @@ 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" -IUSE="+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X" +KEYWORDS="~amd64 ~ppc64" +IUSE="+dbus enchant +hunspell screencast +spell wayland webkit +X" REQUIRED_USE=" spell? ( ^^ ( enchant hunspell ) ) - webkit? ( gtk ) - gtk? ( dbus ) + webkit? ( dbus ) " -# Future: webkit doesn't depend on gtk anymore (version: >2.9.3) RDEPEND=" !net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= - dev-cpp/glibmm:2 dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash @@ -47,15 +44,15 @@ RDEPEND=" media-libs/openal media-libs/opus:= media-libs/rnnoise - ~media-libs/tg_owt-0_pre20210626[screencast=,X=] + ~media-libs/tg_owt-0_pre20210914[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:= ) - gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) @@ -70,12 +67,13 @@ BDEPEND=" >=dev-util/cmake-3.16 virtual/pkgconfig " +# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}/tdesktop-2.9.3-jemalloc-only-telegram.patch" - "${FILESDIR}/tdesktop-2.9.3-add-libdl-dependency.patch" + "${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch" + "${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch" ) pkg_pretend() { @@ -105,7 +103,6 @@ src_configure() { -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_GTK_INTEGRATION=$(usex gtk no yes) -DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit no yes) -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes) # enables hunspell (recommended) -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell @@ -139,8 +136,11 @@ src_configure() { pkg_postinst() { xdg_pkg_postinst - use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems" if ! use X && ! use screencast; then elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!" fi + if has_version '