[telegram-desktop] Updated to 1.2.12 (alpha). DO NOT BUILD FOR STABLE FEDORA RELEASES!

commit 2c2b1431bc09e6c0d5ade3ab47f6ff6f0c7ef257 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Mon Mar 12 15:45:24 2018 +0100 Updated to 1.2.12 (alpha). DO NOT BUILD FOR STABLE FEDORA RELEASES! .gitignore | 1 + sources | 2 +- telegram-desktop-build-fixes.patch | 13 ++++++------- telegram-desktop.spec | 8 +++++++- 4 files changed, 15 insertions(+), 9 deletions(-) --- diff --git a/.gitignore b/.gitignore index d4dd2f4..08c9bf6 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /crl-344cbde.tar.gz /tdesktop-1.2.8.tar.gz /tdesktop-1.2.10.tar.gz +/tdesktop-1.2.12.tar.gz diff --git a/sources b/sources index aaf9b04..e579575 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ ed3d3121418d32866ae348ce75042770 crl-344cbde.tar.gz -eaa47f7c906378e3ff81e22af42672f8 tdesktop-1.2.10.tar.gz +04c7de47b7273e4eb139d3d8c065367e tdesktop-1.2.12.tar.gz diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch index 55563c6..37adaed 100644 --- a/telegram-desktop-build-fixes.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,11 +1,11 @@ -From 6fa7caa33fa5604dc9099389b8381e3f160320cd Mon Sep 17 00:00:00 2001 +From e9714c3fac047a17156769539dabc43b7f8ccc49 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. --- Telegram/Resources/qrc/telegram_linux.qrc | 1 - - Telegram/SourceFiles/core/launcher.cpp | 2 + + Telegram/SourceFiles/core/launcher.cpp | 1 + Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++++++++++ Telegram/gyp/CMakeLists.inj | 3 + Telegram/gyp/PrecompiledHeader.cmake | 4 +- @@ -19,7 +19,7 @@ Subject: [PATCH] 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 +- - 15 files changed, 166 insertions(+), 177 deletions(-) + 15 files changed, 165 insertions(+), 177 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp create mode 100644 Telegram/gyp/CMakeLists.inj @@ -34,14 +34,13 @@ index 0554fa17..3ea02740 100644 </qresource> </RCC> diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index 7f173565..68f077d2 100644 +index 7f173565..c70ccc79 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -51,6 +51,8 @@ int Launcher::exec() { +@@ -51,6 +51,7 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started Platform::start(); // must be started before QApplication is created -+ setenv("QT_STYLE_OVERRIDE", "qwerty", false); + unsetenv("QT_QPA_PLATFORMTHEME"); auto result = executeApplication(); @@ -496,7 +495,7 @@ index f5624a82..b644ce29 100644 '-no-compress', '<(RULE_INPUT_PATH)', diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi -index a4b5f58a..9658b5c3 100644 +index 842b1955..80828037 100644 --- a/Telegram/gyp/settings_linux.gypi +++ b/Telegram/gyp/settings_linux.gypi @@ -9,10 +9,6 @@ diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 0c41aba..6560e39 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -10,7 +10,7 @@ Summary: Telegram Desktop official messaging app Name: telegram-desktop -Version: 1.2.10 +Version: 1.2.12 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -136,6 +136,12 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}. %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Mon Mar 12 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.12-1 +- Updated to 1.2.12 (alpha). + +* Sat Mar 10 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.11-1 +- Updated to 1.2.11 (alpha). + * Fri Mar 09 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.10-1 - Updated to 1.2.10 (alpha).