Telegram: bump version

This commit is contained in:
Gerasim Troeglazov
2025-01-24 14:10:34 +10:00
parent a75fb8ec5a
commit 48d8b2d372
4 changed files with 169 additions and 182 deletions

View File

@@ -1,6 +1,6 @@
From 3ef02ad652b4201a8bafe066e569489a57eaf6e1 Mon Sep 17 00:00:00 2001
From c3951a57c92553cff922a3ff14fbfbe778ce5ab6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 8 Jan 2025 23:15:30 +0000
Date: Thu, 23 Jan 2025 23:27:06 +0000
Subject: Add haiku support

View File

@@ -1,6 +1,6 @@
From 71bd607911101792f5d4abbf521ac3c872e65edd Mon Sep 17 00:00:00 2001
From 555f9a9518b9d7ea8280f41a69d887a7be1bf2d8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 8 Jan 2025 23:15:56 +0000
Date: Thu, 23 Jan 2025 23:28:09 +0000
Subject: Add haiku support
@@ -138,7 +138,7 @@ index 0000000..e5f8b64
+
+resource("BEOS:default_shortcut") "S";
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 1071fbe..da2e45c 100644
index b2298db..b0f7f27 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -97,6 +97,15 @@ PRIVATE
@@ -157,7 +157,7 @@ index 1071fbe..da2e45c 100644
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
nice_target_sources(Telegram ${src_loc}
PRIVATE
@@ -1670,6 +1679,16 @@ if (NOT build_winstore)
@@ -1672,6 +1681,16 @@ if (NOT build_winstore)
)
endif()
@@ -174,7 +174,7 @@ index 1071fbe..da2e45c 100644
if (DESKTOP_APP_USE_PACKAGED)
remove_target_sources(Telegram ${src_loc}
platform/mac/mac_iconv_helper.c
@@ -1833,7 +1852,7 @@ else()
@@ -1835,7 +1854,7 @@ else()
set(bundle_identifier "com.tdesktop.Telegram")
endif()
set(bundle_entitlements "Telegram.entitlements")
@@ -204,10 +204,10 @@ index 51a9068..b5296bc 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 87fb383..6e879b7 100644
index 91da794..0c9713e 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -1034,7 +1034,7 @@ private:
@@ -1033,7 +1033,7 @@ private:
rpl::variable<float64> _dialogsNoChatWidthRatio; // per-window
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
bool _notifyFromAll = true;
@@ -396,10 +396,10 @@ index 4ef98ba..ee8b3ad 100644
void updateWindowIcon() override;
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp
new file mode 100644
index 0000000..21935f0
index 0000000..ed9f6a7
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp
@@ -0,0 +1,294 @@
@@ -0,0 +1,271 @@
+/*
+This file is part of Telegram Desktop for Haiku,
+
@@ -521,14 +521,8 @@ index 0000000..21935f0
+ explicit Private(not_null<Manager*> manager);
+
+ void showNotification(
+ not_null<PeerData*> peer,
+ MsgId topicRootId,
+ Ui::PeerUserpicView &userpicView,
+ MsgId msgId,
+ const QString &title,
+ const QString &subtitle,
+ const QString &msg,
+ DisplayOptions options);
+ NotificationInfo &&info,
+ Ui::PeerUserpicView &userpicView);
+
+ ~Private();
+
@@ -602,17 +596,14 @@ index 0000000..21935f0
+}
+
+void Manager::Private::showNotification(
+ not_null<PeerData*> peer,
+ MsgId topicRootId,
+ Ui::PeerUserpicView &userpicView,
+ MsgId msgId,
+ const QString &title,
+ const QString &subtitle,
+ const QString &msg,
+ DisplayOptions options) {
+ auto titleText = title;
+ auto subtitleText = subtitle;
+ auto msgText = msg;
+ NotificationInfo &&info,
+ Ui::PeerUserpicView &userpicView) {
+ const auto peer = info.peer;
+ const auto options = info.options;
+ const auto titleText = info.title;
+ const auto subtitleText = info.subtitle;
+ const auto msgText = info.message;
+ const auto msgId = info.itemId;
+
+ QString args = QString(
+ "mode:port "
@@ -651,23 +642,9 @@ index 0000000..21935f0
+Manager::~Manager() = default;
+
+void Manager::doShowNativeNotification(
+ not_null<PeerData*> peer,
+ MsgId topicRootId,
+ Ui::PeerUserpicView &userpicView,
+ MsgId msgId,
+ const QString &title,
+ const QString &subtitle,
+ const QString &msg,
+ DisplayOptions options) {
+ _private->showNotification(
+ peer,
+ topicRootId,
+ userpicView,
+ msgId,
+ title,
+ subtitle,
+ msg,
+ options);
+ NotificationInfo &&info,
+ Ui::PeerUserpicView &userpicView) {
+ _private->showNotification(std::move(info), userpicView);
+}
+
+void Manager::doClearAllFast() { }
@@ -695,7 +672,7 @@ index 0000000..21935f0
+} // namespace Notifications
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index ad80627..49902a7 100644
index 19b0c68..0cd0839 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -27,6 +27,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -762,7 +739,7 @@ index ad80627..49902a7 100644
}
bool AutostartSkip() {
@@ -627,7 +663,11 @@ QString psAppDataPath() {
@@ -623,7 +659,11 @@ QString psAppDataPath() {
}
}
@@ -774,7 +751,7 @@ index ad80627..49902a7 100644
}
void psDoCleanup() {
@@ -737,6 +777,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
@@ -733,6 +773,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
}
options.push_back(std::move(command));
};
@@ -782,7 +759,7 @@ index ad80627..49902a7 100644
add("unity-control-center", "sound");
add("kcmshell6", "kcm_pulseaudio");
add("kcmshell5", "kcm_pulseaudio");
@@ -746,7 +787,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
@@ -742,7 +783,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
add("mate-volume-control");
add("pavucontrol-qt");
add("pavucontrol");

View File

@@ -5,7 +5,7 @@ COPYRIGHT="2013-2025 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="856be2d5cc772a2511f6e861b7c3f122385d3b3424c35cd45776fcbfd648a66d"
CHECKSUM_SHA256="5dd0bfe5b9a668ae56b5420cc4c839ef678810d56b8557664c9de10110c3e38a"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
SOURCE_URI_2="https://github.com/ada-url/ada/releases/download/v2.9.0/singleheader.zip"