commit 1489112e33c6a8b5d16027254cad99abdbab4483 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Wed Sep 5 19:10:28 2018 +0200 Updated to 1.3.16 (alpha). .gitignore | 1 + sources | 2 +- telegram-desktop-api-tokens.patch | 2 +- telegram-desktop-build-fixes.patch | 8 ++++---- telegram-desktop-system-fonts.patch | 2 +- telegram-desktop.spec | 14 ++++++++++++-- 6 files changed, 20 insertions(+), 9 deletions(-) --- diff --git a/.gitignore b/.gitignore index b08a8fb..dbd9796 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /crl-4291015.tar.gz /tdesktop-1.3.14.tar.gz /tdesktop-1.3.15.tar.gz +/tdesktop-1.3.16.tar.gz diff --git a/sources b/sources index a3b1e26..7d2d611 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b92e75c44c9d4c9fd96b1d19eb3a666d crl-4291015.tar.gz -2d470428474d45b9a674970c04cf941b tdesktop-1.3.15.tar.gz +4bd5b5c95e71db37aaea32f4da41c500 tdesktop-1.3.16.tar.gz diff --git a/telegram-desktop-api-tokens.patch b/telegram-desktop-api-tokens.patch index 807fd79..e19dbf4 100644 --- a/telegram-desktop-api-tokens.patch +++ b/telegram-desktop-api-tokens.patch @@ -1,4 +1,4 @@ -From db3fe59c48a45d5f6b27ff1abd422950e399c314 Mon Sep 17 00:00:00 2001 +From bbf9a796ebdd702b7b91e71679853e0b787fcb15 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Mon, 9 Apr 2018 16:57:13 +0200 Subject: [PATCH 2/3] Changed default Telegram Desktop's test API keys to diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch index 79fe9d0..521af86 100644 --- a/telegram-desktop-build-fixes.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,4 +1,4 @@ -From f31a8bbeca59889a98ee1416f6d1ebe26f3a5723 Mon Sep 17 00:00:00 2001 +From 735e4243af1ff8c41aedad34dfbffc683b41b5c9 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri, 31 Mar 2017 14:29:58 +0200 Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock. @@ -383,12 +383,12 @@ index b52a9d071..32b126682 100644 ], 'message': 'codegen_scheme-ing scheme.tl..', diff --git a/Telegram/gyp/lib_storage.gyp b/Telegram/gyp/lib_storage.gyp -index d24a105d0..be52e4a1f 100644 +index 527713546..3856cd87a 100644 --- a/Telegram/gyp/lib_storage.gyp +++ b/Telegram/gyp/lib_storage.gyp @@ -15,8 +15,6 @@ 'common.gypi', - 'openssl.gypi', + 'openssl.gypi', 'qt.gypi', - 'telegram_win.gypi', - 'telegram_mac.gypi', @@ -418,7 +418,7 @@ index d24a105d0..be52e4a1f 100644 + '<!(rpm --eval "%{_includedir}")', ], 'sources': [ - '<(src_loc)/storage/storage_databases.cpp', + '<(src_loc)/storage/storage_clear_legacy.cpp', diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi index 0b783ec21..653562ffb 100644 --- a/Telegram/gyp/qt.gypi diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch index 4ee412a..9a21292 100644 --- a/telegram-desktop-system-fonts.patch +++ b/telegram-desktop-system-fonts.patch @@ -1,4 +1,4 @@ -From 5f9087117e4e7d40e6da492275b435bbcdab23e5 Mon Sep 17 00:00:00 2001 +From 0fcc17fc216642941e5139299ab21fbac786d10e Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Sun, 24 Jun 2018 22:59:34 +0200 Subject: [PATCH 3/3] Backported and rebased patch from Debian maintainer diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 337ec2a..aed7ca8 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -10,7 +10,7 @@ Summary: Telegram Desktop official messaging app Name: telegram-desktop -Version: 1.3.15 +Version: 1.3.16 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -30,6 +30,7 @@ Patch0: %{name}-build-fixes.patch Patch1: %{name}-api-tokens.patch Patch2: %{name}-system-fonts.patch +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Recommends: libappindicator-gtk3%{?_isa} Requires: qt5-qtimageformats%{?_isa} Requires: hicolor-icon-theme @@ -48,6 +49,7 @@ BuildRequires: gyp BuildRequires: guidelines-support-library-devel >= 1.0.0 BuildRequires: mapbox-variant-devel >= 0.3.6 BuildRequires: libtgvoip-devel >= 2.2.4 +BuildRequires: qt5-qtbase-private-devel BuildRequires: libappindicator-devel BuildRequires: ffmpeg-devel >= 3.1 BuildRequires: openal-soft-devel @@ -55,7 +57,6 @@ BuildRequires: qt5-qtbase-devel BuildRequires: libstdc++-devel BuildRequires: range-v3-devel BuildRequires: openssl-devel -BuildRequires: minizip-devel BuildRequires: xxhash-devel BuildRequires: lzma-devel BuildRequires: opus-devel @@ -64,6 +65,12 @@ BuildRequires: dee-devel BuildRequires: xz-devel BuildRequires: python2 +%if 0%{?fedora} >= 30 +BuildRequires: minizip-compat-devel +%else +BuildRequires: minizip-devel +%endif + %description Telegram is a messaging app with a focus on speed and security, it’s super fast, simple and free. You can use Telegram on all your devices at the same @@ -136,6 +143,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}. %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed Sep 05 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.3.16-1 +- Updated to 1.3.16 (alpha). + * Sat Sep 01 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.3.15-1 - Updated to 1.3.15 (alpha).