11:14 a.m.
commit 26f0eb0e1c2dc2e2fda24b8709bab9149268e8ae
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed May 29 13:13:20 2019 +0200
Updated to 1.7.1 (beta).
.gitignore | 3 ++
sources | 5 ++-
telegram-desktop-build-fixes.patch | 72 ++++++++++++++++++++++++---------
telegram-desktop-pr-6025.patch | 36 -----------------
telegram-desktop-rr-ddb9c8.patch | 57 --------------------------
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 10 ++---
telegram-desktop.spec | 35 ++++++++++------
8 files changed, 88 insertions(+), 132 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e592da9..9268b18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,6 @@
/tdesktop-1.6.3.tar.gz
/tdesktop-1.6.7.tar.gz
/tdesktop-1.7.0.tar.gz
+/crl-d259aeb.tar.gz
+/qtlottie-6cd5e32.tar.gz
+/tdesktop-1.7.1.tar.gz
diff --git a/sources b/sources
index 6fc9698..ca56694 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-ae7f024486ddce3b598477bf40a86c79 crl-84072fb.tar.gz
-c5160817afb3acb53d65f3dd03108b07 tdesktop-1.7.0.tar.gz
+22d696169c7e4ae7dbd2ab1e979cadd7 crl-d259aeb.tar.gz
+a2346ad2b0fb2d43b9882058bc65a03f qtlottie-6cd5e32.tar.gz
+4cd9ec4fb81acd45cff94424ad4353e5 tdesktop-1.7.1.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 5fd721e..dcbcd57 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 6eebdb636516c5248ca2b3f2089d575c67a4c023 Mon Sep 17 00:00:00 2001
+From c2ac9062ba855d63d9fcdc3337eedd0a4779a872 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
@@ -8,12 +8,13 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
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/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_lottie.gyp | 9 +--
Telegram/gyp/lib_scheme.gyp | 4 +-
Telegram/gyp/lib_storage.gyp | 8 +-
Telegram/gyp/qt.gypi | 87 ++++++---------------
@@ -24,7 +25,7 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
Telegram/gyp/telegram_sources.txt | 2 +-
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 5 +-
- 20 files changed, 172 insertions(+), 199 deletions(-)
+ 21 files changed, 176 insertions(+), 205 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
@@ -56,10 +57,10 @@ index 164e8d4f2..03585ec03 100644
- </qresource>
</RCC>
diff --git a/Telegram/SourceFiles/core/launcher.cpp
b/Telegram/SourceFiles/core/launcher.cpp
-index 3efa53eba..4427ceae6 100644
+index 851ed591e..af18e29a5 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
-@@ -264,6 +264,7 @@ int Launcher::exec() {
+@@ -268,6 +268,7 @@ int Launcher::exec() {
Logs::start(this); // must be started before Platform is started
Platform::start(); // must be started before Sandbox is created
@@ -169,18 +170,19 @@ index 000000000..4a722b8d7
+}
diff --git a/Telegram/gyp/CMakeLists.inj b/Telegram/gyp/CMakeLists.inj
new file mode 100644
-index 000000000..a04c9c3c9
+index 000000000..3a98b10a1
--- /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_lottie ../../Telegram/SourceFiles/lottie/lottie_pch.h)
diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
-index a0e1e0489..bd9bce0c1 100644
+index dfe1193be..75bcd675d 100644
--- a/Telegram/gyp/PrecompiledHeader.cmake
+++ b/Telegram/gyp/PrecompiledHeader.cmake
@@ -114,7 +114,7 @@ function(add_precompiled_header _target _input)
@@ -202,7 +204,7 @@ index a0e1e0489..bd9bce0c1 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 e329d06d9..837943bbe 100644
+index 7370115f0..b48eb774c 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -51,15 +51,13 @@
@@ -232,7 +234,7 @@ index e329d06d9..837943bbe 100644
'crl.gyp:crl',
'lib_base.gyp:lib_base',
'lib_export.gyp:lib_export',
-@@ -84,32 +79,19 @@
+@@ -85,32 +80,19 @@
],
'defines': [
@@ -266,7 +268,7 @@ index e329d06d9..837943bbe 100644
],
'sources': [
'<@(qrc_files)',
-@@ -131,7 +113,6 @@
+@@ -132,7 +114,6 @@
'TDESKTOP_OFFICIAL_TARGET=<(official_build_target)',
],
'dependencies': [
@@ -355,6 +357,38 @@ index f73aabdb1..24493f159 100644
'<(submodules_loc)/crl/src',
],
'sources': [
+diff --git a/Telegram/gyp/lib_lottie.gyp b/Telegram/gyp/lib_lottie.gyp
+index 6ca841f17..515c238a0 100644
+--- a/Telegram/gyp/lib_lottie.gyp
++++ b/Telegram/gyp/lib_lottie.gyp
+@@ -13,7 +13,6 @@
+ 'type': 'static_library',
+ 'includes': [
+ 'common.gypi',
+- 'openssl.gypi',
+ 'qt.gypi',
+ 'telegram_linux.gypi',
+ 'pch.gypi',
+@@ -43,16 +42,14 @@
+ 'include_dirs': [
+ '<(src_loc)',
+ '<(SHARED_INTERMEDIATE_DIR)',
+- '<(libs_loc)/range-v3/include',
+- '<(libs_loc)/zlib',
+ '<(lottie_loc)',
+ '<(lottie_loc)/bodymovin',
+ '<(lottie_loc)/imports',
+ '<(lottie_helper_loc)',
+- '<(submodules_loc)/GSL/include',
+- '<(submodules_loc)/variant/include',
++ '<!(rpm --eval
"%{_includedir}")/guidelines-support-library',
++ '<!(rpm --eval "%{_includedir}")/mapbox',
++ '<!(rpm --eval "%{_includedir}")',
+ '<(submodules_loc)/crl/src',
+- '<(submodules_loc)/rapidjson/include',
+ ],
+ 'sources': [
+ # interface for tdesktop
diff --git a/Telegram/gyp/lib_scheme.gyp b/Telegram/gyp/lib_scheme.gyp
index b52a9d071..4850157a8 100644
--- a/Telegram/gyp/lib_scheme.gyp
@@ -576,10 +610,10 @@ index 0b783ec21..125ab2513 100644
'-rdynamic',
],
diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi
-index 464d3c818..6f20dbbfc 100644
+index ebee90a15..3cfb49f25 100644
--- a/Telegram/gyp/qt_moc.gypi
+++ b/Telegram/gyp/qt_moc.gypi
-@@ -12,12 +12,13 @@
+@@ -15,12 +15,13 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
],
'action': [
@@ -609,7 +643,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 22160515c..ca44eeb16 100644
+index 17f7a5c9c..726b689ac 100644
--- a/Telegram/gyp/settings_linux.gypi
+++ b/Telegram/gyp/settings_linux.gypi
@@ -9,10 +9,6 @@
@@ -623,7 +657,7 @@ index 22160515c..ca44eeb16 100644
'-fPIC',
'-Wno-unused-variable',
'-Wno-unused-parameter',
-@@ -44,24 +40,10 @@
+@@ -46,24 +42,10 @@
'sources': [
'__Wrong_Official_Build_Target_<(official_build_target)_' ],
}],
],
@@ -649,7 +683,7 @@ index 22160515c..ca44eeb16 100644
'QT_PLUGIN',
],
'cflags_c': [
-@@ -73,11 +55,6 @@
+@@ -75,11 +57,6 @@
'-std=c++1z',
'-Wno-register',
],
@@ -781,10 +815,10 @@ 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 ed2e3bc14..45e3e019e 100644
+index 43e043a55..bdf6f80f2 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -855,7 +855,7 @@
+@@ -861,7 +861,7 @@
<(src_loc)/mainwindow.h
<(src_loc)/observer_peer.cpp
<(src_loc)/observer_peer.h
@@ -794,7 +828,7 @@ index ed2e3bc14..45e3e019e 100644
<(src_loc)/settings.h
<(emoji_suggestions_loc)/emoji_suggestions.cpp
diff --git a/lib/xdg/telegramdesktop.appdata.xml b/lib/xdg/telegramdesktop.appdata.xml
-index 7bcf8d835..4508c01cd 100644
+index 9eedae55c..f90a6b8e7 100644
--- a/lib/xdg/telegramdesktop.appdata.xml
+++ b/lib/xdg/telegramdesktop.appdata.xml
@@ -1,6 +1,6 @@
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 192f1d1..2e2714f 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 3f9ccbabc7b6d8074786c953f95f08c1356d4edb Mon Sep 17 00:00:00 2001
+From 67936057480c18f23723d95cfa9bf5ad4913a226 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
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 5f0f201..7817fa7 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From b455e4b41ef600fc9d274aa6d76c2db9e39d29d6 Mon Sep 17 00:00:00 2001
+From 1792a6c2892fef18a1b09f0a58c6ef0632f0c5f2 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
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 837943bbe..2e941316e 100644
+index b48eb774c..c34617aa2 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -18,7 +18,6 @@
@@ -21,7 +21,7 @@ index 837943bbe..2e941316e 100644
'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'emoji_suggestions_loc':
'<(submodules_loc)/emoji_suggestions',
'style_files': [
-@@ -89,7 +88,6 @@
+@@ -90,7 +89,6 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -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 45e3e019e..9c8690dc5 100644
+index bdf6f80f2..c20b61824 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -862,13 +862,6 @@
+@@ -868,13 +868,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 0fb6b94..e8ef23d 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -12,44 +12,44 @@
%global appname tdesktop
%global apiid 208164
%global apihash dfbe1bc42dc9d20507e17d1814cc2f0a
+%global upstreambase https://github.com/telegramdesktop
# Git revision of crl...
-%global commit1 84072fba75f14620935e5e91788ce603daeb1988
+%global commit1 d259aebc11df52cb6ff8c738580dc4d8f245d681
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
+# Git revision of qtlottie...
+%global commit2 6cd5e323645746620f96450487e05900a0fbc7ce
+%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
+
# Decrease debuginfo verbosity to reduce memory consumption...
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
# Applying workaround to RHBZ#1559007...
%if %{with clang}
-%global optflags %(echo %{optflags} | sed -e 's/-mcet//g' -e
's/-fcf-protection//g' -e 's/-fstack-clash-protection//g')
+%global optflags %(echo %{optflags} | sed -e 's/-mcet//g' -e
's/-fcf-protection//g' -e 's/-fstack-clash-protection//g' -e
's/$/-Qunused-arguments -Wno-unknown-warning-option/')
%endif
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.7.0
-Release: 2%{?dist}
+Version: 1.7.1
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
# * S1 (crl) - GPLv3+ -- build-time dependency;
# * P0 (qt_functions.cpp) - LGPLv3 -- build-time dependency.
License: GPLv3+ and LGPLv3
-URL: https://github.com/telegramdesktop/%{appname}
-
-# Warning! Builds on i686 may fail due to technical limitations of this
-# architecture: https://github.com/telegramdesktop/tdesktop/issues/4101
+URL: %{upstreambase}/%{appname}
ExclusiveArch: i686 x86_64
Source0: %{url}/archive/v%{version}.tar.gz#/%{appname}-%{version}.tar.gz
-Source1:
https://github.com/telegramdesktop/crl/archive/%{commit1}.tar.gz#/crl-%{s...
+Source1: %{upstreambase}/crl/archive/%{commit1}.tar.gz#/crl-%{shortcommit1}.tar.gz
+Source2:
%{upstreambase}/qtlottie/archive/%{commit2}.tar.gz#/qtlottie-%{shortcommit2}.tar.gz
Patch0: %{name}-build-fixes.patch
Patch1: %{name}-system-fonts.patch
Patch2: %{name}-unbundle-minizip.patch
-Patch100: %{name}-pr-6025.patch
-Patch101: %{name}-rr-ddb9c8.patch
-
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
Requires: qt5-qtimageformats%{?_isa}
Requires: hicolor-icon-theme
@@ -72,6 +72,7 @@ BuildRequires: ffmpeg-devel >= 3.1
BuildRequires: openal-soft-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: libstdc++-devel
+BuildRequires: rapidjson-devel
BuildRequires: range-v3-devel
BuildRequires: openssl-devel
BuildRequires: xxhash-devel
@@ -125,6 +126,13 @@ pushd Telegram/ThirdParty
mv crl-%{commit1} crl
popd
+# Unpacking qtlottie...
+pushd Telegram/ThirdParty
+ rm -rf qtlottie
+ tar -xf %{SOURCE2}
+ mv qtlottie-%{commit2} qtlottie
+popd
+
%build
# Setting build definitions...
%if %{without gtk3}
@@ -200,6 +208,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Wed May 29 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.7.1-1
+- Updated to 1.7.1 (beta).
+
* Sat May 18 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.7.0-2
- Switched to clang as a temporary workaround on Fedora 30+.
- Disabled LTO optimizations.