Telegram: bump version

This commit is contained in:
Gerasim Troeglazov
2023-11-06 23:16:36 +10:00
parent b1d34c4a72
commit 714b6e23e0
3 changed files with 60 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
From 1c037eefb43624e8d192d3096777a0f9d0319471 Mon Sep 17 00:00:00 2001
From 438a908f49de4831ffb8b04dc37d7f3f937a79ad Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 30 Oct 2023 20:41:28 +1000
Subject: Add Haiku support
@@ -182,10 +182,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 f25345d..e05ce12 100644
index 31b0880..15966c0 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -909,7 +909,7 @@ private:
@@ -918,7 +918,7 @@ private:
rpl::variable<float64> _dialogsWidthRatio; // per-window
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
bool _notifyFromAll = true;
@@ -1075,3 +1075,41 @@ index d9af92a..cd4ba1d 100644
--
2.42.0
From 104dbfab0e3fc0769fb64449bc37070c816595d8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 6 Nov 2023 23:11:45 +1000
Subject: Fix for clang
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index 6099314..6d133e3 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -299,7 +299,7 @@ MTPInputInvoice Form::inputInvoice() const {
users->users
) | ranges::views::transform([](not_null<UserData*> user) {
return MTPInputUser(user->inputUser);
- }) | ranges::to<QVector>),
+ }) | ranges::to<QList>),
users->boostPeer ? users->boostPeer->input : MTPInputPeer(),
MTP_string(giftCode.currency),
MTP_long(giftCode.amount)),
@@ -325,12 +325,12 @@ MTPInputInvoice Form::inputInvoice() const {
giveaway.additionalChannels
) | ranges::views::transform([](not_null<ChannelData*> c) {
return MTPInputPeer(c->input);
- }) | ranges::to<QVector>()),
+ }) | ranges::to<QList>()),
MTP_vector<MTPstring>(ranges::views::all(
giveaway.countries
) | ranges::views::transform([](QString value) {
return MTP_string(value);
- }) | ranges::to<QVector>()),
+ }) | ranges::to<QList>()),
MTP_long(giftCode.randomId),
MTP_int(giveaway.untilDate),
MTP_string(giftCode.currency),
--
2.42.0

View File

@@ -3,9 +3,9 @@ DESCRIPTION="Unofficial build of the original Telegram client for Haiku."
HOMEPAGE="https://www.telegram.org/"
COPYRIGHT="2013-2023 Telegram"
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz"
CHECKSUM_SHA256="be7ca37fda49b790250dc9cbdf0ce801243a0ad3d54279a195573d517196bfd9"
CHECKSUM_SHA256="b5e84a934568e9160c1cacd1fb3f5f4079c1665e9a24d6de23e835fdb8ac9cfe"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"
@@ -26,13 +26,14 @@ PROVIDES="
app:Telegram
"
REQUIRES="
haiku$secondaryArchSuffix
haiku$secondaryArchSuffix
lib:libabsl_strings$secondaryArchSuffix
lib:libatomic$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavutil$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix
lib:libboost_regex$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libboost_program_options$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
@@ -66,16 +67,19 @@ REQUIRES="
lib:libvpx$secondaryArchSuffix
lib:libxxhash$secondaryArchSuffix
lib:libz$secondaryArchSuffix
open_sans
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
gcc${secondaryArchSuffix}_syslibs
qt6_tools${secondaryArchSuffix}_devel
devel:libabsl_strings$secondaryArchSuffix >= 2301.0.0
devel:libavcodec$secondaryArchSuffix >= 59
devel:libboost_filesystem$secondaryArchSuffix >= 1.83.0
devel:libboost_system$secondaryArchSuffix >= 1.83.0
devel:libboost_program_options$secondaryArchSuffix >= 1.83.0
devel:libboost_filesystem$secondaryArchSuffix >= 1.70.0
devel:libboost_regex$secondaryArchSuffix >= 1.70.0
devel:libboost_system$secondaryArchSuffix >= 1.70.0
devel:libboost_program_options$secondaryArchSuffix >= 1.70.0
devel:libcrypto$secondaryArchSuffix
devel:libfmt$secondaryArchSuffix
devel:libgirepository_1.0$secondaryArchSuffix
@@ -84,6 +88,7 @@ BUILD_REQUIRES="
devel:libgthread_2.0$secondaryArchSuffix
devel:libhunspell_1.7$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libLLVM_17$secondaryArchSuffix
devel:liblz4$secondaryArchSuffix
devel:liblzma$secondaryArchSuffix
devel:libminizip$secondaryArchSuffix
@@ -107,10 +112,13 @@ BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
makefile_engine
cmd:clang >= 17
cmd:clang++ >= 17
cmd:cmake
cmd:gawk
cmd:gcc$secondaryArchSuffix
cmd:g_ir_scanner
cmd:lld >= 17
cmd:make
cmd:ninja
cmd:pkg_config$secondaryArchSuffix
@@ -124,10 +132,13 @@ BUILD()
export DISABLE_ASLR=1
export GI_GIR_PATH="`finddir B_SYSTEM_DATA_DIRECTORY`"/gir-1.0
# disable stack protector (fix build for x86_gcc2)
if [ $targetArchitecture == x86_gcc2 ]; then
# disable stack protector
sed -i -e '/-fstack-protector-all/d' cmake/options_linux.cmake
sed -i -e '/_GLIBCXX_ASSERTIONS/d' cmake/options_linux.cmake
# use clang for build
export CC="/bin/clang"
export CXX="/bin/clang++"
fi
# get API_ID and API_HASH from Debian
@@ -160,7 +171,7 @@ BUILD()
-DDESKTOP_APP_DISABLE_X11_INTEGRATION=ON \
-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON \
-DDESKTOP_APP_DISABLE_WEBKITGTK=ON \
-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF \
-DDESKTOP_APP_USE_PACKAGED_FONTS=ON \
-DDESKTOP_APP_USE_HUNSPELL_ONLY=ON \
-DDESKTOP_APP_DISABLE_JEMALLOC=ON \
-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \