commit 1e1f47c1704ef0a6713f4f627eed98764c126b9e Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Wed Apr 8 12:37:52 2020 +0200 Fixed FTBFS on Fedora 32+. lib_base-eedb8af.patch | 22 ++++++++++++++++++++++ telegram-desktop.spec | 9 +++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) --- diff --git a/lib_base-eedb8af.patch b/lib_base-eedb8af.patch new file mode 100644 index 0000000..f2f5811 --- /dev/null +++ b/lib_base-eedb8af.patch @@ -0,0 +1,22 @@ +From eedb8afcf5f1709f3e02db9b06b977bb57aca182 Mon Sep 17 00:00:00 2001 +From: John Preston <johnprestonmail(a)gmail.com&gt; +Date: Wed, 8 Apr 2020 13:56:26 +0400 +Subject: [PATCH] Fix thread_safe_wrap for Clang 10. + +--- + base/thread_safe_wrap.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Telegram/lib_base/base/thread_safe_wrap.h b/Telegram/lib_base/base/thread_safe_wrap.h +index 8c2f562..d5f4e4a 100644 +--- a/Telegram/lib_base/base/thread_safe_wrap.h ++++ b/Telegram/lib_base/base/thread_safe_wrap.h +@@ -31,7 +31,7 @@ class thread_safe_wrap { + + private: + T _value; +- QMutex _mutex; ++ mutable QMutex _mutex; + + }; + diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 00b5f83..5e2aca4 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -1,13 +1,15 @@ # Build conditionals (with - OFF, without - ON)... -%bcond_with rlottie %bcond_with gtk3 -%bcond_with clang %bcond_without spellcheck %bcond_without fonts %bcond_without mindbg %if 0%{?fedora} && 0%{?fedora} >= 32 %bcond_with ipo +%bcond_without clang +%bcond_without rlottie %else +%bcond_with clang +%bcond_with rlottie %ifarch x86_64 %bcond_without ipo %else @@ -50,6 +52,9 @@ ExclusiveArch: x86_64 # Source files... Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}%{tarsuffix}.tar.gz +# https://github.com/desktop-app/lib_base/commit/eedb8afcf5f1709f3e02db9b06... +Patch100: lib_base-eedb8af.patch + # Telegram Desktop require exact version of Qt due to Qt private API usage. %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: qt5-qtimageformats%{?_isa}