[telegram-desktop/f28: 1/2] Updated to version 1.5.1.

commit 8c9d6ef15cce91325cf6d5afd8a109994f2a8b40 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Tue Dec 11 20:52:42 2018 +0100 Updated to version 1.5.1. .gitignore | 1 + sources | 2 +- telegram-desktop-api-tokens.patch | 29 ------- telegram-desktop-build-fixes.patch | 142 +++++++++++++------------------- telegram-desktop-system-fonts.patch | 10 +-- telegram-desktop-unbundle-minizip.patch | 72 ++++++++++++++++ telegram-desktop.spec | 43 ++++++++-- 7 files changed, 172 insertions(+), 127 deletions(-) --- diff --git a/.gitignore b/.gitignore index d951233..e847527 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /tdesktop-1.4.0.tar.gz /tdesktop-1.4.2.tar.gz /tdesktop-1.4.3.tar.gz +/tdesktop-1.5.1.tar.gz diff --git a/sources b/sources index f7dfac7..0d609ea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b92e75c44c9d4c9fd96b1d19eb3a666d crl-4291015.tar.gz -8786fea9f58542aa76ed898879fa0631 tdesktop-1.4.3.tar.gz +bdf5350b3f11ecdfb9030b7a920591ae tdesktop-1.5.1.tar.gz diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch index d1f1e0e..9faf716 100644 --- a/telegram-desktop-build-fixes.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,41 +1,44 @@ -From 2da9a65c2f0d10a1c30134c48a9894270bb83f13 Mon Sep 17 00:00:00 2001 +From 8f11130c80595b73069b534aebd64f6b32b7ed5d 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. --- - Telegram/Resources/qrc/telegram_linux.qrc | 1 - + Telegram/Resources/qrc/telegram_linux.qrc | 2 - Telegram/SourceFiles/core/launcher.cpp | 1 + Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++ Telegram/gyp/CMakeLists.inj | 6 ++ Telegram/gyp/PrecompiledHeader.cmake | 4 +- - Telegram/gyp/Telegram.gyp | 31 ++------ + Telegram/gyp/Telegram.gyp | 24 +----- Telegram/gyp/codegen_rules.gypi | 6 +- - Telegram/gyp/lib_base.gyp | 11 +-- + Telegram/gyp/lib_base.gyp | 10 +-- Telegram/gyp/lib_export.gyp | 9 +-- Telegram/gyp/lib_scheme.gyp | 4 +- - Telegram/gyp/lib_storage.gyp | 11 +-- + Telegram/gyp/lib_storage.gyp | 10 +-- 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_sources.txt | 9 +-- + Telegram/gyp/telegram_linux.gypi | 73 +++++------------- + Telegram/gyp/telegram_sources.txt | 2 +- lib/xdg/telegramdesktop.appdata.xml | 2 +- - lib/xdg/telegramdesktop.desktop | 6 +- - 19 files changed, 183 insertions(+), 206 deletions(-) + lib/xdg/telegramdesktop.desktop | 5 +- + 19 files changed, 172 insertions(+), 199 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp create mode 100644 Telegram/gyp/CMakeLists.inj diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc -index 0554fa179..3ea027406 100644 +index 164e8d4f2..c67569284 100644 --- a/Telegram/Resources/qrc/telegram_linux.qrc +++ b/Telegram/Resources/qrc/telegram_linux.qrc -@@ -1,5 +1,4 @@ +@@ -1,8 +1,6 @@ <RCC> <qresource prefix="/qt"> - <file alias="etc/qt.conf">../etc/qt_linux.conf</file> </qresource> + <qresource prefix="/fc"> +- <file alias="fc-custom.conf">../fc-custom.conf</file> + </qresource> </RCC> diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp index d4bdadc17..728b6b2fe 100644 @@ -184,23 +187,15 @@ 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 dd7779c7e..d92e36b79 100644 +index ac7696e1d..783ad1da2 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp -@@ -18,7 +18,6 @@ - 'src_loc': '../SourceFiles', - 'res_loc': '../Resources', - 'submodules_loc': '../ThirdParty', -- 'minizip_loc': '<(submodules_loc)/minizip', - 'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap', - 'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions', - 'style_files': [ -@@ -51,15 +50,13 @@ +@@ -51,15 +51,13 @@ 'pt-BR', ], 'build_defines%': '', - 'list_sources_command': 'python <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)', -+ 'list_sources_command': 'python2 <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)', ++ 'list_sources_command': 'python3 <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)', 'pch_source': '<(src_loc)/stdafx.cpp', 'pch_header': '<(src_loc)/stdafx.h', }, @@ -212,7 +207,7 @@ index dd7779c7e..d92e36b79 100644 'telegram_linux.gypi', 'openssl.gypi', 'qt.gypi', -@@ -74,9 +71,6 @@ +@@ -74,9 +72,6 @@ 'codegen.gyp:codegen_lang', 'codegen.gyp:codegen_numbers', 'codegen.gyp:codegen_style', @@ -222,7 +217,7 @@ index dd7779c7e..d92e36b79 100644 'crl.gyp:crl', 'lib_base.gyp:lib_base', 'lib_export.gyp:lib_export', -@@ -84,30 +78,20 @@ +@@ -84,32 +79,18 @@ ], 'defines': [ @@ -230,13 +225,10 @@ index dd7779c7e..d92e36b79 100644 - 'AL_ALEXT_PROTOTYPES', 'TGVOIP_USE_CXX11_LIB', - 'XXH_INLINE_ALL', + 'TDESKTOP_API_ID=<(api_id)', + 'TDESKTOP_API_HASH=<(api_hash)', - '<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")', -+ '__STDC_FORMAT_MACROS', -+ 'TDESKTOP_DISABLE_AUTOUPDATE', -+ 'TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME', -+ 'TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION', -+ 'TDESKTOP_DISABLE_CRASH_REPORTS', -+ 'TDESKTOP_DISABLE_UNITY_INTEGRATION', ++ '<!@(python3 -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")', ], 'include_dirs': [ @@ -249,7 +241,7 @@ index dd7779c7e..d92e36b79 100644 - '<(libs_loc)/openal-soft/include', - '<(libs_loc)/opus/include', - '<(libs_loc)/range-v3/include', -- '<(minizip_loc)', + '<(minizip_loc)', - '<(sp_media_key_tap_loc)', '<(emoji_suggestions_loc)', - '<(submodules_loc)/GSL/include', @@ -259,8 +251,8 @@ index dd7779c7e..d92e36b79 100644 ], 'sources': [ '<@(qrc_files)', -@@ -129,7 +113,6 @@ - 'CUSTOM_API_ID', +@@ -131,7 +112,6 @@ + 'TDESKTOP_OFFICIAL_TARGET=<(official_build_target)', ], 'dependencies': [ - 'utils.gyp:Packer', @@ -268,7 +260,7 @@ index dd7779c7e..d92e36b79 100644 }], [ 'build_mac', { 'mac_bundle': '1', diff --git a/Telegram/gyp/codegen_rules.gypi b/Telegram/gyp/codegen_rules.gypi -index a901db3bb..424f70eea 100644 +index a901db3bb..28873f8dc 100644 --- a/Telegram/gyp/codegen_rules.gypi +++ b/Telegram/gyp/codegen_rules.gypi @@ -15,7 +15,7 @@ @@ -276,7 +268,7 @@ index a901db3bb..424f70eea 100644 ], 'action': [ - 'python', '<(DEPTH)/update_dependent.py', '--styles', -+ 'python2', '<(DEPTH)/update_dependent.py', '--styles', ++ 'python3', '<(DEPTH)/update_dependent.py', '--styles', '-I', '<(res_loc)', '-I', '<(src_loc)', '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp', '<@(style_files)', @@ -285,19 +277,19 @@ index a901db3bb..424f70eea 100644 '<(DEPTH)/update_dependent.py', '<@(qrc_files)', - '<!@(python <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))', -+ '<!@(python2 <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))', ++ '<!@(python3 <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))', ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp', ], 'action': [ - 'python', '<(DEPTH)/update_dependent.py', '--qrc', -+ 'python2', '<(DEPTH)/update_dependent.py', '--qrc', ++ 'python3', '<(DEPTH)/update_dependent.py', '--qrc', '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp', '<@(qrc_files)', ], diff --git a/Telegram/gyp/lib_base.gyp b/Telegram/gyp/lib_base.gyp -index 1f3e9c34e..dcb34b536 100644 +index d70fe8fad..cd5a69485 100644 --- a/Telegram/gyp/lib_base.gyp +++ b/Telegram/gyp/lib_base.gyp @@ -15,8 +15,6 @@ @@ -317,24 +309,23 @@ index 1f3e9c34e..dcb34b536 100644 ], 'dependencies': [ 'crl.gyp:crl', -@@ -38,11 +35,11 @@ +@@ -38,11 +35,10 @@ 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', - '<(libs_loc)/range-v3/include', - '<(submodules_loc)/GSL/include', - '<(submodules_loc)/variant/include', -+ '<!(rpm --eval "%{_includedir}")/range-v3', + '<!(rpm --eval "%{_includedir}")/guidelines-support-library', + '<!(rpm --eval "%{_includedir}")/mapbox', ++ '<!(rpm --eval "%{_includedir}")', '<(submodules_loc)/crl/src', - '<(submodules_loc)/xxHash', -+ '<!(rpm --eval "%{_includedir}")', ], 'sources': [ '<(src_loc)/base/algorithm.h', diff --git a/Telegram/gyp/lib_export.gyp b/Telegram/gyp/lib_export.gyp -index 2d1ac6c56..c81930f80 100644 +index 2d1ac6c56..24493f159 100644 --- a/Telegram/gyp/lib_export.gyp +++ b/Telegram/gyp/lib_export.gyp @@ -14,9 +14,6 @@ @@ -354,14 +345,14 @@ index 2d1ac6c56..c81930f80 100644 - '<(libs_loc)/range-v3/include', - '<(submodules_loc)/GSL/include', - '<(submodules_loc)/variant/include', -+ '<!(rpm --eval "%{_includedir}")/range-v3', + '<!(rpm --eval "%{_includedir}")/guidelines-support-library', + '<!(rpm --eval "%{_includedir}")/mapbox', ++ '<!(rpm --eval "%{_includedir}")', '<(submodules_loc)/crl/src', ], 'sources': [ diff --git a/Telegram/gyp/lib_scheme.gyp b/Telegram/gyp/lib_scheme.gyp -index b52a9d071..32b126682 100644 +index b52a9d071..4850157a8 100644 --- a/Telegram/gyp/lib_scheme.gyp +++ b/Telegram/gyp/lib_scheme.gyp @@ -35,7 +35,7 @@ @@ -378,12 +369,12 @@ index b52a9d071..32b126682 100644 ], 'action': [ - 'python', '<(src_loc)/codegen/scheme/codegen_scheme.py', -+ 'python2', '<(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..', diff --git a/Telegram/gyp/lib_storage.gyp b/Telegram/gyp/lib_storage.gyp -index 527713546..3856cd87a 100644 +index 527713546..f34340d50 100644 --- a/Telegram/gyp/lib_storage.gyp +++ b/Telegram/gyp/lib_storage.gyp @@ -15,8 +15,6 @@ @@ -403,24 +394,23 @@ index 527713546..3856cd87a 100644 ], 'dependencies': [ 'crl.gyp:crl', -@@ -43,11 +40,11 @@ +@@ -43,11 +40,10 @@ 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', - '<(libs_loc)/range-v3/include', - '<(submodules_loc)/GSL/include', - '<(submodules_loc)/variant/include', -+ '<!(rpm --eval "%{_includedir}")/range-v3', + '<!(rpm --eval "%{_includedir}")/guidelines-support-library', + '<!(rpm --eval "%{_includedir}")/mapbox', ++ '<!(rpm --eval "%{_includedir}")', '<(submodules_loc)/crl/src', - '<(submodules_loc)/xxHash', -+ '<!(rpm --eval "%{_includedir}")', ], 'sources': [ '<(src_loc)/storage/storage_clear_legacy.cpp', diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi -index 0b783ec21..653562ffb 100644 +index 0b783ec21..125ab2513 100644 --- a/Telegram/gyp/qt.gypi +++ b/Telegram/gyp/qt.gypi @@ -14,25 +14,21 @@ @@ -491,14 +481,14 @@ index 0b783ec21..653562ffb 100644 'qt_version%': '<(qt_version)', 'qt_loc_unix': '<(qt_loc_unix)', - 'qt_version_loc': '<!(python -c "print(\'<(qt_version)\'.replace(\'.\', \'_\'))")', -+ 'qt_version_loc': '<!(python2 -c "print(\'<(qt_version)\'.replace(\'.\', \'_\'))")', ++ 'qt_version_loc': '<!(python3 -c "print(\'<(qt_version)\'.replace(\'.\', \'_\'))")', 'qt_libs_debug': [ - '<!@(python -c "for s in \&#39;&lt;(a)(qt_libs)\&#39;.split(\&#39; \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_debug_postfix)\')")', -+ '<!@(python2 -c "for s in \&#39;&lt;(a)(qt_libs)\&#39;.split(\&#39; \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_debug_postfix)\')")', ++ '<!@(python3 -c "for s in \&#39;&lt;(a)(qt_libs)\&#39;.split(\&#39; \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_debug_postfix)\')")', ], 'qt_libs_release': [ - '<!@(python -c "for s in \&#39;&lt;(a)(qt_libs)\&#39;.split(\&#39; \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_release_postfix)\')")', -+ '<!@(python2 -c "for s in \&#39;&lt;(a)(qt_libs)\&#39;.split(\&#39; \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_release_postfix)\')")', ++ '<!@(python3 -c "for s in \&#39;&lt;(a)(qt_libs)\&#39;.split(\&#39; \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_release_postfix)\')")', ], }, 'qt_libs_debug': [ '<@(qt_libs_debug)' ], @@ -591,7 +581,7 @@ index 0b783ec21..653562ffb 100644 '-rdynamic', ], diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi -index 464d3c818..909c4c5af 100644 +index 464d3c818..6f20dbbfc 100644 --- a/Telegram/gyp/qt_moc.gypi +++ b/Telegram/gyp/qt_moc.gypi @@ -12,12 +12,13 @@ @@ -606,7 +596,7 @@ index 464d3c818..909c4c5af 100644 - '<!@(python -c "for s in \&#39;&lt;(a)(_defines)\&#39;.split(\&#39; \'): print(\'-D\' + s)")', + '<!@(rpm --eval "%{optflags}" | grep -Po "[-]([IDU]\s*\S*|E)")', -+ '<!@(python2 -c "for s in \&#39;&lt;(a)(_defines)\&#39;.split(\&#39; \'): print(\'-D\' + s)")', ++ '<!@(python3 -c "for s in \&#39;&lt;(a)(_defines)\&#39;.split(\&#39; \'): print(\'-D\' + s)")', # '<!@(python -c "for s in \&#39;&lt;(a)(_include_dirs)\&#39;.split(\&#39; \'): print(\'-I\' + s)")', '<(RULE_INPUT_PATH)', '-o', '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp', @@ -677,7 +667,7 @@ index 17219fa2c..9b6f0c510 100644 'Debug': { }, diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index 80259c687..1e1b14748 100644 +index ffe0e5a96..9bc686d44 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi @@ -10,7 +10,7 @@ @@ -685,11 +675,11 @@ index 80259c687..1e1b14748 100644 '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)\')")', ++ 'not_need_gtk%': '<!(python3 -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" -@@ -18,50 +18,31 @@ +@@ -18,51 +18,28 @@ # QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create #'xkbcommon', ], @@ -710,11 +700,9 @@ index 80259c687..1e1b14748 100644 - '<(linux_path_range)/include', + '<!(rpm --eval "%{_includedir}")', + '<!(rpm --eval "%{_includedir}")/ffmpeg', -+ '<!(rpm --eval "%{_includedir}")/minizip', + '<!(rpm --eval "%{_includedir}")/opus', + '<!(rpm --eval "%{_includedir}")/libtgvoip', + '<!(rpm --eval "%{_includedir}")/guidelines-support-library', -+ '<!(rpm --eval "%{_includedir}")/range-v3', ], 'library_dirs': [ - '/usr/local/lib', @@ -731,6 +719,7 @@ index 80259c687..1e1b14748 100644 - 'ibusplatforminputcontextplugin', - 'fcitxplatforminputcontextplugin', - 'himeplatforminputcontextplugin', +- 'nimfplatforminputcontextplugin', - 'liblzma.a', - 'libopenal.a', - 'libavformat.a', @@ -752,14 +741,13 @@ index 80259c687..1e1b14748 100644 + 'swscale', + 'avutil', + 'z', -+ 'minizip', + 'tgvoip', + 'lzma', + 'xxhash', # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ -@@ -69,36 +50,24 @@ +@@ -70,35 +47,23 @@ '-Wno-maybe-uninitialized', ], 'ldflags': [ @@ -791,18 +779,17 @@ index 80259c687..1e1b14748 100644 - }], ['not_need_gtk!="True"', { + ['not_need_gtk!="True"', { 'cflags_cc': [ - '<!(pkg-config 2> /dev/null --cflags appindicator-0.1)', - '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)', - '<!(pkg-config 2> /dev/null --cflags glib-2.0)', + '<!(pkg-config 2> /dev/null --cflags gtk+-3.0)', '<!(pkg-config 2> /dev/null --cflags dee-1.0)', ], - }] + }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', { diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index a21f20b56..657fc8c5b 100644 +index 03c8a1335..b3a385064 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -753,7 +753,7 @@ +@@ -769,7 +769,7 @@ <(src_loc)/messenger.h <(src_loc)/observer_peer.cpp <(src_loc)/observer_peer.h @@ -810,21 +797,7 @@ index a21f20b56..657fc8c5b 100644 +<(src_loc)/qt_functions.cpp <(src_loc)/settings.cpp <(src_loc)/settings.h - <(src_loc)/shortcuts.cpp -@@ -762,13 +762,6 @@ - <(emoji_suggestions_loc)/emoji_suggestions.h - - platforms: !win --<(minizip_loc)/crypt.h --<(minizip_loc)/ioapi.c --<(minizip_loc)/ioapi.h --<(minizip_loc)/zip.c --<(minizip_loc)/zip.h --<(minizip_loc)/unzip.c --<(minizip_loc)/unzip.h - - platforms: win - <(res_loc)/winrc/Telegram.rc + <(emoji_suggestions_loc)/emoji_suggestions.cpp diff --git a/lib/xdg/telegramdesktop.appdata.xml b/lib/xdg/telegramdesktop.appdata.xml index 7bcf8d835..4508c01cd 100644 --- a/lib/xdg/telegramdesktop.appdata.xml @@ -838,15 +811,14 @@ index 7bcf8d835..4508c01cd 100644 <project_license>GPL-3.0</project_license> <name>Telegram Desktop</name> diff --git a/lib/xdg/telegramdesktop.desktop b/lib/xdg/telegramdesktop.desktop -index 0a8069512..550b9f785 100644 +index bb2a8ea79..960eaef0f 100644 --- a/lib/xdg/telegramdesktop.desktop +++ b/lib/xdg/telegramdesktop.desktop -@@ -1,9 +1,11 @@ +@@ -1,9 +1,10 @@ [Desktop Entry] Version=1.0 Name=Telegram Desktop +GenericName=Telegram Desktop -+Keywords=IM;Chat; Comment=Official desktop version of Telegram messaging app -Exec=telegram-desktop -- %u -Icon=telegram @@ -856,5 +828,5 @@ index 0a8069512..550b9f785 100644 StartupWMClass=TelegramDesktop Type=Application -- -2.17.2 +2.19.2 diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch index ea5f7e4..6b93d86 100644 --- a/telegram-desktop-system-fonts.patch +++ b/telegram-desktop-system-fonts.patch @@ -1,7 +1,7 @@ -From b9deb89449e8f1523bd5d94d3f9daeaccae1881a Mon Sep 17 00:00:00 2001 +From 3a7c0887f5d923dc25d852a859b775dd40382ae7 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 +Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer Nicholas Guriev. Removed links to packaged Open Sans fonts. Telegram Desktop will use packaged versions. @@ -11,7 +11,7 @@ Subject: [PATCH 3/3] Backported and rebased patch from Debian maintainer 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Telegram/Resources/qrc/telegram.qrc b/Telegram/Resources/qrc/telegram.qrc -index 5d4433627..26bc20807 100644 +index 99f66c5cb..b3b241c9f 100644 --- a/Telegram/Resources/qrc/telegram.qrc +++ b/Telegram/Resources/qrc/telegram.qrc @@ -42,9 +42,6 @@ @@ -25,7 +25,7 @@ index 5d4433627..26bc20807 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 71f318229..8912791a3 100644 +index 0ccc63ed5..ba13216a0 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp @@ -70,9 +70,9 @@ void Start() { @@ -42,5 +42,5 @@ index 71f318229..8912791a3 100644 #ifdef Q_OS_WIN // Attempt to workaround a strange font bug with Open Sans Semibold not loading. -- -2.17.2 +2.19.2 diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch new file mode 100644 index 0000000..cab20ec --- /dev/null +++ b/telegram-desktop-unbundle-minizip.patch @@ -0,0 +1,72 @@ +From 2501c4ab40a418a24d0f462dc1044fb9618e5970 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. + +--- + Telegram/gyp/Telegram.gyp | 2 -- + Telegram/gyp/telegram_linux.gypi | 2 ++ + Telegram/gyp/telegram_sources.txt | 7 ------- + 3 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp +index 783ad1da2..5a8a53557 100644 +--- a/Telegram/gyp/Telegram.gyp ++++ b/Telegram/gyp/Telegram.gyp +@@ -18,7 +18,6 @@ + 'src_loc': '../SourceFiles', + 'res_loc': '../Resources', + 'submodules_loc': '../ThirdParty', +- 'minizip_loc': '<(submodules_loc)/minizip', + 'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap', + 'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions', + 'style_files': [ +@@ -88,7 +87,6 @@ + 'include_dirs': [ + '<(src_loc)', + '<(SHARED_INTERMEDIATE_DIR)', +- '<(minizip_loc)', + '<(emoji_suggestions_loc)', + '<(submodules_loc)/crl/src', + ], +diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi +index 9bc686d44..806374202 100644 +--- a/Telegram/gyp/telegram_linux.gypi ++++ b/Telegram/gyp/telegram_linux.gypi +@@ -22,6 +22,7 @@ + 'include_dirs': [ + '<!(rpm --eval "%{_includedir}")', + '<!(rpm --eval "%{_includedir}")/ffmpeg', ++ '<!(rpm --eval "%{_includedir}")/minizip', + '<!(rpm --eval "%{_includedir}")/opus', + '<!(rpm --eval "%{_includedir}")/libtgvoip', + '<!(rpm --eval "%{_includedir}")/guidelines-support-library', +@@ -37,6 +38,7 @@ + 'swscale', + 'avutil', + 'z', ++ 'minizip', + 'tgvoip', + 'lzma', + 'xxhash', +diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt +index b3a385064..10895dc5e 100644 +--- a/Telegram/gyp/telegram_sources.txt ++++ b/Telegram/gyp/telegram_sources.txt +@@ -776,13 +776,6 @@ + <(emoji_suggestions_loc)/emoji_suggestions.h + + platforms: !win +-<(minizip_loc)/crypt.h +-<(minizip_loc)/ioapi.c +-<(minizip_loc)/ioapi.h +-<(minizip_loc)/zip.c +-<(minizip_loc)/zip.h +-<(minizip_loc)/unzip.c +-<(minizip_loc)/unzip.h + + platforms: win + <(res_loc)/winrc/Telegram.rc +-- +2.19.2 + diff --git a/telegram-desktop.spec b/telegram-desktop.spec index e568fea..8d2b6dd 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -1,5 +1,7 @@ # Telegram Desktop's constants... %global appname tdesktop +%global apiid 208164 +%global apihash dfbe1bc42dc9d20507e17d1814cc2f0a # Git revision of crl... %global commit1 4291015efab76bda5886a56b5007f4531be17d46 @@ -10,7 +12,7 @@ Summary: Telegram Desktop official messaging app Name: telegram-desktop -Version: 1.4.3 +Version: 1.5.1 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -27,8 +29,8 @@ 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... Patch0: %{name}-build-fixes.patch -Patch1: %{name}-api-tokens.patch -Patch2: %{name}-system-fonts.patch +Patch1: %{name}-system-fonts.patch +Patch2: %{name}-unbundle-minizip.patch %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Recommends: libappindicator-gtk3%{?_isa} @@ -48,8 +50,8 @@ BuildRequires: gyp # Development packages for Telegram Desktop... 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: libtgvoip-devel >= 2.4 BuildRequires: libappindicator-devel BuildRequires: ffmpeg-devel >= 3.1 BuildRequires: openal-soft-devel @@ -58,12 +60,11 @@ BuildRequires: libstdc++-devel BuildRequires: range-v3-devel BuildRequires: openssl-devel BuildRequires: xxhash-devel -BuildRequires: lzma-devel BuildRequires: opus-devel BuildRequires: gtk3-devel BuildRequires: dee-devel BuildRequires: xz-devel -BuildRequires: python2 +BuildRequires: python3 %if 0%{?fedora} >= 30 BuildRequires: minizip-compat-devel @@ -96,9 +97,19 @@ pushd Telegram/ThirdParty popd %build +# Setting build definitions... +%if 0%{?fedora} < 30 +TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_OPENAL_EFFECTS,' +%endif +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 - gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake + gyp --depth=. --generator-output=../.. -Goutput_dir=out -Dapi_id=%{apiid} -Dapi_hash=%{apihash} -Dbuild_defines=$TDESKTOP_BUILD_DEFINES Telegram.gyp --format=cmake popd # Patching generated cmake script... @@ -143,6 +154,24 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}. %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Tue Dec 11 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.5.1-1 +- Updated to 1.5.1. + +* Mon Dec 10 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.5.0-1 +- Updated to 1.5.0. + +* Wed Dec 05 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.4.8-1 +- Updated to 1.4.8 (beta). + +* Sat Nov 10 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.4.7-1 +- Updated to 1.4.7 (beta). + +* Thu Nov 08 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.4.5-1 +- Updated to 1.4.5 (beta). + +* Wed Oct 17 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.4.4-1 +- Updated to 1.4.4 (beta). + * Sat Oct 13 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.4.3-1 - Updated to 1.4.3.