Telegram: bump version

This commit is contained in:
Gerasim Troeglazov
2022-04-17 19:48:32 +10:00
parent fc73cca7d7
commit fc0b51f9bc
3 changed files with 35 additions and 35 deletions

View File

@@ -1,6 +1,6 @@
From b7bae769d728831657f07622d6d74ec9f1e411c2 Mon Sep 17 00:00:00 2001
From 3b38a6407751e4c28e6a1b0d4fddc474858b83af Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 15 Mar 2022 23:05:08 +1000
Date: Sun, 17 Apr 2022 18:05:07 +1000
Subject: Add Haiku support

View File

@@ -1,11 +1,11 @@
From b471eee096bb3ba0bab045584e940a0dde510b8f Mon Sep 17 00:00:00 2001
From 6e9cf57c17b31566846babc3881eb5be32af22f6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 15 Mar 2022 23:13:33 +1000
Date: Sun, 17 Apr 2022 18:28:44 +1000
Subject: Add Haiku support
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c9d14d1..3b3b9b4 100644
index 2caed21..f537c44 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -95,6 +95,15 @@ PRIVATE
@@ -24,7 +24,7 @@ index c9d14d1..3b3b9b4 100644
target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h)
nice_target_sources(Telegram ${src_loc}
PRIVATE
@@ -1254,6 +1263,16 @@ else()
@@ -1279,6 +1288,16 @@ else()
)
endif()
@@ -41,7 +41,7 @@ index c9d14d1..3b3b9b4 100644
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
remove_target_sources(Telegram ${src_loc}
platform/linux/linux_wayland_integration.cpp
@@ -1397,7 +1416,7 @@ if (build_macstore)
@@ -1424,7 +1443,7 @@ if (build_macstore)
else()
set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:Debug>")
set(bundle_entitlements "Telegram.entitlements")
@@ -71,10 +71,10 @@ index 875845f..c301075 100644
if (const auto strong = weak.get()) {
showBox(Box(SettingsBox, strong));
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index f411bd4..5b09ce7 100644
index b21704b..ff29acc 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -762,7 +762,7 @@ private:
@@ -779,7 +779,7 @@ private:
rpl::variable<float64> _dialogsWidthRatio; // per-window
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
bool _notifyFromAll = true;
@@ -113,11 +113,11 @@ index 1641a58..3856c5e 100644
const QStringList &lst(cSendPaths());
for (QStringList::const_iterator i = lst.cbegin(), e = lst.cend(); i != e; ++i) {
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index 0437363..7685881 100644
index 405129b..c3e19b9 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -12,6 +12,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/linux/linux_xdp_open_with_dialog.h"
@@ -19,6 +19,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <giomm.h>
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#ifdef Q_OS_HAIKU
@@ -129,10 +129,10 @@ index 0437363..7685881 100644
+#include <Roster.h>
+#endif
+
#include <QtCore/QProcess>
#include <QtGui/QDesktopServices>
namespace Platform {
namespace File {
@@ -46,6 +55,23 @@ void UnsafeOpenEmailLink(const QString &email) {
@@ -41,6 +50,23 @@ void UnsafeOpenEmailLink(const QString &email) {
}
bool UnsafeShowOpenWith(const QString &filepath) {
@@ -486,11 +486,11 @@ 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 166ea6d..13f6e75 100644
index 277e11a..d9ead21 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
#include "base/platform/linux/base_linux_xsettings.h"
@@ -32,6 +32,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
@@ -498,9 +498,9 @@ index 166ea6d..13f6e75 100644
+#endif
+
#include <QtWidgets/QApplication>
#include <QtWidgets/QStyle>
#include <QtCore/QStandardPaths>
@@ -64,8 +68,36 @@ using UiWaylandIntegration = Ui::Platform::WaylandIntegration;
#include <QtCore/QProcess>
@@ -58,8 +62,36 @@ using namespace Platform;
using Platform::internal::WaylandIntegration;
namespace Platform {
@@ -536,8 +536,8 @@ index 166ea6d..13f6e75 100644
+
constexpr auto kDesktopFile = ":/misc/telegramdesktop.desktop"_cs;
constexpr auto kIconName = "telegram"_cs;
constexpr auto kDarkColorLimit = 192;
@@ -613,37 +645,6 @@ void psActivateProcess(uint64 pid) {
@@ -492,37 +524,6 @@ void psActivateProcess(uint64 pid) {
// objc_activateProgram();
}
@@ -575,7 +575,7 @@ index 166ea6d..13f6e75 100644
QString psAppDataPath() {
// Previously we used ~/.TelegramDesktop, so look there first.
// If we find data there, we should still use it.
@@ -657,8 +658,11 @@ QString psAppDataPath() {
@@ -536,8 +537,11 @@ QString psAppDataPath() {
return oldPath;
}
}
@@ -588,7 +588,7 @@ index 166ea6d..13f6e75 100644
}
void psDoCleanup() {
@@ -823,7 +827,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
@@ -702,7 +706,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
add("mate-volume-control");
}
}
@@ -598,7 +598,7 @@ index 166ea6d..13f6e75 100644
#endif // __ HAIKU__
add("pavucontrol-qt");
diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp b/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp
index ad4a88d..bcbc471 100644
index 38e1b33..3f1b9ed 100644
--- a/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp
+++ b/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp
@@ -973,7 +973,7 @@ void MediaManager::fillCallStats(CallStats &callStats) {
@@ -611,10 +611,10 @@ index ad4a88d..bcbc471 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 d7d23e6..ef52b5e 100644
index 6aa2b05..99960d2 100644
--- a/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp
+++ b/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp
@@ -2839,7 +2839,7 @@ public:
@@ -2845,7 +2845,7 @@ public:
}
void setAudioOutputDevice(const std::string &id) {
@@ -623,7 +623,7 @@ index d7d23e6..ef52b5e 100644
_threads->getWorkerThread()->Invoke<void>(RTC_FROM_HERE, [&] {
SetAudioOutputDeviceById(_audioDeviceModule.get(), id);
});
@@ -2847,7 +2847,7 @@ public:
@@ -2853,7 +2853,7 @@ public:
}
void setAudioInputDevice(const std::string &id) {
@@ -663,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 024a9d8..5f6f375 100644
index 4b5f72a..84a6f22 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 @@
@@ -779,7 +779,7 @@ index 033dcbd..bf7d541 100644
if (::Platform::IsX11()) {
const auto xcbResult = XCBLastUserInputTime();
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 cf86098..9933d26 100644
index 8f059c1..b41e2a2 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 @@
@@ -809,10 +809,10 @@ index 20aed5e..61d46fc 100644
#include <QtCore/QProcess>
#include <QtGui/QWindow>
diff --git a/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp b/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
index f55ed32..6ec825d 100644
index 6e88a80..c8d3dcb 100644
--- a/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
+++ b/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
@@ -618,7 +618,7 @@ TitleControls::Layout TitleControlsLayout() {
@@ -620,7 +620,7 @@ TitleControls::Layout TitleControlsLayout() {
}
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
@@ -821,7 +821,7 @@ index f55ed32..6ec825d 100644
return TitleControls::Layout{
.left = {
TitleControls::Control::Close,
@@ -628,7 +628,7 @@ TitleControls::Layout TitleControlsLayout() {
@@ -630,7 +630,7 @@ TitleControls::Layout TitleControlsLayout() {
TitleControls::Control::Maximize,
}
};
@@ -830,7 +830,7 @@ index f55ed32..6ec825d 100644
return TitleControls::Layout{
.right = {
TitleControls::Control::Minimize,
@@ -636,7 +636,7 @@ TitleControls::Layout TitleControlsLayout() {
@@ -638,7 +638,7 @@ TitleControls::Layout TitleControlsLayout() {
TitleControls::Control::Close,
}
};

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="1e87df0970b135d566f5af4bc6c2695fc98ba387dc1137100a478f02d48c12e8"
CHECKSUM_SHA256="703cf2fb7ef7216a855f18d8eeb371399a07ebe044477df08446ab03bb19369e"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"