From 3cc2df430dd1b92f5745faca13d490f632d10c54 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 20 Jan 2022 16:10:25 +1000 Subject: [PATCH] Telegram: bump version --- ....4.3.patchset => libtgvoip-3.4.8.patchset} | 84 +++++++++---------- ...tchset => telegram_desktop-3.4.8.patchset} | 39 +++++---- ...3.recipe => telegram_desktop-3.4.8.recipe} | 4 +- 3 files changed, 68 insertions(+), 59 deletions(-) rename net-im/telegram-desktop/patches/{libtgvoip-3.4.3.patchset => libtgvoip-3.4.8.patchset} (95%) rename net-im/telegram-desktop/patches/{telegram_desktop-3.4.3.patchset => telegram_desktop-3.4.8.patchset} (97%) rename net-im/telegram-desktop/{telegram_desktop-3.4.3.recipe => telegram_desktop-3.4.8.recipe} (98%) diff --git a/net-im/telegram-desktop/patches/libtgvoip-3.4.3.patchset b/net-im/telegram-desktop/patches/libtgvoip-3.4.8.patchset similarity index 95% rename from net-im/telegram-desktop/patches/libtgvoip-3.4.3.patchset rename to net-im/telegram-desktop/patches/libtgvoip-3.4.8.patchset index b74bcf0df..47b44a06c 100644 --- a/net-im/telegram-desktop/patches/libtgvoip-3.4.3.patchset +++ b/net-im/telegram-desktop/patches/libtgvoip-3.4.8.patchset @@ -1,6 +1,6 @@ -From 38d9c21aa2a14408aa1fe9cd7cc03548df6834e6 Mon Sep 17 00:00:00 2001 +From 50d672a025cdcb07dadd2ee39508a8dcdc6a8d97 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 31 Dec 2021 17:59:23 +1000 +Date: Thu, 20 Jan 2022 14:36:06 +1000 Subject: Add Haiku support @@ -883,50 +883,50 @@ index 0bc42eb..c87cde9 100644 typedef pid_t PlatformThreadId; typedef pthread_t PlatformThreadRef; diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake -index 68a64ba..319e5b4 100644 +index 9b8ec54..7ffb710 100644 --- a/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake -@@ -116,6 +116,14 @@ if (NOT TGVOIP_FOUND) - os/linux/AudioPulse.cpp - os/linux/AudioPulse.h +@@ -116,6 +116,14 @@ PRIVATE + os/linux/AudioPulse.cpp + os/linux/AudioPulse.h -+ # Haiku -+ os/haiku/AudioInputHaiku.cpp -+ os/haiku/AudioInputHaiku.h -+ os/haiku/AudioOutputHaiku.cpp -+ os/haiku/AudioOutputHaiku.h -+ os/haiku/RingBuffer.cpp -+ os/haiku/RingBuffer.h ++ # Haiku ++ os/haiku/AudioInputHaiku.cpp ++ os/haiku/AudioInputHaiku.h ++ os/haiku/AudioOutputHaiku.cpp ++ os/haiku/AudioOutputHaiku.h ++ os/haiku/RingBuffer.cpp ++ os/haiku/RingBuffer.h + - # POSIX - os/posix/NetworkSocketPosix.cpp - os/posix/NetworkSocketPosix.h -@@ -153,6 +161,25 @@ if (NOT TGVOIP_FOUND) - TGVOIP_NO_OSX_PRIVATE_API - ) - endif() -+ elseif (HAIKU) -+ target_compile_definitions(lib_tgvoip_bundled -+ PUBLIC -+ WEBRTC_POSIX -+ WEBRTC_HAIKU -+ ) -+ target_compile_options(lib_tgvoip_bundled -+ PRIVATE -+ -Wno-unknown-pragmas -+ -Wno-error=sequence-point -+ -Wno-error=unused-result -+ -mmmx -+ -msse2 -+ ) -+ target_link_libraries(lib_tgvoip_bundled -+ PRIVATE -+ network -+ media -+ ) - else() - add_library(lib_tgvoip_bundled_options INTERFACE) - target_compile_options(lib_tgvoip_bundled_options + # POSIX + os/posix/NetworkSocketPosix.cpp + os/posix/NetworkSocketPosix.h +@@ -153,6 +161,25 @@ elseif (APPLE) + TGVOIP_NO_OSX_PRIVATE_API + ) + endif() ++elseif (HAIKU) ++ target_compile_definitions(lib_tgvoip_bundled ++ PUBLIC ++ WEBRTC_POSIX ++ WEBRTC_HAIKU ++ ) ++ target_compile_options(lib_tgvoip_bundled ++ PRIVATE ++ -Wno-unknown-pragmas ++ -Wno-error=sequence-point ++ -Wno-error=unused-result ++ -mmmx ++ -msse2 ++ ) ++ target_link_libraries(lib_tgvoip_bundled ++ PRIVATE ++ network ++ media ++ ) + else() + add_library(lib_tgvoip_bundled_options INTERFACE) + target_compile_options(lib_tgvoip_bundled_options -- 2.30.2 diff --git a/net-im/telegram-desktop/patches/telegram_desktop-3.4.3.patchset b/net-im/telegram-desktop/patches/telegram_desktop-3.4.8.patchset similarity index 97% rename from net-im/telegram-desktop/patches/telegram_desktop-3.4.3.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-3.4.8.patchset index ed44d3441..54127f783 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-3.4.3.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-3.4.8.patchset @@ -1,11 +1,11 @@ -From 7673d18ad3b47048733e170474e8257a01d3e809 Mon Sep 17 00:00:00 2001 +From e3d42e5d73fef273d00e48d78eef62edd217501b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 31 Dec 2021 17:59:55 +1000 +Date: Thu, 20 Jan 2022 15:46:19 +1000 Subject: Add Haiku support diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index 7e56c73..b06de66 100644 +index eea381f..f0a6f1f 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -95,6 +95,15 @@ PRIVATE @@ -24,7 +24,7 @@ index 7e56c73..b06de66 100644 target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h) nice_target_sources(Telegram ${src_loc} PRIVATE -@@ -1240,6 +1249,16 @@ else() +@@ -1231,6 +1240,16 @@ else() ) endif() @@ -41,7 +41,7 @@ index 7e56c73..b06de66 100644 if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) remove_target_sources(Telegram ${src_loc} platform/linux/linux_wayland_integration.cpp -@@ -1385,7 +1404,7 @@ if (build_macstore) +@@ -1376,7 +1395,7 @@ if (build_macstore) else() set(bundle_identifier "com.tdesktop.Telegram$<$:Debug>") set(bundle_entitlements "Telegram.entitlements") @@ -51,7 +51,7 @@ index 7e56c73..b06de66 100644 else() set(output_name "Telegram") diff --git a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp -index 0fdaf4c..ea0f606 100644 +index 2f0c52d..63c550a 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp @@ -583,6 +583,7 @@ void FillMenu( @@ -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 f0248ed..d325571 100644 +index e35b9c2..203209d 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp -@@ -1936,7 +1936,9 @@ void Panel::updateButtonsGeometry() { +@@ -1937,7 +1937,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 f0248ed..d325571 100644 + (muteSize + skip) + (_settings ->width() + skip) + _hangup->width(); -@@ -1947,9 +1949,13 @@ void Panel::updateButtonsGeometry() { +@@ -1948,9 +1950,13 @@ void Panel::updateButtonsGeometry() { - membersWidth - membersSkip - fullWidth) / 2; @@ -474,7 +474,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 8a4c8c3..5b94ed9 100644 +index 31e575b..988be5b 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 @@ -596,9 +596,9 @@ index 8a4c8c3..5b94ed9 100644 // Prevent any later calls into setlocale() by Qt QCoreApplicationPrivate::initLocale(); -@@ -828,7 +833,7 @@ bool OpenSystemSettings(SystemSettingsType type) { - } else if (DesktopEnvironment::IsMATE()) { - add("mate-volume-control"); +@@ -831,7 +836,7 @@ bool OpenSystemSettings(SystemSettingsType type) { + add("mate-volume-control"); + } } -#ifdef __HAIKU__ +#ifdef Q_OS_HAIKU @@ -893,10 +893,18 @@ index 28eebaf..7816ead 100644 endif() add_checked_subdirectory(jpeg) diff --git a/cmake/options_linux.cmake b/cmake/options_linux.cmake -index 9b39c06..e5f45d0 100644 +index e599f28..1a00370 100644 --- a/cmake/options_linux.cmake +++ b/cmake/options_linux.cmake -@@ -61,10 +61,12 @@ if (DESKTOP_APP_SPECIAL_TARGET) +@@ -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) target_link_options(common_options INTERFACE $,,-g -flto -fuse-linker-plugin>) endif() @@ -904,6 +912,7 @@ index 9b39c06..e5f45d0 100644 target_link_libraries(common_options INTERFACE desktop-app::external_jemalloc + ${CMAKE_DL_LIBS} ) +endif() diff --git a/net-im/telegram-desktop/telegram_desktop-3.4.3.recipe b/net-im/telegram-desktop/telegram_desktop-3.4.8.recipe similarity index 98% rename from net-im/telegram-desktop/telegram_desktop-3.4.3.recipe rename to net-im/telegram-desktop/telegram_desktop-3.4.8.recipe index 6084c03b4..e3d6b99aa 100644 --- a/net-im/telegram-desktop/telegram_desktop-3.4.3.recipe +++ b/net-im/telegram-desktop/telegram_desktop-3.4.8.recipe @@ -1,11 +1,11 @@ SUMMARY="Telegram Desktop Messenger" DESCRIPTION="Unofficial build of the original Telegram client for Haiku." HOMEPAGE="https://www.telegram.org/" -COPYRIGHT="2013-2021 Telegram" +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="ad673a434a3ca335789c55f6f555a2482f734d897b6f0798dcd837ce65b79405" +CHECKSUM_SHA256="6a962a1110bc15c21999832b0151af8125f33a3b6e978461b8f446217c76876e" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"