commit 28791fa65040612d73b0815c1d425b73ab1665b2 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri Feb 1 18:22:16 2019 +0100 Updated to 1.5.11. Enabled LTO optimizations. .gitignore | 1 + sources | 2 +- telegram-desktop-build-fixes.patch | 46 ++++++++++++++------------------- telegram-desktop-system-fonts.patch | 4 +-- telegram-desktop-unbundle-minizip.patch | 6 ++--- telegram-desktop.spec | 15 +++++++++-- 6 files changed, 39 insertions(+), 35 deletions(-) --- diff --git a/.gitignore b/.gitignore index e890e47..d2b9225 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /crl-9b7c6b5.tar.gz /tdesktop-1.5.7.tar.gz /tdesktop-1.5.8.tar.gz +/tdesktop-1.5.11.tar.gz diff --git a/sources b/sources index 186d347..e8b77ce 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 3ac19bcca9cb18f67bdb0ccb99445773 crl-9b7c6b5.tar.gz -1c8649412b9c2ac36d5e79c9a1236610 tdesktop-1.5.8.tar.gz +b34989efc35c74a313e59fbc64d8583c tdesktop-1.5.11.tar.gz diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch index 0f1b24a..517ff88 100644 --- a/telegram-desktop-build-fixes.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,4 +1,4 @@ -From 1fd00618894c6f2ff7a04620883d123cf0aba7dd Mon Sep 17 00:00:00 2001 +From f2b45bc6e63be1613cda0a5116ef36e2fdb5718f 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. @@ -18,12 +18,12 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock. 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/settings_linux.gypi | 13 ---- Telegram/gyp/telegram_linux.gypi | 73 +++++------------- Telegram/gyp/telegram_sources.txt | 2 +- lib/xdg/telegramdesktop.appdata.xml | 2 +- lib/xdg/telegramdesktop.desktop | 5 +- - 19 files changed, 173 insertions(+), 192 deletions(-) + 19 files changed, 172 insertions(+), 181 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp create mode 100644 Telegram/gyp/CMakeLists.inj @@ -41,12 +41,12 @@ index 164e8d4f2..c67569284 100644 </qresource> </RCC> diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index 83f869e36..a3110d826 100644 +index 129407523..0b5a1c3ef 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -59,6 +59,7 @@ int Launcher::exec() { +@@ -228,6 +228,7 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started - Platform::start(); // must be started before QApplication is created + Platform::start(); // must be started before Sandbox is created + unsetenv("QT_QPA_PLATFORMTHEME"); auto result = executeApplication(); @@ -595,7 +595,7 @@ index f5624a82b..b644ce29f 100644 '-no-compress', '<(RULE_INPUT_PATH)', diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi -index 17219fa2c..9b6f0c510 100644 +index 17219fa2c..072c15d94 100644 --- a/Telegram/gyp/settings_linux.gypi +++ b/Telegram/gyp/settings_linux.gypi @@ -9,10 +9,6 @@ @@ -609,25 +609,17 @@ index 17219fa2c..9b6f0c510 100644 '-fPIC', '-Wno-unused-variable', '-Wno-unused-parameter', -@@ -43,24 +39,10 @@ - 'sources': [ '__Wrong_Official_Build_Target_<(official_build_target)_' ], - }], - ], -- }], [ '"<!(uname -p)" == "x86_64"', { -- # 32 bit version can't be linked with debug info or LTO, -- # virtual memory exhausted :( +@@ -46,9 +42,6 @@ + }], [ '"<!(uname -p)" == "x86_64"', { + # 32 bit version can't be linked with debug info or LTO, + # virtual memory exhausted :( - 'cflags_c': [ '-g' ], - 'cflags_cc': [ '-g' ], - 'ldflags': [ '-g' ], -- 'configurations': { -- 'Release': { -- 'cflags_c': [ '-flto' ], -- 'cflags_cc': [ '-flto' ], -- 'ldflags': [ '-flto', '-fuse-linker-plugin' ], -- }, -- }, -- }] -+ }], + 'configurations': { + 'Release': { + 'cflags_c': [ '-flto' ], +@@ -60,7 +53,6 @@ ], 'defines': [ '_REENTRANT', @@ -635,7 +627,7 @@ index 17219fa2c..9b6f0c510 100644 'QT_PLUGIN', ], 'cflags_c': [ -@@ -72,11 +54,6 @@ +@@ -72,11 +64,6 @@ '-std=c++1z', '-Wno-register', ], @@ -767,11 +759,11 @@ index ffe0e5a96..9bc686d44 100644 ], }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', { diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index 2a2d718b8..d82413a3c 100644 +index a914a0ae5..c36ab7817 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -822,7 +822,7 @@ - <(src_loc)/messenger.h +@@ -824,7 +824,7 @@ + <(src_loc)/mediaview.h <(src_loc)/observer_peer.cpp <(src_loc)/observer_peer.h -<(src_loc)/qt_static_plugins.cpp diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch index fa79d3d..ec731a5 100644 --- a/telegram-desktop-system-fonts.patch +++ b/telegram-desktop-system-fonts.patch @@ -1,4 +1,4 @@ -From c29b7e8b28c044eae3d480bf69338dc1accadbd7 Mon Sep 17 00:00:00 2001 +From 72e5ad8818993786d24ba1321e29612ca3dd99d4 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 @@ -25,7 +25,7 @@ index 99f66c5cb..b3b241c9f 100644 <file alias="art/bg_initial.jpg">../art/bg_initial.jpg</file> <file alias="art/logo_256.png">../art/logo_256.png</file> diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp -index be9ecce12..52da1540a 100644 +index d105f78c2..550bd50db 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp @@ -70,9 +70,9 @@ void Start() { diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch index cfc1a4e..cec8e22 100644 --- a/telegram-desktop-unbundle-minizip.patch +++ b/telegram-desktop-unbundle-minizip.patch @@ -1,4 +1,4 @@ -From 897c69f886c153bb5d5e7be1c57aff972adb5308 Mon Sep 17 00:00:00 2001 +From 421283fe4936cac801aa483dd7af3464a8212982 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. @@ -50,10 +50,10 @@ index 9bc686d44..806374202 100644 'lzma', 'xxhash', diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index d82413a3c..a48fdbf7e 100644 +index c36ab7817..6181f7d35 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -829,13 +829,6 @@ +@@ -831,13 +831,6 @@ <(emoji_suggestions_loc)/emoji_suggestions.h platforms: !win diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 2e477c8..6623c45 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -12,7 +12,7 @@ Summary: Telegram Desktop official messaging app Name: telegram-desktop -Version: 1.5.8 +Version: 1.5.11 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -104,7 +104,6 @@ TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_AUTOUPDATE,' TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME,' TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION,' TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_CRASH_REPORTS,' -TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_UNITY_INTEGRATION' # Generating cmake script using GYP... pushd Telegram/gyp @@ -115,6 +114,11 @@ popd LEN=$(($(wc -l < out/Release/CMakeLists.txt) - 2)) sed -i "$LEN r Telegram/gyp/CMakeLists.inj" out/Release/CMakeLists.txt +# Exporting correct paths to AR and RANLIB in order to use FLTO optimizations... +%ifarch x86_64 +sed -e '/set(configuration "Release")/a\' -e 'set(CMAKE_AR "%{_bindir}/gcc-ar")\' -e 'set(CMAKE_RANLIB "%{_bindir}/gcc-ranlib")\' -e 'set(CMAKE_NM "%{_bindir}/gcc-nm")' -i out/Release/CMakeLists.txt +%endif + # Building Telegram Desktop using cmake... pushd out/Release %cmake . @@ -153,6 +157,13 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}. %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Fri Feb 01 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.5.11-1 +- Updated to 1.5.11. +- Enabled LTO optimizations. + +* Fri Feb 01 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.5.10-1 +- Updated to 1.5.10. + * Mon Jan 21 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.5.8-1 - Updated to 1.5.8.