mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 15:08:57 +02:00
Telegram: bump version
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
From b93338ef2551f9fdc2268756613cf167c95e4ccc Mon Sep 17 00:00:00 2001
|
From 159bceae7ba0280c821a3b45ceb681959dee51b6 Mon Sep 17 00:00:00 2001
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||||
Date: Sun, 5 May 2024 20:34:48 +1000
|
Date: Sat, 1 Jun 2024 21:57:12 +1000
|
||||||
Subject: Add haiku support
|
Subject: Add haiku support
|
||||||
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
From 03c1778982d17224751dd9369f57fd24b4ac3dba Mon Sep 17 00:00:00 2001
|
From be19f4bc9d55529bd82574b5e241189359e7ae7e Mon Sep 17 00:00:00 2001
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||||
Date: Mon, 6 May 2024 19:24:35 +1000
|
Date: Sat, 1 Jun 2024 23:27:32 +1000
|
||||||
Subject: Add haiku support
|
Subject: Add haiku support
|
||||||
|
|
||||||
|
|
||||||
@@ -138,7 +138,7 @@ index 0000000..e5f8b64
|
|||||||
+
|
+
|
||||||
+resource("BEOS:default_shortcut") "S";
|
+resource("BEOS:default_shortcut") "S";
|
||||||
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
|
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
|
||||||
index 2f42270..350b113 100644
|
index 1517a95..5dd9902 100644
|
||||||
--- a/Telegram/CMakeLists.txt
|
--- a/Telegram/CMakeLists.txt
|
||||||
+++ b/Telegram/CMakeLists.txt
|
+++ b/Telegram/CMakeLists.txt
|
||||||
@@ -93,6 +93,15 @@ PRIVATE
|
@@ -93,6 +93,15 @@ PRIVATE
|
||||||
@@ -157,7 +157,7 @@ index 2f42270..350b113 100644
|
|||||||
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
|
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
|
||||||
nice_target_sources(Telegram ${src_loc}
|
nice_target_sources(Telegram ${src_loc}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
@@ -1559,6 +1568,16 @@ if (NOT build_winstore)
|
@@ -1585,6 +1594,16 @@ if (NOT build_winstore)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -174,7 +174,7 @@ index 2f42270..350b113 100644
|
|||||||
if (DESKTOP_APP_USE_PACKAGED)
|
if (DESKTOP_APP_USE_PACKAGED)
|
||||||
remove_target_sources(Telegram ${src_loc}
|
remove_target_sources(Telegram ${src_loc}
|
||||||
platform/mac/mac_iconv_helper.c
|
platform/mac/mac_iconv_helper.c
|
||||||
@@ -1721,7 +1740,7 @@ else()
|
@@ -1747,7 +1766,7 @@ else()
|
||||||
set(bundle_identifier "com.tdesktop.Telegram")
|
set(bundle_identifier "com.tdesktop.Telegram")
|
||||||
endif()
|
endif()
|
||||||
set(bundle_entitlements "Telegram.entitlements")
|
set(bundle_entitlements "Telegram.entitlements")
|
||||||
@@ -204,11 +204,11 @@ index 51a9068..b5296bc 100644
|
|||||||
if (const auto strong = weak.get()) {
|
if (const auto strong = weak.get()) {
|
||||||
showBox(Box(SettingsBox, strong));
|
showBox(Box(SettingsBox, strong));
|
||||||
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
|
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
|
||||||
index 9ebd488..4b51d48 100644
|
index 2588923..e6d901e 100644
|
||||||
--- a/Telegram/SourceFiles/core/core_settings.h
|
--- a/Telegram/SourceFiles/core/core_settings.h
|
||||||
+++ b/Telegram/SourceFiles/core/core_settings.h
|
+++ b/Telegram/SourceFiles/core/core_settings.h
|
||||||
@@ -972,7 +972,7 @@ private:
|
@@ -979,7 +979,7 @@ private:
|
||||||
rpl::variable<float64> _dialogsWidthRatio; // per-window
|
rpl::variable<float64> _dialogsNoChatWidthRatio; // per-window
|
||||||
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
|
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
|
||||||
bool _notifyFromAll = true;
|
bool _notifyFromAll = true;
|
||||||
- rpl::variable<bool> _nativeWindowFrame = false;
|
- rpl::variable<bool> _nativeWindowFrame = false;
|
||||||
@@ -217,7 +217,7 @@ index 9ebd488..4b51d48 100644
|
|||||||
rpl::variable<bool> _systemDarkModeEnabled = false;
|
rpl::variable<bool> _systemDarkModeEnabled = false;
|
||||||
rpl::variable<WindowTitleContent> _windowTitleContent;
|
rpl::variable<WindowTitleContent> _windowTitleContent;
|
||||||
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
|
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
|
||||||
index 3daf917..0876c08 100644
|
index 4110a73..0fd00e2 100644
|
||||||
--- a/Telegram/SourceFiles/core/sandbox.cpp
|
--- a/Telegram/SourceFiles/core/sandbox.cpp
|
||||||
+++ b/Telegram/SourceFiles/core/sandbox.cpp
|
+++ b/Telegram/SourceFiles/core/sandbox.cpp
|
||||||
@@ -233,7 +233,7 @@ void Sandbox::setupScreenScale() {
|
@@ -233,7 +233,7 @@ void Sandbox::setupScreenScale() {
|
||||||
@@ -229,10 +229,10 @@ index 3daf917..0876c08 100644
|
|||||||
const auto base = (basePair.first + basePair.second) * 0.5;
|
const auto base = (basePair.first + basePair.second) * 0.5;
|
||||||
const auto screenScaleExact = dpi / base;
|
const auto screenScaleExact = dpi / base;
|
||||||
const auto screenScale = int(base::SafeRound(screenScaleExact * 20)) * 5;
|
const auto screenScale = int(base::SafeRound(screenScaleExact * 20)) * 5;
|
||||||
@@ -256,9 +256,12 @@ Sandbox::~Sandbox() = default;
|
@@ -259,9 +259,12 @@ bool Sandbox::event(QEvent *e) {
|
||||||
|
if (Quitting()) {
|
||||||
bool Sandbox::event(QEvent *e) {
|
return QCoreApplication::event(e);
|
||||||
if (e->type() == QEvent::Quit && !Quitting()) {
|
}
|
||||||
- Quit(QuitReason::QtQuitEvent);
|
- Quit(QuitReason::QtQuitEvent);
|
||||||
- e->ignore();
|
- e->ignore();
|
||||||
- return false;
|
- return false;
|
||||||
@@ -245,7 +245,7 @@ index 3daf917..0876c08 100644
|
|||||||
} else if (e->type() == QEvent::Close) {
|
} else if (e->type() == QEvent::Close) {
|
||||||
Quit();
|
Quit();
|
||||||
} else if (e->type() == DeadlockDetector::PingPongEvent::Type()) {
|
} else if (e->type() == DeadlockDetector::PingPongEvent::Type()) {
|
||||||
@@ -272,7 +275,7 @@ bool Sandbox::event(QEvent *e) {
|
@@ -275,7 +278,7 @@ bool Sandbox::event(QEvent *e) {
|
||||||
void Sandbox::socketConnected() {
|
void Sandbox::socketConnected() {
|
||||||
LOG(("Socket connected, this is not the first application instance, sending show command..."));
|
LOG(("Socket connected, this is not the first application instance, sending show command..."));
|
||||||
_secondInstance = true;
|
_secondInstance = true;
|
||||||
@@ -307,12 +307,12 @@ index d79e477..9d9b67e 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
|
diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
|
||||||
index b2a8cf6..71882ef 100644
|
index 147a9f0..111b33f 100644
|
||||||
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
|
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
|
||||||
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
|
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
|
||||||
@@ -19,12 +19,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
@@ -18,12 +18,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
|
|
||||||
#include <QtCore/QAbstractEventDispatcher>
|
#include <QtCore/QAbstractEventDispatcher>
|
||||||
#include <qpa/qwindowsysteminterface.h>
|
|
||||||
|
|
||||||
+#ifndef Q_OS_HAIKU
|
+#ifndef Q_OS_HAIKU
|
||||||
#include <gio/gio.hpp>
|
#include <gio/gio.hpp>
|
||||||
@@ -339,7 +339,7 @@ index b2a8cf6..71882ef 100644
|
|||||||
|
|
||||||
std::unique_ptr<Integration> CreateIntegration() {
|
std::unique_ptr<Integration> CreateIntegration() {
|
||||||
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
|
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
|
||||||
index ba73e3b..a95a647 100644
|
index ff9fddc..8224f68 100644
|
||||||
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
|
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
|
||||||
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
|
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
|
||||||
@@ -35,6 +35,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
@@ -35,6 +35,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
@@ -1143,7 +1143,7 @@ index 26b284f..5aa150c 100644
|
|||||||
#include <QtGui/QWindow>
|
#include <QtGui/QWindow>
|
||||||
#include <QtGui/QtEvents>
|
#include <QtGui/QtEvents>
|
||||||
diff --git a/Telegram/lib_ui/ui/widgets/popup_menu.cpp b/Telegram/lib_ui/ui/widgets/popup_menu.cpp
|
diff --git a/Telegram/lib_ui/ui/widgets/popup_menu.cpp b/Telegram/lib_ui/ui/widgets/popup_menu.cpp
|
||||||
index 1c9c7f9..dbce473 100644
|
index 62531a7..df0ff06 100644
|
||||||
--- a/Telegram/lib_ui/ui/widgets/popup_menu.cpp
|
--- a/Telegram/lib_ui/ui/widgets/popup_menu.cpp
|
||||||
+++ b/Telegram/lib_ui/ui/widgets/popup_menu.cpp
|
+++ b/Telegram/lib_ui/ui/widgets/popup_menu.cpp
|
||||||
@@ -18,6 +18,10 @@
|
@@ -18,6 +18,10 @@
|
||||||
@@ -5,7 +5,7 @@ COPYRIGHT="2013-2024 Telegram"
|
|||||||
LICENSE="GNU GPL v3"
|
LICENSE="GNU GPL v3"
|
||||||
REVISION="1"
|
REVISION="1"
|
||||||
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz"
|
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz"
|
||||||
CHECKSUM_SHA256="728bf0cf4c795ef3c481c958ab9b2a8e4799679f6ad7e823723b984dd3ce72d8"
|
CHECKSUM_SHA256="eca999379acfd7d4cbf57621bd39c668b6669778b278948006e5a1edefeec125"
|
||||||
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
|
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
|
||||||
SOURCE_DIR="tdesktop-$portVersion-full"
|
SOURCE_DIR="tdesktop-$portVersion-full"
|
||||||
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"
|
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"
|
||||||
Reference in New Issue
Block a user