Telegram: bump version

This commit is contained in:
Gerasim Troeglazov
2025-06-19 21:56:18 +10:00
parent 591d6b1f28
commit 97af03b896
3 changed files with 243 additions and 200 deletions

View File

@@ -1,32 +1,32 @@
From f9c66f2aecc37a7ecb6aaff0e700f5f40c0fa1bb Mon Sep 17 00:00:00 2001
From 277500df532293e8f3e39f16103b19ee62a11a9c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 24 May 2025 22:12:16 +1000
Date: Thu, 5 Jun 2025 19:15:51 +1000
Subject: Add haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36e5405..c8b48e6 100644
index fc7b239..116fe18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,12 +19,12 @@ elseif (LINUX)
list(APPEND project_langs ASM)
endif()
@@ -12,12 +12,12 @@ include(cmake/validate_special_target.cmake)
include(cmake/version.cmake)
desktop_app_parse_version(Telegram/build/version)
-project(Telegram
- LANGUAGES ${project_langs}
- LANGUAGES C CXX
- VERSION ${desktop_app_version_cmake}
- DESCRIPTION "Official Telegram Desktop messenger"
- HOMEPAGE_URL "https://desktop.telegram.org"
-)
+#project(Telegram
+# LANGUAGES ${project_langs}
+# LANGUAGES C CXX
+# VERSION ${desktop_app_version_cmake}
+# DESCRIPTION "Official Telegram Desktop messenger"
+# HOMEPAGE_URL "https://desktop.telegram.org"
+#)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram)
get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH)
if (APPLE)
enable_language(OBJC OBJCXX)
diff --git a/SendToAddon/Makefile b/SendToAddon/Makefile
new file mode 100644
index 0000000..5098366
@@ -138,7 +138,7 @@ index 0000000..e5f8b64
+
+resource("BEOS:default_shortcut") "S";
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 1cc9694..6f3cbb6 100644
index 3184b11..01764b9 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -96,6 +96,15 @@ PRIVATE
@@ -157,7 +157,7 @@ index 1cc9694..6f3cbb6 100644
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
nice_target_sources(Telegram ${src_loc}
PRIVATE
@@ -1697,6 +1706,16 @@ if (NOT build_winstore)
@@ -1699,6 +1708,16 @@ if (NOT build_winstore)
)
endif()
@@ -174,15 +174,6 @@ index 1cc9694..6f3cbb6 100644
if (DESKTOP_APP_USE_PACKAGED)
remove_target_sources(Telegram ${src_loc}
platform/mac/mac_iconv_helper.c
@@ -1864,7 +1883,7 @@ else()
set(bundle_identifier "com.tdesktop.Telegram")
endif()
set(bundle_entitlements "Telegram.entitlements")
- if (LINUX AND DESKTOP_APP_USE_PACKAGED)
+ if (LINUX AND NOT HAIKU AND DESKTOP_APP_USE_PACKAGED)
set(output_name "telegram-desktop")
else()
set(output_name "Telegram")
diff --git a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
index b41dac6..cea1794 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
@@ -411,10 +402,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..0d7526d
index 0000000..cc5e0f3
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp
@@ -0,0 +1,273 @@
@@ -0,0 +1,275 @@
+/*
+This file is part of Telegram Desktop for Haiku,
+
@@ -674,6 +665,8 @@ index 0000000..0d7526d
+
+void Manager::doClearFromTopic(not_null<Data::ForumTopic*> topic) { }
+
+void Manager::doClearFromSublist(not_null<Data::SavedSublist*> sublist) { }
+
+bool Manager::doSkipToast() const {
+ return false;
+}
@@ -689,7 +682,7 @@ index 0000000..0d7526d
+} // namespace Notifications
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index dcbefc2..6b53ba0 100644
index 1710805..86ddacf 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
@@ -1134,7 +1127,7 @@ index 3e15737..ea43678 100644
#include <QtGui/QWindow>
#include <QtGui/QtEvents>
diff --git a/Telegram/lib_ui/ui/widgets/popup_menu.cpp b/Telegram/lib_ui/ui/widgets/popup_menu.cpp
index c4dd382..8820b10 100644
index 981a3ec..4992351 100644
--- a/Telegram/lib_ui/ui/widgets/popup_menu.cpp
+++ b/Telegram/lib_ui/ui/widgets/popup_menu.cpp
@@ -19,6 +19,10 @@

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="af15716f053403dc42233775e931a711759c8f0468a0aff5f3dfabdf98bf6861"
CHECKSUM_SHA256="3705dc2ecf51e9290a565b7a06dcdfc5ecbac13ec536afe582f3411653ad50d9"
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"
@@ -34,11 +34,13 @@ REQUIRES="
lib:libatomic$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavif$secondaryArchSuffix
lib:libavutil$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix
lib:libboost_regex$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libboost_program_options$secondaryArchSuffix
lib:libbrotlienc$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libfmt$secondaryArchSuffix
lib:libgirepository_1.0$secondaryArchSuffix
@@ -46,9 +48,12 @@ REQUIRES="
lib:libglib_2.0$secondaryArchSuffix
lib:libglibmm_2.68$secondaryArchSuffix
lib:libgthread_2.0$secondaryArchSuffix
lib:libheif$secondaryArchSuffix
lib:libhwy$secondaryArchSuffix
lib:libhunspell_1.7$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libjxl$secondaryArchSuffix
lib:liblz4$secondaryArchSuffix
lib:liblzma$secondaryArchSuffix
lib:libminizip$secondaryArchSuffix
@@ -68,6 +73,7 @@ REQUIRES="
lib:libswresample$secondaryArchSuffix
lib:libswscale$secondaryArchSuffix
lib:libvpx$secondaryArchSuffix
lib:libxkbcommon$secondaryArchSuffix
lib:libxxhash$secondaryArchSuffix
lib:libz$secondaryArchSuffix
qt6_imageformats$secondaryArchSuffix
@@ -78,19 +84,23 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
qt6_tools${secondaryArchSuffix}_devel
devel:libabsl_strings$secondaryArchSuffix >= 2301.0.0
devel:libavcodec$secondaryArchSuffix >= 60
devel:libavif$secondaryArchSuffix
devel:libboost_filesystem$secondaryArchSuffix >= 1.83.0
devel:libboost_regex$secondaryArchSuffix >= 1.83.0
devel:libboost_system$secondaryArchSuffix >= 1.83.0
devel:libboost_program_options$secondaryArchSuffix >= 1.83.0
devel:libbrotlienc$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix >= 3
devel:libfmt$secondaryArchSuffix
devel:libgirepository_1.0$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
devel:libglibmm_2.68$secondaryArchSuffix
devel:libgthread_2.0$secondaryArchSuffix
devel:libheif$secondaryArchSuffix
devel:libhunspell_1.7$secondaryArchSuffix
devel:libhwy$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libjxl$secondaryArchSuffix
devel:liblz4$secondaryArchSuffix
devel:liblzma$secondaryArchSuffix
devel:libminizip$secondaryArchSuffix
@@ -105,14 +115,27 @@ BUILD_REQUIRES="
devel:libQt6Svg$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
devel:librapidjson$secondaryArchSuffix
devel:librav1e$secondaryArchSuffix
devel:librnnoise$secondaryArchSuffix
devel:libsigc_3.0$secondaryArchSuffix
devel:libsharpyuv$secondaryArchSuffix
devel:libtde2e$secondaryArchSuffix
devel:libtg_owt$secondaryArchSuffix
devel:libvpx$secondaryArchSuffix
devel:libxkbcommon$secondaryArchSuffix
devel:libxxhash$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
if [ $targetArchitecture == x86_gcc2 ]; then
BUILD_REQUIRES+="
ffmpeg${secondaryArchSuffix}_devel
"
else
BUILD_REQUIRES+="
ffmpeg6${secondaryArchSuffix}_devel
"
fi
BUILD_PREREQUIRES="
makefile_engine
cmd:cmake
@@ -121,7 +144,7 @@ BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:g_ir_scanner
cmd:make
cmd:lld >= 19
cmd:lld >= 20
cmd:ninja
cmd:patch
cmd:pkg_config$secondaryArchSuffix