commit ea14ca202d0e34a5b2a906b6c8983a4f54bf9603 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Tue Apr 28 10:01:07 2020 +0200 Updated to version 2.1.0. .gitignore | 1 + lib_base-eedb8af.patch | 22 ---------------------- sources | 2 +- telegram-desktop.spec | 43 +++++++++++++++++++++++++++++-------------- 4 files changed, 31 insertions(+), 37 deletions(-) --- diff --git a/.gitignore b/.gitignore index f4602b4..94d761f 100644 --- a/.gitignore +++ b/.gitignore @@ -133,3 +133,4 @@ /tdesktop-1.9.21-full.tar.gz /tdesktop-2.0.0-full.tar.gz /tdesktop-2.0.1-full.tar.gz +/tdesktop-2.1.0-full.tar.gz diff --git a/sources b/sources index a9f0ef8..81277b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tdesktop-2.0.1-full.tar.gz) = 99cd7c5ca1e9dd75ecd98d272522b0e4aab2d46525e3d0c306503b7a00c9d25c1646e9d7462182682a58947c7435864af805a3b6f85906d8b21e5675cc8383cb +SHA512 (tdesktop-2.1.0-full.tar.gz) = 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 5e2aca4..a285c0b 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -1,21 +1,22 @@ # Build conditionals (with - OFF, without - ON)... %bcond_with gtk3 +%bcond_with gsl +%bcond_without rlottie %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 +%endif + %ifarch x86_64 %bcond_without ipo %else %bcond_with ipo %endif -%endif # Telegram Desktop's constants... %global appname tdesktop @@ -37,7 +38,7 @@ %endif Name: telegram-desktop -Version: 2.0.1 +Version: 2.1.0 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -52,9 +53,6 @@ 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} @@ -68,6 +66,12 @@ BuildRequires: rlottie-devel Provides: bundled(rlottie) = 0~git %endif +%if %{with gsl} +BuildRequires: guidelines-support-library-devel +%else +Provides: bundled(guidelines-support-library) = 2.0.0 +%endif + # Telegram Desktop require patched version of lxqt-qtplugin. # Pull Request pending: https://github.com/lxqt/lxqt-qtplugin/pull/52 Provides: bundled(lxqt-qtplugin) = 0.14.0~git @@ -80,7 +84,6 @@ BuildRequires: cmake BuildRequires: gcc # Development packages for Telegram Desktop... -BuildRequires: guidelines-support-library-devel >= 1.0.0 BuildRequires: mapbox-variant-devel >= 0.3.6 BuildRequires: qt5-qtbase-private-devel BuildRequires: libtgvoip-devel >= 2.4.4 @@ -144,7 +147,15 @@ business messaging needs. mkdir -p %{_target_platform} # Unbundling libraries... -rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,libdbusmenu-qt,libtgvoip,lz4,minizip,variant,xxHash} +rm -rf Telegram/ThirdParty/{Catch,QR,SPMediaKeyTap,expected,hunspell,libdbusmenu-qt,libtgvoip,lz4,minizip,variant,xxHash} + +%if %{with rlottie} +rm -rf Telegram/ThirdParty/rlottie +%endif + +%if %{with gsl} +rm -rf Telegram/ThirdParty/GSL +%endif # Patching default desktop file... desktop-file-edit --set-key=Exec --set-value="%{_bindir}/%{name} -- %u" --copy-name-to-generic-name lib/xdg/telegramdesktop.desktop @@ -172,6 +183,11 @@ pushd %{_target_platform} %else -DDESKTOP_APP_USE_PACKAGED_RLOTTIE:BOOL=OFF \ %endif +%if %{with gsl} + -DDESKTOP_APP_USE_PACKAGED_GSL:BOOL=ON \ +%else + -DDESKTOP_APP_USE_PACKAGED_GSL:BOOL=OFF \ +%endif %if %{with clang} -DCMAKE_C_COMPILER=%{_bindir}/clang \ -DCMAKE_CXX_COMPILER=%{_bindir}/clang++ \ @@ -188,7 +204,6 @@ pushd %{_target_platform} -DTDESKTOP_API_ID=611335 \ -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \ -DDESKTOP_APP_USE_PACKAGED:BOOL=ON \ - -DDESKTOP_APP_USE_PACKAGED_GSL:BOOL=ON \ -DDESKTOP_APP_USE_PACKAGED_EXPECTED:BOOL=ON \ -DDESKTOP_APP_USE_PACKAGED_VARIANT:BOOL=ON \ -DDESKTOP_APP_USE_PACKAGED_QRCODE:BOOL=ON \ @@ -219,11 +234,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop %{_metainfodir}/%{launcher}.appdata.xml %changelog +* Tue Apr 28 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.1.0-1 +- Updated to version 2.1.0. + * Tue Mar 31 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.0.1-1 - Updated to version 2.0.1. * Mon Mar 30 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.0.0-1 - Updated to version 2.0.0. - -* Thu Mar 26 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.9.21-4 -- Backported upstream patches with different fixes.