update to 1.2.15-1

5 files changed, 99 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ef7dd9298f7..3291c4c6769e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-systemqt-notoemoji
 	pkgdesc = Official Telegram Desktop client
-	pkgver = 1.2.12
+	pkgver = 1.2.15
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
@@ -17,11 +17,11 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	depends = openal
 	depends = qt5-base
 	depends = qt5-imageformats
-	depends = openssl-1.0
+	depends = openssl
 	optdepends = libnotify: desktop notifications
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.2.12
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.2.15
 	source = GSL::git+https://github.com/Microsoft/GSL.git
 	source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip.git
 	source = variant::git+https://github.com/mapbox/variant.git
@@ -32,6 +32,7 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	source = tdesktop.patch
 	source = no-gtk2.patch
 	source = libtgvoip.patch
+	source = libtgvoip-2.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -40,9 +41,10 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	sha256sums = 0b520c1227010f2357c52208c3937a394534bd3aa30c78810cd4d309afa94bd7
 	sha256sums = d4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb
 	sha256sums = 7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82
-	sha256sums = 36b817ec9843b261af7a246f9ec51feb828203bd90e76aef7383457f23a0d4cb
+	sha256sums = aea18527d47228dcdb42b8c1d74398fcf0fdcd7b3c2246e87198f8d9b2dfe0bc
 	sha256sums = 8d707debe027c7cb658825501dc30fb3beb57ab21b1b6df2f01c5f76ca39a0e6
-	sha256sums = 0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075
+	sha256sums = 4dd2b1674b1a5bcfc5b640612278fe3a53b454192fbcc06b7476ff54ed6d2f6d
+	sha256sums = 07ca232b91e9ad0fb9c1501b8b83275cc62b00477c7e5edde5e4cfd2852f1f26
 
 pkgname = telegram-desktop-systemqt-notoemoji
 
diff --git a/PKGBUILD b/PKGBUILD
index 20fa0211469c..6027eac736c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,13 +6,13 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-systemqt-notoemoji
-pkgver=1.2.12
+pkgver=1.2.15
 pkgrel=1
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
-depends=('ffmpeg' 'hicolor-icon-theme' 'minizip' 'openal' 'qt5-base' 'qt5-imageformats' 'openssl-1.0')
+depends=('ffmpeg' 'hicolor-icon-theme' 'minizip' 'openal' 'qt5-base' 'qt5-imageformats' 'openssl')
 makedepends=('cmake' 'git' 'gyp' 'range-v3' 'python' 'libappindicator-gtk3')
 optdepends=('libnotify: desktop notifications')
 conflicts=('telegram-desktop')
@@ -31,6 +31,7 @@ source=(
     "tdesktop.patch"
     "no-gtk2.patch"
     "libtgvoip.patch"
+    "libtgvoip-2.patch"
 )
 sha256sums=('SKIP'
             'SKIP'
@@ -40,9 +41,10 @@ sha256sums=('SKIP'
             '0b520c1227010f2357c52208c3937a394534bd3aa30c78810cd4d309afa94bd7'
             'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb'
             '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82'
-            '36b817ec9843b261af7a246f9ec51feb828203bd90e76aef7383457f23a0d4cb'
+            'aea18527d47228dcdb42b8c1d74398fcf0fdcd7b3c2246e87198f8d9b2dfe0bc'
             '8d707debe027c7cb658825501dc30fb3beb57ab21b1b6df2f01c5f76ca39a0e6'
-            '0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075')
+            '4dd2b1674b1a5bcfc5b640612278fe3a53b454192fbcc06b7476ff54ed6d2f6d'
+            '07ca232b91e9ad0fb9c1501b8b83275cc62b00477c7e5edde5e4cfd2852f1f26')
 
 prepare() {
     cd "$srcdir/tdesktop"
@@ -57,6 +59,7 @@ prepare() {
 
     cd "Telegram/ThirdParty/libtgvoip"
     patch -Np1 -i "$srcdir/libtgvoip.patch"
+    patch -Np1 -i "$srcdir/libtgvoip-2.patch"
 
     for x in "" "_125x" "_150x" "_200x" "_250x"; do
         cp -vf "$srcdir/noto-emoji-${_emojiver}/emoji$x.webp" "$srcdir/tdesktop/Telegram/Resources/art/emoji$x.webp"
@@ -96,6 +99,6 @@ package() {
         icon_dir="$pkgdir/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
 
         install -d "$icon_dir"
-        install -m644 "$srcdir/tdesktop/Telegram/Resources/art/icon${icon_size}.png" "$icon_dir/telegram-desktop.png"
+        install -m644 "$srcdir/tdesktop/Telegram/Resources/art/icon${icon_size}.png" "$icon_dir/telegram.png"
     done
 }
diff --git a/libtgvoip-2.patch b/libtgvoip-2.patch
new file mode 100644
index 000000000000..61fa35b80dd6
--- /dev/null
+++ b/libtgvoip-2.patch
@@ -0,0 +1,81 @@
+From f2e246c1bfd456646880f4df8062337a53407343 Mon Sep 17 00:00:00 2001
+From: Nicholas Guriev <guriev-ns@ya.ru>
+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 <guriev-ns@ya.ru>
+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;
diff --git a/libtgvoip.patch b/libtgvoip.patch
index 6bd2aebb419b..8e838df34ba1 100644
--- a/libtgvoip.patch
+++ b/libtgvoip.patch
@@ -12,7 +12,7 @@ index 52fbea1..9a4dfb7 100644
          'include_dirs': [
            '<(tgvoip_src_loc)/webrtc_dsp',
            '<(linux_path_opus_include)',
-+          '/usr/include/openssl-1.0'
++          '/usr/include/openssl'
          ],
          'direct_dependent_settings': {
            'include_dirs': [
diff --git a/tdesktop.patch b/tdesktop.patch
index 2d3662c6c288..abcc4ae7bee9 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -276,19 +276,6 @@ index 84a06153..fd7ca47f 100644
        '<(emoji_suggestions_loc)',
        '<(submodules_loc)/GSL/include',
        '<(submodules_loc)/variant/include',
-diff --git a/Telegram/gyp/linux_glibc_wraps.gyp b/Telegram/gyp/linux_glibc_wraps.gyp
-index 07a8276f..99ac4cac 100644
---- a/Telegram/gyp/linux_glibc_wraps.gyp
-+++ b/Telegram/gyp/linux_glibc_wraps.gyp
-@@ -14,7 +14,7 @@
-     'sources': [
-       '../SourceFiles/platform/linux/linux_glibc_wraps.c',
-     ],
--    'conditions': [[ '"<!(uname -p)" == "x86_64" or "<!(uname -p)" == "aarch64"', {
-+    'conditions': [[ '"<!(uname -m)" == "x86_64" or "<!(uname -m)" == "aarch64"', {
-       'sources': [
-         '../SourceFiles/platform/linux/linux_glibc_wraps_64.c',
-       ],
 diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
 index dea127a3..62c95e68 100644
 --- a/Telegram/gyp/qt.gypi
@@ -457,15 +444,6 @@ index b93bace4..0fcdfd56 100644
            '-W',
            '-fPIC',
            '-Wno-unused-variable',
-@@ -25,7 +25,7 @@
-         ],
-       },
-       'conditions': [
--        [ '"<!(uname -p)" == "x86_64" or "<!(uname -p)" == "aarch64"', {
-+        [ '"<!(uname -m)" == "x86_64" or "<!(uname -m)" == "aarch64"', {
-           'defines': [
-             'Q_OS_LINUX64',
-           ],
 @@ -60,7 +59,6 @@
        ],
        'defines': [
@@ -487,7 +465,7 @@ index f6918c22..50f0d8c7 100644
        'linux_path_range%': '/usr/local',
      },
      'include_dirs': [
-+      '/usr/include/openssl-1.0',
++      '/usr/include/openssl',
        '/usr/local/include',
        '<(linux_path_ffmpeg)/include',
        '<(linux_path_openal)/include',
@@ -495,7 +473,7 @@ index f6918c22..50f0d8c7 100644
        '<(linux_path_range)/include',
      ],
      'library_dirs': [
-+      '/usr/lib/openssl-1.0',
++      '/usr/lib/openssl',
        '/usr/local/lib',
        '<(linux_path_ffmpeg)/lib',
        '<(linux_path_openal)/lib',