commit 9b4221dd694fcf7391ba8996b481266eee29857b Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri Jul 13 23:48:14 2018 +0200 Updated to version 1.3.10. .gitignore | 1 + sources | 2 +- telegram-desktop-api-tokens.patch | 8 +++--- telegram-desktop-build-fixes.patch | 51 ++++++++++++++++++++++--------------- telegram-desktop-system-fonts.patch | 14 +++++----- telegram-desktop.spec | 8 ++++-- 6 files changed, 50 insertions(+), 34 deletions(-) --- diff --git a/.gitignore b/.gitignore index 308aae2..e545c09 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /crl-9bc641f.tar.gz /tdesktop-1.3.8.tar.gz /tdesktop-1.3.9.tar.gz +/tdesktop-1.3.10.tar.gz diff --git a/sources b/sources index 5318be9..93729fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ a83f06b2b163c242d20e1ff74711b7d5 crl-9bc641f.tar.gz -acb1029cfef389fdee586edc439b5058 tdesktop-1.3.9.tar.gz +7334804f2ae749aa592e49b810a97b10 tdesktop-1.3.10.tar.gz diff --git a/telegram-desktop-api-tokens.patch b/telegram-desktop-api-tokens.patch index 8126e87..4fb880a 100644 --- a/telegram-desktop-api-tokens.patch +++ b/telegram-desktop-api-tokens.patch @@ -1,9 +1,9 @@ -From f159a390f8441980776e3fa1e3ed3dedc0b9e32c Mon Sep 17 00:00:00 2001 +From 23370701fccf459e6b69d0a75f14abeb030f824a 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] Changed default Telegram Desktop's test API keys to obtained - specially for Fedora/RPMFusion. We cannot hide them because we need to - provide reproducible builds. +Subject: [PATCH 2/3] Changed default Telegram Desktop's test API keys to + obtained specially for Fedora/RPMFusion. We cannot hide them because we need + to provide reproducible builds. --- Telegram/SourceFiles/config.h | 4 ++-- diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch index 68b2714..3e7e6b5 100644 --- a/telegram-desktop-build-fixes.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,7 +1,7 @@ -From 8b674a0b114fe4780ee95070cf810bb12aee392c Mon Sep 17 00:00:00 2001 +From d89702b2460a81b38920cfdfa94cffd37c6f20a1 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] Fixed build under Fedora using rpmbuild and mock. +Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock. --- Telegram/Resources/qrc/telegram_linux.qrc | 1 - @@ -11,17 +11,17 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock. Telegram/gyp/PrecompiledHeader.cmake | 4 +- Telegram/gyp/Telegram.gyp | 29 ++----- Telegram/gyp/codegen_rules.gypi | 6 +- - Telegram/gyp/lib_export.gyp | 6 +- + Telegram/gyp/lib_export.gyp | 9 +-- Telegram/gyp/lib_scheme.gyp | 2 +- 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 | 73 +++++------------- + Telegram/gyp/telegram_linux.gypi | 74 +++++------------- Telegram/gyp/telegram_sources.txt | 9 +-- lib/xdg/telegramdesktop.appdata.xml | 2 +- lib/xdg/telegramdesktop.desktop | 6 +- - 17 files changed, 170 insertions(+), 186 deletions(-) + 17 files changed, 171 insertions(+), 189 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp create mode 100644 Telegram/gyp/CMakeLists.inj @@ -36,10 +36,10 @@ index 0554fa179..3ea027406 100644 </qresource> </RCC> diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index 207885898..872438eea 100644 +index 0a58df067..ce4db4dc6 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -57,6 +57,7 @@ int Launcher::exec() { +@@ -58,6 +58,7 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started Platform::start(); // must be started before QApplication is created @@ -180,7 +180,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 65917d9b5..bb02ca01b 100644 +index f959b65f0..5a5860805 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -18,7 +18,6 @@ @@ -250,14 +250,14 @@ index 65917d9b5..bb02ca01b 100644 '<(submodules_loc)/crl/src', ], 'sources': [ -@@ -120,7 +106,6 @@ +@@ -122,7 +108,6 @@ 'CUSTOM_API_ID', ], 'dependencies': [ - 'utils.gyp:Packer', ], - }], - ], + }], [ 'build_mac', { + 'mac_bundle': '1', diff --git a/Telegram/gyp/codegen_rules.gypi b/Telegram/gyp/codegen_rules.gypi index a901db3bb..424f70eea 100644 --- a/Telegram/gyp/codegen_rules.gypi @@ -288,10 +288,20 @@ index a901db3bb..424f70eea 100644 '<@(qrc_files)', ], diff --git a/Telegram/gyp/lib_export.gyp b/Telegram/gyp/lib_export.gyp -index 0d368e2e7..6250ef782 100644 +index 2d1ac6c56..c81930f80 100644 --- a/Telegram/gyp/lib_export.gyp +++ b/Telegram/gyp/lib_export.gyp -@@ -44,9 +44,9 @@ +@@ -14,9 +14,6 @@ + 'includes': [ + 'common.gypi', + 'qt.gypi', +- 'telegram_win.gypi', +- 'telegram_mac.gypi', +- 'telegram_linux.gypi', + 'pch.gypi', + ], + 'variables': { +@@ -48,9 +45,9 @@ 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', @@ -575,19 +585,19 @@ index 17219fa2c..9b6f0c510 100644 'Debug': { }, diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index 01231c4d1..33b19fe06 100644 +index 80259c687..eea3a862e 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi -@@ -7,7 +7,7 @@ - { - 'conditions': [[ 'build_linux', { - 'variables': { +@@ -10,7 +10,7 @@ + 'variables': { + 'build_defines%': '', + }, - 'not_need_gtk%': '<!(python -c "print(\'TDESKTOP_DISABLE_GTK_INTEGRATION\' in \'<(build_defines)\')")', + 'not_need_gtk%': '<!(python2 -c "print(\'TDESKTOP_DISABLE_GTK_INTEGRATION\' in \'<(build_defines)\')")', 'pkgconfig_libs': [ # In order to work libxkbcommon must be linked statically, # PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon" -@@ -15,50 +15,29 @@ +@@ -18,50 +18,30 @@ # QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create #'xkbcommon', ], @@ -652,10 +662,11 @@ index 01231c4d1..33b19fe06 100644 + 'z', + 'minizip', + 'tgvoip', ++ 'lzma', # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ -@@ -66,36 +45,24 @@ +@@ -69,36 +49,24 @@ '-Wno-maybe-uninitialized', ], 'ldflags': [ diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch index 1b5f4f0..5b6da8a 100644 --- a/telegram-desktop-system-fonts.patch +++ b/telegram-desktop-system-fonts.patch @@ -1,9 +1,9 @@ -From d44202d9bd365ad5978731b96ae15b14b9b211ae Mon Sep 17 00:00:00 2001 +From d572ef721f4824e591e4ca5430616d0019a5c799 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] Backported and rebased patch from Debian maintainer Nicholas - Guriev. Removed links to packaged Open Sans fonts. Telegram Desktop will use - packaged versions. +Subject: [PATCH 3/3] Backported and rebased patch from Debian maintainer + Nicholas Guriev. Removed links to packaged Open Sans fonts. Telegram Desktop + will use packaged versions. --- Telegram/Resources/qrc/telegram.qrc | 3 --- @@ -11,11 +11,11 @@ Subject: [PATCH] Backported and rebased patch from Debian maintainer Nicholas 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Telegram/Resources/qrc/telegram.qrc b/Telegram/Resources/qrc/telegram.qrc -index 48b4398eb..be995db75 100644 +index e96b25780..f6270c5a3 100644 --- a/Telegram/Resources/qrc/telegram.qrc +++ b/Telegram/Resources/qrc/telegram.qrc -@@ -3,9 +3,6 @@ - <file alias="css/style.css">../css/export_style.css</file> +@@ -41,9 +41,6 @@ + <file alias=&quot;images/section_web@2x.png&quot;&gt;../export_html/images/section_web(a)2x.png&lt;/file&gt; </qresource> <qresource prefix="/gui"> - <file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file> diff --git a/telegram-desktop.spec b/telegram-desktop.spec index b89a756..de8d3f4 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -10,8 +10,8 @@ Summary: Telegram Desktop official messaging app Name: telegram-desktop -Version: 1.3.9 -Release: 2%{?dist} +Version: 1.3.10 +Release: 1%{?dist} # Application and 3rd-party modules licensing: # * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source; @@ -56,6 +56,7 @@ BuildRequires: libstdc++-devel BuildRequires: range-v3-devel BuildRequires: openssl-devel BuildRequires: minizip-devel +BuildRequires: lzma-devel BuildRequires: opus-devel BuildRequires: gtk3-devel BuildRequires: dee-devel @@ -134,6 +135,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}. %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Fri Jul 13 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.3.10-1 +- Updated to 1.3.10. + * Mon Jul 02 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.3.9-2 - Rebuild for libtgvoip update.