[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 78889919f9d5cb472111c32a298628b37096633f Author: Aliaksei Urbanski gmail com> AuthorDate: Sun Jul 7 17:32:03 2024 + Commit: Yixun Lan gentoo org> CommitDate: Mon Jul 8 23:58:03 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78889919 net-im/telegram-desktop: bump 5.2.2 to 5.2.3, drop 5.1.5 Release: - https://github.com/telegramdesktop/tdesktop/releases/tag/v5.2.3 Changelog: - https://github.com/telegramdesktop/tdesktop/blob/v5.2.3/changelog.txt These changes also: - drop abandoned tdesktop-4.10.5-qt_compare.patch Closes: https://github.com/gentoo/gentoo/pull/37476 Signed-off-by: Aliaksei Urbanski gmail.com> Signed-off-by: Yixun Lan gentoo.org> net-im/telegram-desktop/Manifest | 3 +- .../files/tdesktop-4.10.5-qt_compare.patch | 12 - .../telegram-desktop/telegram-desktop-5.1.5.ebuild | 249 - ...-5.2.2.ebuild => telegram-desktop-5.2.3.ebuild} | 0 4 files changed, 1 insertion(+), 263 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index eaa8340857c9..2b24ff1f1ae4 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,2 @@ DIST tdesktop-5.0.4-full.tar.gz 69462550 BLAKE2B 46e630ea74c6571e41909bab768ff19e8eaf2246cf624474b1c14d5c598146e0c772f55d7665af35979dc27bc70eb372b6865e5fecb6f97c50e13351c352bb54 SHA512 611bad9f174a35c27ffc55efe3544318f992af25a89364c3b64fa1afb4765ebf7aae7d4a83539d9e0038fe4ca8e637bdb5d453f058e64dffc2c45edf2f348dbb -DIST tdesktop-5.1.5-full.tar.gz 69533393 BLAKE2B 216000da3449da9a9c2100a1f8399afa05627d2583f39c09c89e054cc1e52b8868619f003226c4f8eb734f34d72ab0286b5f5a23db263b28e56340f87fc965e6 SHA512 61dd2c30e6831506b120615758ec74aeb36de4dfce513ce3862f8f40e4812a2d59524dd37a09e3acbfdc5db1f16d89b15d58a81ab252a34a93215d55d8eac39c -DIST tdesktop-5.2.2-full.tar.gz 69739957 BLAKE2B d8ceb807b2208de2cc185128b851f68f41fbfbeac01106d6e8ec12bfb5bb40eada45eb760e12827718261ecb6eaf52f6e1fa5fcae3a7712737e441774c92b0c8 SHA512 85fde17b0ea225e6ef7842688123381f1703aea460a4d4ecf46a8ac5d062c9d630140fca754c832e98925c71f4c6727233be418e5e76d8f54386c826878e +DIST tdesktop-5.2.3-full.tar.gz 69745773 BLAKE2B a6811098d2e0f8d0ebc0d7ac4d392981ff600544d31eb38a72b208778a69462d241122f8ff74b3a8b730d7a1221b78febb0ea9f641872992a830d9c80c39 SHA512 5d5bf1f5c35af11b2adf7db075832e7cca5768c2c5f82d9fc5054b9d45f964a3520eb88864aefc3de593ce1359534b210b1e5d89495819e7386f6ca15fd4a15c diff --git a/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch b/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch deleted file mode 100644 index f481ddd74d7c.. --- a/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Telegram/lib_base/base/qt/qt_compare.h b/Telegram/lib_base/base/qt/qt_compare.h -index ca03fa2..d1eb6ab 100644 a/Telegram/lib_base/base/qt/qt_compare.h -+++ b/Telegram/lib_base/base/qt/qt_compare.h -@@ -10,6 +10,7 @@ - #include - - #include -+#include - - #if !defined(__apple_build_version__) || (__apple_build_version__ > 1232) - diff --git a/net-im/telegram-desktop/telegram-desktop-5.1.5.ebuild b/net-im/telegram-desktop/telegram-desktop-5.1.5.ebuild deleted file mode 100644 index 144d4ae03052.. --- a/net-im/telegram-desktop/telegram-desktop-5.1.5.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit xdg cmake python-any-r1 optfeature flag-o-matic - -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; -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" -IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X" -REQUIRED_USE=" - qt6-imageformats? ( qt6 ) -" - -KIMAGEFORMATS_RDEPEND=" - media-libs/libavif:= - media-libs/libheif:= - >=media-libs/libjxl-0.8.0:= -" -CDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - dev-cpp/abseil-cpp:= - >=dev-cpp/glibmm-2.77:2.68 - dev-libs/glib:2 - dev-libs/libdispatch - dev-libs/openssl:= - dev-libs/protobuf - dev-libs/xxhash - media-libs/libjpeg-turbo:= - ~media-libs/libtgvoip-2.4.4_p20221208 - media-libs/openal - media-libs/opus - media-libs/rnnoise - ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] - media-video/ffmpeg:=[opus,vpx] - sys-libs/zlib:=[minizip] - !enchant? ( >=app-text/hunspell-1.7:= ) - enchant? ( app-text/enchant:= ) - jemalloc? ( dev-libs/jemalloc:= ) - !qt6? ( -
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 8580435894e1480944650dd4b297fe0c97f18736 Author: Aliaksei Urbanski gmail com> AuthorDate: Wed Jul 3 23:37:13 2024 + Commit: Yixun Lan gentoo org> CommitDate: Thu Jul 4 13:46:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85804358 net-im/telegram-desktop: add 5.2.2 Release: - https://github.com/telegramdesktop/tdesktop/releases/tag/v5.2.2 Changelog: - https://github.com/telegramdesktop/tdesktop/blob/v5.2.2/changelog.txt These changes also: - add the libdispatch USE flag - add the repository url to the HOMEPAGE variable Bug: https://bugs.gentoo.org/881697 Closes: https://github.com/gentoo/gentoo/pull/37165 Signed-off-by: Aliaksei Urbanski gmail.com> Signed-off-by: Yixun Lan gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../files/tdesktop-5.2.2-libdispatch.patch | 24 ++ .../files/tdesktop-5.2.2-qt6-no-wayland.patch | 86 +++ net-im/telegram-desktop/metadata.xml | 1 + .../telegram-desktop/telegram-desktop-5.2.2.ebuild | 260 + 5 files changed, 372 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 81fef72ce205..a3bf260ad572 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -2,3 +2,4 @@ DIST tdesktop-4.15.0-full.tar.gz 68286818 BLAKE2B 2bd4d59370a4f97aa3c1b1d64fa7ee DIST tdesktop-5.0.1-full.tar.gz 69454563 BLAKE2B 0bbb0ee0c096a344b00091795c2bfadd71272b01966daed8f44fd7010c4c4ecfb265c80ecd773934dd0636be1e703bbadc0038befdefd6da93dfadea40e53fba SHA512 45b7833f20f01d78c09163e205af7d68afffcfc88075ba6af35dc6cbbce1f0205c0150b137ca09e6bdaf271240e4d1336411ad427bc27a2b2ad42dc435ee0ec2 DIST tdesktop-5.0.4-full.tar.gz 69462550 BLAKE2B 46e630ea74c6571e41909bab768ff19e8eaf2246cf624474b1c14d5c598146e0c772f55d7665af35979dc27bc70eb372b6865e5fecb6f97c50e13351c352bb54 SHA512 611bad9f174a35c27ffc55efe3544318f992af25a89364c3b64fa1afb4765ebf7aae7d4a83539d9e0038fe4ca8e637bdb5d453f058e64dffc2c45edf2f348dbb DIST tdesktop-5.1.5-full.tar.gz 69533393 BLAKE2B 216000da3449da9a9c2100a1f8399afa05627d2583f39c09c89e054cc1e52b8868619f003226c4f8eb734f34d72ab0286b5f5a23db263b28e56340f87fc965e6 SHA512 61dd2c30e6831506b120615758ec74aeb36de4dfce513ce3862f8f40e4812a2d59524dd37a09e3acbfdc5db1f16d89b15d58a81ab252a34a93215d55d8eac39c +DIST tdesktop-5.2.2-full.tar.gz 69739957 BLAKE2B d8ceb807b2208de2cc185128b851f68f41fbfbeac01106d6e8ec12bfb5bb40eada45eb760e12827718261ecb6eaf52f6e1fa5fcae3a7712737e441774c92b0c8 SHA512 85fde17b0ea225e6ef7842688123381f1703aea460a4d4ecf46a8ac5d062c9d630140fca754c832e98925c71f4c6727233be418e5e76d8f54386c826878e diff --git a/net-im/telegram-desktop/files/tdesktop-5.2.2-libdispatch.patch b/net-im/telegram-desktop/files/tdesktop-5.2.2-libdispatch.patch new file mode 100644 index ..dee252c5a7ea --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-5.2.2-libdispatch.patch @@ -0,0 +1,24 @@ +# https://bugs.gentoo.org/881697 +# https://github.com/telegramdesktop/tdesktop/issues/17437 + +--- tdesktop-5.2.0-orig/cmake/external/CMakeLists.txt tdesktop-5.2.0-full/cmake/external/CMakeLists.txt +@@ -18,7 +18,7 @@ + add_checked_subdirectory(cld3) + endif() + add_checked_subdirectory(crash_reports) +-if (LINUX) ++if (LINUX AND DESKTOP_APP_USE_LIBDISPATCH) + add_checked_subdirectory(dispatch) + endif() + add_checked_subdirectory(expected) +--- tdesktop-5.2.0-orig/cmake/variables.cmake tdesktop-5.2.0-full/cmake/variables.cmake +@@ -21,6 +21,7 @@ + endif() + + option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON) ++cmake_dependent_option(DESKTOP_APP_USE_LIBDISPATCH "Use libdispatch instead of QThreadPool." OFF LINUX ON) + cmake_dependent_option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration." OFF LINUX ON) + cmake_dependent_option(DESKTOP_APP_USE_ALLOCATION_TRACER "Use simple allocation tracer." OFF LINUX OFF) + cmake_dependent_option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages." OFF LINUX OFF) diff --git a/net-im/telegram-desktop/files/tdesktop-5.2.2-qt6-no-wayland.patch b/net-im/telegram-desktop/files/tdesktop-5.2.2-qt6-no-wayland.patch new file mode 100644 index ..b411b8e92edd --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-5.2.2-qt6-no-wayland.patch @@ -0,0 +1,86 @@ +Allow disabling wayland integration for Qt6 builds + +Upstream has removed the required toggle for wayland integration, and instead +is forcing it when the program is being built with Qt6 version 6.5.0 or higher. + +Currently this is simple to work around, but its future feasibility remains to +be seen, depending on what upstream thinks about this. + +https://bugs.gentoo.org/928451 +https://github.com/desktop-app/cmake_helpers/commit/a428df5440e76a726abc30924766ac7da0cb381c + +--- a/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 5849ca41ca900c2ced53623319df5f806dc4752a Author: Esteve Varela Colominas gmail com> AuthorDate: Mon Oct 30 21:16:34 2023 + Commit: Yixun Lan gentoo org> CommitDate: Tue Oct 31 01:07:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5849ca41 net-im/telegram-desktop: Drop old Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Yixun Lan gentoo.org> net-im/telegram-desktop/Manifest | 1 - .../files/tdesktop-4.8.3-fix-clang.patch | 52 - .../files/tdesktop-4.8.4-remove-private-qt.patch | 50 - .../files/tdesktop-4.8.4-system-cppgir.patch | 50 - .../telegram-desktop-4.8.4-r1.ebuild | 219 .../telegram-desktop-4.8.4-r2.ebuild | 227 - 6 files changed, 599 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index da3c3b82c76f..cbf158e3a78b 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,4 +1,3 @@ DIST tdesktop-4.10.3-full.tar.gz 67750018 BLAKE2B 395484594dc201019b5cdf3fdaabe1155dca99504b74e65951b6264b61ed0403bb1e016542c6c59370b3ee39d1449ea223409fc64fd6bff723c1be43b615570a SHA512 1e7c0f32b4e17c1f1c39aa9a4f35ce2867324c4410a30fde2c2d6ca5d5fe59a84f58f93cb6b4f8c7ad04fa0adcaf5a276dd2aa7dee0ef34446e6bb95fafa49d6 DIST tdesktop-4.11.1-full.tar.gz 68309005 BLAKE2B ae99dbb5ae051c4bfe54529cc3ee6144c02fd25e897e217757d941526c7af08bece6c8b556b5ad41dcc1a9cad006ba7c4e8f4ff4f9bdd302f4ff58f9c763f820 SHA512 0897846c652d62b7ce301ec4ac0b1df992685448a79e651efe66619a6203f5ac020cb606bc29212aa673994584b1560e4ca38e85f5095ecd818ae66f978aa73a DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567 -DIST tdesktop-4.8.4-full.tar.gz 69090626 BLAKE2B e2c6072b7b90911068ed57ed651176fb4d772f14710d2a4012bda47dae50be7f3050242c3a6950035f3f33a4041257cadac54e639691735f6acfda98c8db8b7b SHA512 7988d047cb72888e303f9902f04bd2168f67fb18a4451e5122ce80b0aef726173f0ee10f83b8bb713a46e02c9ec4150ad6128e4288be432ed3d590011f80e4dd diff --git a/net-im/telegram-desktop/files/tdesktop-4.8.3-fix-clang.patch b/net-im/telegram-desktop/files/tdesktop-4.8.3-fix-clang.patch deleted file mode 100644 index 5135c3c5ef4b.. --- a/net-im/telegram-desktop/files/tdesktop-4.8.3-fix-clang.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build issues with clang - -/var/tmp/portage/net-im/telegram-desktop-4.8.3/work/tdesktop-4.8.3-full/Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp:198:4: error: reference to 'GObject' is ambiguous -GObject::Object, -^ -/usr/include/glib-2.0/gobject/gobject.h:192:42: note: candidate found by name lookup is 'GObject' -typedef struct _GObject GObject; - ^ -/var/tmp/portage/net-im/telegram-desktop-4.8.3/work/tdesktop-4.8.3-full_build/gen/gobject/_functions_impl.hpp:10:11: note: candidate found by name lookup is 'gi::repository::GObject' -namespace GObject { - ^ tdesktop-4.8.3-full.orig/Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp -+++ tdesktop-4.8.3-full/Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp -@@ -195,7 +195,7 @@ - player().set_loop_status("None"); - player().set_rate(1.0); - const auto executeCommand = [=]( -- GObject::Object, -+ gi::repository::GObject::Object, - Gio::DBusMethodInvocation invocation) { - base::Integration::Instance().enterFromEventLoop([&] { - _commandRequests.fire_copy( -@@ -232,23 +232,23 @@ - return true; - }); - player().property_loop_status().signal_notify().connect([=]( -- GObject::Object, -- GObject::ParamSpec) { -+ gi::repository::GObject::Object, -+ gi::repository::GObject::ParamSpec) { - base::Integration::Instance().enterFromEventLoop([&] { - _commandRequests.fire_copy( - LoopStatusToCommand(player().get_loop_status())); - }); - }); - player().property_shuffle().signal_notify().connect([=]( -- GObject::Object, -- GObject::ParamSpec) { -+ gi::repository::GObject::Object, -+ gi::repository::GObject::ParamSpec) { - base::Integration::Instance().enterFromEventLoop([&] { - _commandRequests.fire_copy(Command::Shuffle); -
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 49a2ff0348fa1dc82946cc2a68c4bde6af1d55ff Author: Esteve Varela Colominas gmail com> AuthorDate: Wed Oct 4 06:00:06 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Oct 7 22:25:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a2ff03 net-im/telegram-desktop: Bump to 4.10.3 Closes: https://bugs.gentoo.org/911145 Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33182 Signed-off-by: Ionen Wolkens gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../files/tdesktop-4.10.0-system-cppgir.patch | 32 +++ .../tdesktop-4.10.3-fix-clang-libstdcxx.patch | 13 ++ .../telegram-desktop-4.10.3.ebuild | 234 + 4 files changed, 280 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 03864bb57aea..e426cd09fe62 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1,3 @@ +DIST tdesktop-4.10.3-full.tar.gz 67750018 BLAKE2B 395484594dc201019b5cdf3fdaabe1155dca99504b74e65951b6264b61ed0403bb1e016542c6c59370b3ee39d1449ea223409fc64fd6bff723c1be43b615570a SHA512 1e7c0f32b4e17c1f1c39aa9a4f35ce2867324c4410a30fde2c2d6ca5d5fe59a84f58f93cb6b4f8c7ad04fa0adcaf5a276dd2aa7dee0ef34446e6bb95fafa49d6 DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567 DIST tdesktop-4.8.4-full.tar.gz 69090626 BLAKE2B e2c6072b7b90911068ed57ed651176fb4d772f14710d2a4012bda47dae50be7f3050242c3a6950035f3f33a4041257cadac54e639691735f6acfda98c8db8b7b SHA512 7988d047cb72888e303f9902f04bd2168f67fb18a4451e5122ce80b0aef726173f0ee10f83b8bb713a46e02c9ec4150ad6128e4288be432ed3d590011f80e4dd diff --git a/net-im/telegram-desktop/files/tdesktop-4.10.0-system-cppgir.patch b/net-im/telegram-desktop/files/tdesktop-4.10.0-system-cppgir.patch new file mode 100644 index ..39f30ff0d2d2 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.10.0-system-cppgir.patch @@ -0,0 +1,32 @@ +Use system cppgir + +https://github.com/desktop-app/cmake_helpers/issues/282 +https://github.com/desktop-app/cmake_helpers/pull/305 +--- tdesktop-4.10.0-full.orig/cmake/external/glib/CMakeLists.txt tdesktop-4.10.0-full/cmake/external/glib/CMakeLists.txt +@@ -7,14 +7,6 @@ + add_library(external_glib INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_glib ALIAS external_glib) + +-function(add_cppgir) # isolate scope +-set(BUILD_TESTING OFF) +-set(BUILD_DOC OFF) +-set(BUILD_EXAMPLES OFF) +-add_subdirectory(cppgir EXCLUDE_FROM_ALL) +-endfunction() +-add_cppgir() +- + include(generate_cppgir.cmake) + generate_cppgir(external_glib Gio-2.0) + +--- tdesktop-4.10.0-full.orig/cmake/external/glib/generate_cppgir.cmake tdesktop-4.10.0-full/cmake/external/glib/generate_cppgir.cmake +@@ -4,6 +4,8 @@ + # For license and copyright information please follow this link: + # https://github.com/desktop-app/legal/blob/master/LEGAL + ++find_package(CppGir REQUIRED) ++ + function(generate_cppgir target_name gir) + # cppgir generates all the dependent headers everytime, better to have a global folder + set(gen_dst ${CMAKE_BINARY_DIR}/gen) diff --git a/net-im/telegram-desktop/files/tdesktop-4.10.3-fix-clang-libstdcxx.patch b/net-im/telegram-desktop/files/tdesktop-4.10.3-fix-clang-libstdcxx.patch new file mode 100644 index ..290eb2a6b2d9 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.10.3-fix-clang-libstdcxx.patch @@ -0,0 +1,13 @@ +Fix compilation with Clang + libstdc++ + +--- tdesktop-4.10.3-full.orig/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp tdesktop-4.10.3-full/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +@@ -814,7 +814,7 @@ + + // A list of capabilities that offer feature parity + // with custom notifications +- return ranges::all_of(std::initializer_list{ ++ return ranges::all_of(std::array{ + // To show message content + "body", + // To have buttons on notifications diff --git a/net-im/telegram-desktop/telegram-desktop-4.10.3.ebuild b/net-im/telegram-desktop/telegram-desktop-4.10.3.ebuild new file mode 100644 index ..247cf70a5a6e --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-4.10.3.ebuild @@ -0,0 +1,234 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +DESCRIPTION="Official desktop client for Telegram" +HOMEPAGE="https://desktop.telegram.org; + +MY_P="tdesktop-${PV}-full"
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 4283d28a7c19e4139e4de82bc0220a46d0ea1a55 Author: Esteve Varela Colominas gmail com> AuthorDate: Thu Jun 29 13:22:57 2023 + Commit: Sam James gentoo org> CommitDate: Sat Jul 15 16:24:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4283d28a net-im/telegram-desktop: Drop old Closes: https://bugs.gentoo.org/909038 Thanks-to: orion_cygnus protonmail.com Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Sam James gentoo.org> net-im/telegram-desktop/Manifest | 1 - .../files/tdesktop-4.8.3-system-cppgir.patch | 50 - .../telegram-desktop/telegram-desktop-4.8.3.ebuild | 210 - 3 files changed, 261 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 6b9248e40432..03864bb57aea 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,2 @@ DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567 -DIST tdesktop-4.8.3-full.tar.gz 64351425 BLAKE2B b2f18abee66364f9075dc9a924221092b511d092f755ebf44705efdc96b2cbfe71b77a1a375624fa48e072f2b3f9bd19795b456c5f03f236b164dba35febacf9 SHA512 11fdd39319d1fdae07094d0ab2cb919355015bee14567d88daf98f9e5332bfee7a938415800397e6f24224e97f6425fe0a1d7549d7de14b63f84ab7cb7741872 DIST tdesktop-4.8.4-full.tar.gz 69090626 BLAKE2B e2c6072b7b90911068ed57ed651176fb4d772f14710d2a4012bda47dae50be7f3050242c3a6950035f3f33a4041257cadac54e639691735f6acfda98c8db8b7b SHA512 7988d047cb72888e303f9902f04bd2168f67fb18a4451e5122ce80b0aef726173f0ee10f83b8bb713a46e02c9ec4150ad6128e4288be432ed3d590011f80e4dd diff --git a/net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch b/net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch deleted file mode 100644 index 54c79b3e5a0c.. --- a/net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch +++ /dev/null @@ -1,50 +0,0 @@ -Use system cppgir - tdesktop-4.8.3-full.orig/cmake/external/glib/CMakeLists.txt -+++ tdesktop-4.8.3-full/cmake/external/glib/CMakeLists.txt -@@ -7,14 +7,6 @@ - add_library(external_glib INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_glib ALIAS external_glib) - --function(add_cppgir) # isolate scope --set(BUILD_TESTING OFF) --set(BUILD_DOC OFF) --set(CMAKE_DISABLE_FIND_PACKAGE_Qt5Core ON) --add_subdirectory(cppgir) --endfunction() --add_cppgir() -- - include(generate_cppgir.cmake) - generate_cppgir(external_glib Gio-2.0) - tdesktop-4.8.3-full.orig/cmake/external/glib/generate_cppgir.cmake -+++ tdesktop-4.8.3-full/cmake/external/glib/generate_cppgir.cmake -@@ -4,6 +4,8 @@ - # For license and copyright information please follow this link: - # https://github.com/desktop-app/legal/blob/master/LEGAL - -+find_package(CppGir REQUIRED) -+ - function(generate_cppgir target_name gir) - # cppgir generates all the dependent headers everytime, better to have a global folder - set(gen_dst ${CMAKE_BINARY_DIR}/gen) -@@ -32,17 +34,16 @@ - echo 1> ${gen_timestamp} - COMMENT "Generating C++ wrapper for ${gir} (${target_name})" - DEPENDS --cppgir - ${gir_path} - ) - generate_target(${target_name} cppgir ${gen_timestamp} "" ${gen_dst}) - - get_target_property(target_type ${target_name} TYPE) - if (${target_type} STREQUAL "INTERFACE_LIBRARY") --target_link_libraries(${target_name} INTERFACE gi) -+target_link_libraries(${target_name} INTERFACE CppGir::gi) - target_compile_definitions(${target_name} INTERFACE GI_INLINE GI_OBJECT_NEWV) - else() --target_link_libraries(${target_name} PUBLIC gi) -+target_link_libraries(${target_name} PUBLIC CppGir::gi) - target_compile_definitions(${target_name} PUBLIC GI_INLINE GI_OBJECT_NEWV) - endif() - endfunction() diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild deleted file mode 100644 index cbc4a581fa36.. --- a/net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) - -inherit xdg cmake python-any-r1 optfeature flag-o-matic - -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; -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="enchant +fonts +jemalloc
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 9babac46eb4793511ef9ac99b0630e5e6a976638 Author: Esteve Varela Colominas gmail com> AuthorDate: Thu Jun 29 13:22:04 2023 + Commit: Sam James gentoo org> CommitDate: Sat Jul 15 16:24:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9babac46 net-im/telegram-desktop: Bump to 4.8.4 Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Sam James gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../files/tdesktop-4.8.4-system-cppgir.patch | 50 + .../telegram-desktop/telegram-desktop-4.8.4.ebuild | 216 + 3 files changed, 267 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 644debcd4e0b..6b9248e40432 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1,3 @@ DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567 DIST tdesktop-4.8.3-full.tar.gz 64351425 BLAKE2B b2f18abee66364f9075dc9a924221092b511d092f755ebf44705efdc96b2cbfe71b77a1a375624fa48e072f2b3f9bd19795b456c5f03f236b164dba35febacf9 SHA512 11fdd39319d1fdae07094d0ab2cb919355015bee14567d88daf98f9e5332bfee7a938415800397e6f24224e97f6425fe0a1d7549d7de14b63f84ab7cb7741872 +DIST tdesktop-4.8.4-full.tar.gz 69090626 BLAKE2B e2c6072b7b90911068ed57ed651176fb4d772f14710d2a4012bda47dae50be7f3050242c3a6950035f3f33a4041257cadac54e639691735f6acfda98c8db8b7b SHA512 7988d047cb72888e303f9902f04bd2168f67fb18a4451e5122ce80b0aef726173f0ee10f83b8bb713a46e02c9ec4150ad6128e4288be432ed3d590011f80e4dd diff --git a/net-im/telegram-desktop/files/tdesktop-4.8.4-system-cppgir.patch b/net-im/telegram-desktop/files/tdesktop-4.8.4-system-cppgir.patch new file mode 100644 index ..d8bd00aae907 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.8.4-system-cppgir.patch @@ -0,0 +1,50 @@ +Use system cppgir + +--- tdesktop-4.8.4-full.orig/cmake/external/glib/CMakeLists.txt tdesktop-4.8.4-full/cmake/external/glib/CMakeLists.txt +@@ -7,14 +7,6 @@ + add_library(external_glib INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_glib ALIAS external_glib) + +-function(add_cppgir) # isolate scope +-set(BUILD_TESTING OFF) +-set(BUILD_DOC OFF) +-set(CMAKE_DISABLE_FIND_PACKAGE_Qt5Core ON) +-add_subdirectory(cppgir EXCLUDE_FROM_ALL) +-endfunction() +-add_cppgir() +- + include(generate_cppgir.cmake) + generate_cppgir(external_glib Gio-2.0) + +--- tdesktop-4.8.4-full.orig/cmake/external/glib/generate_cppgir.cmake tdesktop-4.8.4-full/cmake/external/glib/generate_cppgir.cmake +@@ -4,6 +4,8 @@ + # For license and copyright information please follow this link: + # https://github.com/desktop-app/legal/blob/master/LEGAL + ++find_package(CppGir REQUIRED) ++ + function(generate_cppgir target_name gir) + # cppgir generates all the dependent headers everytime, better to have a global folder + set(gen_dst ${CMAKE_BINARY_DIR}/gen) +@@ -32,17 +34,16 @@ + echo 1> ${gen_timestamp} + COMMENT "Generating C++ wrapper for ${gir} (${target_name})" + DEPENDS +-cppgir + ${gir_path} + ) + generate_target(${target_name} cppgir ${gen_timestamp} "" ${gen_dst}) + + get_target_property(target_type ${target_name} TYPE) + if (${target_type} STREQUAL "INTERFACE_LIBRARY") +-target_link_libraries(${target_name} INTERFACE gi) ++target_link_libraries(${target_name} INTERFACE CppGir::gi) + target_compile_definitions(${target_name} INTERFACE GI_INLINE GI_OBJECT_NEWV) + else() +-target_link_libraries(${target_name} PUBLIC gi) ++target_link_libraries(${target_name} PUBLIC CppGir::gi) + target_compile_definitions(${target_name} PUBLIC GI_INLINE GI_OBJECT_NEWV) + endif() + endfunction() diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.4.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.4.ebuild new file mode 100644 index ..486db8be5ccf --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-4.8.4.ebuild @@ -0,0 +1,216 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +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; +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X" +REQUIRED_USE=" +
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: c10437a81bfd717614dcd3e9c8bbd6052e8a14f9 Author: Esteve Varela Colominas gmail com> AuthorDate: Sat Jun 10 12:02:58 2023 + Commit: Sam James gentoo org> CommitDate: Sat Jun 10 13:43:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10437a8 net-im/telegram-desktop: Drop old Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Sam James gentoo.org> net-im/telegram-desktop/Manifest | 1 - .../tdesktop-4.2.4-jemalloc-only-telegram.patch| 43 - .../telegram-desktop-4.6.5-r2.ebuild | 206 - .../telegram-desktop/telegram-desktop-4.6.5.ebuild | 206 - 4 files changed, 456 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index f9b37088f842..e4b269dc8954 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1 @@ -DIST tdesktop-4.6.5-full.tar.gz 63793549 BLAKE2B a425aaf8d1f1c633b3b8ddacff5bb7cc26e6063d4238413fea76db6a4608497d229061a614c79464373e7f1aa3bb854d9718083638e119538e989a202741b3d6 SHA512 4a337e375d7746cb1fa652f5851f8be5718b7b9d9676bba8ab040489b8492b2a665a51848adba28117a910789aa942c386318a01f6c99b4caa12a1eac682c780 DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567 diff --git a/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch deleted file mode 100644 index a7710e145443.. --- a/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch +++ /dev/null @@ -1,43 +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. - -https://bugs.gentoo.org/802624 - tdesktop-4.2.4-full.orig/Telegram/CMakeLists.txt -+++ tdesktop-4.2.4-full/Telegram/CMakeLists.txt -@@ -1478,6 +1478,14 @@ - desktop-app::external_wayland_client - ) - endif() -+ -+if (NOT DESKTOP_APP_DISABLE_JEMALLOC) -+target_link_libraries(Telegram -+INTERFACE -+$ -+$ -+) -+endif() - endif() - - if (build_macstore) tdesktop-4.2.4-full.orig/cmake/options_linux.cmake -+++ tdesktop-4.2.4-full/cmake/options_linux.cmake -@@ -78,14 +78,6 @@ - ) - endif() - --if (NOT DESKTOP_APP_DISABLE_JEMALLOC) -- target_link_libraries(common_options -- INTERFACE -- $ -- $ -- ) --endif() -- - if (DESKTOP_APP_USE_ALLOCATION_TRACER) - target_link_options(common_options - INTERFACE diff --git a/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild deleted file mode 100644 index a0dc810ebc7f.. --- a/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit xdg cmake python-any-r1 optfeature flag-o-matic - -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; -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" -IUSE="+dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X" -REQUIRED_USE=" - qt6-imageformats? ( qt6 ) -" - -KIMAGEFORMATS_RDEPEND=" - media-libs/libavif:= - media-libs/libheif:= - media-libs/libjxl -" -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - dev-cpp/abseil-cpp:= - dev-libs/glib:2 - dev-libs/libdispatch - dev-libs/libsigc++:2 - dev-libs/openssl:= - dev-libs/xxhash - media-libs/fontconfig:= - media-libs/libjpeg-turbo:= - ~media-libs/libtgvoip-2.4.4_p20221208 - media-libs/openal - media-libs/opus:= - media-libs/rnnoise - ~media-libs/tg_owt-0_pre20230428:=[screencast=,X=] - media-video/ffmpeg:=[opus,vpx] - sys-libs/zlib:=[minizip] - virtual/opengl - dbus? ( dev-cpp/glibmm:2.68 ) - !enchant? ( >=app-text/hunspell-1.7:= ) - enchant? ( app-text/enchant:= ) - jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) - !qt6? ( -
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: b1d748ca4d38215d1b0ae05105dc2c91ec191ce9 Author: Esteve Varela Colominas gmail com> AuthorDate: Thu Feb 16 16:41:01 2023 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Feb 22 22:57:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d748ca net-im/telegram-desktop: Drop useless Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29620 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 - .../files/tdesktop-4.6.2-fix-gcc12-optional.patch | 15 -- .../telegram-desktop/telegram-desktop-4.6.2.ebuild | 208 - 3 files changed, 224 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 2c0d19696f67..a8767374a5d1 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,4 +1,3 @@ DIST tdesktop-4.4.1-full.tar.gz 50077498 BLAKE2B 6196c474c0771197c56b386bbfd67e4a014569cb8bd9676990e323005f06cb6938aad0c0dd00fd74cab9fca1ac50c7bf7227f34aa39ae598b4f003199fa8cd00 SHA512 91038f0a615ef7ae1050cbfa614041a3d6a45fdbd26d120ef98cca3c31377612c3bb1e80f9aff58c4853a1726bf2cfb427f752a4f88a796f05b381516c981563 DIST tdesktop-4.5.3-full.tar.gz 63718129 BLAKE2B 85492ad92ea2643dd5e74c831609a4f7be9671648d2b542c24f415dbb19b66521ccecb2a545eadfbf9fa7f934d35d32de085b5b8403dce54bed0b85c54ea98fe SHA512 58a9c5d096e236090347388e1ed480527f841045a80771079dc0c3e35e12ce8ac11753987e87bb57870d9bd8488fc6a4734114648ecec7823d8544744b06c6b1 -DIST tdesktop-4.6.2-full.tar.gz 63799003 BLAKE2B 828b75e13f00c50d26df276479500edd7604987d233b3caf433dc1d5611f0743ef6c9e25ccecd35581b809ca1986ffc3f01bcc0a10c7d05b1d8c9396edc026b1 SHA512 9a52cecb2ccde6e1381045b1c96730c63c5f19ca188a1be3bc905762f6e356906b7be141e8d373473390c21bc8b48ef7d5f4ee43bb09229a96b82c4fd974b531 DIST tdesktop-4.6.3-full.tar.gz 63791674 BLAKE2B 291ed09dc96bb419c38d6c679c14ac5db1a361114c363ed4cfcbbab8e81927a75e87c5c8839bb348cf3395ff167e8e1eae9d6e499b4448e54e705b34ce997e59 SHA512 c01a1b57c71d8e3509664f8dfb8f7aa932e830732ea75211718150c8e4eafaf501f4271e5cb9e0c3348cd398091bc8236ff0cf79c0c6a45e5f897f9e3610566a diff --git a/net-im/telegram-desktop/files/tdesktop-4.6.2-fix-gcc12-optional.patch b/net-im/telegram-desktop/files/tdesktop-4.6.2-fix-gcc12-optional.patch deleted file mode 100644 index 7e471e143ec0.. --- a/net-im/telegram-desktop/files/tdesktop-4.6.2-fix-gcc12-optional.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix missing header with gcc 12 - -Upstream: -https://github.com/telegramdesktop/tdesktop/commit/a8decf154f5aceeff0b977c0a5845e42404286b3 - tdesktop-4.6.2-full.orig/Telegram/SourceFiles/payments/stripe/stripe_card_validator.h -+++ tdesktop-4.6.2-full/Telegram/SourceFiles/payments/stripe/stripe_card_validator.h -@@ -9,6 +9,7 @@ - - #include "stripe/stripe_card.h" - #include -+#include - - class QDate; - diff --git a/net-im/telegram-desktop/telegram-desktop-4.6.2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.6.2.ebuild deleted file mode 100644 index 647c887cfff8.. --- a/net-im/telegram-desktop/telegram-desktop-4.6.2.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit xdg cmake python-any-r1 optfeature flag-o-matic - -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; -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" -IUSE="+dbus enchant +fonts +hunspell +jemalloc screencast qt6 qt6-imageformats wayland +X" -REQUIRED_USE=" - ^^ ( enchant hunspell ) - qt6-imageformats? ( qt6 ) -" - -KIMAGEFORMATS_RDEPEND=" - media-libs/libavif:= - media-libs/libheif:= - media-libs/libjxl -" -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - dev-cpp/abseil-cpp:= - dev-libs/glib:2 - dev-libs/libdispatch - dev-libs/libsigc++:2 - dev-libs/openssl:= - dev-libs/xxhash - media-libs/fontconfig:= - media-libs/libjpeg-turbo:= - ~media-libs/libtgvoip-2.4.4_p20221208 - media-libs/openal - media-libs/opus:= - media-libs/rnnoise - ~media-libs/tg_owt-0_pre20230105:=[screencast=,X=] - media-video/ffmpeg:=[opus] - sys-libs/zlib:=[minizip] - virtual/opengl - dbus? ( dev-cpp/glibmm:2.68 ) - enchant? ( app-text/enchant:= ) - hunspell? ( >=app-text/hunspell-1.7:= ) - jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) - !qt6? ( - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] -
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: b15b0e201996f1ef7c85d349b19cd163a8442ae2 Author: Esteve Varela Colominas gmail com> AuthorDate: Sat Jan 21 10:08:38 2023 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Jan 22 23:25:45 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b15b0e20 net-im/telegram-desktop: Drop old Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29201 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 - .../tdesktop-4.3.4-fix-disabling-spellcheck.patch | 43 - .../tdesktop-4.3.4-qt5-incompatibility-1.patch | 42 .../telegram-desktop-4.3.4-r2.ebuild | 214 - 4 files changed, 300 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 092b4677f878..f8432fb9b681 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,4 +1,3 @@ DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba -DIST tdesktop-4.3.4-full.tar.gz 50030732 BLAKE2B 68d9001128cca6e8a68d991e77a20f9764af9a634c37d792e92f7e77b0446b6d16ec1342f9e7ce7e0c49464f385f795164f9d176d65a74fc64fc072eae33d263 SHA512 415e0d60508317ef6d07e1f8aa2d974b166925f19349106cc543e487dd5bef8d1ff0548fb815682c6c4bb3bf762c08fcb1c7073f2c7ad305ae885b7979c70f88 DIST tdesktop-4.4.1-full.tar.gz 50077498 BLAKE2B 6196c474c0771197c56b386bbfd67e4a014569cb8bd9676990e323005f06cb6938aad0c0dd00fd74cab9fca1ac50c7bf7227f34aa39ae598b4f003199fa8cd00 SHA512 91038f0a615ef7ae1050cbfa614041a3d6a45fdbd26d120ef98cca3c31377612c3bb1e80f9aff58c4853a1726bf2cfb427f752a4f88a796f05b381516c981563 DIST tdesktop-4.5.3-full.tar.gz 63718129 BLAKE2B 85492ad92ea2643dd5e74c831609a4f7be9671648d2b542c24f415dbb19b66521ccecb2a545eadfbf9fa7f934d35d32de085b5b8403dce54bed0b85c54ea98fe SHA512 58a9c5d096e236090347388e1ed480527f841045a80771079dc0c3e35e12ce8ac11753987e87bb57870d9bd8488fc6a4734114648ecec7823d8544744b06c6b1 diff --git a/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch b/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch deleted file mode 100644 index 9529370cdbae.. --- a/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix building without spellcheck - -Upcoming changes to tdesktop include language recognition, which is a bit of a -doozy, and as is tradition, "unusual" compilation flags go untested. - -Regular builds would always return false here, anyway, as linux isn't a -priority with these things. - -/var/tmp/portage/net-im/telegram-desktop-4.3.4/work/tdesktop-4.3.4-full/Telegram/SourceFiles/boxes/translate_box.cpp:18:10: fatal error: spellcheck/platform/platform_language.h: No such file or directory - 18 | #include "spellcheck/platform/platform_language.h" - | ^ -compilation terminated. - tdesktop-4.3.4-full.orig/Telegram/SourceFiles/boxes/translate_box.cpp -+++ tdesktop-4.3.4-full/Telegram/SourceFiles/boxes/translate_box.cpp -@@ -15,7 +15,9 @@ - #include "main/main_session.h" - #include "mtproto/sender.h" - #include "settings/settings_common.h" -+#ifndef TDESKTOP_DISABLE_SPELLCHECK - #include "spellcheck/platform/platform_language.h" -+#endif - #include "ui/effects/loading_element.h" - #include "ui/layers/generic_box.h" - #include "ui/widgets/buttons.h" -@@ -331,6 +333,7 @@ - if (!hasLetters) { - return true; - } -+#ifndef TDESKTOP_DISABLE_SPELLCHECK - const auto result = Platform::Language::Recognize(text); - if (result.unknown) { - return false; -@@ -343,6 +346,9 @@ - ? QLocale::English - : settingsLang; - return (result.locale.language() == skip); -+#else -+return false; -+#endif - } - - } // namespace Ui diff --git a/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch b/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch deleted file mode 100644 index 3229b5be54c8.. --- a/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch +++ /dev/null @@ -1,42 +0,0 @@ -Disable portal-related event loop with qt5 - -QEventLoop::ApplicationExec is undocumented, but only present in qt6, so I have -no idea if the functionality can be preserved in qt5. Upstream code indicates -that not using it at all is safe, and unlikely to cause problems in -distribution packaging. - -Yet another reminder that qt5 is dying. -
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: f62d7c6599bbb275f7863bd1fef0f5d31a673703 Author: Esteve Varela Colominas gmail com> AuthorDate: Sun Nov 27 19:05:52 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Nov 29 14:59:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62d7c65 net-im/telegram-desktop: Bump to 4.3.4 Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../tdesktop-4.3.4-fix-disabling-spellcheck.patch | 43 + .../tdesktop-4.3.4-qt5-incompatibility-1.patch | 42 + .../tdesktop-4.3.4-qt5-incompatibility-2.patch | 28 +++ .../telegram-desktop/telegram-desktop-4.3.4.ebuild | 206 + 5 files changed, 320 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index fd5e85fb3f0d..b7e61178b0e8 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,4 @@ DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba DIST tdesktop-4.2.4-full.tar.gz 49210806 BLAKE2B 5900f977156f8ec98098a5e2fe97efcc5c2d7e2768123268e4b232e384c47a02fec11b3d5d875f99134aace9d3d7f937defb83ea1572d41c7df52f4d1bda1e9c SHA512 c0b458e4f21855d1041f7343ffdd501890a7535d040b45a8bd565e545d5bc01a00703af65e14ae407bf53f81a6d28d3f7d6afa664eb5b8e5641b21bb8e669a3a DIST tdesktop-4.3.1-full.tar.gz 49305237 BLAKE2B 3f0605adb6b471ecd913921a836c8d0e09d5fb40f107290d085af2a0ad64f7f067014b381a50317ffa089ce68724629972c565619d4d24776ac3496c15d9959f SHA512 365c16f4260827e3ad7e066f6ec96fc97a6f5874df376933f16de20c3488c24f52bc1aa3bd5df936f29a198e287dc8e706b259d57d7d7a9d6468c7edc7568514 +DIST tdesktop-4.3.4-full.tar.gz 50030732 BLAKE2B 68d9001128cca6e8a68d991e77a20f9764af9a634c37d792e92f7e77b0446b6d16ec1342f9e7ce7e0c49464f385f795164f9d176d65a74fc64fc072eae33d263 SHA512 415e0d60508317ef6d07e1f8aa2d974b166925f19349106cc543e487dd5bef8d1ff0548fb815682c6c4bb3bf762c08fcb1c7073f2c7ad305ae885b7979c70f88 diff --git a/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch b/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch new file mode 100644 index ..9529370cdbae --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch @@ -0,0 +1,43 @@ +Fix building without spellcheck + +Upcoming changes to tdesktop include language recognition, which is a bit of a +doozy, and as is tradition, "unusual" compilation flags go untested. + +Regular builds would always return false here, anyway, as linux isn't a +priority with these things. + +/var/tmp/portage/net-im/telegram-desktop-4.3.4/work/tdesktop-4.3.4-full/Telegram/SourceFiles/boxes/translate_box.cpp:18:10: fatal error: spellcheck/platform/platform_language.h: No such file or directory + 18 | #include "spellcheck/platform/platform_language.h" + | ^ +compilation terminated. + +--- tdesktop-4.3.4-full.orig/Telegram/SourceFiles/boxes/translate_box.cpp tdesktop-4.3.4-full/Telegram/SourceFiles/boxes/translate_box.cpp +@@ -15,7 +15,9 @@ + #include "main/main_session.h" + #include "mtproto/sender.h" + #include "settings/settings_common.h" ++#ifndef TDESKTOP_DISABLE_SPELLCHECK + #include "spellcheck/platform/platform_language.h" ++#endif + #include "ui/effects/loading_element.h" + #include "ui/layers/generic_box.h" + #include "ui/widgets/buttons.h" +@@ -331,6 +333,7 @@ + if (!hasLetters) { + return true; + } ++#ifndef TDESKTOP_DISABLE_SPELLCHECK + const auto result = Platform::Language::Recognize(text); + if (result.unknown) { + return false; +@@ -343,6 +346,9 @@ + ? QLocale::English + : settingsLang; + return (result.locale.language() == skip); ++#else ++return false; ++#endif + } + + } // namespace Ui diff --git a/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch b/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch new file mode 100644 index ..3229b5be54c8 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch @@ -0,0 +1,42 @@ +Disable portal-related event loop with qt5 + +QEventLoop::ApplicationExec is undocumented, but only present in qt6, so I have +no idea if the functionality can be preserved in qt5. Upstream code indicates +that not using it at all is safe, and unlikely to cause problems in +distribution packaging. + +Yet another reminder that qt5 is dying. +
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 732558f79fe61bf09c97e9e254e54c511aeafdc9 Author: Esteve Varela Colominas gmail com> AuthorDate: Sat Oct 1 10:34:41 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Oct 3 22:51:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732558f7 net-im/telegram-desktop: Bump to 4.2.4 Adds support for bundling kimageformats for qt6. Adds support for disabling bundled fonts. Bug: https://bugs.gentoo.org/841218 Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../tdesktop-4.2.4-jemalloc-only-telegram.patch| 43 + net-im/telegram-desktop/metadata.xml | 2 + .../telegram-desktop/telegram-desktop-4.2.4.ebuild | 204 + 4 files changed, 250 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 9be9d2961fa7..1930ecc47b32 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,4 @@ DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba DIST tdesktop-4.0.2-full.tar.gz 41059443 BLAKE2B da4efb15c8a2d11719d3aa56c3a40b12f70c37577d2909c43e6029e10ca0bb1f8445ed68ed9acd532009c8e0a8f48fa13d2a51573a81f58a8a83b13427ffb631 SHA512 0078b627d06dd8e655bd2bcc222ecbb3b15b7d88f858810bccdca84793ad02a60f4a4bf3808838752d65d4f6cffa3ddb5f70c5afc8e94cb6edae52101362feeb DIST tdesktop-4.1.1-full.tar.gz 41431505 BLAKE2B 7faf8d3a1e6d1ccb621f7a5af89c9b680fe515fbf4994f05d899ec44b8dc863440a368194a0237bef09078d14b5c670749276765da28ac6118787b6584fcbc01 SHA512 3240b9f81c3901997b1ea13fd7db7b8598b31c0faa68a2f711909ed11f33345db5a45ac99c0be77f1caeb1f571093ea42b1dbc7e7bb15e989c8756805c2ec887 +DIST tdesktop-4.2.4-full.tar.gz 49210806 BLAKE2B 5900f977156f8ec98098a5e2fe97efcc5c2d7e2768123268e4b232e384c47a02fec11b3d5d875f99134aace9d3d7f937defb83ea1572d41c7df52f4d1bda1e9c SHA512 c0b458e4f21855d1041f7343ffdd501890a7535d040b45a8bd565e545d5bc01a00703af65e14ae407bf53f81a6d28d3f7d6afa664eb5b8e5641b21bb8e669a3a diff --git a/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch new file mode 100644 index ..a7710e145443 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch @@ -0,0 +1,43 @@ +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. + +https://bugs.gentoo.org/802624 + +--- tdesktop-4.2.4-full.orig/Telegram/CMakeLists.txt tdesktop-4.2.4-full/Telegram/CMakeLists.txt +@@ -1478,6 +1478,14 @@ + desktop-app::external_wayland_client + ) + endif() ++ ++if (NOT DESKTOP_APP_DISABLE_JEMALLOC) ++target_link_libraries(Telegram ++INTERFACE ++$ ++$ ++) ++endif() + endif() + + if (build_macstore) +--- tdesktop-4.2.4-full.orig/cmake/options_linux.cmake tdesktop-4.2.4-full/cmake/options_linux.cmake +@@ -78,14 +78,6 @@ + ) + endif() + +-if (NOT DESKTOP_APP_DISABLE_JEMALLOC) +- target_link_libraries(common_options +- INTERFACE +- $ +- $ +- ) +-endif() +- + if (DESKTOP_APP_USE_ALLOCATION_TRACER) + target_link_options(common_options + INTERFACE diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml index 8cef7d6a41b5..5359672b12eb 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -12,6 +12,8 @@ Enable the app-text/aspell spell-checking backend Enable the app-text/hunspell spell-checking backend + Use builtin patched copy of open-sans fonts (overrides fontconfig) Build with Qt6 support + Add support for HEIF, AVIF and JpegXL by bundling kde-frameworks/kimageformats diff --git a/net-im/telegram-desktop/telegram-desktop-4.2.4.ebuild b/net-im/telegram-desktop/telegram-desktop-4.2.4.ebuild new file mode 100644 index ..56002aede441 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-4.2.4.ebuild @@ -0,0 +1,204 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit xdg cmake python-any-r1 optfeature + +DESCRIPTION="Official desktop
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 1af7aefbf83a1092af70ffd11cffd8f964e34660 Author: peeweep 0x0 ee> AuthorDate: Wed Aug 3 06:00:39 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Aug 3 17:39:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af7aefb net-im/telegram-desktop: fix gcc12 build fail Closes: https://bugs.gentoo.org/863248 Signed-off-by: peeweep 0x0.ee> Closes: https://github.com/gentoo/gentoo/pull/26715 Signed-off-by: Georgy Yakovlev gentoo.org> .../files/tdesktop-4.0.2-fix-gcc12-cstdint.patch | 10 ++ net-im/telegram-desktop/telegram-desktop-4.0.2.ebuild | 1 + 2 files changed, 11 insertions(+) diff --git a/net-im/telegram-desktop/files/tdesktop-4.0.2-fix-gcc12-cstdint.patch b/net-im/telegram-desktop/files/tdesktop-4.0.2-fix-gcc12-cstdint.patch new file mode 100644 index ..a3d67e0c9a1b --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.0.2-fix-gcc12-cstdint.patch @@ -0,0 +1,10 @@ +--- a/Telegram/ThirdParty/tgcalls/tgcalls/utils/gzip.h b/Telegram/ThirdParty/tgcalls/tgcalls/utils/gzip.h +@@ -2,6 +2,7 @@ + #define TGCALLS_UTILS_GZIP_H + + #include ++#include + #include + + namespace tgcalls { diff --git a/net-im/telegram-desktop/telegram-desktop-4.0.2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.0.2.ebuild index 930d3d186fc3..be7e1428d2a7 100644 --- a/net-im/telegram-desktop/telegram-desktop-4.0.2.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-4.0.2.ebuild @@ -75,6 +75,7 @@ PATCHES=( "${FILESDIR}/tdesktop-3.6.0-jemalloc-only-telegram.patch" "${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch" "${FILESDIR}/tdesktop-3.5.2-musl.patch" + "${FILESDIR}/tdesktop-4.0.2-fix-gcc12-cstdint.patch" ) # Current desktop-file-utils-0.26 does not understand Version=1.5
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 48b4072b8670dde327bc2c4fd813c6cf80c6968b Author: Esteve Varela Colominas gmail com> AuthorDate: Sat Mar 12 19:08:02 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Mar 13 18:20:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b4072b net-im/telegram-desktop: Bump to 3.6.0 Also add support for ffmpeg5 Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24518 Signed-off-by: Arthur Zamarin gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../tdesktop-3.6.0-jemalloc-only-telegram.patch| 41 ++ .../files/tdesktop-3.6.0-support-ffmpeg5.patch | 75 ++ .../telegram-desktop/telegram-desktop-3.6.0.ebuild | 163 + 4 files changed, 280 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index c9f271d76d39..8bb0c40c1792 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1,3 @@ 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 +DIST tdesktop-3.6.0-full.tar.gz 41227365 BLAKE2B 2d2c66d3110ef83b88d74fc2ca90e444fb34ffb1e96b71d0871b1477598c75b487d8f932f4ba244b99391390317efa90b017bc8a4f562e31461c330d425410e5 SHA512 e5d4278229dc6033e1d40509d54fe52844dd8bad036bfec1fb9683505c9a626e821c15a487db5f1be5951dd5ed0db3ff5a4cbcbba73627f5e527e88cb06925f3 diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch new file mode 100644 index ..6836e6935049 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch @@ -0,0 +1,41 @@ +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.6.0-full.orig/Telegram/CMakeLists.txt tdesktop-3.6.0-full/Telegram/CMakeLists.txt +@@ -1376,6 +1376,14 @@ + desktop-app::external_kwayland + ) + endif() ++ ++if (NOT DESKTOP_APP_DISABLE_JEMALLOC) ++target_link_libraries(Telegram ++INTERFACE ++$ ++$ ++) ++endif() + endif() + + if (build_macstore) +--- tdesktop-3.6.0-full.orig/cmake/options_linux.cmake tdesktop-3.6.0-full/cmake/options_linux.cmake +@@ -62,14 +62,6 @@ + target_link_options(common_options INTERFACE $,,-g -flto -fuse-linker-plugin>) + endif() + +-if (NOT DESKTOP_APP_DISABLE_JEMALLOC) +- target_link_libraries(common_options +- INTERFACE +- $ +- $ +- ) +-endif() +- + target_link_libraries(common_options + INTERFACE + ${CMAKE_DL_LIBS} diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch new file mode 100644 index ..32959acd5482 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch @@ -0,0 +1,75 @@ +Support FFmpeg 5 + +I'm not comfortable changing the _durationInMilliseconds formula on older +versions of ffmpeg. Doing that only for newer versions also reduces the amount +of testing this patch needs (of which it'll get very minimal amounts, this is a +job better left for upstream when they get to it). + +Also it doesn't compile under ffmpeg 4 if the variables are constants :/ + +--- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp +@@ -104,7 +104,11 @@ + + _frame = av_frame_alloc(); + ++#if LIBAVFORMAT_VERSION_MAJOR >= 59 ++const AVInputFormat *inputFormat = av_find_input_format(container.c_str()); ++#else + AVInputFormat *inputFormat = av_find_input_format(container.c_str()); ++#endif + if (!inputFormat) { + _didReadToEnd = true; + return; +@@ -144,7 +148,11 @@ + + _streamId = i; + ++#if LIBAVFORMAT_VERSION_MAJOR >= 59 ++_durationInMilliseconds = inStream->duration * 1000 / 48000; ++#else + _durationInMilliseconds
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 07dc90a654db8896908499fb9644a25d4833d679 Author: Esteve Varela Colominas gmail com> AuthorDate: Sat Mar 12 19:06:02 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Mar 13 18:20:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07dc90a6 net-im/telegram-desktop: Drop old Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Arthur Zamarin 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.. --- 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 < 0x2000L - 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.. --- 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 $,,-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.. --- 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"
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 6167f5dafc20e5c8734aec45bed3790a435d6b32 Author: Esteve Varela Colominas gmail com> AuthorDate: Fri Feb 11 07:43:48 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Feb 16 19:43:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6167f5da net-im/telegram-desktop: Bump to 3.5.2 Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../tdesktop-3.5.2-jemalloc-only-telegram.patch| 33 + .../telegram-desktop/telegram-desktop-3.5.2.ebuild | 152 + 3 files changed, 186 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 87c135a38f5b..011052e26fd0 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -2,3 +2,4 @@ DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584 DIST tdesktop-3.3.0-full.tar.gz 38662573 BLAKE2B f6cba2be02faccde77c510742dc57680a2731cd3b2bc4a2d680f6cda7fd1a634e2fa0406855a491241434daa080e782f561e5e472dcc42a8b8376c16e038b6af SHA512 ff0ac1abe264f19812c2e0b40d4861caddd6c01a3f863ccb68de9c5227282872b2bde878dcf751d7d04d36c6e0e77912619ac7863d54f25f739f3744e9bca53a DIST tdesktop-3.4.3-full.tar.gz 40647558 BLAKE2B 220a7b29dbc7a48d53e53fe9609dba804e5fe536feebc1225fd5400a8eec703e64f65decb8b503ed77e843c011c8b5fd12916534d4a1ecbc84724f277dcc301a SHA512 6b27eb14570b55fb14c77f1d557591985a4791712897c2e144196c54c2a98b10c7ece9dac7d039a6bb56f39e3062e4fbfbb60f6822e52b76f927bbf419d88a6b 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.5.2-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch new file mode 100644 index ..837cfaf38b7c --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch @@ -0,0 +1,33 @@ +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.5.2-full.orig/Telegram/CMakeLists.txt tdesktop-3.5.2-full/Telegram/CMakeLists.txt +@@ -1335,6 +1335,12 @@ + endif() + endif() + else() ++target_link_libraries(Telegram ++PRIVATE ++desktop-app::linux_jemalloc_helper ++$ ++) ++ + if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) + target_link_libraries(Telegram + PRIVATE +--- tdesktop-3.5.2-full.orig/cmake/options_linux.cmake tdesktop-3.5.2-full/cmake/options_linux.cmake +@@ -64,8 +64,6 @@ + + target_link_libraries(common_options + INTERFACE +-desktop-app::linux_jemalloc_helper +-$ + ${CMAKE_DL_LIBS} + ) + diff --git a/net-im/telegram-desktop/telegram-desktop-3.5.2.ebuild b/net-im/telegram-desktop/telegram-desktop-3.5.2.ebuild new file mode 100644 index ..8a4ae5891361 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-3.5.2.ebuild @@ -0,0 +1,152 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +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; +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +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/libdispatch + 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 +
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 8466d07e680b8d7245fbe352bbd261933b232309 Author: Esteve Varela Colominas gmail com> AuthorDate: Thu Jan 6 20:25:59 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jan 6 23:34:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8466d07e net-im/telegram-desktop: Fix USE=enchant The patched file isn't compiled without this USE flag. No revbump. Closes: https://bugs.gentoo.org/830180 Thanks-to: yongxiang gmail.com> Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> .../files/tdesktop-3.3.0-fix-enchant.patch | 20 .../telegram-desktop/telegram-desktop-3.3.0.ebuild | 1 + 2 files changed, 21 insertions(+) diff --git a/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch b/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch new file mode 100644 index ..35781fda0ced --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch @@ -0,0 +1,20 @@ +--- tdesktop-3.3.0-full.orig/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp tdesktop-3.3.0-full/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp +@@ -34,7 +34,7 @@ + auto IsHebrew(const QString ) { + // Words with mixed scripts will be automatically ignored, + // so this check should be fine. +- return ::Spellchecker::WordScript() == QChar::Script_Hebrew; ++ return ::Spellchecker::WordScript(word) == QChar::Script_Hebrew; + } + + class EnchantSpellChecker { +@@ -154,7 +154,7 @@ + } + + auto EnchantSpellChecker::findSuggestions(const QString ) { +- const auto wordScript = ::Spellchecker::WordScript(); ++ const auto wordScript = ::Spellchecker::WordScript(word); + auto w = word.toStdString(); + std::vector result; + if (!_validators.size()) { diff --git a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild index cedaf383018b..a14b4b6bc825 100644 --- a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild @@ -71,6 +71,7 @@ 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() {
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 6db826e810332e5e040e943836eddd79db7d0ee9 Author: Esteve Varela Colominas gmail com> AuthorDate: Mon Sep 20 17:03:54 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Sep 24 17:33:20 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db826e8 net-im/telegram-desktop: Bump to 3.1.0 Also fix openssl3 compilation error in this new version. Won't backport fixes, by the time openssl3 goes stable these will be phased out anyway... Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/22342 Signed-off-by: Georgy Yakovlev 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.1.0.ebuild | 146 + 4 files changed, 201 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index f2bd8bdf9dc..857e615c8ce 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1,3 @@ DIST tdesktop-2.9.3-full.tar.gz 37335782 BLAKE2B 197583ba6568c455218c51f590c1ba1a3f10c390caa4fd03657098f499ce113a4f5f57ca9dd53bc4baba31992d4229768ed35e68ad6b0685010bc335817edcac SHA512 810cfac5d7e6ce9413b1b2406927e89c1383ea5b725233a68b2cb29dd374b4c3386c22186640afde4492c844516c9a5db8e5b167a09d6d6c1270ac965ac4 DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447 +DIST tdesktop-3.1.0-full.tar.gz 38465279 BLAKE2B c9442507d3ec6f6e36e68d44ec86a9c1dfb864498ee90eef5f50b12482de4e1c93256352fc21bf997c38cda0dfce03f53776c47afe1a3066b109c1675ffc8749 SHA512 7fbb5722917c482aed820154e425642c4a3c7649defebae7076e48ac25da8744933877b70539d5cd6952e9f80493ccc5f144bf2c0c01083bade3473f00a23ec4 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 new file mode 100644 index 000..2b92e8adce4 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch @@ -0,0 +1,19 @@ +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 < 0x2000L + 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 new file mode 100644 index 000..7ad3e75e49b --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch @@ -0,0 +1,35 @@ +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 $,,-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.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild new file mode 100644 index 000..675c8aefaa4 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild @@ -0,0 +1,146 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 4e5846f2c91be868a2962271ddd7f6c753e83c45 Author: Esteve Varela Colominas gmail com> AuthorDate: Tue Sep 14 20:52:28 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Sep 16 12:07:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e5846f2 net-im/telegram-desktop: Add libdl dependency Fixes build error with USE=webkit Closes: https://bugs.gentoo.org/812926 Thanks-to: Azamat H. Hackimov gmail.com> Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> .../files/tdesktop-2.9.3-add-libdl-dependency.patch | 15 +++ net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild | 1 + 2 files changed, 16 insertions(+) diff --git a/net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch b/net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch new file mode 100644 index 000..3df0601b454 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch @@ -0,0 +1,15 @@ +Add missed dependency on libdl + +https://github.com/desktop-app/lib_webview/commit/3cb51ac668d4e1b4f7f2b95fed1192350ba403af + +--- tdesktop-2.9.3-full.orig/Telegram/lib_webview/CMakeLists.txt tdesktop-2.9.3-full/Telegram/lib_webview/CMakeLists.txt +@@ -56,6 +56,8 @@ + + pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0) + target_include_directories(lib_webview SYSTEM PUBLIC ${WEBKIT_INCLUDE_DIRS}) ++ ++target_link_libraries(lib_webview PUBLIC ${CMAKE_DL_LIBS}) + else() + remove_target_sources(lib_webview ${src_loc} + webview/platform/linux/webview_linux_webkit_gtk.cpp diff --git a/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild b/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild index 7ea3e2c0499..9e09efaee54 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild @@ -73,6 +73,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/tdesktop-2.9.3-jemalloc-only-telegram.patch" + "${FILESDIR}/tdesktop-2.9.3-add-libdl-dependency.patch" ) pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 1e74d5871b7aff2cd35b2fce381aa65b7df39fac Author: Esteve Varela Colominas gmail com> AuthorDate: Fri Aug 13 07:41:55 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Aug 13 23:29:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e74d587 net-im/telegram-desktop: Fix building with tg_owt[-screencast] Removed a patch from tg_owt forgetting it actually refused to build without. Upstream's current solution is a patch in telegram-desktop itself. Closes: https://bugs.gentoo.org/807907 Thanks-to: Teun Blok msn.com> Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21974 Signed-off-by: Georgy Yakovlev gentoo.org> ...desktop-2.8.11-fix-build-without-pipewire.patch | 26 ++ .../telegram-desktop-2.8.11-r2.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch b/net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch new file mode 100644 index 000..ecfc63abeb5 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch @@ -0,0 +1,26 @@ +Fix build without pipewire + +set_allow_pipewire isn't available if WEBRTC_USE_PIPEWIRE isn't set + +--- tdesktop-2.8.11-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceHelper.cpp tdesktop-2.8.11-full/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceHelper.cpp +@@ -286,7 +286,7 @@ + options.set_allow_use_magnification_api(false); + #elif defined WEBRTC_MAC + options.set_allow_iosurface(true); +-#elif defined WEBRTC_LINUX ++#elif defined WEBRTC_USE_PIPEWIRE + options.set_allow_pipewire(true); + #endif // WEBRTC_WIN || WEBRTC_MAC + +--- tdesktop-2.8.11-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceManager.cpp tdesktop-2.8.11-full/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceManager.cpp +@@ -33,7 +33,7 @@ + result.set_allow_use_magnification_api(false); + #elif defined WEBRTC_MAC + result.set_allow_iosurface(type == DesktopCaptureType::Screen); +-#elif defined WEBRTC_LINUX ++#elif defined WEBRTC_USE_PIPEWIRE + result.set_allow_pipewire(true); + #endif // WEBRTC_WIN || WEBRTC_MAC + result.set_detect_updated_region(true); diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild index becc983ec4b..940c5b1aed2 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild @@ -79,6 +79,7 @@ PATCHES=( "${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch" # Already upstream "${FILESDIR}/tdesktop-2.8.11-load-gtk-with-qlibrary.patch" + "${FILESDIR}/tdesktop-2.8.11-fix-build-without-pipewire.patch" ) pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: ba3e19059ebe0e6eb6a05e53fd42fff5bdf8e5fd Author: Esteve Varela Colominas gmail com> AuthorDate: Tue Aug 3 21:07:49 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Aug 4 08:29:27 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba3e1905 net-im/telegram-desktop: Fix running with QT_QPA_PLATFORMTHEME=gtk2 Closes: https://bugs.gentoo.org/806292 See-also: https://bugs.archlinux.org/task/71541 Thanks-to: Ilia Durov mail.ru> Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> .../tdesktop-2.8.11-load-gtk-with-qlibrary.patch | 112 + .../telegram-desktop-2.8.11.ebuild | 3 +- 2 files changed, 114 insertions(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.11-load-gtk-with-qlibrary.patch b/net-im/telegram-desktop/files/tdesktop-2.8.11-load-gtk-with-qlibrary.patch new file mode 100644 index 000..91e3f859eeb --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.8.11-load-gtk-with-qlibrary.patch @@ -0,0 +1,112 @@ +Fix running with QT_QPA_PLATFORMTHEME=gtk2 + +From: https://bugs.archlinux.org/task/71541 + +--- tdesktop-2.8.11-full.orig/Telegram/CMakeLists.txt tdesktop-2.8.11-full/Telegram/CMakeLists.txt +@@ -114,25 +114,16 @@ + endif() + + if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) +-target_link_libraries(Telegram PRIVATE rt) + find_package(PkgConfig REQUIRED) + +-if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) +-pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0) +-target_link_libraries(Telegram PRIVATE PkgConfig::GTK3) +- +-if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) +-pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11) +-target_link_libraries(Telegram PRIVATE PkgConfig::X11) +-endif() +-else() +-pkg_check_modules(GTK REQUIRED gtk+-3.0) +-target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS}) ++pkg_check_modules(GTK REQUIRED gtk+-3.0) ++target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS}) + +-if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) +-target_link_libraries(Telegram PRIVATE X11) +-endif() ++if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) ++target_link_libraries(Telegram PRIVATE X11) + endif() ++ ++target_link_libraries(Telegram PRIVATE rt) + endif() + endif() + +--- tdesktop-2.8.11-full.orig/Telegram/lib_base/CMakeLists.txt tdesktop-2.8.11-full/Telegram/lib_base/CMakeLists.txt +@@ -254,13 +254,8 @@ + if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) + find_package(PkgConfig REQUIRED) + +-if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) +-pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0) +-target_link_libraries(lib_base PUBLIC PkgConfig::GTK3) +-else() +-pkg_check_modules(GTK REQUIRED gtk+-3.0) +-target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS}) +-endif() ++pkg_check_modules(GTK REQUIRED gtk+-3.0) ++target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS}) + endif() + endif() + +--- tdesktop-2.8.11-full.orig/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h tdesktop-2.8.11-full/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h +@@ -13,15 +13,7 @@ + #include + } // extern "C" + +-#if defined DESKTOP_APP_USE_PACKAGED && !defined DESKTOP_APP_USE_PACKAGED_LAZY +-#define LINK_TO_GTK +-#endif // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY +- +-#ifdef LINK_TO_GTK +-#define LOAD_GTK_SYMBOL(lib, func) (func = ::func) +-#else // LINK_TO_GTK + #define LOAD_GTK_SYMBOL LOAD_LIBRARY_SYMBOL +-#endif // !LINK_TO_GTK + + namespace base { + namespace Platform { +@@ -31,11 +23,7 @@ + QLibrary , + const char *name, + std::optional version = std::nullopt) { +-#ifdef LINK_TO_GTK +- return true; +-#else // LINK_TO_GTK + return LoadLibrary(lib, name, version); +-#endif // LINK_TO_GTK + } + + inline gboolean (*gtk_init_check)(int *argc, char ***argv) = nullptr; +--- tdesktop-2.8.11-full.orig/Telegram/lib_webview/CMakeLists.txt tdesktop-2.8.11-full/Telegram/lib_webview/CMakeLists.txt +@@ -51,19 +51,11 @@ + if (NOT DESKTOP_APP_DISABLE_WEBKIT) + find_package(PkgConfig REQUIRED) + +-if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) +-pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0) +-target_link_libraries(lib_webview PUBLIC PkgConfig::GTK3) ++pkg_check_modules(GTK3 REQUIRED gtk+-3.0) ++target_include_directories(lib_webview PUBLIC ${GTK3_INCLUDE_DIRS}) + +-pkg_check_modules(WEBKIT
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 4962cfb47fe4a1fa126b892b693433077e3b1460 Author: Esteve Varela Colominas gmail com> AuthorDate: Mon Jul 19 20:07:09 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Jul 20 02:43:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4962cfb4 net-im/telegram-desktop: Bump to 2.8.11 Also attempted to fix a build-time hang. Tested and confirmed by at least one user, that's good enough right? Bug: https://bugs.gentoo.org/802624 Thanks-to: Red runbox.com> Thanks-to: Vlad <@Windows2k@telegram> Closes: https://github.com/gentoo/gentoo/pull/21718 Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 2 +- .../tdesktop-2.8.10-jemalloc-only-telegram.patch | 31 ++ 8.10.ebuild => telegram-desktop-2.8.11.ebuild} | 2 ++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index e246987bf0e..8aaae69ec84 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,3 @@ DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14 DIST tdesktop-2.8.1-full.tar.gz 37129127 BLAKE2B 06f2a3050f0e0f321c766c54e19faf3ea172c41088e2ffdbb5928a41ba01de1fc845a84addded17d113316857c68f265642a8ab32feb79a87beef548c739b56c SHA512 df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69 -DIST tdesktop-2.8.10-full.tar.gz 37105631 BLAKE2B 71a08e0d2fda90898e711dd285478e565ddf7f6bd71db8910688c7f0bb550f04136cb3ccec101d5e89860471ffdd7a868dd90a6317924e96c8ad558d4e3079f2 SHA512 910e34718a061d643937393fa105f2236549059eaecc56aab1203a0efa3a7538f7a2d9b432c8b0a9269118ef3bff56dc1edf856476629efe666d16851e68932f +DIST tdesktop-2.8.11-full.tar.gz 37105468 BLAKE2B 1ec5a0003bd1b948b45213509fa0649dfde5ec8e3dff097bf45aa0951c7963930788b0bee853f286d04b008b78704c464b6614b8391350767affebc2623b25af SHA512 a553313b04fbb562745be2381a84117657172952e46e280980a73c9fcfe2a7cf29c0e012e4b1259816d1e6652418e7a1ddfc4e394544fcc3aeb33704cbe80860 diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch new file mode 100644 index 000..8604acc6a74 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch @@ -0,0 +1,31 @@ +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-2.8.10-full.orig/Telegram/CMakeLists.txt tdesktop-2.8.10-full/Telegram/CMakeLists.txt +@@ -87,6 +87,7 @@ + PRIVATE + desktop-app::external_glibmm + desktop-app::external_glib ++desktop-app::external_jemalloc + ) + + if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) +--- tdesktop-2.8.10-full.orig/cmake/options_linux.cmake tdesktop-2.8.10-full/cmake/options_linux.cmake +@@ -58,11 +58,6 @@ + endif() + endif() + +-target_link_libraries(common_options +-INTERFACE +-desktop-app::external_jemalloc +-) +- + if (DESKTOP_APP_USE_PACKAGED) + find_library(ATOMIC_LIBRARY atomic) + else() diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild similarity index 98% rename from net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild rename to net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild index e738b91f41d..aaa30fc0f33 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild @@ -76,6 +76,8 @@ PATCHES=( "${FILESDIR}/tdesktop-2.8.9-disable-webkit-separately.patch" # Not a proper fix, not upstreamed "${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.patch" + # Not upstreamed (yet) + "${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch" ) pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 9211d19aab7f33d7fff393be4c4e9e1286cb3550 Author: Esteve Varela Colominas gmail com> AuthorDate: Sat Jun 12 16:45:32 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Jun 12 22:48:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9211d19a net-im/telegram-desktop: Require USE=gtk for USE=webkit No sense in leaving out the "gtk" in "webkit-gtk", even though the current build error can be patched around. Also synced the patch with the pull request, which is a simple rename, no revbump necessary. Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> .../tdesktop-2.7.3-disable-webkit-separately.patch | 72 -- .../tdesktop-2.7.4-disable-webkit-separately.patch | 72 ++ .../telegram-desktop-2.7.4-r1.ebuild | 5 +- 3 files changed, 75 insertions(+), 74 deletions(-) diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch deleted file mode 100644 index 8e56d10f0de..000 --- a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch +++ /dev/null @@ -1,72 +0,0 @@ tdesktop-2.7.3-full.orig/Telegram/lib_webview/CMakeLists.txt -+++ tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt -@@ -116,7 +116,7 @@ if (WIN32) - desktop-app::lib_webview_winrt - ) - elseif (LINUX) --if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) -+if (NOT DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION) - find_package(PkgConfig REQUIRED) - - if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp -+++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp -@@ -11,14 +11,14 @@ - namespace Webview { - - Available Availability() { --#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#ifndef DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - return WebKit2Gtk::Availability(); --#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#else // !DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - return Available{ - .error = Available::Error::NoGtkOrWebkit2Gtk, - .details = "This feature was disabled at build time.", - }; --#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#endif // DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - } - - bool SupportsEmbedAfterCreate() { -@@ -26,11 +26,11 @@ bool SupportsEmbedAfterCreate() { - } - - std::unique_ptr CreateInstance(Config config) { --#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#ifndef DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - return WebKit2Gtk::CreateInstance(std::move(config)); --#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#else // !DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - return nullptr; --#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#endif // DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - } - - } // namespace Webview tdesktop-2.7.3-full.orig/cmake/options.cmake -+++ tdesktop-2.7.3-full/cmake/options.cmake -@@ -49,6 +49,13 @@ if (DESKTOP_APP_DISABLE_GTK_INTEGRATION) - ) - endif() - -+if (DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION) -+target_compile_definitions(common_options -+INTERFACE -+DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION -+) -+endif() -+ - if (DESKTOP_APP_USE_PACKAGED) - target_compile_definitions(common_options - INTERFACE tdesktop-2.7.3-full.orig/cmake/variables.cmake -+++ tdesktop-2.7.3-full/cmake/variables.cmake -@@ -32,6 +32,7 @@ option(DESKTOP_APP_DISABLE_DBUS_INTEGRAT - option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration (Linux only)." OFF) - option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration (Linux only)." OFF) - option(DESKTOP_APP_DISABLE_GTK_INTEGRATION "Disable all code for GTK integration (Linux only)." OFF) -+option(DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION "Disable all code for WebkitGTK integration (Linux only)." OFF) - option(DESKTOP_APP_USE_GLIBC_WRAPS "Use wraps for new GLIBC features." OFF) - option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ${no_special_target}) - option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF) diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch new file mode 100644 index 000..e54aca2ffa0 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch @@ -0,0 +1,72 @@ +--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/CMakeLists.txt tdesktop-2.7.4-full/Telegram/lib_webview/CMakeLists.txt +@@ -116,7 +116,7 @@ + desktop-app::lib_webview_winrt + ) + elseif (LINUX) +-if (NOT
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: c612239cd9c08b694ba8542b288610c92c3e870a Author: Esteve Varela Colominas gmail com> AuthorDate: Fri Jun 4 12:45:41 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Jun 4 18:43:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c612239c net-im/telegram-desktop: Fix USE=-dbus No revbump since it wasn't able to build, and this has no single chance of affecting anything *but* USE=-dbus. Closes: https://bugs.gentoo.org/794094 Thanks-to: Joe Kappus gmail.com> Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> ...desktop-2.7.4-fix-disable-dbus-integration.patch | 21 + .../telegram-desktop-2.7.4-r1.ebuild| 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch new file mode 100644 index 000..941a4ecc09c --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch @@ -0,0 +1,21 @@ +--- tdesktop-2.7.4-full.orig/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp tdesktop-2.7.4-full/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp +@@ -13,15 +13,15 @@ + namespace Platform { + namespace Notifications { + +-bool SkipAudio() { ++bool SkipAudioForCustom() { + return false; + } + +-bool SkipToast() { ++bool SkipToastForCustom() { + return false; + } + +-bool SkipFlashBounce() { ++bool SkipFlashBounceForCustom() { + return false; + } + diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild index 095e7419b7c..bf094b20847 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild @@ -73,10 +73,11 @@ PATCHES=( "${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch" # https://github.com/desktop-app/lib_webview/pull/3 "${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch" - # https://github.com/telegramdesktop/tdesktop/issues/16217 "${FILESDIR}/tdesktop-2.7.4-voice-crash.patch" "${FILESDIR}/tdesktop-2.7.4-voice-ffmpeg44.patch" + # https://github.com/telegramdesktop/tdesktop/commit/404538c98968d44d207671de3adde91b8df50721 + "${FILESDIR}/tdesktop-2.7.4-fix-disable-dbus-integration.patch" ) pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 7ee2b4eb47d30099e87982b282accb6b04e0048b Author: Esteve Varela Colominas gmail com> AuthorDate: Wed Apr 28 10:58:35 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Apr 28 13:14:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee2b4eb net-im/telegram-desktop: fix USE=-dbus Thanks-to: Kirill A. Shutemov shutemov.name> Closes: https://bugs.gentoo.org/786183 Closes: https://github.com/gentoo/gentoo/pull/20570 Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> .../tdesktop-2.7.1-fix-disable-dbus-integration.patch | 17 + ...2.7.1-r1.ebuild => telegram-desktop-2.7.1-r2.ebuild} | 4 2 files changed, 21 insertions(+) diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch new file mode 100644 index 000..5351a808ec4 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch @@ -0,0 +1,17 @@ +Index: tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp +=== +--- tdesktop-2.7.1-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp +@@ -754,10 +754,12 @@ void InstallLauncher(bool force) { + + void RegisterCustomScheme(bool force) { + try { ++#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION + if (InSnap()) { + SnapDefaultHandler(qsl("tg")); + return; + } ++#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION + + if (cExeName().isEmpty()) { + return; diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild similarity index 98% rename from net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild rename to net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild index dbfad550c49..ee4a0e5a5bf 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild @@ -65,6 +65,10 @@ REQUIRED_USE=" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/tdesktop-2.7.1-fix-disable-dbus-integration.patch" +) + pkg_pretend() { if has ccache ${FEATURES}; then ewarn
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 599beaa6d3b62e8849fde028fea9b37f1a183deb Author: Esteve Varela Colominas gmail com> AuthorDate: Thu Apr 22 16:22:00 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Apr 23 19:05:38 2021 + 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 gmail.com> Signed-off-by: Georgy Yakovlev 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..000 --- 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 Instance::getVideoCapture() { - return result; - } - auto result = std::shared_ptr( -+ #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> _maxSample; -+#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION - crl::object_on_thread _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
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: e631981144117cad28fc202d007f5f06154521de Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Jul 17 18:10:40 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Jul 17 18:10:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6319811 net-im/telegram-desktop: bump to 2.1.20 wayland is not optional anymore. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 2 +- .../files/2.1.20-qt-includes.patch | 72 ++ 1.18.ebuild => telegram-desktop-2.1.20.ebuild} | 11 ++-- 3 files changed, 80 insertions(+), 5 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index baec09df3b8..eb85fb1360a 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1,2 @@ DIST tdesktop-2.1.13-full.tar.gz 36549505 BLAKE2B 48514be8add4ad4491c8e81a868f140228787ee489de7cd90faf31dbee959b0fb87cf2c844bf98c5b62fd6de8e32f504a6d19b071c56e6a4c0cd489d7b283818 SHA512 f28ae7c8c9a9eb8094fc52784742b470235234a3df7487902152858bc7c297b2dcfe5c8b939cdb9653a356b3835609e7289f53cdf7d5fb3f009823d3dbeb1bd8 -DIST tdesktop-2.1.18-full.tar.gz 36579968 BLAKE2B 49b0d8e6fd1233588601fdd39ba22f1686ad2d9900e71ebdadc3f0c8870bb2c752e60f437795ab484d87899aad7edcc7e530ae3c640d9a875f889d004c83e525 SHA512 e7c1df200ac5ca8f0d3cb244e9a5daf49996046176488046d8d503ecfbf67d91bec9504fb712cfd649ae5cc0bed1cbbfc78e3a9fd6bed95c558cf51cb014dd66 +DIST tdesktop-2.1.20-full.tar.gz 36585360 BLAKE2B 217a90ca07513f8c2e1f1fcd4f543cafabc4d85fd5ef29417a18c55fc6f64c0070c02d34bfcae86c434153ba015713139f0f61733a9b31e53dd011ac4943de6c SHA512 6e5c2ddec7fc447cf0900665153772b82ddc5d9d1f4dc6061b60dc003f0c295acb01795fa7201e3cde27705f866a30a7d2d3740556b1e8d1de49a12ae276ef9c diff --git a/net-im/telegram-desktop/files/2.1.20-qt-includes.patch b/net-im/telegram-desktop/files/2.1.20-qt-includes.patch new file mode 100644 index 000..a2f02aea3b0 --- /dev/null +++ b/net-im/telegram-desktop/files/2.1.20-qt-includes.patch @@ -0,0 +1,72 @@ +From 9eb24ca5c194482faf86e68d93527707fa01a78e Mon Sep 17 00:00:00 2001 +From: Ilya Fedin +Date: Thu, 16 Jul 2020 18:54:29 +0400 +Subject: [PATCH] QtWaylandClient contains QtXkbCommonSupport includes + +--- + external/qt/CMakeLists.txt | 25 + + external/qt/package.cmake | 1 + + 2 files changed, 26 insertions(+) + +diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt +index 25b662a..490d13b 100644 +--- a/cmake/external/qt/CMakeLists.txt b/cmake/external/qt/CMakeLists.txt +@@ -57,6 +57,15 @@ if (DESKTOP_APP_USE_PACKAGED) + ) + endif() + ++if (Qt5XkbCommonSupport_FOUND) ++target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport) ++ ++target_include_directories(external_qt ++INTERFACE ++${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS} ++) ++endif() ++ + if (Qt5WaylandClient_FOUND) + target_link_libraries(external_qt INTERFACE Qt5::WaylandClient) + +@@ -97,6 +106,15 @@ else() + ) + endif() + ++if (Qt5XkbCommonSupport_FOUND) ++target_include_directories(external_qt SYSTEM ++INTERFACE ++${qt_loc}/include/QtXkbCommonSupport ++${qt_loc}/include/QtXkbCommonSupport/${qt_version} ++ ${qt_loc}/include/QtXkbCommonSupport/${qt_version}/QtXkbCommonSupport ++) ++endif() ++ + if (LINUX) + target_include_directories(external_qt SYSTEM + INTERFACE +@@ -129,6 +147,13 @@ else() + ) + endif() + ++if (Qt5XkbCommonSupport_FOUND) ++target_compile_definitions(external_qt ++INTERFACE ++QT_XKBCOMMON_SUPPORT_LIB ++) ++endif() ++ + if (LINUX) + target_compile_definitions(external_qt + INTERFACE +diff --git a/external/qt/package.cmake b/external/qt/package.cmake +index 4e97717..ac40f05 100644 +--- a/cmake/external/qt/package.cmake b/cmake/external/qt/package.cmake +@@ -25,6 +25,7 @@ find_package(Qt5Gui COMPONENTS QWebpPlugin REQUIRED) + + if (LINUX) + find_package(Qt5 COMPONENTS WaylandClient REQUIRED) ++find_package(Qt5 COMPONENTS XkbCommonSupport) + + if (NOT DESKTOP_APP_USE_PACKAGED) + find_package(Qt5 COMPONENTS Svg X11Extras REQUIRED) diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.18.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.20.ebuild similarity index 95% rename from net-im/telegram-desktop/telegram-desktop-2.1.18.ebuild rename to net-im/telegram-desktop/telegram-desktop-2.1.20.ebuild index 0ef79f82b7c..8d40c4048a7 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.1.18.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.1.20.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 87f8e591e6772cf0e39898fbd5cd6cbe5c257843 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Jul 17 17:56:44 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Jul 17 17:56:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f8e591 net-im/telegram-desktop: drop old Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 3 - net-im/telegram-desktop/files/2.1.0-kde-dir.patch | 51 .../files/telegram-desktop-qt5.15.patch| 23 .../telegram-desktop-2.1.0-r1.ebuild | 139 .../telegram-desktop-2.1.11-r1.ebuild | 144 .../telegram-desktop-2.1.12.ebuild | 145 - 6 files changed, 505 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index bb07ebfca98..baec09df3b8 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,5 +1,2 @@ -DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce365bcf0d6124f75558570189e07e9dcd9f6f3282d53fec621be736cbd1269a9dd820629d4d9a36167d8f71109bfcd5a52e2 SHA512 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d -DIST tdesktop-2.1.11-full.tar.gz 36548657 BLAKE2B 969ee0b680cb225c86bbab25e792b9fa21182227d73f062700ac56f08de83b249cca41d661c711e1a7dbcbeeeda70ddb13535403bee6f001ea10c4864b995c67 SHA512 9f2fba2814a5ab64f946913e32fce66dbc842d9607cbaee00994689ef6a661a04c2a8de5e075fc532e7d8926b51432c06c2b1510b019d729eef40da373d91d42 -DIST tdesktop-2.1.12-full.tar.gz 36549678 BLAKE2B 0a973f8f560ccd30a35f172d4a63af9b4d16601af47f2ed71f37f6c3845e328501a79062f2917f37842248646b60ff3d88f8444d75df8bbae967969907cd3a83 SHA512 961f7e4900f782d58d5d1b1045590a7029777c3daa8d26f47a61663de9ab0c3c3cdfa7507c0710af2fb231e480ffe67de0bcbd61b72acb751ae8133b73d86cff DIST tdesktop-2.1.13-full.tar.gz 36549505 BLAKE2B 48514be8add4ad4491c8e81a868f140228787ee489de7cd90faf31dbee959b0fb87cf2c844bf98c5b62fd6de8e32f504a6d19b071c56e6a4c0cd489d7b283818 SHA512 f28ae7c8c9a9eb8094fc52784742b470235234a3df7487902152858bc7c297b2dcfe5c8b939cdb9653a356b3835609e7289f53cdf7d5fb3f009823d3dbeb1bd8 DIST tdesktop-2.1.18-full.tar.gz 36579968 BLAKE2B 49b0d8e6fd1233588601fdd39ba22f1686ad2d9900e71ebdadc3f0c8870bb2c752e60f437795ab484d87899aad7edcc7e530ae3c640d9a875f889d004c83e525 SHA512 e7c1df200ac5ca8f0d3cb244e9a5daf49996046176488046d8d503ecfbf67d91bec9504fb712cfd649ae5cc0bed1cbbfc78e3a9fd6bed95c558cf51cb014dd66 diff --git a/net-im/telegram-desktop/files/2.1.0-kde-dir.patch b/net-im/telegram-desktop/files/2.1.0-kde-dir.patch deleted file mode 100644 index b936275e361..000 --- a/net-im/telegram-desktop/files/2.1.0-kde-dir.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7bc86cc9af28ba3d04a5cb69f6f7c16bfe7f8719 Mon Sep 17 00:00:00 2001 -From: Ilya Fedin -Date: Tue, 21 Apr 2020 23:05:17 +0400 -Subject: [PATCH] Fix directory opening with portal and use them by default - with KDE - - .../SourceFiles/platform/linux/file_utilities_linux.cpp | 6 +++--- - Telegram/SourceFiles/platform/linux/specific_linux.cpp | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp -index 47dd56a411..88f8a69a91 100644 a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp -@@ -83,11 +83,11 @@ constexpr auto kPreviewHeight = 512; - using Type = ::FileDialog::internal::Type; - - #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION --bool NativeSupported() { -+bool NativeSupported(Type type = Type::ReadFile) { - #ifndef TDESKTOP_FORCE_GTK_FILE_DIALOG - return false; - #endif // TDESKTOP_FORCE_GTK_FILE_DIALOG -- return !Platform::UseXDGDesktopPortal() -+ return (!Platform::UseXDGDesktopPortal() || type == Type::ReadFolder) - && Platform::internal::GdkHelperLoaded() - && (Libs::gtk_widget_hide_on_delete != nullptr) - && (Libs::gtk_clipboard_store != nullptr) -@@ -192,7 +192,7 @@ bool Get( - parent = parent->window(); - } - #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION -- if (NativeSupported()) { -+ if (NativeSupported(type)) { - return GetNative( - parent, - files, -diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index 0bb3963420..c12e5a0780 100644 a/Telegram/SourceFiles/platform/linux/specific_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -266,7 +266,7 @@ bool UseXDGDesktopPortal() { - const auto envVar =
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 083a373e66379c9f2d82a701cb21889186e47766 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Jun 29 21:48:56 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Jun 29 23:39:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=083a373e net-im/telegram-desktop: bump to 2.1.14 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 + net-im/telegram-desktop/files/2.1.14-no-gtk.patch | 21 +++ .../telegram-desktop-2.1.14.ebuild | 155 + 3 files changed, 177 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 64596b04aa6..7305e795f3e 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -2,3 +2,4 @@ DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce36 DIST tdesktop-2.1.11-full.tar.gz 36548657 BLAKE2B 969ee0b680cb225c86bbab25e792b9fa21182227d73f062700ac56f08de83b249cca41d661c711e1a7dbcbeeeda70ddb13535403bee6f001ea10c4864b995c67 SHA512 9f2fba2814a5ab64f946913e32fce66dbc842d9607cbaee00994689ef6a661a04c2a8de5e075fc532e7d8926b51432c06c2b1510b019d729eef40da373d91d42 DIST tdesktop-2.1.12-full.tar.gz 36549678 BLAKE2B 0a973f8f560ccd30a35f172d4a63af9b4d16601af47f2ed71f37f6c3845e328501a79062f2917f37842248646b60ff3d88f8444d75df8bbae967969907cd3a83 SHA512 961f7e4900f782d58d5d1b1045590a7029777c3daa8d26f47a61663de9ab0c3c3cdfa7507c0710af2fb231e480ffe67de0bcbd61b72acb751ae8133b73d86cff DIST tdesktop-2.1.13-full.tar.gz 36549505 BLAKE2B 48514be8add4ad4491c8e81a868f140228787ee489de7cd90faf31dbee959b0fb87cf2c844bf98c5b62fd6de8e32f504a6d19b071c56e6a4c0cd489d7b283818 SHA512 f28ae7c8c9a9eb8094fc52784742b470235234a3df7487902152858bc7c297b2dcfe5c8b939cdb9653a356b3835609e7289f53cdf7d5fb3f009823d3dbeb1bd8 +DIST tdesktop-2.1.14-full.tar.gz 36578245 BLAKE2B 0ec3e5e4d696544975a95a6ab70f240b2ab172ab5135ad037d1537d57b0aef2ce9f479cdfae89a6499ef31e391ac65e3d40476918beadac11d4541f4a52e7ead SHA512 4c48e235ac790ecd2d5e7344de9641d0e843e7d2e46a3883f8016587034bc7f5aebd4e1b26c701a225dfb3777b610d69a2ccc685aaa5ee08a163fdd49fee1e9e diff --git a/net-im/telegram-desktop/files/2.1.14-no-gtk.patch b/net-im/telegram-desktop/files/2.1.14-no-gtk.patch new file mode 100644 index 000..365b7f2967e --- /dev/null +++ b/net-im/telegram-desktop/files/2.1.14-no-gtk.patch @@ -0,0 +1,21 @@ +diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp +index eb23796..3424bab 100644 +--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp +@@ -521,6 +521,7 @@ QString GetIconName() { + } + + bool GtkClipboardSupported() { ++#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION + return (Libs::gtk_clipboard_get != nullptr) + && (Libs::gtk_clipboard_wait_for_contents != nullptr) + && (Libs::gtk_clipboard_wait_for_image != nullptr) +@@ -532,6 +533,8 @@ bool GtkClipboardSupported() { + && (Libs::gdk_pixbuf_get_rowstride != nullptr) + && (Libs::gdk_pixbuf_get_has_alpha != nullptr) + && (Libs::gdk_atom_intern != nullptr); ++#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION ++ return false; + } + + QImage GetImageFromClipboard() { diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.14.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.14.ebuild new file mode 100644 index 000..c8c7b4eb668 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-2.1.14.ebuild @@ -0,0 +1,155 @@ +# 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 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[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_p20200627[alsa?,pulseaudio?] + media-libs/openal[alsa?,pulseaudio?] + media-libs/opus:= + media-video/ffmpeg:=[alsa?,opus,pulseaudio?] + sys-libs/zlib[minizip] +
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 75ba0410baf1ead0e0b3ea05083f09d9f700508c Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Apr 24 19:25:51 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Apr 24 20:01:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ba0410 net-im/telegram-desktop: bump to 2.1.0 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 + net-im/telegram-desktop/files/2.1.0-kde-dir.patch | 51 .../telegram-desktop/telegram-desktop-2.1.0.ebuild | 136 + 3 files changed, 188 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index a2241d57d0c..76099ebd88f 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1,3 @@ DIST tdesktop-1.9.21-full.tar.gz 25848026 BLAKE2B 503e22bcc83a64721aa4c4c6e8bca89c4c976703c338b1615c5ab1599098e98cbd220a94cffdbe24d9c305b44ffef7719ad1c2d2ad81f4ec6edc8377e1afa4ef SHA512 ea02fc69e88ed6244ed420516bb7a93827cb85efaa0a7e9af7562aa1bc29184c5a2102caca8693c976b25d374832e0deb2ccbf00144d5340b5ffacbdc9dcebf1 DIST tdesktop-2.0.1-full.tar.gz 26106949 BLAKE2B 3975e7d42af8b323a86408e2301b292d94b308413bb92d135673fb12851cd6672156dcf9b631482fa9b8dc9361d9593dc1104c8c335e0c610706b308414db01b SHA512 99cd7c5ca1e9dd75ecd98d272522b0e4aab2d46525e3d0c306503b7a00c9d25c1646e9d7462182682a58947c7435864af805a3b6f85906d8b21e5675cc8383cb +DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce365bcf0d6124f75558570189e07e9dcd9f6f3282d53fec621be736cbd1269a9dd820629d4d9a36167d8f71109bfcd5a52e2 SHA512 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d diff --git a/net-im/telegram-desktop/files/2.1.0-kde-dir.patch b/net-im/telegram-desktop/files/2.1.0-kde-dir.patch new file mode 100644 index 000..b936275e361 --- /dev/null +++ b/net-im/telegram-desktop/files/2.1.0-kde-dir.patch @@ -0,0 +1,51 @@ +From 7bc86cc9af28ba3d04a5cb69f6f7c16bfe7f8719 Mon Sep 17 00:00:00 2001 +From: Ilya Fedin +Date: Tue, 21 Apr 2020 23:05:17 +0400 +Subject: [PATCH] Fix directory opening with portal and use them by default + with KDE + +--- + .../SourceFiles/platform/linux/file_utilities_linux.cpp | 6 +++--- + Telegram/SourceFiles/platform/linux/specific_linux.cpp | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp +index 47dd56a411..88f8a69a91 100644 +--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp +@@ -83,11 +83,11 @@ constexpr auto kPreviewHeight = 512; + using Type = ::FileDialog::internal::Type; + + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION +-bool NativeSupported() { ++bool NativeSupported(Type type = Type::ReadFile) { + #ifndef TDESKTOP_FORCE_GTK_FILE_DIALOG + return false; + #endif // TDESKTOP_FORCE_GTK_FILE_DIALOG +- return !Platform::UseXDGDesktopPortal() ++ return (!Platform::UseXDGDesktopPortal() || type == Type::ReadFolder) + && Platform::internal::GdkHelperLoaded() + && (Libs::gtk_widget_hide_on_delete != nullptr) + && (Libs::gtk_clipboard_store != nullptr) +@@ -192,7 +192,7 @@ bool Get( + parent = parent->window(); + } + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION +- if (NativeSupported()) { ++ if (NativeSupported(type)) { + return GetNative( + parent, + files, +diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp +index 0bb3963420..c12e5a0780 100644 +--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp +@@ -266,7 +266,7 @@ bool UseXDGDesktopPortal() { + const auto envVar = qEnvironmentVariableIsSet("TDESKTOP_USE_PORTAL"); + const auto portalPresent = IsXDGDesktopPortalPresent(); + +- return envVar && portalPresent; ++ return (DesktopEnvironment::IsKDE() || envVar) && portalPresent; + }(); + + return UsePortal; diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild new file mode 100644 index 000..6c7b00706da --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild @@ -0,0 +1,136 @@ +# 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"
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 4683feb03b394a60676847acf6f31db3a209c4f2 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Apr 24 19:59:43 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Apr 24 20:01:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4683feb0 net-im/telegram-desktop: drop old Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 - net-im/telegram-desktop/files/1.9.21-icon.patch| 99 -- .../telegram-desktop-1.9.21.ebuild | 143 - 3 files changed, 243 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 76099ebd88f..027ce251088 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,2 @@ -DIST tdesktop-1.9.21-full.tar.gz 25848026 BLAKE2B 503e22bcc83a64721aa4c4c6e8bca89c4c976703c338b1615c5ab1599098e98cbd220a94cffdbe24d9c305b44ffef7719ad1c2d2ad81f4ec6edc8377e1afa4ef SHA512 ea02fc69e88ed6244ed420516bb7a93827cb85efaa0a7e9af7562aa1bc29184c5a2102caca8693c976b25d374832e0deb2ccbf00144d5340b5ffacbdc9dcebf1 DIST tdesktop-2.0.1-full.tar.gz 26106949 BLAKE2B 3975e7d42af8b323a86408e2301b292d94b308413bb92d135673fb12851cd6672156dcf9b631482fa9b8dc9361d9593dc1104c8c335e0c610706b308414db01b SHA512 99cd7c5ca1e9dd75ecd98d272522b0e4aab2d46525e3d0c306503b7a00c9d25c1646e9d7462182682a58947c7435864af805a3b6f85906d8b21e5675cc8383cb DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce365bcf0d6124f75558570189e07e9dcd9f6f3282d53fec621be736cbd1269a9dd820629d4d9a36167d8f71109bfcd5a52e2 SHA512 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d diff --git a/net-im/telegram-desktop/files/1.9.21-icon.patch b/net-im/telegram-desktop/files/1.9.21-icon.patch deleted file mode 100644 index 689e01af72c..000 --- a/net-im/telegram-desktop/files/1.9.21-icon.patch +++ /dev/null @@ -1,99 +0,0 @@ -From d2291f5b17e0c169083a34e51053a99546207ec8 Mon Sep 17 00:00:00 2001 -From: Ilya Fedin -Date: Tue, 17 Mar 2020 23:13:11 +0400 -Subject: [PATCH] Fix panel icon forcing - - .../platform/linux/main_window_linux.cpp | 20 +++ - .../platform/linux/main_window_linux.h| 2 +- - 2 files changed, 13 insertions(+), 9 deletions(-) - -diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp -index 347395ab38..3d30ef755c 100644 a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp -@@ -78,7 +78,8 @@ QString GetTrayIconName(int counter, bool muted) { - const auto iconName = GetIconName(); - const auto panelIconName = GetPanelIconName(counter, muted); - -- if (QIcon::hasThemeIcon(panelIconName)) { -+ if (QIcon::hasThemeIcon(panelIconName) -+ || qEnvironmentVariableIsSet(kForcePanelIcon.utf8())) { - return panelIconName; - } else if (QIcon::hasThemeIcon(iconName)) { - return iconName; -@@ -158,7 +159,7 @@ QIcon TrayIconGen(int counter, bool muted) { - || iconThemeName != TrayIconThemeName - || iconName != TrayIconName) { - if (!iconName.isEmpty()) { -- if(systemIcon.isNull()) { -+ if (systemIcon.isNull()) { - systemIcon = QIcon::fromTheme(iconName); - } - -@@ -467,11 +468,12 @@ void MainWindow::psTrayMenuUpdated() { - } - - #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION --void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) { -+void MainWindow::setSNITrayIcon(int counter, bool muted) { - const auto iconName = GetTrayIconName(counter, muted); - - if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8()) -- && ((!iconName.isEmpty() && !InSnap()) -+ && !iconName.isEmpty() -+ && (!InSnap() - || qEnvironmentVariableIsSet(kForcePanelIcon.utf8( { - if (_sniTrayIcon->iconName() == iconName) { - return; -@@ -480,7 +482,8 @@ void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) { - _sniTrayIcon->setIconByName(iconName); - _sniTrayIcon->setToolTipIconByName(iconName); - } else if (IsIndicatorApplication()) { -- if(!IsIconRegenerationNeeded(counter, muted) && !firstShow) { -+ if (!IsIconRegenerationNeeded(counter, muted) -+ && !_sniTrayIcon->iconName().isEmpty()) { - return; - } - -@@ -492,7 +495,8 @@ void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) { -
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 3ec7fa2ad16116f2a25f5fd9231fa72a3f629ecc Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Mar 31 12:03:02 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Mar 31 12:50:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec7fa2a net-im/telegram-desktop: bump to 2.0.1 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 2 +- net-im/telegram-desktop/files/2.0.0-fixes.patch| 410 - ...-2.0.0.ebuild => telegram-desktop-2.0.1.ebuild} | 0 3 files changed, 1 insertion(+), 411 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index e0809eb234a..dddf94c4141 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,3 @@ DIST tdesktop-1.9.14-full.tar.gz 25324084 BLAKE2B 45c071aa573541b6e483d2ae712b7f3b672c1294e8e7e624d9292f7176482f4d68069c35541019dc27fdb1c66134c29fb4d3667f1197e7085e4f8a80c8ca603c SHA512 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056 DIST tdesktop-1.9.21-full.tar.gz 25848026 BLAKE2B 503e22bcc83a64721aa4c4c6e8bca89c4c976703c338b1615c5ab1599098e98cbd220a94cffdbe24d9c305b44ffef7719ad1c2d2ad81f4ec6edc8377e1afa4ef SHA512 ea02fc69e88ed6244ed420516bb7a93827cb85efaa0a7e9af7562aa1bc29184c5a2102caca8693c976b25d374832e0deb2ccbf00144d5340b5ffacbdc9dcebf1 -DIST tdesktop-2.0.0-full.tar.gz 26106238 BLAKE2B 0634e66384b786cfaf6d3608bdf6f64985bc433a272d6eb86f4e787a9ee7e25dfaae89a6cb0a5aa2e73a2e1f3593a8a776d12457ab90f0a7c3ef6d0f254e254d SHA512 53ea3bb0e1d7cb1fc9d8c8725801295e89f8765b6560f046065dde89aef501d7ddb8aa268aa82f33e3674164a825506c4276cd07c0b59c242dd78ab59d659508 +DIST tdesktop-2.0.1-full.tar.gz 26106949 BLAKE2B 3975e7d42af8b323a86408e2301b292d94b308413bb92d135673fb12851cd6672156dcf9b631482fa9b8dc9361d9593dc1104c8c335e0c610706b308414db01b SHA512 99cd7c5ca1e9dd75ecd98d272522b0e4aab2d46525e3d0c306503b7a00c9d25c1646e9d7462182682a58947c7435864af805a3b6f85906d8b21e5675cc8383cb diff --git a/net-im/telegram-desktop/files/2.0.0-fixes.patch b/net-im/telegram-desktop/files/2.0.0-fixes.patch deleted file mode 100644 index 2040a9da668..000 --- a/net-im/telegram-desktop/files/2.0.0-fixes.patch +++ /dev/null @@ -1,410 +0,0 @@ -From 2f7563767dc7214ec3c9a4d0c4d4b50e62c5927f Mon Sep 17 00:00:00 2001 -From: John Preston -Date: Mon, 30 Mar 2020 21:04:49 +0400 -Subject: [PATCH 1/3] Fix crash in archive / pinned in folder management. - - Telegram/SourceFiles/history/history.cpp | 16 - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp -index d1d0bcb43c..fa69e0a9de 100644 a/Telegram/SourceFiles/history/history.cpp -+++ b/Telegram/SourceFiles/history/history.cpp -@@ -1948,12 +1948,6 @@ void History::setFolderPointer(Data::Folder *folder) { - const auto wasInList = inChatList(); - if (wasInList) { - removeFromChatList(0, owner().chatsList(this->folder())); -- for (const auto : filters.list()) { -- const auto id = filter.id(); -- if (inChatList(id)) { -- removeFromChatList(id, filters.chatsList(id)); -- } -- } - } - const auto was = _folder.value_or(nullptr); - _folder = folder; -@@ -1962,12 +1956,10 @@ void History::setFolderPointer(Data::Folder *folder) { - } - if (wasInList) { - addToChatList(0, owner().chatsList(folder)); -- for (const auto : filters.list()) { -- if (filter.contains(this)) { -- const auto id = filter.id(); -- addToChatList(id, filters.chatsList(id)); -- } -- } -+ -+ owner().chatsFilters().refreshHistory(this); -+ updateChatListEntry(); -+ - owner().chatsListChanged(was); - owner().chatsListChanged(folder); - } else if (!wasKnown) { - -From c2ff27793a56241135fde194256a2ebf7bc5ec90 Mon Sep 17 00:00:00 2001 -From: John Preston -Date: Mon, 30 Mar 2020 23:34:07 +0400 -Subject: [PATCH 2/3] Try to use Ctrl+1..Ctrl+8 for folders. - - Telegram/SourceFiles/core/shortcuts.cpp | 78 --- - Telegram/SourceFiles/core/shortcuts.h | 18 ++--- - .../dialogs/dialogs_inner_widget.cpp | 60 +++--- - 3 files changed, 86 insertions(+), 70 deletions(-) - -diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp -index 76bc4bd0d3..f8c10e4ee8 100644 a/Telegram/SourceFiles/core/shortcuts.cpp -+++ b/Telegram/SourceFiles/core/shortcuts.cpp -@@ -113,7 +113,7 @@ class Manager { -
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 3819450c3a03beaf9572fd17302f829c5616d8ca Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Mar 19 17:46:55 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Mar 19 17:47:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3819450c net-im/telegram-desktop: drop BE patch it does not work anyway Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 - .../files/0002-PPC-big-endian.patch| 25 -- .../telegram-desktop-1.9.14.ebuild | 4 3 files changed, 30 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index ddd4e4a6ac6..cace9a278c6 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,2 @@ DIST tdesktop-1.9.14-full.tar.gz 25324084 BLAKE2B 45c071aa573541b6e483d2ae712b7f3b672c1294e8e7e624d9292f7176482f4d68069c35541019dc27fdb1c66134c29fb4d3667f1197e7085e4f8a80c8ca603c SHA512 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056 -DIST tdesktop-1.9.19-full.tar.gz 25840478 BLAKE2B 1a730e74df71af0c8fcc579fb1b2546fe279d64dd60786a32e015dbc0046a5d4a933bfdc128f7bb2b624705e6788ec6d597ceeb328f91dc173d1c5a0e739a29c SHA512 29070c6e1d813943d5062dc1703f383a18323b5698fbc4e6f2c89b33366da9da5d1ec84dc29950288e7e7d112024de2924244ec9c800d59d4b210e6288c7291d DIST tdesktop-1.9.21-full.tar.gz 25848026 BLAKE2B 503e22bcc83a64721aa4c4c6e8bca89c4c976703c338b1615c5ab1599098e98cbd220a94cffdbe24d9c305b44ffef7719ad1c2d2ad81f4ec6edc8377e1afa4ef SHA512 ea02fc69e88ed6244ed420516bb7a93827cb85efaa0a7e9af7562aa1bc29184c5a2102caca8693c976b25d374832e0deb2ccbf00144d5340b5ffacbdc9dcebf1 diff --git a/net-im/telegram-desktop/files/0002-PPC-big-endian.patch b/net-im/telegram-desktop/files/0002-PPC-big-endian.patch deleted file mode 100644 index b1af3deb587..000 --- a/net-im/telegram-desktop/files/0002-PPC-big-endian.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d4c11502175e2a7821dbd92e029a90d54498e3e8 Mon Sep 17 00:00:00 2001 -From: John Zimmermann -Date: Thu, 2 Jan 2020 12:57:33 +0100 -Subject: [PATCH] PPC big endian - - Telegram/SourceFiles/config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git Telegram/SourceFiles/config.h Telegram/SourceFiles/config.h -index fb7b54e4d..6a873fbd7 100644 a/Telegram/SourceFiles/config.h -+++ b/Telegram/SourceFiles/config.h -@@ -177,7 +177,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb"; - #endif // TDESKTOP_API_ID && TDESKTOP_API_HASH - - #if Q_BYTE_ORDER == Q_BIG_ENDIAN --#error "Only little endian is supported!" -+#warning "Only little endian is supported!" - #endif // Q_BYTE_ORDER == Q_BIG_ENDIAN - - #if (TDESKTOP_ALPHA_VERSION != 0) --- -2.24.1 - diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild index 620b15ce23a..6c917eff946 100644 --- a/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild @@ -68,10 +68,6 @@ REQUIRED_USE="|| ( alsa pulseaudio )" S="${WORKDIR}/${MY_P}" -PATCHES=( - "${FILESDIR}/0002-PPC-big-endian.patch" -) - src_configure() { local mycxxflags=( -Wno-deprecated-declarations
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: bd4d76cff762eb05a3005f27635f8729c6120693 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Mar 19 17:36:34 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Mar 19 17:47:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4d76cf net-im/telegram-desktop: bump to 1.9.21 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 + net-im/telegram-desktop/files/1.9.21-icon.patch| 99 ++ .../telegram-desktop-1.9.21.ebuild | 143 + 3 files changed, 243 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 3eecdabeb01..68299fefb13 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,3 +1,4 @@ DIST tdesktop-1.9.14-full.tar.gz 25324084 BLAKE2B 45c071aa573541b6e483d2ae712b7f3b672c1294e8e7e624d9292f7176482f4d68069c35541019dc27fdb1c66134c29fb4d3667f1197e7085e4f8a80c8ca603c SHA512 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056 DIST tdesktop-1.9.19-full.tar.gz 25840478 BLAKE2B 1a730e74df71af0c8fcc579fb1b2546fe279d64dd60786a32e015dbc0046a5d4a933bfdc128f7bb2b624705e6788ec6d597ceeb328f91dc173d1c5a0e739a29c SHA512 29070c6e1d813943d5062dc1703f383a18323b5698fbc4e6f2c89b33366da9da5d1ec84dc29950288e7e7d112024de2924244ec9c800d59d4b210e6288c7291d DIST tdesktop-1.9.20-full.tar.gz 25847905 BLAKE2B 228e7ad703bf3c3ca5ac198d099b0c747ddce31fbf7f93b46084043b0d02f36df54f684ee1cddb1040ff83cb1d5c41a05e84e045c68fba4bf13c864ab0b29e80 SHA512 d4f3b57a5b34f47b9a35517d15f7296509e9b2a160d6c8b77aae1c791e13c5171409c32be371bd8191bb8fbde3e32d03c380a99b5587a98c38b93f34c8cd7b52 +DIST tdesktop-1.9.21-full.tar.gz 25848026 BLAKE2B 503e22bcc83a64721aa4c4c6e8bca89c4c976703c338b1615c5ab1599098e98cbd220a94cffdbe24d9c305b44ffef7719ad1c2d2ad81f4ec6edc8377e1afa4ef SHA512 ea02fc69e88ed6244ed420516bb7a93827cb85efaa0a7e9af7562aa1bc29184c5a2102caca8693c976b25d374832e0deb2ccbf00144d5340b5ffacbdc9dcebf1 diff --git a/net-im/telegram-desktop/files/1.9.21-icon.patch b/net-im/telegram-desktop/files/1.9.21-icon.patch new file mode 100644 index 000..689e01af72c --- /dev/null +++ b/net-im/telegram-desktop/files/1.9.21-icon.patch @@ -0,0 +1,99 @@ +From d2291f5b17e0c169083a34e51053a99546207ec8 Mon Sep 17 00:00:00 2001 +From: Ilya Fedin +Date: Tue, 17 Mar 2020 23:13:11 +0400 +Subject: [PATCH] Fix panel icon forcing + +--- + .../platform/linux/main_window_linux.cpp | 20 +++ + .../platform/linux/main_window_linux.h| 2 +- + 2 files changed, 13 insertions(+), 9 deletions(-) + +diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +index 347395ab38..3d30ef755c 100644 +--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +@@ -78,7 +78,8 @@ QString GetTrayIconName(int counter, bool muted) { + const auto iconName = GetIconName(); + const auto panelIconName = GetPanelIconName(counter, muted); + +- if (QIcon::hasThemeIcon(panelIconName)) { ++ if (QIcon::hasThemeIcon(panelIconName) ++ || qEnvironmentVariableIsSet(kForcePanelIcon.utf8())) { + return panelIconName; + } else if (QIcon::hasThemeIcon(iconName)) { + return iconName; +@@ -158,7 +159,7 @@ QIcon TrayIconGen(int counter, bool muted) { + || iconThemeName != TrayIconThemeName + || iconName != TrayIconName) { + if (!iconName.isEmpty()) { +- if(systemIcon.isNull()) { ++ if (systemIcon.isNull()) { + systemIcon = QIcon::fromTheme(iconName); + } + +@@ -467,11 +468,12 @@ void MainWindow::psTrayMenuUpdated() { + } + + #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION +-void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) { ++void MainWindow::setSNITrayIcon(int counter, bool muted) { + const auto iconName = GetTrayIconName(counter, muted); + + if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8()) +- && ((!iconName.isEmpty() && !InSnap()) ++ && !iconName.isEmpty() ++ && (!InSnap() + || qEnvironmentVariableIsSet(kForcePanelIcon.utf8( { + if (_sniTrayIcon->iconName() == iconName) { + return; +@@ -480,7 +482,8 @@ void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) { + _sniTrayIcon->setIconByName(iconName); + _sniTrayIcon->setToolTipIconByName(iconName); + } else if (IsIndicatorApplication()) { +-
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 1992207efa411206083b772b1d0e818ccea141ae Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Feb 26 02:43:15 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Feb 26 02:44:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1992207e net-im/telegram-desktop: bump to 1.9.19, drop 1.9.18 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 2 +- .../files/1.9.18-hunspell-cmake.patch | 22 -- net-im/telegram-desktop/files/1.9.19-crash.patch | 47 ++ 9.18.ebuild => telegram-desktop-1.9.19.ebuild} | 2 +- 4 files changed, 49 insertions(+), 24 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 50a9bdaa45f..00fca507490 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,4 +1,4 @@ DIST tdesktop-1.9.14-full.tar.gz 25324084 BLAKE2B 45c071aa573541b6e483d2ae712b7f3b672c1294e8e7e624d9292f7176482f4d68069c35541019dc27fdb1c66134c29fb4d3667f1197e7085e4f8a80c8ca603c SHA512 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056 DIST tdesktop-1.9.15-full.tar.gz 25327647 BLAKE2B 5d689f656a66d55b3e62d52d48106270fc16675a01ff8a2b865c122191c7ee4781c2e698d0652c765a10985148ade0ce5dd47f4938538f24348cd5b42fe0160c SHA512 457b568226e34cc23e379d34a9ad21d0d6c26fb69647cd17bf74aef48ad9ce35eae6697795af8c349f43e376b44bcab49e1939733b1cc20ec16ddf1c29a32c4e DIST tdesktop-1.9.16-full.tar.gz 25328085 BLAKE2B 1d429964e67641a1cfa0f826820ed54eb7e37d9946fdd3292d5d67276609d736dcfb2b4c422f6b64364705eb68e78f6ac6bfa52096ca39d948a9e01bc152404b SHA512 89cdf12456d9bcaa4e332286d2d5c4da6cf715bd0e798e51e458adb7bf5c89044899beb9ac7b11a808b81e37958473a473e3774519420baf7a6bc34eb7938733 -DIST tdesktop-1.9.18-full.tar.gz 25840600 BLAKE2B c9138f547dde25549ec93b845de4036feee296c4bf8148a623da16177a901c017e4b2bd8a4ebd8e9e5c077a0cb8c7cf5058160c2d5230ccfe74dd7272b5254d5 SHA512 8cf293055f1929dea4b5cbea1b56d0be997e08ba820d3492c674cfaa79396719de139fe9cee313dc91d8e5eb05a56f0ba55c0c2e7912c5ca291c018a6f403ba8 +DIST tdesktop-1.9.19-full.tar.gz 25840478 BLAKE2B 1a730e74df71af0c8fcc579fb1b2546fe279d64dd60786a32e015dbc0046a5d4a933bfdc128f7bb2b624705e6788ec6d597ceeb328f91dc173d1c5a0e739a29c SHA512 29070c6e1d813943d5062dc1703f383a18323b5698fbc4e6f2c89b33366da9da5d1ec84dc29950288e7e7d112024de2924244ec9c800d59d4b210e6288c7291d diff --git a/net-im/telegram-desktop/files/1.9.18-hunspell-cmake.patch b/net-im/telegram-desktop/files/1.9.18-hunspell-cmake.patch deleted file mode 100644 index bbf250861ad..000 --- a/net-im/telegram-desktop/files/1.9.18-hunspell-cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 81e27ccc0e7bf27405569ce98582860dfc9ea9bb Mon Sep 17 00:00:00 2001 -From: John Preston -Date: Tue, 25 Feb 2020 01:11:10 +0400 -Subject: [PATCH] Fix packaged build. - - external/hunspell/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/external/hunspell/CMakeLists.txt b/cmake/external/hunspell/CMakeLists.txt -index 6fec471..fbe2e95 100644 a/cmake/external/hunspell/CMakeLists.txt -+++ b/cmake/external/hunspell/CMakeLists.txt -@@ -5,7 +5,7 @@ - # https://github.com/desktop-app/legal/blob/master/LEGAL - - if (DESKTOP_APP_USE_PACKAGED) --add_library(external_hunspell INTERFACE IMPORTED) -+add_library(external_hunspell INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_hunspell ALIAS external_hunspell) - - find_package(PkgConfig REQUIRED) diff --git a/net-im/telegram-desktop/files/1.9.19-crash.patch b/net-im/telegram-desktop/files/1.9.19-crash.patch new file mode 100644 index 000..ff88aec74eb --- /dev/null +++ b/net-im/telegram-desktop/files/1.9.19-crash.patch @@ -0,0 +1,47 @@ +From 844e9b60ddf01712082e7ff87cfe74bb20d97297 Mon Sep 17 00:00:00 2001 +From: John Preston +Date: Tue, 25 Feb 2020 16:12:04 +0400 +Subject: [PATCH] Fix crash in SearchController. + +Data::Histories cancels request in Main::Session::api(), so the +request must be sent using this global api(), not custom MTP::Sender. +--- + Telegram/SourceFiles/data/data_search_controller.cpp | 5 ++--- + Telegram/SourceFiles/data/data_search_controller.h | 1 - + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/Telegram/SourceFiles/data/data_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp +index 08541b13da..90fbd36762 100644 +--- a/Telegram/SourceFiles/data/data_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp +@@ -194,8 +194,7 @@ SearchController::CacheEntry::CacheEntry(const Query ) + } + + SearchController::SearchController(not_null session) +-: _session(session) +-, _api(session->api().instance()) { ++: _session(session) { + } + + bool SearchController::hasInCache(const
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 8a21651b830977d17610df25e4d664c02c351022 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Feb 25 08:16:10 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Feb 25 08:16:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a21651b net-im/telegram-desktop: bump to 1.9.18 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest| 2 +- .../files/{1.9.17-hunspell-cmake.patch => 1.9.18-hunspell-cmake.patch} | 0 .../{telegram-desktop-1.9.17.ebuild => telegram-desktop-1.9.18.ebuild} | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 8031465b0e3..50a9bdaa45f 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,4 +1,4 @@ DIST tdesktop-1.9.14-full.tar.gz 25324084 BLAKE2B 45c071aa573541b6e483d2ae712b7f3b672c1294e8e7e624d9292f7176482f4d68069c35541019dc27fdb1c66134c29fb4d3667f1197e7085e4f8a80c8ca603c SHA512 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056 DIST tdesktop-1.9.15-full.tar.gz 25327647 BLAKE2B 5d689f656a66d55b3e62d52d48106270fc16675a01ff8a2b865c122191c7ee4781c2e698d0652c765a10985148ade0ce5dd47f4938538f24348cd5b42fe0160c SHA512 457b568226e34cc23e379d34a9ad21d0d6c26fb69647cd17bf74aef48ad9ce35eae6697795af8c349f43e376b44bcab49e1939733b1cc20ec16ddf1c29a32c4e DIST tdesktop-1.9.16-full.tar.gz 25328085 BLAKE2B 1d429964e67641a1cfa0f826820ed54eb7e37d9946fdd3292d5d67276609d736dcfb2b4c422f6b64364705eb68e78f6ac6bfa52096ca39d948a9e01bc152404b SHA512 89cdf12456d9bcaa4e332286d2d5c4da6cf715bd0e798e51e458adb7bf5c89044899beb9ac7b11a808b81e37958473a473e3774519420baf7a6bc34eb7938733 -DIST tdesktop-1.9.17-full.tar.gz 25840548 BLAKE2B ca824ceb691d244a6a7879d753c78559d763e023f77527bd843693035716f27576a9d4e97b38b4d25cc7b3950dbc593dcca21effda47199bc080ff5976c48612 SHA512 b545c39b9ae013a2ae96636895b6eedf27e6deda07af7516e3b2caf58bf7df6f67d9f9da281d7eb9589081b2dc61b95fdf6088afa6fc19e3b79f27e46505738c +DIST tdesktop-1.9.18-full.tar.gz 25840600 BLAKE2B c9138f547dde25549ec93b845de4036feee296c4bf8148a623da16177a901c017e4b2bd8a4ebd8e9e5c077a0cb8c7cf5058160c2d5230ccfe74dd7272b5254d5 SHA512 8cf293055f1929dea4b5cbea1b56d0be997e08ba820d3492c674cfaa79396719de139fe9cee313dc91d8e5eb05a56f0ba55c0c2e7912c5ca291c018a6f403ba8 diff --git a/net-im/telegram-desktop/files/1.9.17-hunspell-cmake.patch b/net-im/telegram-desktop/files/1.9.18-hunspell-cmake.patch similarity index 100% rename from net-im/telegram-desktop/files/1.9.17-hunspell-cmake.patch rename to net-im/telegram-desktop/files/1.9.18-hunspell-cmake.patch diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.17.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.18.ebuild similarity index 100% rename from net-im/telegram-desktop/telegram-desktop-1.9.17.ebuild rename to net-im/telegram-desktop/telegram-desktop-1.9.18.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 2d14bd79d8df53068516ebcd89d6ec5499b53807 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Feb 14 06:19:57 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Feb 14 06:20:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d14bd79 net-im/telegram-desktop: drop old Closes: https://bugs.gentoo.org/707372 Closes: https://bugs.gentoo.org/707288 Closes: https://bugs.gentoo.org/708476 Closes: https://bugs.gentoo.org/709286 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 4 - .../telegram-desktop/files/0003-PPC-config.patch | 28 net-im/telegram-desktop/files/1.9.12-dbus.patch| 13 -- net-im/telegram-desktop/files/musl.patch | 12 -- net-im/telegram-desktop/metadata.xml | 3 - .../telegram-desktop-1.9.10-r2.ebuild | 157 - .../telegram-desktop-1.9.10.ebuild | 155 .../telegram-desktop-1.9.12.ebuild | 154 .../telegram-desktop/telegram-desktop-1.9.8.ebuild | 144 --- .../telegram-desktop/telegram-desktop-1.9.9.ebuild | 147 --- 10 files changed, 817 deletions(-) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 6dd775ef92f..428d9676872 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,5 +1 @@ -DIST tdesktop-1.9.10-full.tar.gz 25272713 BLAKE2B 26b2eb49b5b55dac21be46d37ff7ddd3b6ea4490e58d8a04aaada3237b81cfbb87f2422d179882407501db2a597718f4974629791c8d3f165673fe953bdecbf6 SHA512 128dc3fd42196ebf61853917914c3d33fb148d3e6b04847ffa6d4df5baa8d9e286e7d25317b0dd2a332f1475f60b5addd19bb6e25a0fa6bbca316c22235569c6 -DIST tdesktop-1.9.12-full.tar.gz 25324201 BLAKE2B ea4a5ee18c68cd332dd2f1f79fb2a1c376c2c8142f44924220ea44e9d2ff9a4db00770b80ef7fdcedd3f4c114f1f9c6f6c0f44df527117f144a59b8d845d4bf9 SHA512 11b6be5fa4db95a8b329b492edcdeca2cf834c274a86a26fac3e62254649e5767da6b2442eff6f7b48b975f4b319fee46d10e9430e28a3ef080146a8deb3bfb2 DIST tdesktop-1.9.13-full.tar.gz 25324119 BLAKE2B 70029ea0dd68fd4be3ba54083b79d223e059f70551a970847190b00f2aaebc13319236b2c681b2a55ee99408d20e6feea3fc3ab2fb9c97d4740fd4c6a644 SHA512 995face8a2ffb54f9f31aaa8d5a26421f4915e73360945553b6fa4e4b02431ca83ec1e72d6d2ce77f5b9daa39892859c88f7ea53c3ddbeec2cb37f27451878d2 -DIST tdesktop-1.9.8-full.tar.gz 25225784 BLAKE2B d938dc5d82740f93c575f621697e4bae430dc045c18437957bead6cc949ad0643b0422d8fd2a1695af921ea7f259ca323094a4a7821855d842edfaf4f328c840 SHA512 5562eb99812a8faec74fe073323d6e04e36311c1e4ce984035212ecfed8bd5d12df92cd0f0022401201136315fb5556971b267b4bf47edf4eeddc9926c7969dc -DIST tdesktop-1.9.9-full.tar.gz 25221934 BLAKE2B c8f6252fd6e72785a39c92f04e5dadf322775fc1a178f2c6dac9e38cb654b9eb924c16cffcf9dc47e2e309e4f27a13ea07235146e7d7960b6bd0a342a3645e03 SHA512 ba6400e6f5eec5bda6e8a54b43846e695b2cce731cb6b39f17407cc39e3e9b8078d977253d29962671f30e33dbe012f8e40f340f781fd8ca73487e5f2d42e3de diff --git a/net-im/telegram-desktop/files/0003-PPC-config.patch b/net-im/telegram-desktop/files/0003-PPC-config.patch deleted file mode 100644 index 95b7b639d58..000 --- a/net-im/telegram-desktop/files/0003-PPC-config.patch +++ /dev/null @@ -1,28 +0,0 @@ -From af5f8d19f0fdded987beee4568f02cc8dcbd20f4 Mon Sep 17 00:00:00 2001 -From: John Zimmermann -Date: Thu, 2 Jan 2020 12:58:45 +0100 -Subject: [PATCH] PPC config - - base/build_config.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git Telegram/lib_base/base/build_config.h Telegram/lib_base/base/build_config.h -index a02c9b0..b3f4860 100644 a/Telegram/lib_base/base/build_config.h -+++ b/Telegram/lib_base/base/build_config.h -@@ -46,9 +46,9 @@ - #define ARCH_CPU_X86_FAMILY 1 - #define ARCH_CPU_X86 1 - #define ARCH_CPU_32_BITS 1 --#elif defined(__aarch64__) -+#elif defined(__aarch64__) || defined(__powerpc64__) - #define ARCH_CPU_64_BITS 1 --#elif defined(_M_ARM) || defined(__arm__) -+#elif defined(_M_ARM) || defined(__arm__) || defined(__powerpc__) - #define ARCH_CPU_32_BITS 1 - #else - #error Please add support for your architecture in base/build_config.h --- -2.24.1 - diff --git a/net-im/telegram-desktop/files/1.9.12-dbus.patch b/net-im/telegram-desktop/files/1.9.12-dbus.patch deleted file mode 100644 index d622645d8f8..000 --- a/net-im/telegram-desktop/files/1.9.12-dbus.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt -index b52e2cd..e868a63 100644 a/cmake/external/CMakeLists.txt -+++ b/cmake/external/CMakeLists.txt -@@ -24,7 +24,7 @@ add_subdirectory(rlottie) - if (APPLE) - add_subdirectory(sp_media_key_tap) - endif() --if (LINUX) -+if (LINUX AND Qt5DBus_FOUND AND dbusmenu-qt5_FOUND) - add_subdirectory(statusnotifieritem) - endif() - add_subdirectory(variant)
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: c793aa288187e2094355eb2aa841340adb48315c Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Feb 12 09:04:21 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Feb 12 09:10:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c793aa28 net-im/telegram-desktop: remove gtk3 useflag from 1.9.12 gtk integration is unneeded with system-qt according to upstream also remove unneeded musl patch and make possible to build without qdbus (patch will be upstream) Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/files/1.9.12-dbus.patch| 13 + net-im/telegram-desktop/telegram-desktop-1.9.12.ebuild | 12 +++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/net-im/telegram-desktop/files/1.9.12-dbus.patch b/net-im/telegram-desktop/files/1.9.12-dbus.patch new file mode 100644 index 000..d622645d8f8 --- /dev/null +++ b/net-im/telegram-desktop/files/1.9.12-dbus.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt +index b52e2cd..e868a63 100644 +--- a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt +@@ -24,7 +24,7 @@ add_subdirectory(rlottie) + if (APPLE) + add_subdirectory(sp_media_key_tap) + endif() +-if (LINUX) ++if (LINUX AND Qt5DBus_FOUND AND dbusmenu-qt5_FOUND) + add_subdirectory(statusnotifieritem) + endif() + add_subdirectory(variant) diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.12.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.12.ebuild index 79b0ce1d5a0..7dd055b0574 100644 --- a/net-im/telegram-desktop/telegram-desktop-1.9.12.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-1.9.12.ebuild @@ -16,10 +16,8 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${ LICENSE="GPL-3-with-openssl-exception" SLOT="0" KEYWORDS="~amd64 ~ppc64" -IUSE="+alsa ayatana dbus gtk3 libressl pulseaudio spell" +IUSE="+alsa ayatana dbus libressl pulseaudio spell" -# dbus still required to build, but use flag disables dbus usage at runtime -# pkg-config will pick up gtk2 first if found, needs a workaround RDEPEND=" !net-im/telegram-desktop-bin app-arch/lz4:= @@ -31,7 +29,6 @@ RDEPEND=" dev-libs/libdbusmenu-qt[qt5(+)] dev-libs/xxhash dev-qt/qtcore:5 - dev-qt/qtdbus:5 dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 @@ -53,7 +50,7 @@ RDEPEND=" dev-qt/qtwidgets:5[png,xcb(-)] ) ayatana? ( dev-libs/libappindicator:3 ) - gtk3? ( x11-libs/gtk+:3 ) + dbus? ( dev-qt/qtdbus:5 ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/enchant:= ) " @@ -74,7 +71,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/0002-PPC-big-endian.patch" - "${FILESDIR}/musl.patch" + "${FILESDIR}/${PV}-dbus.patch" ) src_configure() { @@ -90,7 +87,6 @@ src_configure() { # it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots # EXPECTED VARIANT local mycmakeargs=( - -Ddisable_autoupdate=1 -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF -DDESKTOP_APP_USE_PACKAGED=ON @@ -100,9 +96,7 @@ src_configure() { -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON -DTDESKTOP_LAUNCHER_BASENAME="${PN}" -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" - -DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)" -DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - -DTDESKTOP_FORCE_GTK_FILE_DIALOG="$(usex gtk3)" ) if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
commit: 4cf52650cf5f437a1c845283e1121a251b7083e4 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Jan 25 10:05:41 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Jan 25 10:32:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf52650 net-im/telegram-desktop: new package, source version should work on musl as well Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/Manifest | 1 + .../files/0002-PPC-big-endian.patch| 25 .../telegram-desktop/files/0003-PPC-config.patch | 28 net-im/telegram-desktop/files/musl.patch | 12 ++ net-im/telegram-desktop/metadata.xml | 11 ++ .../telegram-desktop/telegram-desktop-1.9.8.ebuild | 142 + 6 files changed, 219 insertions(+) diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest new file mode 100644 index 000..33d52dd8916 --- /dev/null +++ b/net-im/telegram-desktop/Manifest @@ -0,0 +1 @@ +DIST tdesktop-1.9.8-full.tar.gz 25225784 BLAKE2B d938dc5d82740f93c575f621697e4bae430dc045c18437957bead6cc949ad0643b0422d8fd2a1695af921ea7f259ca323094a4a7821855d842edfaf4f328c840 SHA512 5562eb99812a8faec74fe073323d6e04e36311c1e4ce984035212ecfed8bd5d12df92cd0f0022401201136315fb5556971b267b4bf47edf4eeddc9926c7969dc diff --git a/net-im/telegram-desktop/files/0002-PPC-big-endian.patch b/net-im/telegram-desktop/files/0002-PPC-big-endian.patch new file mode 100644 index 000..b1af3deb587 --- /dev/null +++ b/net-im/telegram-desktop/files/0002-PPC-big-endian.patch @@ -0,0 +1,25 @@ +From d4c11502175e2a7821dbd92e029a90d54498e3e8 Mon Sep 17 00:00:00 2001 +From: John Zimmermann +Date: Thu, 2 Jan 2020 12:57:33 +0100 +Subject: [PATCH] PPC big endian + +--- + Telegram/SourceFiles/config.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git Telegram/SourceFiles/config.h Telegram/SourceFiles/config.h +index fb7b54e4d..6a873fbd7 100644 +--- a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h +@@ -177,7 +177,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb"; + #endif // TDESKTOP_API_ID && TDESKTOP_API_HASH + + #if Q_BYTE_ORDER == Q_BIG_ENDIAN +-#error "Only little endian is supported!" ++#warning "Only little endian is supported!" + #endif // Q_BYTE_ORDER == Q_BIG_ENDIAN + + #if (TDESKTOP_ALPHA_VERSION != 0) +-- +2.24.1 + diff --git a/net-im/telegram-desktop/files/0003-PPC-config.patch b/net-im/telegram-desktop/files/0003-PPC-config.patch new file mode 100644 index 000..95b7b639d58 --- /dev/null +++ b/net-im/telegram-desktop/files/0003-PPC-config.patch @@ -0,0 +1,28 @@ +From af5f8d19f0fdded987beee4568f02cc8dcbd20f4 Mon Sep 17 00:00:00 2001 +From: John Zimmermann +Date: Thu, 2 Jan 2020 12:58:45 +0100 +Subject: [PATCH] PPC config + +--- + base/build_config.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git Telegram/lib_base/base/build_config.h Telegram/lib_base/base/build_config.h +index a02c9b0..b3f4860 100644 +--- a/Telegram/lib_base/base/build_config.h b/Telegram/lib_base/base/build_config.h +@@ -46,9 +46,9 @@ + #define ARCH_CPU_X86_FAMILY 1 + #define ARCH_CPU_X86 1 + #define ARCH_CPU_32_BITS 1 +-#elif defined(__aarch64__) ++#elif defined(__aarch64__) || defined(__powerpc64__) + #define ARCH_CPU_64_BITS 1 +-#elif defined(_M_ARM) || defined(__arm__) ++#elif defined(_M_ARM) || defined(__arm__) || defined(__powerpc__) + #define ARCH_CPU_32_BITS 1 + #else + #error Please add support for your architecture in base/build_config.h +-- +2.24.1 + diff --git a/net-im/telegram-desktop/files/musl.patch b/net-im/telegram-desktop/files/musl.patch new file mode 100644 index 000..dece8ec216f --- /dev/null +++ b/net-im/telegram-desktop/files/musl.patch @@ -0,0 +1,12 @@ +Should send this one upstream; it would work with glibc as well. + +--- tdesktop-1.9.6-full/Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp.old 2020-01-21 12:16:27.0 + tdesktop-1.9.6-full/Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp 2020-01-22 17:44:42.185530350 + +@@ -6,6 +6,7 @@ + + #include "AudioPulse.h" + #include ++#include + #include "../../logging.h" + + #define DECLARE_DL_FUNCTION(name) typeof(name)* AudioPulse::_import_##name=NULL diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml new file mode 100644 index 000..36b8a035d4c --- /dev/null +++ b/net-im/telegram-desktop/metadata.xml @@ -0,0 +1,11 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + gyakov...@gentoo.org + Georgy Yakovlev + + + Enable GTK3 integration (tray, theme, filepicker, etc) + + diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.8.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.8.ebuild new file mode 100644 index