From 54fe5ec76bdc54f854051184b16269013999b9ba Mon Sep 17 00:00:00 2001 From: John Date: Fri, 1 Jun 2018 11:28:57 +0200 Subject: [PATCH] telegram-desktop: update to 1.3.7. [ci skip] --- .../patches/06-remove-GLIBC-2.15-compat.patch | 6 ++--- .../patches/07-libressl-2.7.patch | 13 ---------- srcpkgs/telegram-desktop/template | 26 +++++++++---------- 3 files changed, 16 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/telegram-desktop/patches/07-libressl-2.7.patch diff --git a/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch b/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch index 72ec0cf09e5..5a3b259c5e8 100644 --- a/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch +++ b/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch @@ -18,11 +18,11 @@ index c9eca6ad..1404f91b 100644 '-lcrypto', '-lX11', diff --git Telegram/gyp/telegram_linux.gypi Telegram/gyp/telegram_linux.gypi -index a755fc58..8bf49216 100644 +index 1e118538..c02e57a0 100644 --- Telegram/gyp/telegram_linux.gypi +++ Telegram/gyp/telegram_linux.gypi -@@ -57,9 +57,6 @@ - '-Wno-strict-overflow', +@@ -58,9 +58,6 @@ + '-Wno-maybe-uninitialized', ], 'ldflags': [ - '-Wl,-wrap,aligned_alloc', diff --git a/srcpkgs/telegram-desktop/patches/07-libressl-2.7.patch b/srcpkgs/telegram-desktop/patches/07-libressl-2.7.patch deleted file mode 100644 index 2c43a8844ac..00000000000 --- a/srcpkgs/telegram-desktop/patches/07-libressl-2.7.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git Telegram/SourceFiles/mtproto/rsa_public_key.cpp Telegram/SourceFiles/mtproto/rsa_public_key.cpp -index fcb11979..add50d03 100644 ---- Telegram/SourceFiles/mtproto/rsa_public_key.cpp -+++ Telegram/SourceFiles/mtproto/rsa_public_key.cpp -@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - namespace MTP { - namespace internal { - namespace { --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - // This is a key setter for compatibility with OpenSSL 1.0 - int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 0c8b7b830ed..60e75459096 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,23 +1,24 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=1.2.17 -revision=2 -_libtgvoip_commit=6e0e1026147364cfb1234489980a2625ab50b598 +version=1.3.7 +revision=1 +_libtgvoip_commit=6ba1241cfef6c3ddf4e50e82f67afde0abc02285 _GSL_commit=9d65e74400976b3509833f49b16d401600c7317d _variant_commit=550ac2f159ca883d360c196149b466955c77a573 -_crl_commit=344cbde9ae8d89a6530408d3176d2754ae0ff0e2 +_crl_commit=f893c36427993e22181c8b3ec382dedb5563dc08 _Catch_commit=5ca44b68721833ae3731802ed99af67c6f38a53a -wrksrc="tdesktop-${version}" build_style=cmake +wrksrc="tdesktop-${version}" build_wrksrc="out/Release" hostmakedepends="gyp pkg-config" -makedepends="qt5-devel gtk+3-devel libappindicator-devel libdbusmenu-glib-devel - opus-devel alsa-lib-devel pulseaudio-devel range-v3 minizip-devel ffmpeg-devel - libopenal-devel" +makedepends="alsa-lib-devel ffmpeg-devel gtk+3-devel libappindicator-devel + libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel + pulseaudio-devel qt5-devel range-v3" depends="qt5-imageformats" short_desc="Telegram Desktop messaging app" maintainer="John " -license="GPL-3" +license="GPL-3.0-or-later" +#changelog"https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" homepage="https://desktop.telegram.org/" distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.gz https://github.com/telegramdesktop/libtgvoip/archive/${_libtgvoip_commit}.tar.gz @@ -25,11 +26,11 @@ distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.g https://github.com/mapbox/variant/archive/${_variant_commit}.tar.gz https://github.com/telegramdesktop/crl/archive/${_crl_commit}.tar.gz https://github.com/catchorg/Catch2/archive/${_Catch_commit}.tar.gz" -checksum="775614e70372b2e18ef1b2940fa043599240975597e4c5e4431c6deb041a613d - 55569944e609bc817a454a43407bbbe1cd6dcfdbbb43579678e0d9e4340ddb14 +checksum="cbb30bad15496848beda2db3481700a7292de6c453ee616cc62a2189a32dd7d8 + ba233ea1550b3abdbbe4a25055070553b04e0f4633453fa8d15f0313a15bd3b2 1aab15abd08fd377524df9dc6a71c977f8617d4a2a8f8a2aa1ce07f3c3ff4371 aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d - c8ad2e354b13aa162a1f6104cfbf353bd6c2d19af7a439b55ffaa2b38e040ce5 + 1357cab18cf4e6798b7586c0ff0948676c44ccd2424d7fbcf1f260aa3087393a d24e6d9df2b8aa5739d3b9077c6b0ff0ef4d5ef8acc52c3a57e32893854d8d18" nocross="gyp build script doesn't support cross compiling" @@ -47,7 +48,6 @@ post_extract() { mv ${wrksrc}/../Catch2-${_Catch_commit}/* ${wrksrc}/Telegram/ThirdParty/Catch mkdir out/Release -p } - pre_configure() { export GYP_DEFINES="TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME,TDESKTOP_DISABLE_UNITY_INTEGRATION" cd ${wrksrc} && \