snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

telegram-desktop: update to 1.3.10.

This commit is contained in:
John 2018-07-14 19:04:19 +02:00 committed by maxice8
parent 13d1ee99c9
commit 0e37767ab5
4 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
srcpkgs/telegram-desktop/files/Telegram.cmake
View File

@ -121,7 +121,6 @@ file(GLOB_RECURSE SUBDIRS_SOURCE_FILES
add_executable(Telegram WIN32 ${QRC_FILES} ${FLAT_SOURCE_FILES} ${SUBDIRS_SOURCE_FILES}) add_executable(Telegram WIN32 ${QRC_FILES} ${FLAT_SOURCE_FILES} ${SUBDIRS_SOURCE_FILES})
set(TELEGRAM_COMPILE_DEFINITIONS set(TELEGRAM_COMPILE_DEFINITIONS
TDESKTOP_DISABLE_AUTOUPDATE
TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
TDESKTOP_DISABLE_UNITY_INTEGRATION TDESKTOP_DISABLE_UNITY_INTEGRATION
__STDC_FORMAT_MACROS __STDC_FORMAT_MACROS

2
srcpkgs/telegram-desktop/patches/fix-xdg.patch
View File

@ -23,7 +23,7 @@ index 0a80695..550b9f7 100644
Comment=Official desktop version of Telegram messaging app Comment=Official desktop version of Telegram messaging app
-Exec=telegram-desktop -- %u -Exec=telegram-desktop -- %u
-Icon=telegram -Icon=telegram
+Exec=Telegram -- %u +Exec=Telegram -externalupdater -- %u
+Icon=telegram-desktop +Icon=telegram-desktop
Terminal=false Terminal=false
StartupWMClass=TelegramDesktop StartupWMClass=TelegramDesktop

38
srcpkgs/telegram-desktop/patches/gcc-if-constexpr-tmpfix.patch
View File

@ -1,8 +1,8 @@
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp Telegram/SourceFiles/export/data/export_data_types.cpp diff --git Telegram/SourceFiles/export/data/export_data_types.cpp Telegram/SourceFiles/export/data/export_data_types.cpp
index 0cc79f7e2..b54065ba1 100644 index f835dc2f9..188708ab8 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp --- Telegram/SourceFiles/export/data/export_data_types.cpp
+++ Telegram/SourceFiles/export/data/export_data_types.cpp +++ Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -179,7 +179,8 @@ Image ParseMaxImage( @@ -221,7 +221,8 @@ Image ParseMaxImage(
result.width = data.vw.v; result.width = data.vw.v;
result.height = data.vh.v; result.height = data.vh.v;
result.file.location = ParseLocation(data.vlocation); result.file.location = ParseLocation(data.vlocation);
@ -12,11 +12,31 @@ index 0cc79f7e2..b54065ba1 100644
result.file.content = data.vbytes.v; result.file.content = data.vbytes.v;
result.file.size = result.file.content.size(); result.file.size = result.file.content.size();
} else { } else {
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp Telegram/SourceFiles/export/export_api_wrap.cpp @@ -409,7 +410,8 @@ Document ParseDocument(
index 34ddd1b5a..21816472a 100644 result.width = data.vw.v;
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp result.height = data.vh.v;
result.file.location = ParseLocation(data.vlocation);
- if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
+ constexpr bool is = MTPDphotoCachedSize::Is<decltype(data)>();
+ if constexpr (is) {
result.file.content = data.vbytes.v;
result.file.size = result.file.content.size();
} else {
@@ -1017,7 +1019,8 @@ Message ParseMessage(
auto result = Message();
data.match([&](const auto &data) {
result.id = data.vid.v;
- if constexpr (!MTPDmessageEmpty::Is<decltype(data)>()) {
+ constexpr bool is = (!MTPDmessageEmpty::Is<decltype(data)>());
+ if constexpr (is) {
result.toId = ParsePeerId(data.vto_id);
const auto peerId = (!data.is_out()
&& data.has_from_id()
diff --git Telegram/SourceFiles/export/export_api_wrap.cpp Telegram/SourceFiles/export/export_api_wrap.cpp
index b618937f6..528d61393 100644
--- Telegram/SourceFiles/export/export_api_wrap.cpp
+++ Telegram/SourceFiles/export/export_api_wrap.cpp +++ Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -710,7 +710,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { @@ -709,7 +709,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) {
Expects(_userpicsProcess != nullptr); Expects(_userpicsProcess != nullptr);
result.match([&](const auto &data) { result.match([&](const auto &data) {
@ -26,7 +46,7 @@ index 34ddd1b5a..21816472a 100644
_userpicsProcess->lastSlice = true; _userpicsProcess->lastSlice = true;
} }
loadUserpicsFiles(Data::ParseUserpicsSlice( loadUserpicsFiles(Data::ParseUserpicsSlice(
@@ -1128,7 +1129,8 @@ void ApiWrap::requestMessagesSlice() { @@ -1141,7 +1142,8 @@ void ApiWrap::requestMessagesSlice() {
result.match([&](const MTPDmessages_messagesNotModified &data) { result.match([&](const MTPDmessages_messagesNotModified &data) {
error("Unexpected messagesNotModified received."); error("Unexpected messagesNotModified received.");
}, [&](const auto &data) { }, [&](const auto &data) {

10
srcpkgs/telegram-desktop/template
View File

@ -1,8 +1,8 @@
# Template file for 'telegram-desktop' # Template file for 'telegram-desktop'
pkgname=telegram-desktop pkgname=telegram-desktop
version=1.3.9 version=1.3.10
revision=1 revision=1
_libtgvoip_commit=6ba1241cfef6c3ddf4e50e82f67afde0abc02285 _libtgvoip_commit=697eea96aa90205db4fc368df4127eef56b2a5c6
_GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec _GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
_variant_commit=550ac2f159ca883d360c196149b466955c77a573 _variant_commit=550ac2f159ca883d360c196149b466955c77a573
_crl_commit=9bc641f2d4ab140a84aea64c7f2d4669f7633246 _crl_commit=9bc641f2d4ab140a84aea64c7f2d4669f7633246
@ -29,8 +29,8 @@ distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.g
https://github.com/mapbox/variant/archive/${_variant_commit}.tar.gz https://github.com/mapbox/variant/archive/${_variant_commit}.tar.gz
https://github.com/telegramdesktop/crl/archive/${_crl_commit}.tar.gz https://github.com/telegramdesktop/crl/archive/${_crl_commit}.tar.gz
https://github.com/catchorg/Catch2/archive/${_Catch_commit}.tar.gz" https://github.com/catchorg/Catch2/archive/${_Catch_commit}.tar.gz"
checksum="fd52433dac14a6643114e8f5ff9d38c709141bfca8461cce47fa93e9ef8b45b2 checksum="2cdf89859be93196def45145fabbbbeff6c54743f84fe2a1809d66644aac243c
ba233ea1550b3abdbbe4a25055070553b04e0f4633453fa8d15f0313a15bd3b2 1a7c7b7b3757a6eaec6ab283a0203426690775b2564b2ab5f5a26ab0518fe579
be81db4ab1b57102a0fa1cd0c4a6469294eb9daf24294347592245b754f65ff6 be81db4ab1b57102a0fa1cd0c4a6469294eb9daf24294347592245b754f65ff6
aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d
d827499de19cd6a8ff922a88a700663f41eb49c3ac98a975bab55307cb662b95 d827499de19cd6a8ff922a88a700663f41eb49c3ac98a975bab55307cb662b95
@ -52,7 +52,7 @@ case "$XBPS_TARGET_MACHINE" in
esac esac
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in
aarch64*|x86_64*) configure_args+=" ENABLE_64BIT=ON";; aarch64*|x86_64*) configure_args+=" -DENABLE_64BIT=ON";;
esac esac
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then