From b209bb32a1f013f3fcd2fed918097c858d5c725d9045bf571ee130155b7bf068 Mon Sep 17 00:00:00 2001 From: Marcel Kuehlhorn Date: Sun, 30 Aug 2020 23:56:14 +0000 Subject: [PATCH] Accepting request 830613 from home:nuklly:branches:server:messaging - Update to 2.3.2 * Revert custom window shadow on Linux. - Update in 2.3.1 * Fix Calls Settings for Video Calls. - Update in 2.3.0 * Video Calls (alpha version). - Updates in 2.2.0, 2.1.22, and 2.1.21 * Quickly switch between different Telegram accounts if you use multiple phone numbers. * Share and store unlimited files of any type up to 2 GB each. * Edit your scheduled messages. * Use Auto-Night Mode to make Telegram night mode match system Dark Mode settings * Also added an option to switch to system window frame in Windows and Linux. * Fix crash in web page preview display - Rebase 0000-gtk2-default.patch * Prioritize qgtk2 platform plugin - Rename 0001-use-bundled-range.patch to 0001-use-bundled-ranged-exptected-gsl.patch * Use bundled ranged-v3, Microsoft GSL, and expected. - Add 0002-tg_owt-fix-name-confliction.patch * Patch tg_owt library to fix header name conflict with openssl * Include header to define int types like uint32_t OBS-URL: https://build.opensuse.org/request/show/830613 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=153 --- 0000-gtk2-default.patch | 10 +- 0001-use-bundled-range.patch | 11 - 0001-use-bundled-ranged-exptected-gsl.patch | 56 +++ 0002-tg_owt-fix-name-confliction.patch | 477 ++++++++++++++++++++ tdesktop-2.1.13-full.tar.gz | 3 - tdesktop-2.3.2-full.tar.gz | 3 + telegram-desktop.changes | 28 ++ telegram-desktop.spec | 45 +- tg_owt-master.zip | 3 + 9 files changed, 611 insertions(+), 25 deletions(-) delete mode 100644 0001-use-bundled-range.patch create mode 100644 0001-use-bundled-ranged-exptected-gsl.patch create mode 100644 0002-tg_owt-fix-name-confliction.patch delete mode 100644 tdesktop-2.1.13-full.tar.gz create mode 100644 tdesktop-2.3.2-full.tar.gz create mode 100644 tg_owt-master.zip diff --git a/0000-gtk2-default.patch b/0000-gtk2-default.patch index 451f350..4f79b56 100644 --- a/0000-gtk2-default.patch +++ b/0000-gtk2-default.patch @@ -1,6 +1,6 @@ ---- tdesktop-2.1.8-full/Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2020-06-03 18:18:48.829895452 +0000 -+++ tdesktop-2.1.8-full/Telegram/SourceFiles/platform/linux/linux_libs.cpp 2020-06-03 18:21:15.248705051 +0000 -@@ -271,10 +271,10 @@ void start() { +--- tdesktop-2.7.3-full/Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2020-06-03 18:18:48.829895452 +0000 ++++ tdesktop-2.7.3-full/Telegram/SourceFiles/platform/linux/linux_libs.cpp 2020-06-03 18:21:15.248705051 +0000 +@@ -272,10 +272,10 @@ void start() { QLibrary lib_gtk; lib_gtk.setLoadHints(QLibrary::DeepBindHint); @@ -8,8 +8,8 @@ + if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) { gtkLoaded = setupGtkBase(lib_gtk); } -- if (!gtkLoaded && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) { -+ if (!gtkLoaded && loadLibrary(lib_gtk, "gtk-3", 0)) { +- if (!gtkLoaded && !gtkTriedToInit && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) { ++ if (!gtkLoaded && !gtkTriedToInit && loadLibrary(lib_gtk, "gtk-3", 0)) { gtkLoaded = setupGtkBase(lib_gtk); } diff --git a/0001-use-bundled-range.patch b/0001-use-bundled-range.patch deleted file mode 100644 index d833da4..0000000 --- a/0001-use-bundled-range.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tdesktop-2.1.5-full/cmake/external/ranges/CMakeLists.txt.orig 2020-05-13 19:24:13.765240115 +0000 -+++ tdesktop-2.1.5-full/cmake/external/ranges/CMakeLists.txt 2020-05-13 19:25:44.062788903 +0000 -@@ -7,7 +7,7 @@ - add_library(external_ranges INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_ranges ALIAS external_ranges) - --if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) -+if (NOT DESKTOP_APP_USE_PACKAGED) - find_package(range-v3 REQUIRED) - target_link_libraries(external_ranges INTERFACE range-v3::range-v3) - else() diff --git a/0001-use-bundled-ranged-exptected-gsl.patch b/0001-use-bundled-ranged-exptected-gsl.patch new file mode 100644 index 0000000..ecdd033 --- /dev/null +++ b/0001-use-bundled-ranged-exptected-gsl.patch @@ -0,0 +1,56 @@ +diff --git a/tdesktop-2.3.2-full/cmake/external/expected/CMakeLists.txt b/tdesktop-2.3.2-full-patched/cmake/external/expected/CMakeLists.txt +index 10c2c26..fddfbb4 100644 +--- a/tdesktop-2.3.2-full/cmake/external/expected/CMakeLists.txt ++++ b/tdesktop-2.3.2-full-patched/cmake/external/expected/CMakeLists.txt +@@ -7,7 +7,7 @@ + add_library(external_expected INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_expected ALIAS external_expected) + +-if (DESKTOP_APP_USE_PACKAGED) ++if (NOT DESKTOP_APP_USE_PACKAGED) + if (DESKTOP_APP_USE_PACKAGED_LAZY) + find_package(tl-expected QUIET) + else() +diff --git a/tdesktop-2.3.2-full/cmake/external/gsl/CMakeLists.txt b/tdesktop-2.3.2-full-patched/cmake/external/gsl/CMakeLists.txt +index b03be4f..80c0e07 100644 +--- a/tdesktop-2.3.2-full/cmake/external/gsl/CMakeLists.txt ++++ b/tdesktop-2.3.2-full-patched/cmake/external/gsl/CMakeLists.txt +@@ -7,7 +7,7 @@ + add_library(external_gsl INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_gsl ALIAS external_gsl) + +-if (DESKTOP_APP_USE_PACKAGED) ++if (NOT DESKTOP_APP_USE_PACKAGED) + if (DESKTOP_APP_USE_PACKAGED_LAZY) + find_package(Microsoft.GSL QUIET) + else() +diff --git a/tdesktop-2.3.2-full/cmake/external/ranges/CMakeLists.txt b/tdesktop-2.3.2-full-patched/cmake/external/ranges/CMakeLists.txt +index 5a584dd..9b9049f 100644 +--- a/tdesktop-2.3.2-full/cmake/external/ranges/CMakeLists.txt ++++ b/tdesktop-2.3.2-full-patched/cmake/external/ranges/CMakeLists.txt +@@ -7,7 +7,7 @@ + add_library(external_ranges INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_ranges ALIAS external_ranges) + +-if (DESKTOP_APP_USE_PACKAGED) ++if (NOT DESKTOP_APP_USE_PACKAGED) + if (DESKTOP_APP_USE_PACKAGED_LAZY) + find_package(range-v3 QUIET) + else() +@@ -32,4 +32,4 @@ if (NOT range-v3_FOUND) + /wd5105 # needed for `/Zc:preprocessor`, suppressing C5105 "macro expansion producing 'defined' has undefined behavior" + ) + endif() +-endif() +\ No newline at end of file ++endif() +diff --git a/tdesktop-2.3.2-full/cmake/external/webrtc/CMakeLists.txt b/tdesktop-2.3.2-full-patched/cmake/external/webrtc/CMakeLists.txt +index 1273291..1dd8ae6 100644 +--- a/tdesktop-2.3.2-full/cmake/external/webrtc/CMakeLists.txt ++++ b/tdesktop-2.3.2-full-patched/cmake/external/webrtc/CMakeLists.txt +@@ -99,4 +99,5 @@ target_link_libraries(external_webrtc + INTERFACE + ${webrtc_libs_list} + desktop-app::external_openssl ++ jpeg + ) diff --git a/0002-tg_owt-fix-name-confliction.patch b/0002-tg_owt-fix-name-confliction.patch new file mode 100644 index 0000000..cc487ed --- /dev/null +++ b/0002-tg_owt-fix-name-confliction.patch @@ -0,0 +1,477 @@ +diff --git a/tg_owt-master/src/call/rtx_receive_stream.h b/tg_owt/src/call/rtx_receive_stream.h +index 8ffa440..113a816 100644 +--- a/tg_owt-master/src/call/rtx_receive_stream.h ++++ b/tg_owt/src/call/rtx_receive_stream.h +@@ -12,6 +12,7 @@ + #define CALL_RTX_RECEIVE_STREAM_H_ + + #include ++#include + + #include "call/rtp_packet_sink_interface.h" + +diff --git a/tg_owt-master/src/common_video/h264/pps_parser.h b/tg_owt/src/common_video/h264/pps_parser.h +index d6c31b0..d8852df 100644 +--- a/tg_owt-master/src/common_video/h264/pps_parser.h ++++ b/tg_owt/src/common_video/h264/pps_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H264_PPS_PARSER_H_ + + #include "absl/types/optional.h" ++#include + + namespace rtc { + class BitBuffer; +diff --git a/tg_owt-master/src/common_video/h264/prefix_parser.h b/tg_owt/src/common_video/h264/prefix_parser.h +index 9298eb4..400b11d 100644 +--- a/tg_owt-master/src/common_video/h264/prefix_parser.h ++++ b/tg_owt/src/common_video/h264/prefix_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H264_PREFIX_PARSER_H_ + + #include "absl/types/optional.h" ++#include + + namespace rtc { + class BitBuffer; +diff --git a/tg_owt-master/src/common_video/h264/sps_parser.h b/tg_owt/src/common_video/h264/sps_parser.h +index 76e627d..942435f 100644 +--- a/tg_owt-master/src/common_video/h264/sps_parser.h ++++ b/tg_owt/src/common_video/h264/sps_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H264_SPS_PARSER_H_ + + #include "absl/types/optional.h" ++#include + + namespace rtc { + class BitBuffer; +diff --git a/tg_owt-master/src/common_video/h265/h265_pps_parser.h b/tg_owt/src/common_video/h265/h265_pps_parser.h +index 28c95ea..c180b1b 100644 +--- a/tg_owt-master/src/common_video/h265/h265_pps_parser.h ++++ b/tg_owt/src/common_video/h265/h265_pps_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H265_PPS_PARSER_H_ + + #include "absl/types/optional.h" ++#include + + namespace rtc { + class BitBuffer; +diff --git a/tg_owt-master/src/common_video/h265/h265_sps_parser.h b/tg_owt/src/common_video/h265/h265_sps_parser.h +index dbd3f0e..a3d5eac 100644 +--- a/tg_owt-master/src/common_video/h265/h265_sps_parser.h ++++ b/tg_owt/src/common_video/h265/h265_sps_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H265_H265_SPS_PARSER_H_ + + #include ++#include + + #include "absl/types/optional.h" + +diff --git a/tg_owt-master/src/common_video/h265/h265_vps_parser.h b/tg_owt/src/common_video/h265/h265_vps_parser.h +index e8a2775..24d8398 100644 +--- a/tg_owt-master/src/common_video/h265/h265_vps_parser.h ++++ b/tg_owt/src/common_video/h265/h265_vps_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H265_H265_VPS_PARSER_H_ + + #include "absl/types/optional.h" ++#include + + namespace rtc { + class BitBuffer; +diff --git a/tg_owt-master/src/modules/audio_processing/aec3/clockdrift_detector.h b/tg_owt/src/modules/audio_processing/aec3/clockdrift_detector.h +index 22528c9..69e624e 100644 +--- a/tg_owt-master/src/modules/audio_processing/aec3/clockdrift_detector.h ++++ b/tg_owt/src/modules/audio_processing/aec3/clockdrift_detector.h +@@ -12,6 +12,7 @@ + #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ + + #include ++#include + + namespace webrtc { + +diff --git a/tg_owt-master/src/modules/congestion_controller/rtp/transport_feedback_demuxer.h b/tg_owt/src/modules/congestion_controller/rtp/transport_feedback_demuxer.h +index bcd25d5..e5ceae4 100644 +--- a/tg_owt-master/src/modules/congestion_controller/rtp/transport_feedback_demuxer.h ++++ b/tg_owt/src/modules/congestion_controller/rtp/transport_feedback_demuxer.h +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "modules/include/module_common_types_public.h" + #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +diff --git a/tg_owt-master/src/modules/rtp_rtcp/source/receive_statistics_impl.h b/tg_owt/src/modules/rtp_rtcp/source/receive_statistics_impl.h +index e352ae8..f8edda6 100644 +--- a/tg_owt-master/src/modules/rtp_rtcp/source/receive_statistics_impl.h ++++ b/tg_owt/src/modules/rtp_rtcp/source/receive_statistics_impl.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #include "absl/types/optional.h" + #include "modules/include/module_common_types_public.h" +diff --git a/tg_owt-master/src/pc/external_hmac.cc b/tg_owt/src/pc/external_hmac.cc +index 99021f8..19b87cb 100644 +--- a/tg_owt-master/src/pc/external_hmac.cc ++++ b/tg_owt/src/pc/external_hmac.cc +@@ -15,7 +15,7 @@ + + #include "rtc_base/logging.h" + #include "rtc_base/zero_memory.h" +-#include "third_party/libsrtp/include/srtp.h" ++#include "third_party/libsrtp/include/private_srtp.h" + + // Begin test case 0 */ + static const uint8_t kExternalHmacTestCase0Key[20] = { +diff --git a/tg_owt-master/src/pc/external_hmac.h b/tg_owt/src/pc/external_hmac.h +index 3319bea..3c1cffc 100644 +--- a/tg_owt-master/src/pc/external_hmac.h ++++ b/tg_owt/src/pc/external_hmac.h +@@ -32,7 +32,7 @@ + + #include "third_party/libsrtp/crypto/include/auth.h" + #include "third_party/libsrtp/crypto/include/crypto_types.h" +-#include "third_party/libsrtp/include/srtp.h" ++#include "third_party/libsrtp/include/private_srtp.h" + + #define EXTERNAL_HMAC_SHA1 SRTP_HMAC_SHA1 + 1 + #define HMAC_KEY_LENGTH 20 +diff --git a/tg_owt-master/src/pc/srtp_session.cc b/tg_owt/src/pc/srtp_session.cc +index 5ded455..90643f8 100644 +--- a/tg_owt-master/src/pc/srtp_session.cc ++++ b/tg_owt/src/pc/srtp_session.cc +@@ -17,7 +17,7 @@ + #include "rtc_base/logging.h" + #include "rtc_base/ssl_stream_adapter.h" + #include "system_wrappers/include/metrics.h" +-#include "third_party/libsrtp/include/srtp.h" ++#include "third_party/libsrtp/include/private_srtp.h" + #include "third_party/libsrtp/include/srtp_priv.h" + + namespace cricket { +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c +index b3a449b..ab4c529 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c ++++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c +@@ -50,7 +50,7 @@ + #include "aes_icm_ossl.h" + #include "aes_gcm_ossl.h" + #include "alloc.h" +-#include "err.h" /* for srtp_debug */ ++#include "private_err.h" /* for srtp_debug */ + #include "crypto_types.h" + #include "cipher_types.h" + +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c +index fcd75e8..8ecdd9f 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c ++++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c +@@ -53,7 +53,7 @@ + #include + #include "aes_icm_ossl.h" + #include "crypto_types.h" +-#include "err.h" /* for srtp_debug */ ++#include "private_err.h" /* for srtp_debug */ + #include "alloc.h" + #include "cipher_types.h" + +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/cipher.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/cipher.c +index 822cff0..2593183 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/cipher.c ++++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/cipher.c +@@ -48,7 +48,7 @@ + + #include "cipher.h" + #include "crypto_types.h" +-#include "err.h" /* for srtp_debug */ ++#include "private_err.h" /* for srtp_debug */ + #include "alloc.h" /* for crypto_alloc(), crypto_free() */ + + srtp_debug_module_t srtp_mod_cipher = { +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/null_cipher.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/null_cipher.c +index f5e4469..1576150 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/null_cipher.c ++++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/null_cipher.c +@@ -48,7 +48,7 @@ + + #include "datatypes.h" + #include "null_cipher.h" +-#include "err.h" /* for srtp_debug */ ++#include "private_err.h" /* for srtp_debug */ + #include "alloc.h" + #include "cipher_types.h" + +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/hash/auth.c b/tg_owt/src/third_party/libsrtp/crypto/hash/auth.c +index 9ffbfb2..0ef283d 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/hash/auth.c ++++ b/tg_owt/src/third_party/libsrtp/crypto/hash/auth.c +@@ -46,7 +46,7 @@ + #include "config.h" + + #include "auth.h" +-#include "err.h" /* for srtp_debug */ ++#include "private_err.h" /* for srtp_debug */ + #include "datatypes.h" /* for octet_string */ + + /* the debug module for authentiation */ +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/hash/hmac_ossl.c b/tg_owt/src/third_party/libsrtp/crypto/hash/hmac_ossl.c +index 36cfb71..8cb52b9 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/hash/hmac_ossl.c ++++ b/tg_owt/src/third_party/libsrtp/crypto/hash/hmac_ossl.c +@@ -46,7 +46,7 @@ + + #include "auth.h" + #include "alloc.h" +-#include "err.h" /* for srtp_debug */ ++#include "private_err.h" /* for srtp_debug */ + #include + #include + +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/hash/null_auth.c b/tg_owt/src/third_party/libsrtp/crypto/hash/null_auth.c +index 01d7722..219d47d 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/hash/null_auth.c ++++ b/tg_owt/src/third_party/libsrtp/crypto/hash/null_auth.c +@@ -47,7 +47,7 @@ + #include "config.h" + + #include "null_auth.h" +-#include "err.h" /* for srtp_debug */ ++#include "private_err.h" /* for srtp_debug */ + #include "alloc.h" + #include "cipher_types.h" + +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h b/tg_owt/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h +index d5b83ee..c1862e1 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h +@@ -47,7 +47,7 @@ + #define AES_GCM_OSSL_H + + #include "cipher.h" +-#include "srtp.h" ++#include "private_srtp.h" + #include "datatypes.h" + #include + #include +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/auth.h b/tg_owt/src/third_party/libsrtp/crypto/include/auth.h +index 774ea16..11f3b93 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/auth.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/auth.h +@@ -46,7 +46,7 @@ + #ifndef SRTP_AUTH_H + #define SRTP_AUTH_H + +-#include "srtp.h" ++#include "private_srtp.h" + #include "crypto_types.h" /* for values of auth_type_id_t */ + + #ifdef __cplusplus +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher.h b/tg_owt/src/third_party/libsrtp/crypto/include/cipher.h +index 4f14e35..2221cda 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/cipher.h +@@ -45,7 +45,7 @@ + #ifndef SRTP_CIPHER_H + #define SRTP_CIPHER_H + +-#include "srtp.h" ++#include "private_srtp.h" + #include "crypto_types.h" /* for values of cipher_type_id_t */ + + #ifdef __cplusplus +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher_types.h b/tg_owt/src/third_party/libsrtp/crypto/include/cipher_types.h +index a543b54..88228df 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher_types.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/cipher_types.h +@@ -39,6 +39,7 @@ + + #include "cipher.h" + #include "auth.h" ++#include "private_err.h" + + /* + * cipher types that can be included in the kernel +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/crypto_kernel.h b/tg_owt/src/third_party/libsrtp/crypto/include/crypto_kernel.h +index 1f8dfa7..0005b7d 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/crypto_kernel.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/crypto_kernel.h +@@ -47,7 +47,7 @@ + + #include "cipher.h" + #include "auth.h" +-#include "err.h" ++#include "private_err.h" + #include "crypto_types.h" + #include "key.h" + +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/key.h b/tg_owt/src/third_party/libsrtp/crypto/include/key.h +index 3498114..fe0c220 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/key.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/key.h +@@ -46,7 +46,7 @@ + #define KEY_H + + #include "rdbx.h" /* for srtp_xtd_seq_num_t */ +-#include "err.h" ++#include "private_err.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes.h b/tg_owt/src/third_party/libsrtp/crypto/include/private_aes.h +similarity index 98% +rename from tg_owt-master/src/third_party/libsrtp/crypto/include/aes.h +rename to tg_owt/src/third_party/libsrtp/crypto/include/private_aes.h +index 779c3ac..e257fb2 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/private_aes.h +@@ -47,7 +47,7 @@ + #define AES_H + + #include "datatypes.h" +-#include "err.h" ++#include "private_err.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/err.h b/tg_owt/src/third_party/libsrtp/crypto/include/private_err.h +similarity index 99% +rename from tg_owt-master/src/third_party/libsrtp/crypto/include/err.h +rename to tg_owt/src/third_party/libsrtp/crypto/include/private_err.h +index 66a1023..d82191a 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/err.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/private_err.h +@@ -47,7 +47,7 @@ + + #include + #include +-#include "srtp.h" ++#include "private_srtp.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdb.h b/tg_owt/src/third_party/libsrtp/crypto/include/rdb.h +index 98314c1..97387c0 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdb.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/rdb.h +@@ -48,7 +48,7 @@ + + #include "integers.h" /* for uint32_t */ + #include "datatypes.h" /* for v128_t */ +-#include "err.h" /* for srtp_err_status_t */ ++#include "private_err.h" /* for srtp_err_status_t */ + + #ifdef __cplusplus + extern "C" { +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdbx.h b/tg_owt/src/third_party/libsrtp/crypto/include/rdbx.h +index 2194178..8740996 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdbx.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/rdbx.h +@@ -48,7 +48,7 @@ + #define RDBX_H + + #include "datatypes.h" +-#include "err.h" ++#include "private_err.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/stat.h b/tg_owt/src/third_party/libsrtp/crypto/include/stat.h +index 1894e04..8001645 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/stat.h ++++ b/tg_owt/src/third_party/libsrtp/crypto/include/stat.h +@@ -47,7 +47,7 @@ + #define STAT_H + + #include "datatypes.h" /* for uint8_t */ +-#include "err.h" /* for srtp_err_status_t */ ++#include "private_err.h" /* for srtp_err_status_t */ + + #ifdef __cplusplus + extern "C" { +diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/kernel/err.c b/tg_owt/src/third_party/libsrtp/crypto/kernel/err.c +index e9bb64b..ff4123f 100644 +--- a/tg_owt-master/src/third_party/libsrtp/crypto/kernel/err.c ++++ b/tg_owt/src/third_party/libsrtp/crypto/kernel/err.c +@@ -44,7 +44,7 @@ + + #include "config.h" + +-#include "err.h" ++#include "private_err.h" + #include "datatypes.h" + #include + +diff --git a/tg_owt-master/src/third_party/libsrtp/include/ekt.h b/tg_owt/src/third_party/libsrtp/include/ekt.h +index a289a53..d87d60d 100644 +--- a/tg_owt-master/src/third_party/libsrtp/include/ekt.h ++++ b/tg_owt/src/third_party/libsrtp/include/ekt.h +@@ -62,6 +62,7 @@ + + // left in commented out as reminder to not include private headers + //#include "srtp_priv.h" ++#include "private_aes.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/tg_owt-master/src/third_party/libsrtp/include/srtp.h b/tg_owt/src/third_party/libsrtp/include/private_srtp.h +similarity index 100% +rename from tg_owt-master/src/third_party/libsrtp/include/srtp.h +rename to tg_owt/src/third_party/libsrtp/include/private_srtp.h +diff --git a/tg_owt-master/src/third_party/libsrtp/include/srtp_priv.h b/tg_owt/src/third_party/libsrtp/include/srtp_priv.h +index 1e86df7..6fd4997 100644 +--- a/tg_owt-master/src/third_party/libsrtp/include/srtp_priv.h ++++ b/tg_owt/src/third_party/libsrtp/include/srtp_priv.h +@@ -48,13 +48,13 @@ + // Leave this as the top level import. Ensures the existence of defines + #include "config.h" + +-#include "srtp.h" ++#include "private_srtp.h" + #include "rdbx.h" + #include "rdb.h" + #include "integers.h" + #include "cipher.h" + #include "auth.h" +-#include "aes.h" ++#include "private_aes.h" + #include "key.h" + #include "crypto_kernel.h" + +diff --git a/tg_owt-master/src/third_party/libsrtp/srtp/ekt.c b/tg_owt/src/third_party/libsrtp/srtp/ekt.c +index b54ecf6..96b0a1d 100644 +--- a/tg_owt-master/src/third_party/libsrtp/srtp/ekt.c ++++ b/tg_owt/src/third_party/libsrtp/srtp/ekt.c +@@ -43,7 +43,7 @@ + */ + + #include "srtp_priv.h" +-#include "err.h" ++#include "private_err.h" + #include "ekt.h" + + extern srtp_debug_module_t mod_srtp; +diff --git a/tg_owt-master/src/third_party/libsrtp/srtp/srtp.c b/tg_owt/src/third_party/libsrtp/srtp/srtp.c +index 4462501..6de2495 100644 +--- a/tg_owt-master/src/third_party/libsrtp/srtp/srtp.c ++++ b/tg_owt/src/third_party/libsrtp/srtp/srtp.c +@@ -47,10 +47,11 @@ + + #include "srtp_priv.h" + #include "crypto_types.h" +-#include "err.h" ++#include "private_err.h" + #include "ekt.h" /* for SRTP Encrypted Key Transport */ + #include "alloc.h" /* for srtp_crypto_alloc() */ + ++ + #ifdef OPENSSL + #include "aes_gcm_ossl.h" /* for AES GCM mode */ + #ifdef OPENSSL_KDF diff --git a/tdesktop-2.1.13-full.tar.gz b/tdesktop-2.1.13-full.tar.gz deleted file mode 100644 index 20e1bcf..0000000 --- a/tdesktop-2.1.13-full.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1653a386107836a0808c3d828341ad54aa962f167d8b2e17430d8aedc710357 -size 36549505 diff --git a/tdesktop-2.3.2-full.tar.gz b/tdesktop-2.3.2-full.tar.gz new file mode 100644 index 0000000..a92469f --- /dev/null +++ b/tdesktop-2.3.2-full.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:292631bcac4b30f778879ecd2cebf4c6f569ab5be01230c8e62b924b4211a259 +size 36402335 diff --git a/telegram-desktop.changes b/telegram-desktop.changes index 2932c9f..283f31a 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Sun Aug 30 22:25:52 UTC 2020 - Xu Zhao + +- Update to 2.3.2 + * Revert custom window shadow on Linux. +- Update in 2.3.1 + * Fix Calls Settings for Video Calls. +- Update in 2.3.0 + * Video Calls (alpha version). +- Updates in 2.2.0, 2.1.22, and 2.1.21 + * Quickly switch between different Telegram accounts + if you use multiple phone numbers. + * Share and store unlimited files of any type up to 2 GB each. + * Edit your scheduled messages. + * Use Auto-Night Mode to make Telegram night mode match system + Dark Mode settings + * Also added an option to switch to system window frame + in Windows and Linux. + * Fix crash in web page preview display +- Rebase 0000-gtk2-default.patch + * Prioritize qgtk2 platform plugin +- Rename 0001-use-bundled-range.patch to + 0001-use-bundled-ranged-exptected-gsl.patch + * Use bundled ranged-v3, Microsoft GSL, and expected. +- Add 0002-tg_owt-fix-name-confliction.patch + * Patch tg_owt library to fix header name conflict with openssl + * Include header to define int types like uint32_t + ------------------------------------------------------------------- Thu Aug 20 09:06:04 UTC 2020 - Martin Liška diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 7c4eb47..34e9a40 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -31,17 +31,21 @@ %define __builder ninja Name: telegram-desktop -Version: 2.1.13 +Version: 2.3.2 Release: 0 Summary: Messaging application with a focus on speed and security License: GPL-3.0-only Group: Productivity/Networking/Instant Messenger URL: https://github.com/telegramdesktop/tdesktop Source0: https://github.com/telegramdesktop/tdesktop/releases/download/v%{version}/tdesktop-%{version}-full.tar.gz +# tg_owt: https://github.com/desktop-app/tg_owt/archive/master.zip +Source1: tg_owt-master.zip # PATCH-FIX-OPENSUSE Patch0: 0000-gtk2-default.patch # PATCH-FIX-OPENSUSE -Patch1: 0001-use-bundled-range.patch +Patch1: 0001-use-bundled-ranged-exptected-gsl.patch +# PATCH-FIX-OPENSUSE +Patch2: 0002-tg_owt-fix-name-confliction.patch BuildRequires: appstream-glib BuildRequires: chrpath BuildRequires: cmake >= 3.16 @@ -61,13 +65,18 @@ BuildRequires: libjpeg-devel BuildRequires: liblz4-devel BuildRequires: libqt5-qtbase-common-devel BuildRequires: libqt5-qtimageformats-devel +BuildRequires: libqt5-qtwayland-private-headers-devel +BuildRequires: libwebrtc_audio_processing-devel BuildRequires: ninja BuildRequires: pkgconfig +BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRequires: xxhash-devel BuildRequires: xz +BuildRequires: yasm BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5WaylandClient) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(dbusmenu-qt5) @@ -138,9 +147,14 @@ The service also provides APIs to independent developers. %prep %setup -q -n tdesktop-%{version}-full - %patch0 -p1 -%patch1 -p1 +%patch1 -p2 + +cd ../ +unzip %{S:1} +mkdir Libraries +mv tg_owt-master Libraries/tg_owt +%patch2 -p2 -d Libraries/tg_owt %build %if %{with fixed_gcc} @@ -148,13 +162,32 @@ export CC=/usr/bin/gcc-9 export CXX=/usr/bin/g++-9 %endif +cd %{_builddir}/Libraries/tg_owt +mkdir -p out/Release +cd out/Release +cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DTG_OWT_SPECIAL_TARGET=linux \ + -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/include \ + -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/include/openssl \ + -DTG_OWT_OPUS_INCLUDE_PATH=/usr/include/opus \ + -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/include/ffmpeg \ + ../.. +sed -i 's,gnu++2a,gnu++17,g' build.ninja +ninja + +cd %{_builddir}/tdesktop-%{version}-full +# Use the official API key that telegram uses for their snap builds: +# https://github.com/telegramdesktop/tdesktop/blob/8fab9167beb2407c1153930ed03a4badd0c2b59f/snap/snapcraft.yaml#L87-L88 +# Thanks to @primeos on Github. %cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_BUILD_TYPE=Release \ - -DTDESKTOP_API_ID=340630 \ - -DTDESKTOP_API_HASH=98a22f733eac40f1bd187a30d19271de \ + -DTDESKTOP_API_ID=611335 \ + -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \ -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \ -DDESKTOP_APP_USE_PACKAGED=ON \ + -DDESKTOP_APP_QTWAYLANDCLIENT_PRIVATE_HEADERS=OFF \ -DDESKTOP_APP_USE_PACKAGED_GSL=OFF \ -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF \ -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \ diff --git a/tg_owt-master.zip b/tg_owt-master.zip new file mode 100644 index 0000000..bc4db2d --- /dev/null +++ b/tg_owt-master.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:128da7a6dac6bdbd67767f2c7c845a9c44a08fe32824c3bd085d6b3eefd9a486 +size 24449406