commit ac3e24fe2852d9378da011b133e260067bb997a9 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri Aug 9 18:39:39 2019 +0200 Updated to version 1.8.0. .gitignore | 3 + sources | 5 +- telegram-desktop-build-fixes.patch | 93 ++++++++++------- telegram-desktop-system-fonts.patch | 2 +- telegram-desktop-unbundle-minizip.patch | 12 +-- telegram-desktop-upstream-0710dde.patch | 172 -------------------------------- telegram-desktop-upstream-9c909c8.patch | 88 ---------------- telegram-desktop.spec | 41 ++++++-- 8 files changed, 99 insertions(+), 317 deletions(-) --- diff --git a/.gitignore b/.gitignore index 45ad6fd..2213858 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,6 @@ /tdesktop-1.7.10.tar.gz /crl-9ea8700.tar.gz /tdesktop-1.7.14.tar.gz +/crl-52baf11.tar.gz +/rlottie-d08a03b.tar.gz +/tdesktop-1.8.0.tar.gz diff --git a/sources b/sources index 9819f27..9c8a42f 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -80f1e713be05746a3ee27aca5514ef18 crl-9ea8700.tar.gz -57441d43a61f9a59f0e622c203a036f5 tdesktop-1.7.14.tar.gz +744e77b69697f659a356727be22d4247 crl-52baf11.tar.gz +d81386c7ddd0453463131a4a0e6c0f22 rlottie-d08a03b.tar.gz +2a665c09ebdd10daac7e35912bf5eb14 tdesktop-1.8.0.tar.gz diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch index 3960f22..ed93641 100644 --- a/telegram-desktop-build-fixes.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,4 +1,4 @@ -From 5c4d3c3fe20ab30d721ab45a03775791ce12e660 Mon Sep 17 00:00:00 2001 +From 14d4699a446910051fcd63705c1752ff3ab9ba30 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. @@ -7,26 +7,27 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock. Telegram/Resources/qrc/telegram.qrc | 3 - Telegram/Resources/qrc/telegram_linux.qrc | 6 -- Telegram/SourceFiles/core/launcher.cpp | 1 + - Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++ - Telegram/gyp/CMakeLists.inj | 6 ++ + Telegram/SourceFiles/qt_functions.cpp | 97 +++++++++++++++++++++++ + Telegram/gyp/CMakeLists.inj | 7 ++ Telegram/gyp/PrecompiledHeader.cmake | 4 +- Telegram/gyp/Telegram.gyp | 23 +----- Telegram/gyp/codegen_rules.gypi | 6 +- Telegram/gyp/lib_base.gyp | 8 +- Telegram/gyp/lib_export.gyp | 7 +- Telegram/gyp/lib_ffmpeg.gyp | 7 +- - Telegram/gyp/lib_lottie.gyp | 14 +--- + Telegram/gyp/lib_lottie.gyp | 11 +-- + Telegram/gyp/lib_mtproto.gyp | 6 +- Telegram/gyp/lib_scheme.gyp | 4 +- Telegram/gyp/lib_storage.gyp | 8 +- - Telegram/gyp/qt.gypi | 87 ++++++--------------- + Telegram/gyp/qt.gypi | 87 ++++++-------------- Telegram/gyp/qt_moc.gypi | 5 +- Telegram/gyp/qt_rcc.gypi | 2 +- Telegram/gyp/settings_linux.gypi | 25 +----- - Telegram/gyp/telegram_linux.gypi | 75 +++++------------- + Telegram/gyp/telegram_linux.gypi | 74 +++++------------ Telegram/gyp/telegram_sources.txt | 2 +- lib/xdg/telegramdesktop.appdata.xml | 2 +- lib/xdg/telegramdesktop.desktop | 5 +- - 22 files changed, 180 insertions(+), 214 deletions(-) + 23 files changed, 186 insertions(+), 214 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp create mode 100644 Telegram/gyp/CMakeLists.inj @@ -58,10 +59,10 @@ index 164e8d4f2..03585ec03 100644 - </qresource> </RCC> diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index 1b8c4795e..79f7b75f3 100644 +index 9237e629d..3e4b1d6a5 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -269,6 +269,7 @@ int Launcher::exec() { +@@ -271,6 +271,7 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started Platform::start(); // must be started before Sandbox is created @@ -71,10 +72,10 @@ index 1b8c4795e..79f7b75f3 100644 DEBUG_LOG(("Telegram finished, result: %1").arg(result)); diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp new file mode 100644 -index 000000000..4a722b8d7 +index 000000000..a7c697f25 --- /dev/null +++ b/Telegram/SourceFiles/qt_functions.cpp -@@ -0,0 +1,94 @@ +@@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. @@ -108,6 +109,9 @@ index 000000000..4a722b8d7 +** +****************************************************************************/ + ++#include <private/qfixed_p.h> ++#include <private/qfontengine_p.h> ++ +/* TODO: find a dynamic library with these symbols. */ + +/* Debian maintainer: this function is taken from qfiledialog.cpp */ @@ -171,16 +175,17 @@ index 000000000..4a722b8d7 +} diff --git a/Telegram/gyp/CMakeLists.inj b/Telegram/gyp/CMakeLists.inj new file mode 100644 -index 000000000..a04c9c3c9 +index 000000000..6dd1a2a18 --- /dev/null +++ b/Telegram/gyp/CMakeLists.inj -@@ -0,0 +1,6 @@ +@@ -0,0 +1,7 @@ +set_target_properties(Telegram PROPERTIES SKIP_BUILD_RPATH TRUE) +include(../../Telegram/gyp/PrecompiledHeader.cmake) +add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h) +add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h) +add_precompiled_header(lib_base ../../Telegram/SourceFiles/base/base_pch.h) +add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h) ++add_precompiled_header(lib_mtproto ../../Telegram/SourceFiles/mtproto/mtp_pch.h) diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake index dfe1193be..75bcd675d 100644 --- a/Telegram/gyp/PrecompiledHeader.cmake @@ -204,7 +209,7 @@ index dfe1193be..75bcd675d 100644 IMPLICIT_DEPENDS CXX "${_pch_header}" COMMENT "Precompiling header ${_name} for ${_target} (C++)") diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp -index 27e180de3..737735a9f 100644 +index ec2ed28b7..fedb782ca 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -51,15 +51,13 @@ @@ -234,7 +239,7 @@ index 27e180de3..737735a9f 100644 'crl.gyp:crl', 'lib_base.gyp:lib_base', 'lib_export.gyp:lib_export', -@@ -86,32 +81,19 @@ +@@ -87,32 +82,19 @@ ], 'defines': [ @@ -268,7 +273,7 @@ index 27e180de3..737735a9f 100644 ], 'sources': [ '<@(qrc_files)', -@@ -134,7 +116,6 @@ +@@ -135,7 +117,6 @@ 'TDESKTOP_FORCE_GTK_FILE_DIALOG', ], 'dependencies': [ @@ -306,7 +311,7 @@ index a901db3bb..28873f8dc 100644 '<@(qrc_files)', ], diff --git a/Telegram/gyp/lib_base.gyp b/Telegram/gyp/lib_base.gyp -index 3ffbf7f90..f3045546c 100644 +index 82d42d4ae..92adc6d8e 100644 --- a/Telegram/gyp/lib_base.gyp +++ b/Telegram/gyp/lib_base.gyp @@ -28,7 +28,6 @@ @@ -358,7 +363,7 @@ index f73aabdb1..24493f159 100644 ], 'sources': [ diff --git a/Telegram/gyp/lib_ffmpeg.gyp b/Telegram/gyp/lib_ffmpeg.gyp -index 9971d76ae..0fb455d12 100644 +index b9ada5362..ef5aa200e 100644 --- a/Telegram/gyp/lib_ffmpeg.gyp +++ b/Telegram/gyp/lib_ffmpeg.gyp @@ -36,10 +36,9 @@ @@ -376,34 +381,32 @@ index 9971d76ae..0fb455d12 100644 ], 'sources': [ diff --git a/Telegram/gyp/lib_lottie.gyp b/Telegram/gyp/lib_lottie.gyp -index ada149e85..5d3c7fa21 100644 +index 9767651f2..181577828 100644 --- a/Telegram/gyp/lib_lottie.gyp +++ b/Telegram/gyp/lib_lottie.gyp -@@ -29,16 +29,12 @@ - 'dependencies': [ - 'crl.gyp:crl', +@@ -31,14 +31,12 @@ 'lib_base.gyp:lib_base', -- 'lib_rlottie.gyp:lib_rlottie', + 'lib_rlottie.gyp:lib_rlottie', 'lib_ffmpeg.gyp:lib_ffmpeg', - 'lib_lz4.gyp:lib_lz4', ], 'export_dependent_settings': [ 'crl.gyp:crl', 'lib_base.gyp:lib_base', -- 'lib_rlottie.gyp:lib_rlottie', + 'lib_rlottie.gyp:lib_rlottie', 'lib_ffmpeg.gyp:lib_ffmpeg', - 'lib_lz4.gyp:lib_lz4', ], 'defines': [ 'LOT_BUILD', -@@ -46,13 +42,9 @@ +@@ -46,13 +44,10 @@ 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', - '<(libs_loc)/range-v3/include', - '<(libs_loc)/zlib', - '<(libs_loc)/ffmpeg', -- '<(rlottie_loc)', + '<(rlottie_loc)', - '<(lz4_loc)', - '<(submodules_loc)/GSL/include', - '<(submodules_loc)/variant/include', @@ -413,8 +416,25 @@ index ada149e85..5d3c7fa21 100644 '<(submodules_loc)/crl/src', ], 'sources': [ +diff --git a/Telegram/gyp/lib_mtproto.gyp b/Telegram/gyp/lib_mtproto.gyp +index b592cb796..464168ede 100644 +--- a/Telegram/gyp/lib_mtproto.gyp ++++ b/Telegram/gyp/lib_mtproto.gyp +@@ -47,9 +47,9 @@ + 'include_dirs': [ + '<(src_loc)', + '<(SHARED_INTERMEDIATE_DIR)', +- '<(libs_loc)/range-v3/include', +- '<(submodules_loc)/GSL/include', +- '<(submodules_loc)/variant/include', ++ '<!(rpm --eval "%{_includedir}")', ++ '<!(rpm --eval "%{_includedir}")/guidelines-support-library', ++ '<!(rpm --eval "%{_includedir}")/mapbox', + '<(submodules_loc)/crl/src', + ], + 'sources': [ diff --git a/Telegram/gyp/lib_scheme.gyp b/Telegram/gyp/lib_scheme.gyp -index b52a9d071..4850157a8 100644 +index 0c12f240b..629e58da7 100644 --- a/Telegram/gyp/lib_scheme.gyp +++ b/Telegram/gyp/lib_scheme.gyp @@ -35,7 +35,7 @@ @@ -426,15 +446,15 @@ index b52a9d071..4850157a8 100644 ], 'actions': [{ 'action_name': 'codegen_scheme', -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ '<(SHARED_INTERMEDIATE_DIR)/scheme.h', ], 'action': [ - 'python', '<(src_loc)/codegen/scheme/codegen_scheme.py', + 'python3', '<(src_loc)/codegen/scheme/codegen_scheme.py', - '-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl', - ], - 'message': 'codegen_scheme-ing scheme.tl..', + '-o', '<(SHARED_INTERMEDIATE_DIR)', + '<(res_loc)/tl/mtproto.tl', + '<(res_loc)/tl/api.tl', diff --git a/Telegram/gyp/lib_storage.gyp b/Telegram/gyp/lib_storage.gyp index d72f4b5a7..f34340d50 100644 --- a/Telegram/gyp/lib_storage.gyp @@ -720,7 +740,7 @@ index 17f7a5c9c..726b689ac 100644 'Debug': { }, diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index ffe0e5a96..f01692ca3 100644 +index ffe0e5a96..4efd97851 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi @@ -10,7 +10,7 @@ @@ -732,7 +752,7 @@ index ffe0e5a96..f01692ca3 100644 'pkgconfig_libs': [ # In order to work libxkbcommon must be linked statically, # PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon" -@@ -18,51 +18,30 @@ +@@ -18,51 +18,29 @@ # QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create #'xkbcommon', ], @@ -798,11 +818,10 @@ index ffe0e5a96..f01692ca3 100644 + 'lzma', + 'xxhash', + 'lz4', -+ 'rlottie', # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ -@@ -70,35 +49,23 @@ +@@ -70,35 +48,23 @@ '-Wno-maybe-uninitialized', ], 'ldflags': [ @@ -841,10 +860,10 @@ index ffe0e5a96..f01692ca3 100644 ], }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', { diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index 35a4c5740..c3d6db974 100644 +index 5c57e2d44..03b1baa6d 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -888,7 +888,7 @@ +@@ -901,7 +901,7 @@ <(src_loc)/mainwindow.h <(src_loc)/observer_peer.cpp <(src_loc)/observer_peer.h diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch index 63a6602..821a308 100644 --- a/telegram-desktop-system-fonts.patch +++ b/telegram-desktop-system-fonts.patch @@ -1,4 +1,4 @@ -From 31cbef1756e5f4c02d7b2cd6a72f3407c07ffe3d Mon Sep 17 00:00:00 2001 +From 9fc6815a554be97d2923608e72852d1151ae312f 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 2/3] Backported and rebased patch from Debian maintainer diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch index 12c0c30..03e119d 100644 --- a/telegram-desktop-unbundle-minizip.patch +++ b/telegram-desktop-unbundle-minizip.patch @@ -1,4 +1,4 @@ -From d56251039a2e13d8dfeefbf70c1aeead6206026e Mon Sep 17 00:00:00 2001 +From ec229dc5d3ee999bbcf715345fc05178c5a1c113 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Wed, 17 Oct 2018 17:57:59 +0200 Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29. @@ -10,7 +10,7 @@ Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29. 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp -index 737735a9f..4bcf8eb0f 100644 +index fedb782ca..a1caa989b 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -18,7 +18,6 @@ @@ -21,7 +21,7 @@ index 737735a9f..4bcf8eb0f 100644 'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap', 'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions', 'style_files': [ -@@ -91,7 +90,6 @@ +@@ -92,7 +91,6 @@ 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', @@ -30,7 +30,7 @@ index 737735a9f..4bcf8eb0f 100644 '<(submodules_loc)/crl/src', ], diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index f01692ca3..1287c5e51 100644 +index 4efd97851..b314ba137 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi @@ -22,6 +22,7 @@ @@ -50,10 +50,10 @@ index f01692ca3..1287c5e51 100644 'lzma', 'xxhash', diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index c3d6db974..b96a3fa83 100644 +index 03b1baa6d..80bb63299 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -895,13 +895,6 @@ +@@ -908,13 +908,6 @@ <(emoji_suggestions_loc)/emoji_suggestions.h platforms: !win diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 94f846e..50a741a 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -15,9 +15,13 @@ %global upstreambase https://github.com/telegramdesktop # Git revision of crl... -%global commit1 9ea870038a2a667add7f621be6252db909068386 +%global commit1 52baf11aaeb7f5ea6955a438abaa1aee4c4308d8 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) +# Git revision of patched rlottie... +%global commit2 d08a03b6508b390af20491f2dbeee3453594afc8 +%global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) + # Decrease debuginfo verbosity to reduce memory consumption... %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') @@ -28,36 +32,42 @@ Summary: Telegram Desktop official messaging app Name: telegram-desktop -Version: 1.7.14 -Release: 2%{?dist} +Version: 1.8.0 +Release: 1%{?dist} # Application and 3rd-party modules licensing: # * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source; # * S1 (crl) - GPLv3+ -- build-time dependency; -# * S2 (qtlottie) - GPLv3+ -- build-time dependency; +# * S2 (rlottie) - LGPLv2+ -- static dependency; # * P0 (qt_functions.cpp) - LGPLv3 -- build-time dependency. License: GPLv3+ and LGPLv3 URL: %{upstreambase}/%{appname} + +%if 0%{?fedora} && 0%{?fedora} < 31 ExclusiveArch: i686 x86_64 +%else +ExclusiveArch: x86_64 +%endif # Source files... Source0: %{url}/archive/v%{version}.tar.gz#/%{appname}-%{version}.tar.gz Source1: %{upstreambase}/crl/archive/%{commit1}.tar.gz#/crl-%{shortcommit1}.tar.gz +Source2: https://github.com/john-preston/rlottie/archive/%{commit2}.tar.gz#/rlotti... # Downstream patches... Patch0: %{name}-build-fixes.patch Patch1: %{name}-system-fonts.patch Patch2: %{name}-unbundle-minizip.patch -# Upstream patches... -Patch100: %{name}-upstream-0710dde.patch -Patch101: %{name}-upstream-9c909c8.patch - %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: qt5-qtimageformats%{?_isa} Requires: hicolor-icon-theme Requires: open-sans-fonts +# Telegram Desktop require patched version of rlottie since 1.8.0. +# Pull Request pending: https://github.com/Samsung/rlottie/pull/252 +Provides: bundled(rlottie) = 0~git%{shortcommit2} + # Compilers and tools... BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -77,7 +87,6 @@ BuildRequires: qt5-qtbase-devel BuildRequires: libstdc++-devel BuildRequires: range-v3-devel BuildRequires: openssl-devel -BuildRequires: rlottie-devel BuildRequires: xxhash-devel BuildRequires: json11-devel BuildRequires: glib2-devel @@ -130,6 +139,13 @@ pushd Telegram/ThirdParty mv crl-%{commit1} crl popd +# Unpacking patched rlottie... +pushd Telegram/ThirdParty + rm -rf rlottie + tar -xf %{SOURCE2} + mv rlottie-%{commit2} rlottie +popd + %build # Setting build definitions... %if %{without gtk3} @@ -205,8 +221,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_metainfodir}/%{name}.appdata.xml %changelog -* Wed Aug 07 2019 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.7.14-2 -- Rebuild for new ffmpeg version +* Fri Aug 09 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.8.0-1 +- Updated to 1.8.0. + +* Fri Jul 19 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.7.15-1 +- Updated to 1.7.15 (beta). * Tue Jul 09 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.7.14-1 - Updated to 1.7.14.