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

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-10-31 11:38:03 +10:00
parent b7fc99174e
commit c894a5a927
3 changed files with 38 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
net-im/telegram-desktop/patches/telegram_desktop-2.4.4-owt.patchset → net-im/telegram-desktop/patches/telegram_desktop-2.4.5-owt.patchset
View File

79
net-im/telegram-desktop/patches/telegram_desktop-2.4.4.patchset → net-im/telegram-desktop/patches/telegram_desktop-2.4.5.patchset
View File

@@ -1,14 +1,14 @@
From 85adc68f9ef667d15154ebc37c77408df0ccf270 Mon Sep 17 00:00:00 2001
From 1cdb808134cc80b171164d49ae21a1346ed8e7a8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 1 Oct 2020 10:18:04 +1000
Date: Sat, 31 Oct 2020 11:35:43 +1000
Subject: Add Haiku support
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 8e3ea3e..c3f2345 100644
index 85f68e3..7e31015 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -930,6 +930,16 @@ PRIVATE
@@ -862,6 +862,16 @@ PRIVATE
platform/win/windows_event_filter.cpp
platform/win/windows_event_filter.h
platform/win/wrapper_wrl_implements_h.h
@@ -25,7 +25,7 @@ index 8e3ea3e..c3f2345 100644
platform/platform_audio.h
platform/platform_file_utilities.h
platform/platform_launcher.h
@@ -1144,7 +1154,7 @@ PRIVATE
@@ -1074,7 +1084,7 @@ PRIVATE
stdafx.h
)
@@ -35,10 +35,10 @@ index 8e3ea3e..c3f2345 100644
window/window_title_qt.cpp
window/window_title_qt.h
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index a774db0..f0e38d2 100644
index dbb3a89..7bcc52f 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -494,7 +494,7 @@ private:
@@ -500,7 +500,7 @@ private:
bool _desktopNotify = true;
bool _flashBounceNotify = true;
DBINotifyView _notifyView = dbinvShowPreview;
@@ -47,7 +47,7 @@ index a774db0..f0e38d2 100644
int _notificationsCount = 3;
ScreenCorner _notificationsCorner = ScreenCorner::BottomRight;
bool _includeMutedCounter = true;
@@ -533,7 +533,7 @@ private:
@@ -540,7 +540,7 @@ private:
rpl::variable<float64> _dialogsWidthRatio; // per-window
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
bool _notifyFromAll = true;
@@ -56,24 +56,11 @@ index a774db0..f0e38d2 100644
rpl::variable<std::optional<bool>> _systemDarkMode = std::nullopt;
rpl::variable<bool> _systemDarkModeEnabled = false;
rpl::variable<Window::ControlsLayout> _windowControlsLayout;
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index ee01d01..ba1f418 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -300,7 +300,7 @@ void Launcher::init() {
QApplication::setApplicationName(qsl("TelegramDesktop"));
-#if defined Q_OS_UNIX && !defined Q_OS_MAC && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
+#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined Q_OS_HAIKU && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
QApplication::setDesktopFileName(Platform::GetLauncherFilename());
#endif
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index 2c4fb47..5c61bf0 100644
index 69ba0f7..4653779 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -1552,7 +1552,7 @@ bool checkReadyUpdate() {
@@ -1553,7 +1553,7 @@ bool checkReadyUpdate() {
ClearAll();
return false;
}
@@ -83,10 +70,10 @@ index 2c4fb47..5c61bf0 100644
ClearAll();
return false;
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 1a1e286..b2bcdf7 100644
index 8ae6619..28fd2f6 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -232,7 +232,7 @@ Session::Session(not_null<Main::Session*> session)
@@ -233,7 +233,7 @@ Session::Session(not_null<Main::Session*> session)
_cache->open(_session->local().cacheKey());
_bigFileCache->open(_session->local().cacheBigFileKey());
@@ -118,10 +105,10 @@ index 5e20476..7f687f2 100644
} else {
showFromTray(reason);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 99edec4..2374287 100644
index eff607f..6257127 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -357,7 +357,7 @@ OverlayWidget::OverlayWidget()
@@ -360,7 +360,7 @@ OverlayWidget::OverlayWidget()
hide();
createWinId();
@@ -1151,10 +1138,10 @@ index 0000000..a1df976
+}
diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.h b/Telegram/SourceFiles/platform/haiku/specific_haiku.h
new file mode 100644
index 0000000..266e56d
index 0000000..e7a5011
--- /dev/null
+++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.h
@@ -0,0 +1,117 @@
@@ -0,0 +1,121 @@
+/*
+This file is part of Telegram Desktop for Haiku,
+
@@ -1210,6 +1197,10 @@ index 0000000..266e56d
+ return false;
+}
+
+inline bool SkipTaskbarSupported() {
+ return false;
+}
+
+} // namespace Platform
+
+inline void psCheckLocalSocket(const QString &serverName) {
@@ -1273,10 +1264,10 @@ index 0000000..266e56d
+
+bool psLaunchMaps(const Data::LocationPoint &point);
diff --git a/Telegram/SourceFiles/platform/platform_file_utilities.h b/Telegram/SourceFiles/platform/platform_file_utilities.h
index cd70b78..ac7bbe6 100644
index ad229d2..d37e402 100644
--- a/Telegram/SourceFiles/platform/platform_file_utilities.h
+++ b/Telegram/SourceFiles/platform/platform_file_utilities.h
@@ -46,6 +46,8 @@ bool Get(
@@ -45,6 +45,8 @@ bool Get(
#ifdef Q_OS_MAC
#include "platform/mac/file_utilities_mac.h"
@@ -1325,10 +1316,10 @@ index 4afeadf..7e4398a 100644
#include "platform/linux/notifications_manager_linux.h"
#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX
diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h
index cbdbb2e..1f01e94 100644
index 45fafae..4c11a0d 100644
--- a/Telegram/SourceFiles/platform/platform_specific.h
+++ b/Telegram/SourceFiles/platform/platform_specific.h
@@ -71,6 +71,8 @@ void finish();
@@ -65,6 +65,8 @@ void finish();
#ifdef Q_OS_MAC
#include "platform/mac/specific_mac.h"
@@ -1351,10 +1342,10 @@ index 19ce0db..7597438 100644
}
return QString();
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 8fe85f3..03a482d 100644
index cef3517..712ab95 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -116,7 +116,7 @@ QIcon CreateOfficialIcon(Main::Session *session) {
@@ -117,7 +117,7 @@ QIcon CreateOfficialIcon(Main::Session *session) {
QIcon CreateIcon(Main::Session *session) {
auto result = CreateOfficialIcon(session);
@@ -2258,7 +2249,7 @@ index b4841e6..354ce2c 100644
target_compile_options(lib_tgcalls
PRIVATE
diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake
index 4fe3e26..f0d3d2e 100644
index 684f927..96811ce 100644
--- a/Telegram/cmake/lib_tgvoip.cmake
+++ b/Telegram/cmake/lib_tgvoip.cmake
@@ -120,6 +120,14 @@ if (NOT TGVOIP_FOUND)
@@ -2306,10 +2297,10 @@ index 4fe3e26..f0d3d2e 100644
target_compile_definitions(lib_tgvoip_bundled
PUBLIC
diff --git a/Telegram/lib_base/CMakeLists.txt b/Telegram/lib_base/CMakeLists.txt
index 6330908..418d567 100644
index d8fb4c7..170608f 100644
--- a/Telegram/lib_base/CMakeLists.txt
+++ b/Telegram/lib_base/CMakeLists.txt
@@ -58,6 +58,18 @@ PRIVATE
@@ -60,6 +60,18 @@ PRIVATE
base/platform/win/base_windows_h.h
base/platform/win/base_windows_safe_library.cpp
base/platform/win/base_windows_safe_library.h
@@ -2364,19 +2355,19 @@ index 1b63b2a..00a9900 100644
#include "base/platform/linux/base_file_utilities_linux.h"
#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX
diff --git a/Telegram/lib_base/base/platform/base_platform_info.h b/Telegram/lib_base/base/platform/base_platform_info.h
index 52c07f8..b88c6b8 100644
index d2de33a..780bdae 100644
--- a/Telegram/lib_base/base/platform/base_platform_info.h
+++ b/Telegram/lib_base/base/platform/base_platform_info.h
@@ -54,6 +54,8 @@ enum class OutdateReason {
[[nodiscard]] bool IsWayland();
[[nodiscard]] QString GetGlibCVersion();
@@ -56,6 +56,8 @@ enum class OutdateReason {
[[nodiscard]] QString GetLibcName();
[[nodiscard]] QString GetLibcVersion();
+[[nodiscard]] constexpr bool IsHaiku();
+
void Start(QJsonObject settings);
void Finish();
@@ -61,6 +63,8 @@ void Finish();
@@ -63,6 +65,8 @@ void Finish();
#ifdef Q_OS_MAC
#include "base/platform/mac/base_info_mac.h"
@@ -3057,7 +3048,7 @@ index 8dfa916..01ece83 100644
#include "api/task_queue/default_task_queue_factory.h"
#include "crl/crl_object_on_thread.h"
diff --git a/cmake/external/webrtc/CMakeLists.txt b/cmake/external/webrtc/CMakeLists.txt
index a354057..ba0928c 100644
index 8adb2d2..7969763 100644
--- a/cmake/external/webrtc/CMakeLists.txt
+++ b/cmake/external/webrtc/CMakeLists.txt
@@ -7,7 +7,7 @@

6
net-im/telegram-desktop/telegram_desktop-2.4.4.recipe → net-im/telegram-desktop/telegram_desktop-2.4.5.recipe
View File

@@ -5,12 +5,12 @@ COPYRIGHT="2013-2020 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="88799708daedaf5c132752259945b4e1b5dcbb62385661e2cca7b8e5d58c9026"
CHECKSUM_SHA256="a5f7a6cb6b0146969c0034ae53c14df7482b693df2ab513c7ec515c2def51f5a"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="c73a4718cbff7048373a63db32068482e5fd11ef"
srcGitRev_2="1d4f7d74ff1a627db6e45682efd0e3b85738e426"
SOURCE_URI_2="https://github.com/desktop-app/tg_owt/archive/$srcGitRev_2.tar.gz"
CHECKSUM_SHA256_2="736fd171f198b5a88b99f2ec717c39d0396e7c45e0adf95146f4b5e66f5cd0a8"
CHECKSUM_SHA256_2="9dfff38be02e0ce3bafa18faed859f9296fc84ac55d87e6683ffff5069ff2ef1"
SOURCE_FILENAME_2="tg_owt-$srcGitRev_2.tar.gz"
srcGitRev_3="0663103551379b958b2e79c51d51d163ec484300"
SOURCE_URI_3="https://salsa.debian.org/debian/telegram-desktop/raw/$srcGitRev_3/debian/rules#noarchive"