From f4dd91c3ad088b0dca04de2f8655d45ce8e77457 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 2 Jan 2022 00:06:50 +1000 Subject: [PATCH] Kotatogram: bump version --- ...recipe => kotatogram_desktop-1.4.8.recipe} | 10 ++++---- ....patchset => cmake_helpers-1.4.8.patchset} | 0 ...hset => kotatogram_desktop-1.4.8.patchset} | 24 +++++++++---------- ...1.4.6.patchset => lib_base-1.4.8.patchset} | 0 ...i-1.4.6.patchset => lib_ui-1.4.8.patchset} | 0 ...4.6.patchset => lib_webrtc-1.4.8.patchset} | 0 ....4.6.patchset => libtgvoip-1.4.8.patchset} | 0 ...-1.4.6.patchset => tgcalls-1.4.8.patchset} | 0 8 files changed, 17 insertions(+), 17 deletions(-) rename net-im/kotatogram-desktop/{kotatogram_desktop-1.4.6.recipe => kotatogram_desktop-1.4.8.recipe} (97%) rename net-im/kotatogram-desktop/patches/{cmake_helpers-1.4.6.patchset => cmake_helpers-1.4.8.patchset} (100%) rename net-im/kotatogram-desktop/patches/{kotatogram_desktop-1.4.6.patchset => kotatogram_desktop-1.4.8.patchset} (97%) rename net-im/kotatogram-desktop/patches/{lib_base-1.4.6.patchset => lib_base-1.4.8.patchset} (100%) rename net-im/kotatogram-desktop/patches/{lib_ui-1.4.6.patchset => lib_ui-1.4.8.patchset} (100%) rename net-im/kotatogram-desktop/patches/{lib_webrtc-1.4.6.patchset => lib_webrtc-1.4.8.patchset} (100%) rename net-im/kotatogram-desktop/patches/{libtgvoip-1.4.6.patchset => libtgvoip-1.4.8.patchset} (100%) rename net-im/kotatogram-desktop/patches/{tgcalls-1.4.6.patchset => tgcalls-1.4.8.patchset} (100%) diff --git a/net-im/kotatogram-desktop/kotatogram_desktop-1.4.6.recipe b/net-im/kotatogram-desktop/kotatogram_desktop-1.4.8.recipe similarity index 97% rename from net-im/kotatogram-desktop/kotatogram_desktop-1.4.6.recipe rename to net-im/kotatogram-desktop/kotatogram_desktop-1.4.8.recipe index 3dd0a799e..128127229 100644 --- a/net-im/kotatogram-desktop/kotatogram_desktop-1.4.6.recipe +++ b/net-im/kotatogram-desktop/kotatogram_desktop-1.4.8.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2013-2021 Telegram LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/kotatogram/kotatogram-desktop/archive/refs/tags/k$portVersion.tar.gz" -CHECKSUM_SHA256="91fb24a1e0e022be313826a83ff0edeee15a0629acd71bca1795fe9cafeed63d" +CHECKSUM_SHA256="ba65b7a056caca2c91b590463cf54fffe8dbab7b76d145bbfd64a8bb03978aac" SOURCE_FILENAME="kotatogram-$portVersion.tar.gz" SOURCE_DIR="kotatogram-desktop-k$portVersion" #libtgvoip @@ -47,9 +47,9 @@ CHECKSUM_SHA256_7="06ee75ceb3be9cbd1471f14c1edce07b30189b012edb71a3c8ea1fdf8e30a SOURCE_FILENAME_7="codegen-$srcGitRev_7.tar.gz" SOURCE_DIR_7="codegen-$srcGitRev_7" #lib_ui -srcGitRev_8="d9274f06bddccf0e5f4deabe641bafdd3b453c3f" +srcGitRev_8="f8f407004b139a1cd882c538f00e8a87b5e65b9a" SOURCE_URI_8="https://github.com/kotatogram/lib_ui/archive/$srcGitRev_8.tar.gz" -CHECKSUM_SHA256_8="b6ac135ef5dfabd938a89e8c7d341585ad4a7892c94822d9a4d43ff2431839a6" +CHECKSUM_SHA256_8="1e54c8b6b6da81c52a23d338947220ce30594ad565ddfa5424e909f9cae02531" SOURCE_FILENAME_8="lib_ui-$srcGitRev_8.tar.gz" SOURCE_DIR_8="lib_ui-$srcGitRev_8" #lib_rlottie @@ -83,9 +83,9 @@ CHECKSUM_SHA256_13="ce440ae1cbfc35a4e1f04adfe14497991a9347045970620b199abfd3f162 SOURCE_FILENAME_13="lib_storage-$srcGitRev_13.tar.gz" SOURCE_DIR_13="lib_storage-$srcGitRev_13" #cmake_helpers -srcGitRev_14="37c59a2d5773eb4cea7803fa6f72933b3c5374f7" +srcGitRev_14="7d2037630abad09ee7b8857710aa7a0efd0c5672" SOURCE_URI_14="https://github.com/kotatogram/cmake_helpers/archive/$srcGitRev_14.tar.gz" -CHECKSUM_SHA256_14="4224b9d0e7a6b582654929ccadaf9a91e57e05b449697915e3f7c4a1b115b44d" +CHECKSUM_SHA256_14="035954107782d63781f2328ce11c051e74a379d5cf63f4d38d6c77502f979a97" SOURCE_FILENAME_14="cmake_helpers-$srcGitRev_14.tar.gz" SOURCE_DIR_14="cmake_helpers-$srcGitRev_14" #QR-Code-generator diff --git a/net-im/kotatogram-desktop/patches/cmake_helpers-1.4.6.patchset b/net-im/kotatogram-desktop/patches/cmake_helpers-1.4.8.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/cmake_helpers-1.4.6.patchset rename to net-im/kotatogram-desktop/patches/cmake_helpers-1.4.8.patchset diff --git a/net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.6.patchset b/net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.8.patchset similarity index 97% rename from net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.6.patchset rename to net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.8.patchset index aac422151..c1b5a82ad 100644 --- a/net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.6.patchset +++ b/net-im/kotatogram-desktop/patches/kotatogram_desktop-1.4.8.patchset @@ -1,6 +1,6 @@ -From 5783d0558915c272cf0b413302c2de6311a642e1 Mon Sep 17 00:00:00 2001 +From d2b97d1868c9a97d454ed559a82481d9f29825a5 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 22 Dec 2021 23:20:41 +1000 +Date: Sat, 1 Jan 2022 23:26:50 +1000 Subject: Add Haiku support @@ -71,10 +71,10 @@ index 0fdaf4c..ea0f606 100644 if (const auto strong = weak.get()) { showBox(Box(SettingsBox, strong)); diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp -index 0181b16..099a5fa 100644 +index f0248ed..d325571 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp -@@ -1935,7 +1935,9 @@ void Panel::updateButtonsGeometry() { +@@ -1936,7 +1936,9 @@ void Panel::updateButtonsGeometry() { const auto muteSize = _mute->innerSize().width() + 2 * addSkip; const auto skip = st::groupCallButtonSkipSmall; const auto fullWidth = (_video->width() + skip) @@ -84,7 +84,7 @@ index 0181b16..099a5fa 100644 + (muteSize + skip) + (_settings ->width() + skip) + _hangup->width(); -@@ -1946,9 +1948,13 @@ void Panel::updateButtonsGeometry() { +@@ -1947,9 +1949,13 @@ void Panel::updateButtonsGeometry() { - membersWidth - membersSkip - fullWidth) / 2; @@ -156,7 +156,7 @@ index 453ccfd..c8374f9 100644 if (internal::ShowXDPOpenWithDialog(filepath)) { return true; diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp -index 500b5b6..d9248d8 100644 +index 500b5b6..d784700 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -934,11 +934,17 @@ bool MainWindow::hasTrayIcon() const { @@ -177,18 +177,18 @@ index 500b5b6..d9248d8 100644 } void MainWindow::psTrayMenuUpdated() { -@@ -975,8 +981,9 @@ void MainWindow::psSetupTrayIcon() { - if (_sniAvailable) { - trayIcon->setContextMenu(trayIconMenu); +@@ -977,6 +983,10 @@ void MainWindow::psSetupTrayIcon() { } -+#ifdef Q_OS_HAIKU trayIcon->setIcon(TrayIconGen(counter, muted)); -- + ++#ifdef Q_OS_HAIKU ++ trayIcon->setContextMenu(trayIconMenu); +#endif ++ attachToTrayIcon(trayIcon); } updateIconCounters(); -@@ -1067,8 +1074,10 @@ void MainWindow::updateIconCounters() { +@@ -1067,8 +1077,10 @@ void MainWindow::updateIconCounters() { } void MainWindow::initTrayMenuHook() { diff --git a/net-im/kotatogram-desktop/patches/lib_base-1.4.6.patchset b/net-im/kotatogram-desktop/patches/lib_base-1.4.8.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/lib_base-1.4.6.patchset rename to net-im/kotatogram-desktop/patches/lib_base-1.4.8.patchset diff --git a/net-im/kotatogram-desktop/patches/lib_ui-1.4.6.patchset b/net-im/kotatogram-desktop/patches/lib_ui-1.4.8.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/lib_ui-1.4.6.patchset rename to net-im/kotatogram-desktop/patches/lib_ui-1.4.8.patchset diff --git a/net-im/kotatogram-desktop/patches/lib_webrtc-1.4.6.patchset b/net-im/kotatogram-desktop/patches/lib_webrtc-1.4.8.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/lib_webrtc-1.4.6.patchset rename to net-im/kotatogram-desktop/patches/lib_webrtc-1.4.8.patchset diff --git a/net-im/kotatogram-desktop/patches/libtgvoip-1.4.6.patchset b/net-im/kotatogram-desktop/patches/libtgvoip-1.4.8.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/libtgvoip-1.4.6.patchset rename to net-im/kotatogram-desktop/patches/libtgvoip-1.4.8.patchset diff --git a/net-im/kotatogram-desktop/patches/tgcalls-1.4.6.patchset b/net-im/kotatogram-desktop/patches/tgcalls-1.4.8.patchset similarity index 100% rename from net-im/kotatogram-desktop/patches/tgcalls-1.4.6.patchset rename to net-im/kotatogram-desktop/patches/tgcalls-1.4.8.patchset