[telegram-desktop/f28] Fixed build under Rawhide.

commit 142ed0610a77f7fafc30a21dad9fb1e7adf53bd9 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Sat Jul 14 00:35:58 2018 +0200 Fixed build under Rawhide. telegram-desktop-api-tokens.patch | 2 +- telegram-desktop-build-fixes.patch | 17 +++++++++++++---- telegram-desktop-system-fonts.patch | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) --- diff --git a/telegram-desktop-api-tokens.patch b/telegram-desktop-api-tokens.patch index 4fb880a..31f7855 100644 --- a/telegram-desktop-api-tokens.patch +++ b/telegram-desktop-api-tokens.patch @@ -1,4 +1,4 @@ -From 23370701fccf459e6b69d0a75f14abeb030f824a Mon Sep 17 00:00:00 2001 +From 164a9560c3acc649110977c0725c3bc741bb0cd0 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 2/3] Changed default Telegram Desktop's test API keys to diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch index 3e7e6b5..f179143 100644 --- a/telegram-desktop-build-fixes.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,4 +1,4 @@ -From d89702b2460a81b38920cfdfa94cffd37c6f20a1 Mon Sep 17 00:00:00 2001 +From cf2f66bdea32ba5ea77f9a172e6506be07e3cbdd 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. @@ -12,7 +12,7 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock. Telegram/gyp/Telegram.gyp | 29 ++----- Telegram/gyp/codegen_rules.gypi | 6 +- Telegram/gyp/lib_export.gyp | 9 +-- - Telegram/gyp/lib_scheme.gyp | 2 +- + Telegram/gyp/lib_scheme.gyp | 4 +- Telegram/gyp/qt.gypi | 87 ++++++--------------- Telegram/gyp/qt_moc.gypi | 5 +- Telegram/gyp/qt_rcc.gypi | 2 +- @@ -21,7 +21,7 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock. Telegram/gyp/telegram_sources.txt | 9 +-- lib/xdg/telegramdesktop.appdata.xml | 2 +- lib/xdg/telegramdesktop.desktop | 6 +- - 17 files changed, 171 insertions(+), 189 deletions(-) + 17 files changed, 172 insertions(+), 190 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp create mode 100644 Telegram/gyp/CMakeLists.inj @@ -315,7 +315,7 @@ index 2d1ac6c56..c81930f80 100644 ], 'sources': [ diff --git a/Telegram/gyp/lib_scheme.gyp b/Telegram/gyp/lib_scheme.gyp -index b52a9d071..a74ac1646 100644 +index b52a9d071..32b126682 100644 --- a/Telegram/gyp/lib_scheme.gyp +++ b/Telegram/gyp/lib_scheme.gyp @@ -35,7 +35,7 @@ @@ -327,6 +327,15 @@ index b52a9d071..a74ac1646 100644 ], 'actions': [{ 'action_name': 'codegen_scheme', +@@ -48,7 +48,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/scheme.h', + ], + 'action': [ +- 'python', '<(src_loc)/codegen/scheme/codegen_scheme.py', ++ 'python2', '<(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/qt.gypi b/Telegram/gyp/qt.gypi index 0b783ec21..653562ffb 100644 --- a/Telegram/gyp/qt.gypi diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch index 5b6da8a..8bd110c 100644 --- a/telegram-desktop-system-fonts.patch +++ b/telegram-desktop-system-fonts.patch @@ -1,4 +1,4 @@ -From d572ef721f4824e591e4ca5430616d0019a5c799 Mon Sep 17 00:00:00 2001 +From 6c0ca234f917cb21372ea1e88042a344092d8ab4 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