From 18514861890e728fcff411bebee19e58824b7e33 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 2 Feb 2022 15:56:45 +1000 Subject: [PATCH] Telegram: bump version --- ....4.8.patchset => libtgvoip-3.5.0.patchset} | 2 +- ...tchset => telegram_desktop-3.5.0.patchset} | 71 ++++++++++--------- ...8.recipe => telegram_desktop-3.5.0.recipe} | 4 +- 3 files changed, 41 insertions(+), 36 deletions(-) rename net-im/telegram-desktop/patches/{libtgvoip-3.4.8.patchset => libtgvoip-3.5.0.patchset} (99%) rename net-im/telegram-desktop/patches/{telegram_desktop-3.4.8.patchset => telegram_desktop-3.5.0.patchset} (94%) rename net-im/telegram-desktop/{telegram_desktop-3.4.8.recipe => telegram_desktop-3.5.0.recipe} (97%) diff --git a/net-im/telegram-desktop/patches/libtgvoip-3.4.8.patchset b/net-im/telegram-desktop/patches/libtgvoip-3.5.0.patchset similarity index 99% rename from net-im/telegram-desktop/patches/libtgvoip-3.4.8.patchset rename to net-im/telegram-desktop/patches/libtgvoip-3.5.0.patchset index 47b44a06c..e4484ad4e 100644 --- a/net-im/telegram-desktop/patches/libtgvoip-3.4.8.patchset +++ b/net-im/telegram-desktop/patches/libtgvoip-3.5.0.patchset @@ -1,4 +1,4 @@ -From 50d672a025cdcb07dadd2ee39508a8dcdc6a8d97 Mon Sep 17 00:00:00 2001 +From 535e6b42a29b712a77d00c4986eeab35b90854bd Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 20 Jan 2022 14:36:06 +1000 Subject: Add Haiku support diff --git a/net-im/telegram-desktop/patches/telegram_desktop-3.4.8.patchset b/net-im/telegram-desktop/patches/telegram_desktop-3.5.0.patchset similarity index 94% rename from net-im/telegram-desktop/patches/telegram_desktop-3.4.8.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-3.5.0.patchset index 54127f783..338a7797b 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-3.4.8.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-3.5.0.patchset @@ -1,11 +1,11 @@ -From e3d42e5d73fef273d00e48d78eef62edd217501b Mon Sep 17 00:00:00 2001 +From a479007db98f7eb2369be5dfc61701488fe395f1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 20 Jan 2022 15:46:19 +1000 +Date: Wed, 2 Feb 2022 15:53:44 +1000 Subject: Add Haiku support diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index eea381f..f0a6f1f 100644 +index fee3472..1bbeda2 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -95,6 +95,15 @@ PRIVATE @@ -24,7 +24,7 @@ index eea381f..f0a6f1f 100644 target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h) nice_target_sources(Telegram ${src_loc} PRIVATE -@@ -1231,6 +1240,16 @@ else() +@@ -1235,6 +1244,16 @@ else() ) endif() @@ -41,7 +41,7 @@ index eea381f..f0a6f1f 100644 if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) remove_target_sources(Telegram ${src_loc} platform/linux/linux_wayland_integration.cpp -@@ -1376,7 +1395,7 @@ if (build_macstore) +@@ -1378,7 +1397,7 @@ if (build_macstore) else() set(bundle_identifier "com.tdesktop.Telegram$<$:Debug>") set(bundle_entitlements "Telegram.entitlements") @@ -99,10 +99,10 @@ index e35b9c2..203209d 100644 _video->moveToLeft(left, buttonsTop); left += _video->width() + skip; diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h -index b057a1f..3b4b813 100644 +index 414d56d..3341fe6 100644 --- a/Telegram/SourceFiles/core/core_settings.h +++ b/Telegram/SourceFiles/core/core_settings.h -@@ -749,7 +749,7 @@ private: +@@ -756,7 +756,7 @@ private: rpl::variable _dialogsWidthRatio; // per-window rpl::variable _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w bool _notifyFromAll = true; @@ -156,10 +156,21 @@ index 0437363..7685881 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 cffa63a..257722c 100644 +index efaf0a7..e6c20de 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp -@@ -903,11 +903,17 @@ bool MainWindow::hasTrayIcon() const { +@@ -41,6 +41,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include "base/platform/linux/base_linux_xcb_utilities.h" + #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION + ++#ifdef Q_OS_HAIKU ++#include ++#endif ++ + #include + #include + #include +@@ -493,11 +497,17 @@ bool MainWindow::hasTrayIcon() const { bool MainWindow::isActiveForTrayMenu() { updateIsActive(); @@ -172,14 +183,14 @@ index cffa63a..257722c 100644 void MainWindow::psShowTrayMenu() { +#ifndef Q_OS_HAIKU - _trayIconMenuXEmbed->popup(QCursor::pos()); + _private->trayIconMenuXEmbed->popup(QCursor::pos()); +#endif } void MainWindow::psTrayMenuUpdated() { -@@ -946,6 +952,10 @@ void MainWindow::psSetupTrayIcon() { - } - trayIcon->setIcon(TrayIconGen(counter, muted)); +@@ -511,6 +521,10 @@ void MainWindow::psSetupTrayIcon() { + Core::App().unreadBadge(), + Core::App().unreadBadgeMuted())); +#ifdef Q_OS_HAIKU + trayIcon->setContextMenu(trayIconMenu); @@ -188,13 +199,13 @@ index cffa63a..257722c 100644 attachToTrayIcon(trayIcon); } updateIconCounters(); -@@ -1036,8 +1046,10 @@ void MainWindow::updateIconCounters() { +@@ -589,8 +603,10 @@ void MainWindow::updateIconCounters() { } void MainWindow::initTrayMenuHook() { +#ifndef Q_OS_HAIKU - _trayIconMenuXEmbed.emplace(nullptr, trayIconMenu); - _trayIconMenuXEmbed->deleteOnHide(false); + _private->trayIconMenuXEmbed.emplace(nullptr, trayIconMenu); + _private->trayIconMenuXEmbed->deleteOnHide(false); +#endif } @@ -474,7 +485,7 @@ index 0000000..8605b28 +} // namespace Notifications +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index 31e575b..988be5b 100644 +index 1f3744d..7f708b2 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -34,6 +34,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL @@ -534,7 +545,7 @@ index 31e575b..988be5b 100644 constexpr auto kDesktopFile = ":/misc/telegramdesktop.desktop"_cs; constexpr auto kIconName = "telegram"_cs; constexpr auto kDarkColorLimit = 192; -@@ -618,37 +650,6 @@ void psActivateProcess(uint64 pid) { +@@ -616,37 +648,6 @@ void psActivateProcess(uint64 pid) { // objc_activateProgram(); } @@ -572,7 +583,7 @@ index 31e575b..988be5b 100644 QString psAppDataPath() { // Previously we used ~/.TelegramDesktop, so look there first. // If we find data there, we should still use it. -@@ -662,8 +663,11 @@ QString psAppDataPath() { +@@ -660,8 +661,11 @@ QString psAppDataPath() { return oldPath; } } @@ -585,7 +596,7 @@ index 31e575b..988be5b 100644 } void psDoCleanup() { -@@ -691,8 +695,9 @@ namespace Platform { +@@ -689,8 +693,9 @@ namespace Platform { void start() { auto backgroundThread = true; @@ -596,7 +607,7 @@ index 31e575b..988be5b 100644 // Prevent any later calls into setlocale() by Qt QCoreApplicationPrivate::initLocale(); -@@ -831,7 +836,7 @@ bool OpenSystemSettings(SystemSettingsType type) { +@@ -829,7 +834,7 @@ bool OpenSystemSettings(SystemSettingsType type) { add("mate-volume-control"); } } @@ -619,7 +630,7 @@ index 057a9b5..68abe1e 100644 SetAudioInputDeviceById(_audioDeviceModule.get(), id); #endif diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp b/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp -index 8898223..615b4eb 100644 +index 4c4faef..9ef3409 100644 --- a/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp +++ b/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp @@ -2782,7 +2782,7 @@ public: @@ -880,10 +891,10 @@ index 092b667..204e259 100644 #include "webrtc/webrtc_create_adm.h" diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt -index 28eebaf..7816ead 100644 +index 0922a66..3d08188 100644 --- a/cmake/external/CMakeLists.txt +++ b/cmake/external/CMakeLists.txt -@@ -40,7 +40,7 @@ if (add_hunspell_library) +@@ -37,7 +37,7 @@ if (add_hunspell_library) add_checked_subdirectory(hunspell) endif() add_checked_subdirectory(iconv) @@ -893,18 +904,10 @@ index 28eebaf..7816ead 100644 endif() add_checked_subdirectory(jpeg) diff --git a/cmake/options_linux.cmake b/cmake/options_linux.cmake -index e599f28..1a00370 100644 +index 65bd94a..4ca9b6e 100644 --- a/cmake/options_linux.cmake +++ b/cmake/options_linux.cmake -@@ -29,7 +29,6 @@ INTERFACE - target_link_options(common_options - INTERFACE - -Wl,--as-needed -- -pthread - ) - - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -@@ -63,11 +62,13 @@ if (DESKTOP_APP_SPECIAL_TARGET) +@@ -62,11 +62,13 @@ if (DESKTOP_APP_SPECIAL_TARGET) target_link_options(common_options INTERFACE $,,-g -flto -fuse-linker-plugin>) endif() diff --git a/net-im/telegram-desktop/telegram_desktop-3.4.8.recipe b/net-im/telegram-desktop/telegram_desktop-3.5.0.recipe similarity index 97% rename from net-im/telegram-desktop/telegram_desktop-3.4.8.recipe rename to net-im/telegram-desktop/telegram_desktop-3.5.0.recipe index e3d6b99aa..319c052f4 100644 --- a/net-im/telegram-desktop/telegram_desktop-3.4.8.recipe +++ b/net-im/telegram-desktop/telegram_desktop-3.5.0.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2013-2022 Telegram" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz" -CHECKSUM_SHA256="6a962a1110bc15c21999832b0151af8125f33a3b6e978461b8f446217c76876e" +CHECKSUM_SHA256="3b5742d05a97bd9a9602419293cfeb5023b98fba81fb465db0d881ce811f6706" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92" @@ -56,6 +56,7 @@ REQUIRES=" lib:libstdc++$secondaryArchSuffix lib:libswresample$secondaryArchSuffix lib:libswscale$secondaryArchSuffix + lib:libvpx$secondaryArchSuffix lib:libxxhash$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -90,6 +91,7 @@ BUILD_REQUIRES=" devel:libswresample$secondaryArchSuffix devel:libswscale$secondaryArchSuffix devel:libtg_owt$secondaryArchSuffix + devel:libvpx$secondaryArchSuffix devel:libxxhash$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:range_v3$secondaryArchSuffix