Date: Monday, July 16, 2018 @ 15:21:01 Author: svenstaro Revision: 359861
upgpkg: telegram-desktop 1.3.10-1 Modified: telegram-desktop/trunk/CMakeLists.inj telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch Deleted: telegram-desktop/trunk/libtgvoip-2.patch -------------------+ CMakeLists.inj | 1 PKGBUILD | 18 ++++++----- libtgvoip-2.patch | 81 ---------------------------------------------------- tdesktop.patch | 17 +++------- 4 files changed, 16 insertions(+), 101 deletions(-) Modified: CMakeLists.inj =================================================================== --- CMakeLists.inj 2018-07-16 14:55:33 UTC (rev 359860) +++ CMakeLists.inj 2018-07-16 15:21:01 UTC (rev 359861) @@ -9,6 +9,7 @@ # lines. include(../../Telegram/gyp/PrecompiledHeader.cmake) add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h) +add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h) # vim: ft=cmake # -------------- debian/CMakeLists.inj end -------------- Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-07-16 14:55:33 UTC (rev 359860) +++ PKGBUILD 2018-07-16 15:21:01 UTC (rev 359861) @@ -5,7 +5,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.3.7 +pkgver=1.3.10 pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -16,16 +16,16 @@ optdepends=('libnotify: desktop notifications') source=( "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v$pkgver"; + "libtgvoip::git+https://github.com/telegramdesktop/libtgvoip"; + "variant::git+https://github.com/mapbox/variant"; "GSL::git+https://github.com/Microsoft/GSL.git"; - "libtgvoip::git+https://github.com/telegramdesktop/libtgvoip.git"; - "variant::git+https://github.com/mapbox/variant.git"; "Catch::git+https://github.com/philsquared/Catch"; + "crl::git+https://github.com/telegramdesktop/crl.git"; "tg.protocol" "CMakeLists.inj" "tdesktop.patch" "no-gtk2.patch" "libtgvoip.patch" - "libtgvoip-2.patch" ) sha512sums=('SKIP' 'SKIP' @@ -32,12 +32,13 @@ 'SKIP' 'SKIP' 'SKIP' + 'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' - 'aa97c02ff4f1caa152671496aff6bb7162271fbfb86ade7c5b72f1cca3ab1ef92b69a9e9390614d2b84ae43606545b8c8bc2bfd98132d0cf57a8b253bcf2e643' - '72c9cf1f5639c2c090e853d7141cc9f8c295b869f3ce1b998559db136903d37f3a8c6676520cd5d5d228f6e1e6db0ec0b0c7c399a3653f214bf56d9d1c1a25d0' + '2647251940f0d3a2d41ca8a32a592f1ab1e23fe02d3b11d8dc3a54ef34df7c290c9cbf3df76b09970e1cba15c149bc38d49fc824a173d4b21c54edb3c5d5a3da' + '00b4307143cf599859d9b9b6d7ac4acbe8b407da55a1e3833921e113dc3aed8c61f2e5f2c1c37e81a261ba4b9e6f40d9bf5f8c90c20dcf0820cfb73852cb091d' '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' - '251f43bcdfd688a4c7dda082e981569c6cd6332289652576cfdc9f6376eee6e28195ec4a60bcfa002c6358d0f3cbdf215b7d390bbcce2ed560abfc9c606566b5') + '536dfada1a4fbffda32893fb2ac8a0f2412e23ac20a19f032a826cc5e0518b1d35004cba42ee9244e253d34429050e782ffc57ffca4f01b8733a40bc69b98958') prepare() { cd "$srcdir/tdesktop" @@ -46,13 +47,14 @@ git config submodule.Telegram/ThirdParty/variant.url "$srcdir/variant" git config submodule.Telegram/ThirdParty/libtgvoip.url "$srcdir/libtgvoip" git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/Catch" + git config submodule.Telegram/ThirdParty/crl.url "$srcdir/crl" git submodule update + patch -Np1 -i "$srcdir/tdesktop.patch" patch -Np1 -i "$srcdir/no-gtk2.patch" cd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "$srcdir/libtgvoip.patch" - # patch -Np1 -i "$srcdir/libtgvoip-2.patch" } build() { Deleted: libtgvoip-2.patch =================================================================== --- libtgvoip-2.patch 2018-07-16 14:55:33 UTC (rev 359860) +++ libtgvoip-2.patch 2018-07-16 15:21:01 UTC (rev 359861) @@ -1,81 +0,0 @@ -From f2e246c1bfd456646880f4df8062337a53407343 Mon Sep 17 00:00:00 2001 -From: Nicholas Guriev <[email protected]> -Date: Thu, 6 Jul 2017 23:19:12 +0300 -Subject: [PATCH 1/2] Remove deprecated call of AES_ctr128_encrypt - - * The AES_ctr128_encrypt function is not available in OpenSSL 1.1.0 - without a special compiler flag - * Fix a small misspelling ---- - VoIPController.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/VoIPController.cpp b/VoIPController.cpp -index 78e9e4b..c81673f 100644 ---- a/VoIPController.cpp -+++ b/VoIPController.cpp -@@ -102,6 +102,7 @@ bool VoIPController::didInitWin32TimeScale = false; - #ifndef TGVOIP_USE_CUSTOM_CRYPTO - #include <openssl/sha.h> - #include <openssl/aes.h> -+#include <openssl/modes.h> - #include <openssl/rand.h> - - void tgvoip_openssl_aes_ige_encrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){ -@@ -131,7 +132,7 @@ void tgvoip_openssl_sha256(uint8_t* msg, size_t len, uint8_t* output){ - void tgvoip_openssl_aes_ctr_encrypt(uint8_t* inout, size_t length, uint8_t* key, uint8_t* iv, uint8_t* ecount, uint32_t* num){ - AES_KEY akey; - AES_set_encrypt_key(key, 32*8, &akey); -- AES_ctr128_encrypt(inout, inout, length, &akey, iv, ecount, num); -+ CRYPTO_ctr128_encrypt(inout, inout, length, &akey, iv, ecount, num, (block128_f) AES_encrypt); - } - - voip_crypto_functions_t VoIPController::crypto={ -@@ -1142,7 +1143,7 @@ simpleAudioBlock random_id:long random_bytes:string raw_data:string = DecryptedA - if(!micMuted){ - audioInput->Start(); - if(!audioInput->IsInitialized()){ -- LOGE("Erorr initializing audio capture"); -+ LOGE("Error initializing audio capture"); - lastError=TGVOIP_ERROR_AUDIO_IO; - - SetState(STATE_FAILED); -@@ -1150,7 +1151,7 @@ simpleAudioBlock random_id:long random_bytes:string raw_data:string = DecryptedA - } - } - if(!audioOutput->IsInitialized()){ -- LOGE("Erorr initializing audio playback"); -+ LOGE("Error initializing audio playback"); - lastError=TGVOIP_ERROR_AUDIO_IO; - - SetState(STATE_FAILED); - -From b0c6da9bdc68fd692d3a4e620a75e7f4ef10555b Mon Sep 17 00:00:00 2001 -From: Nicholas Guriev <[email protected]> -Date: Fri, 8 Dec 2017 23:16:12 +0300 -Subject: [PATCH 2/2] Add extern "C" wrapper - -It perhaps fixes build failure against ancient OpenSSL. - -See also: https://github.com/openssl/openssl/commit/17e80c6 ---- - VoIPController.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/VoIPController.cpp b/VoIPController.cpp -index c81673f..1003e50 100644 ---- a/VoIPController.cpp -+++ b/VoIPController.cpp -@@ -100,10 +100,12 @@ bool VoIPController::didInitWin32TimeScale = false; - #define SHA256_LENGTH 32 - - #ifndef TGVOIP_USE_CUSTOM_CRYPTO -+extern "C" { - #include <openssl/sha.h> - #include <openssl/aes.h> - #include <openssl/modes.h> - #include <openssl/rand.h> -+} - - void tgvoip_openssl_aes_ige_encrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){ - AES_KEY akey; Modified: tdesktop.patch =================================================================== --- tdesktop.patch 2018-07-16 14:55:33 UTC (rev 359860) +++ tdesktop.patch 2018-07-16 15:21:01 UTC (rev 359861) @@ -228,7 +228,7 @@ add_custom_command( OUTPUT "${_output_c}" - COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} -x c-header -o "${_output_c}" -c "${_pchfile}" -+ COMMAND "${CMAKE_C_COMPILER}" "$(C_DEFINES)" "$(C_INCLUDES)" "$(C_FLAGS)" -x c-header -o "${_output_c}" -c "${_pchfile}" ++ COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} "$(C_DEFINES)" "$(C_INCLUDES)" "$(C_FLAGS)" -x c-header -o "${_output_c}" -c "${_pchfile}" DEPENDS "${_pchfile}" "${_pch_c_flags_file}" IMPLICIT_DEPENDS C "${_pch_header}" COMMENT "Precompiling ${_name} for ${_target} (C)") @@ -237,7 +237,7 @@ add_custom_command( OUTPUT "${_output_cxx}" - COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} -x c++-header -o "${_output_cxx}" -c "${_pchfile}" -+ COMMAND "${CMAKE_CXX_COMPILER}" "$(CXX_DEFINES)" "$(CXX_INCLUDES)" "$(CXX_FLAGS)" -x c++-header -o "${_output_cxx}" -c "${_pchfile}" ++ COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} "$(CXX_DEFINES)" "$(CXX_INCLUDES)" "$(CXX_FLAGS)" -x c++-header -o "${_output_cxx}" -c "${_pchfile}" DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}" IMPLICIT_DEPENDS CXX "${_pch_header}" COMMENT "Precompiling ${_name} for ${_target} (C++)") @@ -252,6 +252,7 @@ - 'utils.gyp:Updater', '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', 'crl.gyp:crl', + 'lib_export.gyp:lib_export', ], 'defines': [ @@ -477,7 +478,7 @@ '/usr/local/lib', '<(linux_path_ffmpeg)/lib', '<(linux_path_openal)/lib', -@@ -53,25 +55,15 @@ +@@ -53,25 +55,16 @@ '<(linux_path_breakpad)/lib', ], 'libraries': [ @@ -509,18 +510,10 @@ + 'minizip', + 'opus', + 'z', ++ 'lzma', # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ -@@ -99,7 +91,7 @@ - }, - }, - 'conditions': [ -- [ '"<!(uname -p)" == "x86_64"', { -+ [ '"<!(uname -m)" == "x86_64"', { - # 32 bit version can't be linked with debug info or LTO, - # virtual memory exhausted :( - 'cflags_c': [ '-g' ], @@ -118,10 +110,8 @@ ], }], ['not_need_gtk!="True"', {
