mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 23:18:58 +02:00
Telegram: bump version
This commit is contained in:
@@ -1136,3 +1136,52 @@ index a8406e1..3eb0414 100644
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
From 8a5f208920708d6dc37fceb04ec1e6d8efd503b7 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 2 Aug 2024 23:06:18 +1000
|
||||
Subject: Use singleheader ada library
|
||||
|
||||
|
||||
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
|
||||
index 759ef0d..0a9a767 100644
|
||||
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
|
||||
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
|
||||
@@ -44,7 +44,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include <QtGui/QWindow>
|
||||
#include <charconv>
|
||||
|
||||
-#include <ada.h>
|
||||
+#include "ada.cpp"
|
||||
+#include "ada.h"
|
||||
|
||||
namespace Iv {
|
||||
namespace {
|
||||
diff --git a/Telegram/cmake/td_iv.cmake b/Telegram/cmake/td_iv.cmake
|
||||
index 1d4edf9..602abf4 100644
|
||||
--- a/Telegram/cmake/td_iv.cmake
|
||||
+++ b/Telegram/cmake/td_iv.cmake
|
||||
@@ -38,7 +38,6 @@ PUBLIC
|
||||
tdesktop::td_scheme
|
||||
PRIVATE
|
||||
desktop-app::lib_webview
|
||||
- desktop-app::external_ada
|
||||
tdesktop::td_lang
|
||||
tdesktop::td_ui
|
||||
)
|
||||
diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
|
||||
index 52243d2..985d8e5 100644
|
||||
--- a/cmake/external/CMakeLists.txt
|
||||
+++ b/cmake/external/CMakeLists.txt
|
||||
@@ -11,7 +11,7 @@ macro(add_checked_subdirectory name)
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
-add_checked_subdirectory(ada)
|
||||
+#add_checked_subdirectory(ada)
|
||||
add_checked_subdirectory(angle)
|
||||
add_checked_subdirectory(auto_updates)
|
||||
add_checked_subdirectory(boost)
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -5,12 +5,14 @@ COPYRIGHT="2013-2024 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="ef652ef5d11e4faef4410c73440faafb001128dc1a143c5e22efe939957205bb"
|
||||
CHECKSUM_SHA256="e03b7a0715e302c71de40771dd32e17c1bcfbea5b716972612cebafd4a114d0d"
|
||||
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
|
||||
SOURCE_DIR="tdesktop-$portVersion-full"
|
||||
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"
|
||||
SOURCE_URI_2="https://salsa.debian.org/debian/telegram-desktop/-/raw/$srcGitRev_2/debian/rules#noarchive"
|
||||
CHECKSUM_SHA256_2="613e7e357518739e1f7d035337f37c344b248283fd4d916ddc95df73c2ff84ad"
|
||||
SOURCE_URI_2="https://github.com/ada-url/ada/releases/download/v2.9.0/singleheader.zip"
|
||||
CHECKSUM_SHA256_2="20b09948cf58362abe4de20b8e709d5041477fb798350fd1a02cde6aad121e08"
|
||||
srcGitRev_3="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"
|
||||
SOURCE_URI_3="https://salsa.debian.org/debian/telegram-desktop/-/raw/$srcGitRev_3/debian/rules#noarchive"
|
||||
CHECKSUM_SHA256_3="613e7e357518739e1f7d035337f37c344b248283fd4d916ddc95df73c2ff84ad"
|
||||
|
||||
PATCHES="
|
||||
libtgvoip-$portVersion.patchset
|
||||
@@ -148,9 +150,12 @@ BUILD()
|
||||
DISABLE_PRECOMPILE_HEADERS="ON"
|
||||
fi
|
||||
|
||||
# copy ada library files
|
||||
cp $sourceDir2/ada.* Telegram/SourceFiles/iv
|
||||
|
||||
# get API_ID and API_HASH from Debian
|
||||
local TELEGRAM_API_ID=`sed -n "/TDESKTOP_API_ID/p" $sourceDir2/rules | cut -d'=' -f2 | cut -d' ' -f1`
|
||||
local TELEGRAM_API_HASH=`sed -n "/TDESKTOP_API_HASH/p" $sourceDir2/rules | cut -d'=' -f2 | cut -d' ' -f1`
|
||||
local TELEGRAM_API_ID=`sed -n "/TDESKTOP_API_ID/p" $sourceDir3/rules | cut -d'=' -f2 | cut -d' ' -f1`
|
||||
local TELEGRAM_API_HASH=`sed -n "/TDESKTOP_API_HASH/p" $sourceDir3/rules | cut -d'=' -f2 | cut -d' ' -f1`
|
||||
|
||||
if [ -z $TELEGRAM_API_ID ] || [ -z $TELEGRAM_API_HASH ]; then
|
||||
TELEGRAM_API_ID="17349"
|
||||
Reference in New Issue
Block a user