haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2022-03-16 20:53:12 +10:00
parent 4be806e2af
commit c592a2965b
3 changed files with 32 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net-im/telegram-desktop/patches/libtgvoip-3.5.1.patchset → net-im/telegram-desktop/patches/libtgvoip-3.6.0.patchset
View File

@@ -1,6 +1,6 @@
From 4f7ea110350dfac0ff954cd4249bf109a529928d Mon Sep 17 00:00:00 2001
From b7bae769d728831657f07622d6d74ec9f1e411c2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 5 Feb 2022 21:04:18 +1000
Date: Tue, 15 Mar 2022 23:05:08 +1000
Subject: Add Haiku support

148
net-im/telegram-desktop/patches/telegram_desktop-3.5.1.patchset → net-im/telegram-desktop/patches/telegram_desktop-3.6.0.patchset
View File

@@ -1,11 +1,11 @@
From 41abdebaff0f767ccc739bd7429c96545b6c6e20 Mon Sep 17 00:00:00 2001
From b471eee096bb3ba0bab045584e940a0dde510b8f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 5 Feb 2022 22:34:58 +1000
Date: Tue, 15 Mar 2022 23:13:33 +1000
Subject: Add Haiku support
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index fee3472..1bbeda2 100644
index c9d14d1..3b3b9b4 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -95,6 +95,15 @@ PRIVATE
@@ -24,7 +24,7 @@ index fee3472..1bbeda2 100644
target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h)
nice_target_sources(Telegram ${src_loc}
PRIVATE
@@ -1235,6 +1244,16 @@ else()
@@ -1254,6 +1263,16 @@ else()
)
endif()
@@ -41,7 +41,7 @@ index fee3472..1bbeda2 100644
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
remove_target_sources(Telegram ${src_loc}
platform/linux/linux_wayland_integration.cpp
@@ -1378,7 +1397,7 @@ if (build_macstore)
@@ -1397,7 +1416,7 @@ if (build_macstore)
else()
set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:Debug>")
set(bundle_entitlements "Telegram.entitlements")
@@ -51,10 +51,10 @@ index fee3472..1bbeda2 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 2f0c52d..63c550a 100644
index 875845f..c301075 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(
@@ -571,6 +571,7 @@ void FillMenu(
real->recordStartDateValue(),
handler));
}
@@ -62,7 +62,7 @@ index 2f0c52d..63c550a 100644
if (addScreenCast) {
const auto sharing = call->isSharingScreen();
const auto toggle = [=] {
@@ -600,6 +601,7 @@ void FillMenu(
@@ -588,6 +589,7 @@ void FillMenu(
: tr::lng_group_call_screen_share_start(tr::now)),
toggle);
}
@@ -70,34 +70,6 @@ index 2f0c52d..63c550a 100644
menu->addAction(tr::lng_group_call_settings(tr::now), [=] {
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 1fd532c..504c62a 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -1942,7 +1942,9 @@ void Panel::updateButtonsGeometry() {
const auto muteSize = _mute->innerSize().width() + 2 * addSkip;
const auto skip = st::groupCallButtonSkipSmall;
const auto fullWidth = (_video->width() + skip)
+#ifndef Q_OS_HAIKU
+ (_screenShare->width() + skip)
+#endif
+ (muteSize + skip)
+ (_settings ->width() + skip)
+ _hangup->width();
@@ -1953,9 +1955,13 @@ void Panel::updateButtonsGeometry() {
- membersWidth
- membersSkip
- fullWidth) / 2;
+#ifndef Q_OS_HAIKU
toggle(_screenShare, !hidden);
_screenShare->moveToLeft(left, buttonsTop);
left += _screenShare->width() + skip;
+#else
+ toggle(_screenShare, false);
+#endif
toggle(_video, !hidden);
_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 f411bd4..5b09ce7 100644
--- a/Telegram/SourceFiles/core/core_settings.h
@@ -185,10 +157,10 @@ 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 efaf0a7..e6c20de 100644
index 4f0202b..26a6ba0 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -41,6 +41,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -40,6 +40,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/platform/linux/base_linux_xcb_utilities.h"
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
@@ -199,7 +171,7 @@ index efaf0a7..e6c20de 100644
#include <QtCore/QSize>
#include <QtCore/QMimeData>
#include <QtGui/QWindow>
@@ -493,11 +497,17 @@ bool MainWindow::hasTrayIcon() const {
@@ -451,11 +455,17 @@ bool MainWindow::hasTrayIcon() const {
bool MainWindow::isActiveForTrayMenu() {
updateIsActive();
@@ -212,12 +184,12 @@ index efaf0a7..e6c20de 100644
void MainWindow::psShowTrayMenu() {
+#ifndef Q_OS_HAIKU
_private->trayIconMenuXEmbed->popup(QCursor::pos());
_trayIconMenuXEmbed->popup(QCursor::pos());
+#endif
}
void MainWindow::psTrayMenuUpdated() {
@@ -511,6 +521,10 @@ void MainWindow::psSetupTrayIcon() {
@@ -469,6 +479,10 @@ void MainWindow::psSetupTrayIcon() {
Core::App().unreadBadge(),
Core::App().unreadBadgeMuted()));
@@ -228,13 +200,13 @@ index efaf0a7..e6c20de 100644
attachToTrayIcon(trayIcon);
}
updateIconCounters();
@@ -589,8 +603,10 @@ void MainWindow::updateIconCounters() {
@@ -548,8 +562,10 @@ void MainWindow::updateIconCounters() {
}
void MainWindow::initTrayMenuHook() {
+#ifndef Q_OS_HAIKU
_private->trayIconMenuXEmbed.emplace(nullptr, trayIconMenu);
_private->trayIconMenuXEmbed->deleteOnHide(false);
_trayIconMenuXEmbed.emplace(nullptr, trayIconMenu);
_trayIconMenuXEmbed->deleteOnHide(false);
+#endif
}
@@ -514,7 +486,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 54eed49..7d1841d 100644
index 166ea6d..13f6e75 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -35,6 +35,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -528,7 +500,7 @@ index 54eed49..7d1841d 100644
#include <QtWidgets/QApplication>
#include <QtWidgets/QStyle>
#include <QtCore/QStandardPaths>
@@ -63,8 +67,36 @@ using UiWaylandIntegration = Ui::Platform::WaylandIntegration;
@@ -64,8 +68,36 @@ using UiWaylandIntegration = Ui::Platform::WaylandIntegration;
using Platform::internal::WaylandIntegration;
namespace Platform {
@@ -565,7 +537,7 @@ index 54eed49..7d1841d 100644
constexpr auto kDesktopFile = ":/misc/telegramdesktop.desktop"_cs;
constexpr auto kIconName = "telegram"_cs;
constexpr auto kDarkColorLimit = 192;
@@ -612,37 +644,6 @@ void psActivateProcess(uint64 pid) {
@@ -613,37 +645,6 @@ void psActivateProcess(uint64 pid) {
// objc_activateProgram();
}
@@ -603,7 +575,7 @@ index 54eed49..7d1841d 100644
QString psAppDataPath() {
// Previously we used ~/.TelegramDesktop, so look there first.
// If we find data there, we should still use it.
@@ -656,8 +657,11 @@ QString psAppDataPath() {
@@ -657,8 +658,11 @@ QString psAppDataPath() {
return oldPath;
}
}
@@ -616,7 +588,7 @@ index 54eed49..7d1841d 100644
}
void psDoCleanup() {
@@ -822,7 +826,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
@@ -823,7 +827,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
add("mate-volume-control");
}
}
@@ -626,10 +598,10 @@ index 54eed49..7d1841d 100644
#endif // __ HAIKU__
add("pavucontrol-qt");
diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp b/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp
index 057a9b5..68abe1e 100644
index ad4a88d..bcbc471 100644
--- a/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp
+++ b/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp
@@ -967,7 +967,7 @@ void MediaManager::fillCallStats(CallStats &callStats) {
@@ -973,7 +973,7 @@ void MediaManager::fillCallStats(CallStats &callStats) {
}
void MediaManager::setAudioInputDevice(std::string id) {
@@ -639,10 +611,10 @@ 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 574260c..a78bf44 100644
index d7d23e6..ef52b5e 100644
--- a/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp
+++ b/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp
@@ -2782,7 +2782,7 @@ public:
@@ -2839,7 +2839,7 @@ public:
}
void setAudioOutputDevice(const std::string &id) {
@@ -651,7 +623,7 @@ index 574260c..a78bf44 100644
_threads->getWorkerThread()->Invoke<void>(RTC_FROM_HERE, [&] {
SetAudioOutputDeviceById(_audioDeviceModule.get(), id);
});
@@ -2790,7 +2790,7 @@ public:
@@ -2847,7 +2847,7 @@ public:
}
void setAudioInputDevice(const std::string &id) {
@@ -691,7 +663,7 @@ index 0000000..3a57ce2
+
+#endif
diff --git a/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp b/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
index aa65e5e..60b761f 100644
index 024a9d8..5f6f375 100644
--- a/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
@@ -27,8 +27,58 @@
@@ -806,27 +778,8 @@ index 033dcbd..bf7d541 100644
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
if (::Platform::IsX11()) {
const auto xcbResult = XCBLastUserInputTime();
diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration_dummy.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration_dummy.cpp
index 4253274..65c28e2 100644
--- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration_dummy.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration_dummy.cpp
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/platform/base_platform_info.h"
-namespace Ui {
+namespace base {
namespace Platform {
struct WaylandIntegration::Private {
@@ -34,4 +34,4 @@ void WaylandIntegration::preventDisplaySleep(bool prevent, QWindow *window) {
}
} // namespace Platform
-} // namespace Ui
+} // namespace Base
diff --git a/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp b/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp
index 690752d..f7432eb 100644
index cf86098..9933d26 100644
--- a/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp
@@ -21,6 +21,10 @@
@@ -933,51 +886,6 @@ index 092b667..204e259 100644
#include "webrtc/webrtc_audio_input_tester.h"
#include "webrtc/webrtc_create_adm.h"
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 465f5f7..f2f13fc 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -5,7 +5,7 @@
# https://github.com/desktop-app/legal/blob/master/LEGAL
add_subdirectory(external)
-if (LINUX)
+if (LINUX AND NOT HAIKU)
add_subdirectory(linux_jemalloc_helper)
endif()
if (LINUX AND NOT DESKTOP_APP_USE_PACKAGED)
diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
index 0922a66..3d08188 100644
--- a/cmake/external/CMakeLists.txt
+++ b/cmake/external/CMakeLists.txt
@@ -37,7 +37,7 @@ if (add_hunspell_library)
add_checked_subdirectory(hunspell)
endif()
add_checked_subdirectory(iconv)
-if (LINUX)
+if (LINUX AND NOT HAIKU)
add_checked_subdirectory(jemalloc)
endif()
add_checked_subdirectory(jpeg)
diff --git a/cmake/options_linux.cmake b/cmake/options_linux.cmake
index a12feab..76efc15 100644
--- a/cmake/options_linux.cmake
+++ b/cmake/options_linux.cmake
@@ -62,12 +62,14 @@ if (DESKTOP_APP_SPECIAL_TARGET)
target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
endif()
+if (NOT HAIKU)
target_link_libraries(common_options
INTERFACE
desktop-app::linux_jemalloc_helper
$<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
${CMAKE_DL_LIBS}
)
+endif()
if (DESKTOP_APP_USE_ALLOCATION_TRACER)
target_link_options(common_options
--
2.30.2

3
net-im/telegram-desktop/telegram_desktop-3.5.1.recipe → net-im/telegram-desktop/telegram_desktop-3.6.0.recipe
View File

@@ -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="2fb9d276e67c05f1843bad3cbe327079ae0f47710d155748b5d442fb349a58ac"
CHECKSUM_SHA256="a381a4aacaa41beaea31bdd30047ee7b127277d73f7591ccb7ed363a3f048a5c"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"
@@ -142,6 +142,7 @@ BUILD()
-DDESKTOP_APP_DISABLE_WEBKITGTK=ON \
-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF \
-DDESKTOP_APP_USE_HUNSPELL_ONLY=ON \
-DDESKTOP_APP_DISABLE_JEMALLOC=ON \
-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
-DLIBTGVOIP_DISABLE_ALSA=ON \
-DLIBTGVOIP_DISABLE_PULSEAUDIO=ON \