diff options
author | xiota | 2023-10-31 07:58:16 -0700 |
---|---|---|
committer | xiota | 2023-10-31 07:58:16 -0700 |
commit | 7bcbcd696fe8d9c6f9481ec56166d069580e2ffe (patch) | |
tree | 9ca3ee851a38315b466c9a22c5aea8ec2b93fc12 | |
parent | 681ed88935f02cb7e49c27c2018a7be91d653182 (diff) | |
download | aur-7bcbcd696fe8d9c6f9481ec56166d069580e2ffe.tar.gz |
metapackage
-rw-r--r-- | .SRCINFO | 95 | ||||
-rw-r--r-- | .gitignore | 8 | ||||
-rw-r--r-- | 0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch | 234 | ||||
-rw-r--r-- | 0002-Block-sponsored_messages.patch | 13 | ||||
-rw-r--r-- | 0003-Allow-downloading-and-copying-from-restricted-channels.patch | 52 | ||||
-rw-r--r-- | PKGBUILD | 131 | ||||
-rw-r--r-- | include.patch | 13 | ||||
-rw-r--r-- | kf594.patch | 57 | ||||
-rw-r--r-- | tg_owt-fix.patch | 49 |
9 files changed, 14 insertions, 638 deletions
@@ -1,95 +1,8 @@ pkgbase = kotatogram-dev-git - pkgdesc = Kotatogram – experimental Telegram Desktop fork - Dev branch - pkgver = k1.4.9.r2.g52b300cb3 + pkgdesc = metapackage - migrate to kotatogram-desktop-git + pkgver = 0.0.1 pkgrel = 1 - url = https://kotatogram.github.io - arch = x86_64 - license = GPL3 - makedepends = cmake - makedepends = git - makedepends = ninja - makedepends = python - makedepends = range-v3 - makedepends = tl-expected - makedepends = microsoft-gsl - makedepends = extra-cmake-modules - makedepends = wayland-protocols - makedepends = plasma-wayland-protocols - makedepends = webkit2gtk - makedepends = unzip - makedepends = yasm - makedepends = meson - depends = hunspell - depends = ffmpeg4.4 - depends = hicolor-icon-theme - depends = lz4 - depends = minizip - depends = openal - depends = ttf-opensans - depends = qt5-imageformats - depends = qt5-svg - depends = qt5-wayland - depends = xxhash - depends = kwayland - depends = glibmm - depends = rnnoise - depends = pipewire - depends = libxtst - depends = jemalloc - depends = libxrandr - depends = abseil-cpp - depends = libjpeg-turbo - depends = opus - depends = openssl-1.1 - depends = libx11 - depends = libvpx - depends = libxcomposite - depends = libxdamage - depends = libxext - depends = libxfixes - depends = zlib - depends = wayland - depends = glibc - depends = libsigc++ - depends = glib2 - depends = xcb-util-keysyms - depends = libxcb - depends = gcc-libs - depends = libdispatch - optdepends = webkit2gtk: embedded browser features - optdepends = xdg-desktop-portal: desktop integration - provides = kotatogram-desktop - provides = kotatogram-desktop-git - conflicts = kotatogram-desktop-bin - conflicts = kotatogram-desktop-dynamic-bin - conflicts = kotatogram-desktop - source = kotatogram-desktop::git+https://github.com/kotatogram/kotatogram-desktop.git#branch=dev - source = kotatogram-desktop-tg_owt::git+https://github.com/desktop-app/tg_owt.git#commit=63a934db1ed212ebf8aaaa20f0010dd7b0d7b396 - source = include.patch - source = kf594.patch - source = https://patch-diff.githubusercontent.com/raw/kotatogram/kotatogram-desktop/pull/326.patch - source = https://patch-diff.githubusercontent.com/raw/kotatogram/kotatogram-desktop/pull/333.patch - source = https://patch-diff.githubusercontent.com/raw/kotatogram/kotatogram-desktop/pull/334.patch - source = https://patch-diff.githubusercontent.com/raw/kotatogram/kotatogram-desktop/pull/335.patch - source = https://patch-diff.githubusercontent.com/raw/kotatogram/kotatogram-desktop/pull/337.patch - source = https://patch-diff.githubusercontent.com/raw/desktop-app/tg_owt/pull/101.patch - source = tg_owt-fix.patch - source = 0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch - source = 0002-Block-sponsored_messages.patch - source = 0003-Allow-downloading-and-copying-from-restricted-channels.patch - b2sums = SKIP - b2sums = SKIP - b2sums = a3448b085b2046a9cb19848f8e5c96c609ba00f41209e23cae82c09e23e22303fbc313f718ce635541d66d42b7682215b3dfa35a969575ecaba65b68354b2c2d - b2sums = c4e75540ed8363689265d57dfe3410ceeeed4a1f06d3b8efd4fd029c0c2792b7ecc992ea75bfeba0599133ff85814f4ba25ce7dab2a18264344de3fadb47e626 - b2sums = 7564058d932166d6e267ad87d8da1e1bc9e33c42de057feae44f74da9cbdc0947f7233c724802af3e1d10fe699cdf1e7630a634fc7c47eb06d55f0237fd36972 - b2sums = 5fcc611dad411bc53a800a9f6e6f013bcf72ada64c5a70453f624941d983f02e80afb0cbcd646e4aaf51688ef3304f601d2cf1ab41de81a171250ca0d11cad5c - b2sums = 228acce28b60cd60c54e954a281893bb9cbdbaccec9743907c237d0577963963f79efe44df7de932d69061603cc0a1626d4a8e04f78e04d167b1e3bf1c7c020b - b2sums = ab537548d871939e0d905849032d435f0732a1bd586dde212c8f7079f1652dafa07a0cde356cee78e47f5fb9a687185a9150fe3b70d08562fd781f20e6f64708 - b2sums = 802199bb3b6ec54437d8505695112743cbdaef1b13e25629d3832e68601147b48668738e3c0832296e74ee3bf1820914a46264aeda54411d4733fbb2e86260c9 - b2sums = 0d9d0927e401da06e5b77b6606c32d79966e946bc5dedb2086a5fc3fb5472a1c9039b8470031416d2bad81b3138ead5e29636b28e283774978e66b80cec15c2f - b2sums = 9874a75e04500c2a9b8f67d75e9c81e970ab5dd8f62657fe82046a5be22f4dde371e3e8b50ab207d2a6a3017e3a209b5078f7ea16b94a2128a5a96db42f9d1c4 - b2sums = 63c912c53b7c259d97162f96acdb67a88b625c99ac2144869abc88a08d96e940bfdefcf9478c3c20a95f03c19ac16428e3fa6f6a2fa16a879de29b2856b4b617 - b2sums = 96a703e3c7e4a2e2229c386daa24af0ca0228d130a35a6ba25e5da4885297d5d0b33fe37f26f71955cac01e3250dc4f811ebb6ff0fe58f3f7e5d5380a970347f - b2sums = a2190defa8f08a7c8c42062debf7339ba1f6bf3171977cb23a0ca8a6264c6e4da8ac52966d9191bd395e6463531c431662ab009f7d7c8df82dd9219d07b9e5b6 + arch = any pkgname = kotatogram-dev-git + depends = kotatogram-desktop-git diff --git a/.gitignore b/.gitignore index 64a9bb9e4eac..018a3de08144 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -kotatogram-desktop* -kotatogram-dev-git* -pkg/ -src/ +* +!PKGBUILD +!.SRCINFO +!.gitignore diff --git a/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch b/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch deleted file mode 100644 index 5698362efc4d..000000000000 --- a/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch +++ /dev/null @@ -1,234 +0,0 @@ -From 51ec84e88a3c60d6ba65ba2400d76eea97ef7745 Mon Sep 17 00:00:00 2001 -From: Ilya Fedin <fedin-ilja2010@ya.ru> -Date: Sun, 14 Jun 2020 03:25:53 +0400 -Subject: [PATCH] Add an option to hide messages from blocked users in groups - ---- - Telegram/Resources/langs/rewrites/en.json | 1 + - Telegram/Resources/langs/rewrites/ru.json | 1 + - .../history/history_item_components.cpp | 9 ++++- - .../SourceFiles/history/history_widget.cpp | 30 ++++++++++++++ - .../history/view/history_view_element.cpp | 7 ++++ - .../SourceFiles/kotato/kotato_settings.cpp | 3 ++ - .../kotato/kotato_settings_menu.cpp | 1 + - Telegram/SourceFiles/main/main_session.cpp | 40 +++++++++++++++++++ - 8 files changed, 90 insertions(+), 2 deletions(-) - -diff --git a/Telegram/Resources/langs/rewrites/en.json b/Telegram/Resources/langs/rewrites/en.json -index e50ac3e25..bd67e4d27 100644 ---- a/Telegram/Resources/langs/rewrites/en.json -+++ b/Telegram/Resources/langs/rewrites/en.json -@@ -167,6 +167,7 @@ - "ktg_admin_log_banned_send_games": "Send games", - "ktg_admin_log_banned_use_inline": "Use inline bots", - "ktg_forward_go_to_chat": "Go to chat", -+ "ktg_settings_block_users_in_groups": "Block users in groups", - "ktg_settings_forward": "Forward", - "ktg_settings_forward_retain_selection": "Retain selection after forward", - "ktg_settings_forward_chat_on_click": "Open chat on click", -diff --git a/Telegram/Resources/langs/rewrites/ru.json b/Telegram/Resources/langs/rewrites/ru.json -index 5f4c7e775..cb1509722 100644 ---- a/Telegram/Resources/langs/rewrites/ru.json -+++ b/Telegram/Resources/langs/rewrites/ru.json -@@ -167,6 +167,7 @@ - "ktg_admin_log_banned_send_games": "Отправка игр", - "ktg_admin_log_banned_use_inline": "Отправка через ботов", - "ktg_forward_go_to_chat": "Перейти в чат", -+ "ktg_settings_block_users_in_groups": "Блокировать пользователей в группах", - "ktg_settings_forward": "Пересылка", - "ktg_settings_forward_retain_selection": "Сохранять выделение после пересылки", - "ktg_settings_forward_chat_on_click": "Открывать чат по клику", -diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp -index 09e2fe34e..1939d3570 100644 ---- a/Telegram/SourceFiles/history/history_item_components.cpp -+++ b/Telegram/SourceFiles/history/history_item_components.cpp -@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #include "history/history_item_components.h" - -+#include "kotato/kotato_settings.h" - #include "kotato/kotato_lang.h" - #include "base/qt/qt_key_modifiers.h" - #include "lang/lang_keys.h" -@@ -334,7 +335,11 @@ void HistoryMessageReply::paint( - p.fillRect(rbar, bar); - - if (w > st::msgReplyBarSkip) { -- if (replyToMsg) { -+ auto blocked = replyToMsg -+ && replyToMsg->from()->isUser() -+ && replyToMsg->from()->asUser()->isBlocked(); -+ const auto blockUsersInGroups = ::Kotato::JsonSettings::GetBool("block_users_in_groups"); -+ if (replyToMsg && (!blocked || !blockUsersInGroups)) { - auto hasPreview = replyToMsg->media() ? replyToMsg->media()->hasReplyPreview() : false; - if (hasPreview && w < st::msgReplyBarSkip + st::msgReplyBarSize.height()) { - hasPreview = false; -@@ -380,7 +385,7 @@ void HistoryMessageReply::paint( - p.setPen(inBubble - ? stm->msgDateFg - : st->msgDateImgFg()); -- p.drawTextLeft(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2, w + 2 * x, st::msgDateFont->elided(replyToMsgId ? tr::lng_profile_loading(tr::now) : tr::lng_deleted_message(tr::now), w - st::msgReplyBarSkip)); -+ p.drawTextLeft(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2, w + 2 * x, st::msgDateFont->elided((replyToMsgId && (!blocked || !blockUsersInGroups)) ? tr::lng_profile_loading(tr::now) : tr::lng_deleted_message(tr::now), w - st::msgReplyBarSkip)); - } - } - } -diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp -index c09939134..79e020277 100644 ---- a/Telegram/SourceFiles/history/history_widget.cpp -+++ b/Telegram/SourceFiles/history/history_widget.cpp -@@ -682,6 +682,36 @@ HistoryWidget::HistoryWidget( - }); - }, lifetime()); - -+ ::Kotato::JsonSettings::Events( -+ "block_users_in_groups" -+ ) | rpl::start_with_next([=] { -+ crl::on_main(this, [=] { -+ if (_history) { -+ _history->forceFullResize(); -+ if (_migrated) { -+ _migrated->forceFullResize(); -+ } -+ updateHistoryGeometry(); -+ update(); -+ } -+ }); -+ }, 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()); -+ - session().data().animationPlayInlineRequest( - ) | rpl::start_with_next([=](not_null<HistoryItem*> item) { - if (const auto view = item->mainView()) { -diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp -index f6938da0c..975d502ae 100644 ---- a/Telegram/SourceFiles/history/view/history_view_element.cpp -+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp -@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include "ui/toast/toast.h" - #include "ui/toasts/common_toasts.h" - #include "data/data_session.h" -+#include "data/data_user.h" - #include "data/data_groups.h" - #include "data/data_media_types.h" - #include "data/data_sponsored_messages.h" -@@ -521,6 +522,12 @@ bool Element::isHiddenByGroup() const { - } - - bool Element::isHidden() const { -+ if (::Kotato::JsonSettings::GetBool("block_users_in_groups") -+ && data()->from()->isUser() -+ && data()->from()->asUser()->isBlocked()) { -+ return true; -+ } -+ - return isHiddenByGroup(); - } - -diff --git a/Telegram/SourceFiles/kotato/kotato_settings.cpp b/Telegram/SourceFiles/kotato/kotato_settings.cpp -index 9b0513d82..ebceb4f8f 100644 ---- a/Telegram/SourceFiles/kotato/kotato_settings.cpp -+++ b/Telegram/SourceFiles/kotato/kotato_settings.cpp -@@ -326,6 +326,9 @@ const std::map<QString, Definition, std::greater<QString>> DefinitionMap { - { "big_emoji_outline", { - .type = SettingType::BoolSetting, - .defaultValue = true, }}, -+ { "block_users_in_groups", { -+ .type = SettingType::BoolSetting, -+ .defaultValue = true, }}, - { "sticker_height", { - .type = SettingType::IntSetting, - .defaultValue = 170, -diff --git a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp -index 88249d0d3..73ef1f8a2 100644 ---- a/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp -+++ b/Telegram/SourceFiles/kotato/kotato_settings_menu.cpp -@@ -472,6 +472,7 @@ void SetupKotatoMessages(not_null<Ui::VerticalLayout*> container) { - } - - SettingsMenuJsonSwitch(ktg_settings_emoji_outline, big_emoji_outline); -+ SettingsMenuJsonSwitch(ktg_settings_block_users_in_groups, block_users_in_groups); - - AddSkip(container); - } -diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp -index 084137b82..cf882a238 100644 ---- a/Telegram/SourceFiles/main/main_session.cpp -+++ b/Telegram/SourceFiles/main/main_session.cpp -@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #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" -@@ -68,6 +69,43 @@ constexpr auto kTmpPasswordReserveTime = TimeId(10); - return MTP::ConfigFields().internalLinksDomain; - } - -+void InitializeBlockedPeers(not_null<Main::Session*> session) { -+ const auto offset = std::make_shared<int>(0); -+ const auto allLoaded = std::make_shared<bool>(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( -@@ -158,6 +196,8 @@ Session::Session( - _api->requestNotifySettings(MTP_inputNotifyUsers()); - _api->requestNotifySettings(MTP_inputNotifyChats()); - _api->requestNotifySettings(MTP_inputNotifyBroadcasts()); -+ -+ InitializeBlockedPeers(this); - } - - void Session::setTmpPassword(const QByteArray &password, TimeId validUntil) { --- -2.35.1 - diff --git a/0002-Block-sponsored_messages.patch b/0002-Block-sponsored_messages.patch deleted file mode 100644 index 4ccdd789f4e8..000000000000 --- a/0002-Block-sponsored_messages.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp -index 1dc5b49..91cba9c 100644 ---- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp -+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp -@@ -93,7 +93,7 @@ bool SponsoredMessages::append(not_null<History*> history) { - } - - bool SponsoredMessages::canHaveFor(not_null<History*> history) const { -- return history->peer->isChannel(); -+ return false; - } - - void SponsoredMessages::request(not_null<History*> history) { diff --git a/0003-Allow-downloading-and-copying-from-restricted-channels.patch b/0003-Allow-downloading-and-copying-from-restricted-channels.patch deleted file mode 100644 index cf96c089c286..000000000000 --- a/0003-Allow-downloading-and-copying-from-restricted-channels.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp -index eedcd4cb6..efe87ce59 100644 ---- a/Telegram/SourceFiles/history/history_inner_widget.cpp -+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp -@@ -2314,6 +2314,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { - } - - bool HistoryInner::hasCopyRestriction(HistoryItem *item) const { -+ return false; - return !_peer->allowsForwarding() || (item && item->forbidsForward()); - } - -@@ -2330,6 +2331,7 @@ bool HistoryInner::showCopyRestriction(HistoryItem *item) { - } - - bool HistoryInner::hasCopyRestrictionForSelected() const { -+ return false; - if (hasCopyRestriction()) { - return true; - } -diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp -index 87b8611f7..b0cfc7670 100644 ---- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp -+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp -@@ -1218,6 +1218,7 @@ bool ListWidget::isEmpty() const { - } - - bool ListWidget::hasCopyRestriction(HistoryItem *item) const { -+ return false; - return _delegate->listCopyRestrictionType(item) - != CopyRestrictionType::None; - } -@@ -1236,6 +1237,7 @@ bool ListWidget::showCopyRestriction(HistoryItem *item) { - } - - bool ListWidget::hasCopyRestrictionForSelected() const { -+ return false; - if (hasCopyRestriction()) { - return true; - } -diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -index 6b77cfefe..75ceb075d 100644 ---- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -@@ -560,6 +560,7 @@ QSize OverlayWidget::flipSizeByRotation(QSize size) const { - } - - bool OverlayWidget::hasCopyRestriction() const { -+ return false; - return (_history && !_history->peer->allowsForwarding()) - || (_message && _message->forbidsForward()); - } @@ -1,129 +1,10 @@ -# Maintainer: Francesco Minnocci <ascoli dot minnocci at gmail dot com> -# Co Maintainer: 3Jl0y_PYCCKUi <3jl0y_pycckui@riseup.net> -# Contributor: solopasha <daron439 at gmail dot com> -# Contributor: Ilya Fedin <fedin-ilja2010@ya.ru> -# Contributor: Auteiy <dmitry@auteiy.me> - -pkgname=kotatogram-dev-git -_pkgname=kotatogram-desktop -pkgver=k1.4.9.r2.g52b300cb3 +_newpkg='kotatogram-desktop-git' +pkgname='kotatogram-dev-git' +pkgver=0.0.1 pkgrel=1 -pkgdesc='Kotatogram – experimental Telegram Desktop fork - Dev branch' -arch=('x86_64') -url="https://kotatogram.github.io" -license=('GPL3') -provides=(kotatogram-desktop kotatogram-desktop-git) -depends=('hunspell' 'ffmpeg4.4' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 'ttf-opensans' - # 'qt6-imageformats' 'qt6-svg' 'qt6-wayland' 'qt6-5compat' - 'qt5-imageformats' 'qt5-svg' 'qt5-wayland' - 'xxhash' 'kwayland' 'glibmm' - 'rnnoise' 'pipewire' 'libxtst' 'jemalloc' 'libxrandr' 'abseil-cpp' 'libjpeg-turbo' 'opus' 'openssl-1.1' 'libx11' 'libvpx' 'libxcomposite' - 'libxdamage' 'libxext' 'libxfixes' 'zlib' 'wayland' 'glibc' 'libsigc++' 'glib2' 'xcb-util-keysyms' 'libxcb' 'gcc-libs' 'libdispatch' - ) -makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' - 'extra-cmake-modules' 'wayland-protocols' 'plasma-wayland-protocols' 'webkit2gtk' 'unzip' - 'yasm' 'meson') -optdepends=('webkit2gtk: embedded browser features' - 'xdg-desktop-portal: desktop integration') -conflicts=('kotatogram-desktop-bin' 'kotatogram-desktop-dynamic-bin' 'kotatogram-desktop') -_tg_owt_commit=63a934db1ed212ebf8aaaa20f0010dd7b0d7b396 -source=("${_pkgname}::git+https://github.com/kotatogram/${_pkgname}.git#branch=dev" - "${_pkgname}-tg_owt::git+https://github.com/desktop-app/tg_owt.git#commit=${_tg_owt_commit}" - - "include.patch" - "kf594.patch" - "https://patch-diff.githubusercontent.com/raw/kotatogram/kotatogram-desktop/pull/326.patch" - "https://patch-diff.githubusercontent.com/raw/kotatogram/kotatogram-desktop/pull/333.patch" - "https://patch-diff.githubusercontent.com/raw/kotatogram/kotatogram-desktop/pull/334.patch" - "https://patch-diff.githubusercontent.com/raw/kotatogram/kotatogram-desktop/pull/335.patch" - "https://patch-diff.githubusercontent.com/raw/kotatogram/kotatogram-desktop/pull/337.patch" - - "https://patch-diff.githubusercontent.com/raw/desktop-app/tg_owt/pull/101.patch" - "tg_owt-fix.patch" - - "0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch" - "0002-Block-sponsored_messages.patch" - "0003-Allow-downloading-and-copying-from-restricted-channels.patch" - ) - -b2sums=('SKIP' - 'SKIP' - 'a3448b085b2046a9cb19848f8e5c96c609ba00f41209e23cae82c09e23e22303fbc313f718ce635541d66d42b7682215b3dfa35a969575ecaba65b68354b2c2d' - 'c4e75540ed8363689265d57dfe3410ceeeed4a1f06d3b8efd4fd029c0c2792b7ecc992ea75bfeba0599133ff85814f4ba25ce7dab2a18264344de3fadb47e626' - '7564058d932166d6e267ad87d8da1e1bc9e33c42de057feae44f74da9cbdc0947f7233c724802af3e1d10fe699cdf1e7630a634fc7c47eb06d55f0237fd36972' - '5fcc611dad411bc53a800a9f6e6f013bcf72ada64c5a70453f624941d983f02e80afb0cbcd646e4aaf51688ef3304f601d2cf1ab41de81a171250ca0d11cad5c' - '228acce28b60cd60c54e954a281893bb9cbdbaccec9743907c237d0577963963f79efe44df7de932d69061603cc0a1626d4a8e04f78e04d167b1e3bf1c7c020b' - 'ab537548d871939e0d905849032d435f0732a1bd586dde212c8f7079f1652dafa07a0cde356cee78e47f5fb9a687185a9150fe3b70d08562fd781f20e6f64708' - '802199bb3b6ec54437d8505695112743cbdaef1b13e25629d3832e68601147b48668738e3c0832296e74ee3bf1820914a46264aeda54411d4733fbb2e86260c9' - '0d9d0927e401da06e5b77b6606c32d79966e946bc5dedb2086a5fc3fb5472a1c9039b8470031416d2bad81b3138ead5e29636b28e283774978e66b80cec15c2f' - '9874a75e04500c2a9b8f67d75e9c81e970ab5dd8f62657fe82046a5be22f4dde371e3e8b50ab207d2a6a3017e3a209b5078f7ea16b94a2128a5a96db42f9d1c4' - '63c912c53b7c259d97162f96acdb67a88b625c99ac2144869abc88a08d96e940bfdefcf9478c3c20a95f03c19ac16428e3fa6f6a2fa16a879de29b2856b4b617' - '96a703e3c7e4a2e2229c386daa24af0ca0228d130a35a6ba25e5da4885297d5d0b33fe37f26f71955cac01e3250dc4f811ebb6ff0fe58f3f7e5d5380a970347f' - 'a2190defa8f08a7c8c42062debf7339ba1f6bf3171977cb23a0ca8a6264c6e4da8ac52966d9191bd395e6463531c431662ab009f7d7c8df82dd9219d07b9e5b6') - -pkgver() { - cd "${srcdir}/${_pkgname}" - git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' -} - -prepare() { - apply-patch(){ - printf "Applying patch %s\n" "$1" - patch -Np1 -i "$1" - } - - cd "${srcdir}/${_pkgname}" - - git submodule update --init --recursive --depth 1 --jobs $(nproc) - - apply-patch "${srcdir}/kf594.patch" - apply-patch "${srcdir}/326.patch" - apply-patch "${srcdir}/333.patch" - apply-patch "${srcdir}/334.patch" - apply-patch "${srcdir}/335.patch" - apply-patch "${srcdir}/337.patch" - - apply-patch "${srcdir}/0001-Add-an-option-to-hide-messages-from-blocked-users-in.patch" - apply-patch "${srcdir}/0002-Block-sponsored_messages.patch" - apply-patch "${srcdir}/0003-Allow-downloading-and-copying-from-restricted-channels.patch" - - cd "${srcdir}/${_pkgname}-tg_owt" - git submodule update --init --recursive --depth 1 --jobs $(nproc) - - apply-patch "$srcdir/101.patch" - # apply-patch "$srcdir/include.patch" - apply-patch "$srcdir/tg_owt-fix.patch" -} - -build() { - export CXXFLAGS+=" -Wp,-U_GLIBCXX_ASSERTIONS" - export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig' # force build with ffmpeg4.4 - - cd "${srcdir}/${_pkgname}-tg_owt" - cmake \ - -B build \ - -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DBUILD_SHARED_LIBS=OFF \ - -DTG_OWT_PACKAGED_BUILD=ON - - CFLAGS+=" -ffat-lto-objects" CXXFLAGS+=" -ffat-lto-objects -I/usr/include/libdrm" cmake --build build - - cd "${srcdir}/${_pkgname}" - cmake . \ - -B build \ - -G Ninja \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_BUILD_TYPE=Release \ - -DTDESKTOP_API_TEST=ON \ - -Dtg_owt_DIR="${srcdir}/${_pkgname}-tg_owt/build" \ - -DDESKTOP_APP_QT6=OFF - - cmake --build build -} +pkgdesc="metapackage - migrate to $_newpkg" +arch=('any') package() { - cd "${srcdir}/${_pkgname}" - DESTDIR="$pkgdir" cmake --install build + depends=("$_newpkg") } diff --git a/include.patch b/include.patch deleted file mode 100644 index 1cedb97ffb85..000000000000 --- a/include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/modules/include/module_common_types_public.h b/src/modules/include/module_common_types_public.h -index 345e45ce..de74bf69 100644 ---- a/src/modules/include/module_common_types_public.h -+++ b/src/modules/include/module_common_types_public.h -@@ -10,7 +10,7 @@ - - #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ -- -+#include <cstdint> - #include <limits> - - #include "absl/types/optional.h" diff --git a/kf594.patch b/kf594.patch deleted file mode 100644 index 0fa2d8bc8f6e..000000000000 --- a/kf594.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -index 7641579aa..3c195e397 100644 ---- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #include "base/platform/base_platform_info.h" - --#include <connection_thread.h> --#include <registry.h> --#include <surface.h> --#include <plasmashell.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> -+#include <KWayland/Client/surface.h> -+#include <KWayland/Client/plasmashell.h> - - using namespace KWayland::Client; - -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -index 32f0de6..30a087f 100644 ---- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -+++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include <QtCore/QPointer> - #include <QtGui/QWindow> - --#include <connection_thread.h> --#include <registry.h> --#include <surface.h> --#include <xdgforeign.h> --#include <idleinhibit.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> -+#include <KWayland/Client/surface.h> -+#include <KWayland/Client/xdgforeign.h> -+#include <KWayland/Client/idleinhibit.h> - - using namespace KWayland::Client; - -Submodule Telegram/lib_ui contains modified content -diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -index 01f1e80..163cb6a 100644 ---- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -+++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include <private/qwaylandwindow_p.h> - #include <private/qwaylandshellsurface_p.h> - --#include <connection_thread.h> --#include <registry.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> - - Q_DECLARE_METATYPE(QMargins); - diff --git a/tg_owt-fix.patch b/tg_owt-fix.patch deleted file mode 100644 index 8a8bedb5ce53..000000000000 --- a/tg_owt-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h -index 28c95ea9..790b0b73 100644 ---- a/src/common_video/h265/h265_pps_parser.h -+++ b/src/common_video/h265/h265_pps_parser.h -@@ -13,6 +13,8 @@ - - #include "absl/types/optional.h" - -+#include <stdint.h> -+ - namespace rtc { - class BitBuffer; - } -diff --git a/src/modules/audio_processing/transient/file_utils.h b/src/modules/audio_processing/transient/file_utils.h -index b7483377..56696708 100644 ---- a/src/modules/audio_processing/transient/file_utils.h -+++ b/src/modules/audio_processing/transient/file_utils.h -@@ -14,6 +14,7 @@ - #include <string.h> - - #include "rtc_base/system/file_wrapper.h" -+#include <cstdint> - - namespace webrtc { - -diff --git a/src/modules/include/module_common_types_public.h b/src/modules/include/module_common_types_public.h -index 345e45ce..8338a514 100644 ---- a/src/modules/include/module_common_types_public.h -+++ b/src/modules/include/module_common_types_public.h -@@ -11,6 +11,7 @@ - #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - -+#include <cstdint> - #include <limits> - - #include "absl/types/optional.h" -diff --git a/src/rtc_base/third_party/base64/base64.h b/src/rtc_base/third_party/base64/base64.h -index ca249541..b5cf3f73 100644 ---- a/src/rtc_base/third_party/base64/base64.h -+++ b/src/rtc_base/third_party/base64/base64.h -@@ -16,6 +16,7 @@ - #include <vector> - - #include "rtc_base/system/rtc_export.h" -+#include <cstdint> - - namespace rtc { - |