diff --git a/dev-cpp/range-v3/range-v3-9999.ebuild b/dev-cpp/range-v3/range-v3-9999.ebuild index 9a8c6339..77269131 100644 --- a/dev-cpp/range-v3/range-v3-9999.ebuild +++ b/dev-cpp/range-v3/range-v3-9999.ebuild @@ -8,8 +8,8 @@ inherit cmake git-r3 DESCRIPTION="Range library for C++14/17/20, basis for C++20's std::ranges" HOMEPAGE="https://github.com/ericniebler/range-v3" EGIT_REPO_URI="https://github.com/ericniebler/range-v3" -EGIT_COMMIT="0487cca29e352e8f16bbd91fda38e76e39a0ed28" -#SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +# EGIT_COMMIT="0487cca29e352e8f16bbd91fda38e76e39a0ed28" +# SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Boost-1.0" SLOT="0" diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest index 1987b2c7..f9c4a5ae 100644 --- a/media-libs/tg_owt/Manifest +++ b/media-libs/tg_owt/Manifest @@ -1,2 +1,2 @@ DIST libsrtp-2.5.0.tar.gz 638704 BLAKE2B e944e506de22e5aa6574b548bc7f63a9e0544dd5c44be2111d5250c1a5600c07960eb5d423a8100c6788b7db201f946a40396b61f82d3c9f24cd9d3bce753f37 SHA512 bd679ab65ccf22ca30fe867b9649a0b84cfa6fad6e22eb10f081141632f6dd56479a04d525b865f11fd46007303ca211065d9c170e4820d6ea7055403702340a -DIST tg_owt-0_pre20230428.tar.gz 13725816 BLAKE2B c854de42696e397ea7101b7536f940c5424ebeae4105b84c9d3ef39242409b450e3cf38b7319ede7eb185667b78f4d4fb72c046880495f300205dff4d553be3a SHA512 883be1ba54db10462dadf0ef0e03270535972eed37d7fec745bd660faa67eabc539bfa88122a9c64a895cba97fb1d1a67ff6ee590ad002480ad327736f07284e +DIST tg_owt-0_pre20231007.tar.gz 13726037 BLAKE2B 635342dd2127330542374e2f0f9acee91844c3c825fe4610dabe2996c541d9b3dc1681999910e5b591752f7e8f65a089c16b43216dd0c0b84f1a0e913e5a0213 SHA512 538d713e9ac91e9f676cdf301d11d7b5be0d67bda6283537e03b6322f3cca5c0234ff2f2b0b23e9046709f77ed282fc4d3526d3b21ee93478c50380be410372f diff --git a/media-libs/tg_owt/tg_owt-0_pre20230428.ebuild b/media-libs/tg_owt/tg_owt-0_pre20231007.ebuild similarity index 99% rename from media-libs/tg_owt/tg_owt-0_pre20230428.ebuild rename to media-libs/tg_owt/tg_owt-0_pre20231007.ebuild index b90fb860..1b8a3986 100644 --- a/media-libs/tg_owt/tg_owt-0_pre20230428.ebuild +++ b/media-libs/tg_owt/tg_owt-0_pre20231007.ebuild @@ -22,7 +22,7 @@ if [[ "${PV}" == *9999* ]]; then ) else KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - EGIT_COMMIT="9d120195334db4f232c925529aa7601656dc59d7" + EGIT_COMMIT="592b14d13bf9103226e90a83571e24c49f6bfdcd" SRTP_PV="2.5.0" SRC_URI=" https://github.com/desktop-app/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz diff --git a/media-libs/tg_owt/tg_owt-9999.ebuild b/media-libs/tg_owt/tg_owt-9999.ebuild index b90fb860..1b8a3986 100644 --- a/media-libs/tg_owt/tg_owt-9999.ebuild +++ b/media-libs/tg_owt/tg_owt-9999.ebuild @@ -22,7 +22,7 @@ if [[ "${PV}" == *9999* ]]; then ) else KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - EGIT_COMMIT="9d120195334db4f232c925529aa7601656dc59d7" + EGIT_COMMIT="592b14d13bf9103226e90a83571e24c49f6bfdcd" SRTP_PV="2.5.0" SRC_URI=" https://github.com/desktop-app/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz diff --git a/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_hide-banned/0000_hide-messages-from-blocked-users.patch b/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_hide-banned/0000_hide-messages-from-blocked-users.patch new file mode 100644 index 00000000..f7d6a593 --- /dev/null +++ b/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_hide-banned/0000_hide-messages-from-blocked-users.patch @@ -0,0 +1,138 @@ +diff -ru a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp +--- a/Telegram/SourceFiles/history/history_item_components.cpp 1970-01-01 06:00:00.000000000 +0600 ++++ b/Telegram/SourceFiles/history/history_item_components.cpp 2023-09-22 19:55:06.414790851 +0600 +@@ -552,7 +552,10 @@ + const auto pausedSpoiler = context.paused + || On(PowerSaving::kChatSpoiler); + if (w > st::msgReplyBarSkip) { +- if (replyToMsg || replyToStory) { ++ auto blocked = replyToMsg ++ && replyToMsg->from()->isUser() ++ && replyToMsg->from()->asUser()->isBlocked(); ++ if ((replyToMsg && (!blocked)) || replyToStory) { + const auto media = replyToMsg ? replyToMsg->media() : nullptr; + auto hasPreview = (replyToStory && replyToStory->hasReplyPreview()) || (media && media->hasReplyPreview()); + if (hasPreview && w < st::msgReplyBarSkip + st::msgReplyBarSize.height()) { +@@ -645,7 +648,10 @@ + } + + QString HistoryMessageReply::statePhrase() const { +- return (replyToMsgId || replyToStoryId) ++ auto blocked = replyToMsg ++ && replyToMsg->from()->isUser() ++ && replyToMsg->from()->asUser()->isBlocked(); ++ return ((replyToMsgId && (!blocked)) || replyToStoryId) + ? tr::lng_profile_loading(tr::now) + : storyReply + ? tr::lng_deleted_story(tr::now) +diff -ru a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp +--- a/Telegram/SourceFiles/history/history_widget.cpp 1970-01-01 06:00:00.000000000 +0600 ++++ b/Telegram/SourceFiles/history/history_widget.cpp 2023-09-22 20:00:03.007374659 +0600 +@@ -829,6 +829,21 @@ + } + }, lifetime()); + ++ session().changes().peerUpdates( ++ Data::PeerUpdate::Flag::IsBlocked ++ ) | rpl::start_with_next([=] { ++ crl::on_main(this, [=] { ++ if (_history) { ++ _history->forceFullResize(); ++ if (_migrated) { ++ _migrated->forceFullResize(); ++ } ++ updateHistoryGeometry(); ++ update(); ++ } ++ }); ++ }, lifetime()); ++ + _topBar->membersShowAreaActive( + ) | rpl::start_with_next([=](bool active) { + setMembersShowAreaActive(active); +diff -ru a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp +--- a/Telegram/SourceFiles/history/view/history_view_element.cpp 1970-01-01 06:00:00.000000000 +0600 ++++ b/Telegram/SourceFiles/history/view/history_view_element.cpp 2023-09-22 20:01:58.251711974 +0600 +@@ -42,6 +42,7 @@ + #include "ui/item_text_options.h" + #include "ui/painter.h" + #include "data/data_session.h" ++#include "data/data_user.h" + #include "data/data_groups.h" + #include "data/data_forum.h" + #include "data/data_forum_topic.h" +@@ -611,6 +612,10 @@ + } + + bool Element::isHidden() const { ++ if (data()->from()->isUser() ++ && data()->from()->asUser()->isBlocked()) { ++ return true; ++ } + return isHiddenByGroup(); + } + +diff -ru a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp +--- a/Telegram/SourceFiles/main/main_session.cpp 1970-01-01 06:00:00.000000000 +0600 ++++ b/Telegram/SourceFiles/main/main_session.cpp 2023-09-22 20:03:45.975983794 +0600 +@@ -11,6 +11,7 @@ + #include "api/api_updates.h" + #include "api/api_send_progress.h" + #include "api/api_user_privacy.h" ++#include "api/api_blocked_peers.h" + #include "main/main_account.h" + #include "main/main_domain.h" + #include "main/main_session_settings.h" +@@ -74,6 +75,43 @@ + return MTP::ConfigFields().internalLinksDomain; + } + ++void InitializeBlockedPeers(not_null session) { ++ const auto offset = std::make_shared(0); ++ const auto allLoaded = std::make_shared(false); ++ const auto applySlice = [=]( ++ const Api::BlockedPeers::Slice &slice, ++ auto self) -> void { ++ if (slice.list.empty()) { ++ *allLoaded = true; ++ } ++ ++ *offset += slice.list.size(); ++ for (const auto &item : slice.list) { ++ if (const auto peer = session->data().peerLoaded(item.id)) { ++ peer->setIsBlocked(true); ++ } ++ } ++ if (*offset >= slice.total) { ++ *allLoaded = true; ++ } ++ ++ if (!*allLoaded) { ++ session->api().blockedPeers().request( ++ *offset, ++ [=](const Api::BlockedPeers::Slice &slice) { ++ self(slice, self); ++ }); ++ } ++ }; ++ ++ session->api().blockedPeers().slice( ++ ) | rpl::take( ++ 1 ++ ) | rpl::start_with_next([=](const Api::BlockedPeers::Slice &result) { ++ applySlice(result, applySlice); ++ }, session->lifetime()); ++} ++ + } // namespace + + Session::Session( +@@ -181,6 +219,7 @@ + _api->requestNotifySettings(MTP_inputNotifyChats()); + _api->requestNotifySettings(MTP_inputNotifyBroadcasts()); + ++ InitializeBlockedPeers(this); + Core::App().downloadManager().trackSession(this); + } + + diff --git a/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_hide-banned/0007_hide-messages-from-blocked-users.patch b/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_hide-banned/0007_hide-messages-from-blocked-users.patch.disabled similarity index 100% rename from net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_hide-banned/0007_hide-messages-from-blocked-users.patch rename to net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_hide-banned/0007_hide-messages-from-blocked-users.patch.disabled diff --git a/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_ignore-restrictions/remove-restricted.patch b/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_ignore-restrictions/remove-restricted.patch index 84bcc12d..2a1aecb4 100644 --- a/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_ignore-restrictions/remove-restricted.patch +++ b/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_ignore-restrictions/remove-restricted.patch @@ -78,16 +78,18 @@ diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Tel index f25cecb..214b889 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -@@ -994,10 +994,7 @@ QSize OverlayWidget::flipSizeByRotation( +@@ -1029,13 +1029,7 @@ QSize OverlayWidget::flipSizeByRotation( } - bool OverlayWidget::hasCopyMediaRestriction() const { -- const auto story = _stories ? _stories->story() : nullptr; -- return (story && !story->canDownload()) -- || (_history && !_history->peer->allowsForwarding()) + bool OverlayWidget::hasCopyMediaRestriction(bool skipPremiumCheck) const { +- if (const auto story = _stories ? _stories->story() : nullptr) { +- return skipPremiumCheck +- ? !story->canDownloadIfPremium() +- : !story->canDownloadChecked(); +- } +- return (_history && !_history->peer->allowsForwarding()) - || (_message && _message->forbidsSaving()); + return false; } - bool OverlayWidget::showCopyMediaRestriction() { - + bool OverlayWidget::showCopyMediaRestriction(bool skipPRemiumCheck) { diff --git a/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_wide-baloons/0000_exploit_through_monospace.patch b/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_wide-baloons/0000_exploit_through_monospace.patch index d1545ba8..929f6dda 100644 --- a/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_wide-baloons/0000_exploit_through_monospace.patch +++ b/net-im/telegram-desktop/files/patches/0/conditional/tdesktop_patches_wide-baloons/0000_exploit_through_monospace.patch @@ -1,13 +1,14 @@ --- a/Telegram/lib_ui/ui/text/text.cpp 2021-03-03 03:13:31.095340596 +0700 +++ b/Telegram/lib_ui/ui/text/text.cpp 2021-03-03 03:14:44.720811463 +0700 -@@ -2791,10 +2791,6 @@ int String::countMaxMonospaceWidth() con +@@ -340,10 +340,6 @@ int String::countMaxMonospaceWidth() con _width = (b->f_width() - last_rBearing); continue; } -- if (!(b->flags() & (TextBlockFPre | TextBlockFCode)) -- && (b->type() != TextBlockTSkip)) { +- if (!(b->flags() & (TextBlockFlag::Pre | TextBlockFlag::Code)) +- && (b->type() != TextBlockType::Skip)) { - fullMonospace = false; - } auto b__f_rbearing = b->f_rbearing(); // cache // We need to accumulate max width after each block, because + diff --git a/net-im/telegram-desktop/files/patches/0/conditional/wayland/desktop-app_lib-ui.PR.92.patch b/net-im/telegram-desktop/files/patches/0/conditional/wayland/desktop-app_lib-ui.PR.92.patch.broken similarity index 100% rename from net-im/telegram-desktop/files/patches/0/conditional/wayland/desktop-app_lib-ui.PR.92.patch rename to net-im/telegram-desktop/files/patches/0/conditional/wayland/desktop-app_lib-ui.PR.92.patch.broken diff --git a/net-im/telegram-desktop/files/patches/0/tdesktop-4.8.3-fix-clang.patch b/net-im/telegram-desktop/files/patches/0/tdesktop-4.8.3-fix-clang.patch index 5135c3c5..88043583 100644 --- a/net-im/telegram-desktop/files/patches/0/tdesktop-4.8.3-fix-clang.patch +++ b/net-im/telegram-desktop/files/patches/0/tdesktop-4.8.3-fix-clang.patch @@ -20,7 +20,7 @@ namespace GObject { Gio::DBusMethodInvocation invocation) { base::Integration::Instance().enterFromEventLoop([&] { _commandRequests.fire_copy( -@@ -232,23 +232,23 @@ +@@ -234,16 +234,16 @@ SystemMediaControls::Private::Private() return true; }); player().property_loop_status().signal_notify().connect([=]( @@ -30,7 +30,7 @@ namespace GObject { + gi::repository::GObject::ParamSpec) { base::Integration::Instance().enterFromEventLoop([&] { _commandRequests.fire_copy( - LoopStatusToCommand(player().get_loop_status())); + LoopStatusToCommand(player().get_loop_status().value_or(""))); }); }); player().property_shuffle().signal_notify().connect([=]( @@ -38,8 +38,10 @@ namespace GObject { - GObject::ParamSpec) { + gi::repository::GObject::Object, + gi::repository::GObject::ParamSpec) { - base::Integration::Instance().enterFromEventLoop([&] { - _commandRequests.fire_copy(Command::Shuffle); + if (playerData().inSetShuffle) { + return; + } +@@ -252,8 +252,8 @@ SystemMediaControls::Private::Private() }); }); player().property_volume().signal_notify().connect([=]( diff --git a/net-im/telegram-desktop/files/patches/0/tdesktop-4.8.4-remove-private-qt.patch b/net-im/telegram-desktop/files/patches/0/tdesktop-4.8.4-remove-private-qt.patch index 3dcf1766..811c0573 100644 --- a/net-im/telegram-desktop/files/patches/0/tdesktop-4.8.4-remove-private-qt.patch +++ b/net-im/telegram-desktop/files/patches/0/tdesktop-4.8.4-remove-private-qt.patch @@ -8,12 +8,15 @@ https://bugs.gentoo.org/908500 --- tdesktop-4.8.4-full.orig/Telegram/lib_ui/ui/rp_widget.cpp +++ tdesktop-4.8.4-full/Telegram/lib_ui/ui/rp_widget.cpp -@@ -12,38 +12,9 @@ - +@@ -13,41 +13,9 @@ #include #include + #include -#include - +-// Patching out this code without patching out all other private API usage +-// and the Qt::{Core,Gui,Widgets}Private cmake dependency is asking +-// for memory corruption -class TWidgetPrivate : public QWidgetPrivate { -public: -#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) @@ -48,3 +51,4 @@ https://bugs.gentoo.org/908500 [[maybe_unused]] static const auto Once = [] { auto format = QSurfaceFormat::defaultFormat(); format.setSwapInterval(0); + diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.7.ebuild b/net-im/telegram-desktop/telegram-desktop-4.10.3.ebuild similarity index 99% rename from net-im/telegram-desktop/telegram-desktop-4.8.7.ebuild rename to net-im/telegram-desktop/telegram-desktop-4.10.3.ebuild index a73927f4..4b37192e 100644 --- a/net-im/telegram-desktop/telegram-desktop-4.8.7.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-4.10.3.ebuild @@ -76,6 +76,7 @@ COMMON_DEPEND=" media-libs/opus:= media-video/ffmpeg:=[opus,vpx] sys-libs/zlib:=[minizip] + dev-libs/glib:= >=dev-cpp/glibmm-2.77:2.68 jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( @@ -137,11 +138,12 @@ BDEPEND=" >=dev-util/cmake-3.16 virtual/pkgconfig amd64? ( dev-lang/yasm ) + >=dev-cpp/range-v3-0.10.0:= + dev-libs/gobject-introspection:= " # system-rlottie? ( >=media-libs/rlottie-0_pre20190818:=[threads(-),-cache(-)] ) # system-expected? ( >dev-cpp/tl-expected-1.0.0:= ) -# >=dev-cpp/range-v3-0.10.0:= # system-gsl? ( >dev-cpp/ms-gsl-2.0.0:= ) RESTRICT="!test? ( test )" diff --git a/net-im/telegram-desktop/telegram-desktop-9999.ebuild b/net-im/telegram-desktop/telegram-desktop-9999.ebuild index a73927f4..4b37192e 100644 --- a/net-im/telegram-desktop/telegram-desktop-9999.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-9999.ebuild @@ -76,6 +76,7 @@ COMMON_DEPEND=" media-libs/opus:= media-video/ffmpeg:=[opus,vpx] sys-libs/zlib:=[minizip] + dev-libs/glib:= >=dev-cpp/glibmm-2.77:2.68 jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( @@ -137,11 +138,12 @@ BDEPEND=" >=dev-util/cmake-3.16 virtual/pkgconfig amd64? ( dev-lang/yasm ) + >=dev-cpp/range-v3-0.10.0:= + dev-libs/gobject-introspection:= " # system-rlottie? ( >=media-libs/rlottie-0_pre20190818:=[threads(-),-cache(-)] ) # system-expected? ( >dev-cpp/tl-expected-1.0.0:= ) -# >=dev-cpp/range-v3-0.10.0:= # system-gsl? ( >dev-cpp/ms-gsl-2.0.0:= ) RESTRICT="!test? ( test )"