[telegram-desktop] Fixed build with packaged GSL 3.1.0.

commit e31c948ecc685dcd6895b7fc82ef941ab82eb99c Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Sat Jun 6 20:27:38 2020 +0200 Fixed build with packaged GSL 3.1.0. telegram-desktop-gsl-version-fix.patch | 26 ++++++++++++++++++++++++++ telegram-desktop.spec | 5 +++-- 2 files changed, 29 insertions(+), 2 deletions(-) --- diff --git a/telegram-desktop-gsl-version-fix.patch b/telegram-desktop-gsl-version-fix.patch new file mode 100644 index 0000000..c1a1e8e --- /dev/null +++ b/telegram-desktop-gsl-version-fix.patch @@ -0,0 +1,26 @@ +From 536d41410cfedc6d28fc7a4a4eed86bfcfce0cf4 Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; +Date: Sat, 6 Jun 2020 20:21:32 +0200 +Subject: [PATCH] Correctly specified required version of the GSL library. + +Signed-off-by: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; +--- + external/gsl/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/external/gsl/CMakeLists.txt b/cmake/external/gsl/CMakeLists.txt +index 312447c..8762b36 100644 +--- a/cmake/external/gsl/CMakeLists.txt ++++ b/cmake/external/gsl/CMakeLists.txt +@@ -8,7 +8,7 @@ add_library(external_gsl INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_gsl ALIAS external_gsl) + + if (DESKTOP_APP_USE_PACKAGED_GSL AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) +- find_package(Microsoft.GSL CONFIG REQUIRED) ++ find_package(Microsoft.GSL 3.1.0 CONFIG REQUIRED) + target_link_libraries(external_gsl INTERFACE Microsoft.GSL::GSL) + else() + target_include_directories(external_gsl SYSTEM +-- +2.26.2 + diff --git a/telegram-desktop.spec b/telegram-desktop.spec index c1841c7..2e882db 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -30,10 +30,11 @@ Release: 1%{?dist} License: GPLv3+ and LGPLv2+ and LGPLv3 URL: https://github.com/telegramdesktop/%{appname} Summary: Telegram Desktop official messaging app +Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz ExclusiveArch: x86_64 -# Source files... -Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz +# Fixed build with packaged GSL 3.1.0... +Patch100: %{name}-gsl-version-fix.patch # Telegram Desktop require exact version of Qt due to Qt private API usage. %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}