Telegram: bump version

This commit is contained in:
Gerasim Troeglazov
2024-01-08 17:57:27 +10:00
parent 04413de454
commit a39fe60a63
4 changed files with 81 additions and 23 deletions

View File

@@ -1,6 +1,6 @@
From b38a65154ca2bb5703e3ac6bbeb737d88f96772d Mon Sep 17 00:00:00 2001 From 6879ca63a8c68dd4aac994c9d6d94932ed778d02 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 15 Dec 2023 09:47:38 +0000 Date: Sun, 7 Jan 2024 23:12:01 +1000
Subject: Add haiku support Subject: Add haiku support

View File

@@ -1,15 +1,15 @@
From 763ba820ecdfd2f86eca7f40a7750c0a0d0f6d2d Mon Sep 17 00:00:00 2001 From a65e9ad19ffb362ba7b486d460ff3b8578dfce7a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 15 Dec 2023 12:25:02 +0000 Date: Mon, 8 Jan 2024 01:40:37 +0000
Subject: Add PCH files Subject: Add PCH file
diff --git a/pch_disable.patchset b/pch_disable.patchset diff --git a/pch_disable.patchset b/pch_disable.patchset
new file mode 100644 new file mode 100644
index 0000000..c81df08 index 0000000..d34b81b
--- /dev/null --- /dev/null
+++ b/pch_disable.patchset +++ b/pch_disable.patchset
@@ -0,0 +1,10225 @@ @@ -0,0 +1,10283 @@
+From a51fddf3dfbe7400391745e697242fc43478d470 Mon Sep 17 00:00:00 2001 +From a51fddf3dfbe7400391745e697242fc43478d470 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com> +From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Fri, 15 Dec 2023 10:20:02 +0000 +Date: Fri, 15 Dec 2023 10:20:02 +0000
@@ -10235,6 +10235,64 @@ index 0000000..c81df08
+-- +--
+2.42.1 +2.42.1
+ +
+
+From 3686a57cd1210c3bb3b6b9aa2a5c064c2a6e770f Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Fri, 15 Dec 2023 12:20:45 +0000
+Subject: Include PCH (part 3)
+
+diff --git a/Telegram/SourceFiles/data/data_saved_messages.cpp b/Telegram/SourceFiles/data/data_saved_messages.cpp
+index 66bc876..31f154e 100644
+--- a/Telegram/SourceFiles/data/data_saved_messages.cpp
++++ b/Telegram/SourceFiles/data/data_saved_messages.cpp
+@@ -1,3 +1,5 @@
++#include "ui/ui_pch.h"
++#include "stdafx.h"
+ /*
+ This file is part of Telegram Desktop,
+ the official desktop application for the Telegram messaging service.
+diff --git a/Telegram/SourceFiles/data/data_saved_sublist.cpp b/Telegram/SourceFiles/data/data_saved_sublist.cpp
+index 2d129a5..1fb5635 100644
+--- a/Telegram/SourceFiles/data/data_saved_sublist.cpp
++++ b/Telegram/SourceFiles/data/data_saved_sublist.cpp
+@@ -1,3 +1,5 @@
++#include "ui/ui_pch.h"
++#include "stdafx.h"
+ /*
+ This file is part of Telegram Desktop,
+ the official desktop application for the Telegram messaging service.
+diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
+index a1c9578..1a3729b 100644
+--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
++++ b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
+@@ -1,3 +1,5 @@
++#include "ui/ui_pch.h"
++#include "stdafx.h"
+ /*
+ This file is part of Telegram Desktop,
+ the official desktop application for the Telegram messaging service.
+diff --git a/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp b/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp
+index 41c9eaf..6128d26 100644
+--- a/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp
++++ b/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp
+@@ -1,3 +1,5 @@
++#include "ui/ui_pch.h"
++#include "stdafx.h"
+ /*
+ This file is part of Telegram Desktop,
+ the official desktop application for the Telegram messaging service.
+diff --git a/Telegram/SourceFiles/ui/new_badges.cpp b/Telegram/SourceFiles/ui/new_badges.cpp
+index aa1cada..34b9886 100644
+--- a/Telegram/SourceFiles/ui/new_badges.cpp
++++ b/Telegram/SourceFiles/ui/new_badges.cpp
+@@ -1,3 +1,4 @@
++#include "ui/ui_pch.h"
+ /*
+ This file is part of Telegram Desktop,
+ the official desktop application for the Telegram messaging service.
+--
+2.42.1
+
-- --
2.42.1 2.42.1

View File

@@ -1,11 +1,11 @@
From d21e5ab0699ecfe7c75951bd8e363799d333af22 Mon Sep 17 00:00:00 2001 From df064a728db60e65a8a45683497bdd4dd4763e54 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 15 Dec 2023 09:48:43 +0000 Date: Sun, 7 Jan 2024 23:12:59 +1000
Subject: Add haiku support Subject: Add haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index c822565..8b9cbb0 100644 index abea2aa..91970bd 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -27,12 +27,12 @@ elseif (LINUX) @@ -27,12 +27,12 @@ elseif (LINUX)
@@ -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 acf322f..3920431 100644 index 4f9db79..6df3d3c 100644
--- a/Telegram/CMakeLists.txt --- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt
@@ -91,6 +91,15 @@ PRIVATE @@ -91,6 +91,15 @@ PRIVATE
@@ -157,7 +157,7 @@ index acf322f..3920431 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
@@ -1497,6 +1506,17 @@ if (NOT build_winstore) @@ -1505,6 +1514,17 @@ if (NOT build_winstore)
) )
endif() endif()
@@ -175,7 +175,7 @@ index acf322f..3920431 100644
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
remove_target_sources(Telegram ${src_loc} remove_target_sources(Telegram ${src_loc}
platform/linux/linux_wayland_integration.cpp platform/linux/linux_wayland_integration.cpp
@@ -1685,7 +1705,7 @@ else() @@ -1693,7 +1713,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")
@@ -218,10 +218,10 @@ index 0f70822..7d2fbbb 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 fc4d619..62d8e49 100644 index 6feacdb..38f5f23 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
@@ -261,7 +261,7 @@ void Sandbox::setupScreenScale() { @@ -234,7 +234,7 @@ void Sandbox::setupScreenScale() {
const auto screen = Sandbox::primaryScreen(); const auto screen = Sandbox::primaryScreen();
const auto dpi = screen->logicalDotsPerInch(); const auto dpi = screen->logicalDotsPerInch();
@@ -230,7 +230,7 @@ index fc4d619..62d8e49 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;
@@ -284,9 +284,12 @@ Sandbox::~Sandbox() = default; @@ -257,9 +257,12 @@ Sandbox::~Sandbox() = default;
bool Sandbox::event(QEvent *e) { bool Sandbox::event(QEvent *e) {
if (e->type() == QEvent::Quit && !Quitting()) { if (e->type() == QEvent::Quit && !Quitting()) {
@@ -246,7 +246,7 @@ index fc4d619..62d8e49 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()) {
@@ -300,7 +303,7 @@ bool Sandbox::event(QEvent *e) { @@ -273,7 +276,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;
@@ -256,7 +256,7 @@ index fc4d619..62d8e49 100644
const QStringList &lst(cSendPaths()); const QStringList &lst(cSendPaths());
for (QStringList::const_iterator i = lst.cbegin(), e = lst.cend(); i != e; ++i) { for (QStringList::const_iterator i = lst.cbegin(), e = lst.cend(); i != e; ++i) {
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 6c461ec..020f6b6 100644 index 1087e09..42d1427 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,13 +19,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL @@ -19,13 +19,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -279,8 +279,8 @@ index 6c461ec..020f6b6 100644
using namespace gi::repository; using namespace gi::repository;
class Application : public Gio::impl::ApplicationImpl { class Application : public Gio::impl::ApplicationImpl {
@@ -293,7 +298,7 @@ void LinuxIntegration::initInhibit() { @@ -286,7 +291,7 @@ void LinuxIntegration::initInhibit() {
GLib::Variant::new_array(options.data(), options.size()), }),
nullptr); nullptr);
} }
- -
@@ -1069,7 +1069,7 @@ index ded550d..95fb8bb 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 0bd4e4d..b10e038 100644 index 3a79351..3c58540 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 @@

View File

@@ -1,11 +1,11 @@
SUMMARY="Telegram Desktop Messenger" SUMMARY="Telegram Desktop Messenger"
DESCRIPTION="Unofficial build of the original Telegram client for Haiku." DESCRIPTION="Unofficial build of the original Telegram client for Haiku."
HOMEPAGE="https://www.telegram.org/" HOMEPAGE="https://www.telegram.org/"
COPYRIGHT="2013-2023 Telegram" 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="7e9e51ae9c40d5b8c964bcfe0e252e35980c6668327934d2270144405c519914" CHECKSUM_SHA256="f226a652820811bcbfc36c036a9ca8124247b9ba8d4937010122b439a2a3fa08"
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"