commit cf862844529cb56e75809c706641c5bfa5e0390a Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Tue May 5 22:37:37 2020 +0200 Updated to version 2.1.2. .gitignore | 1 + sources | 2 +- telegram-desktop.spec | 72 +++++++++++++++------------------------------------ 3 files changed, 23 insertions(+), 52 deletions(-) --- diff --git a/.gitignore b/.gitignore index f84a1c8..9cf79c1 100644 --- a/.gitignore +++ b/.gitignore @@ -135,3 +135,4 @@ /tdesktop-2.0.1-full.tar.gz /tdesktop-2.1.0-full.tar.gz /tdesktop-2.1.1-full.tar.gz +/tdesktop-2.1.2-full.tar.gz diff --git a/sources b/sources index 8ac7e33..f4e32c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tdesktop-2.1.1-full.tar.gz) = aa542c029ead2d1b6c398ecca949b86fae8f37094ceb462ace4628f8e53882faf35b3c2e4fe03dd2e4e17b07412896f7b05d6748b13c99a3bac117b7449d69a8 +SHA512 (tdesktop-2.1.2-full.tar.gz) = c23d9a961132cd2592ce8f728ed7592091a8c2a1d94797facd93516ab0c9194bd5b90ba7a7d4e8aa778940bc4a23d4ac69507a9f150c3bf4e743c6659e545ccf diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 3a0ede2..e7ee469 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -1,9 +1,6 @@ # Build conditionals (with - OFF, without - ON)... -%bcond_with gtk3 %bcond_without rlottie -%bcond_without spellcheck -%bcond_without fonts -%bcond_without mindbg +%bcond_without ipo %if 0%{?fedora} && 0%{?fedora} >= 32 %bcond_without clang @@ -11,33 +8,24 @@ %bcond_with clang %endif -%ifarch x86_64 -%bcond_without ipo -%else -%bcond_with ipo -%endif - # Telegram Desktop's constants... %global appname tdesktop %global launcher telegramdesktop -%global tarsuffix -full # Applying workaround to RHBZ#1559007... %if %{with clang} -%global optflags %(echo %{optflags} | sed -e 's/-mcet//g' -e 's/-fcf-protection//g' -e 's/-fstack-clash-protection//g' -e 's/$/-Qunused-arguments -Wno-unknown-warning-option/') +%global optflags %(echo %{optflags} | sed -e 's/-mcet//g' -e 's/-fcf-protection//g' -e 's/-fstack-clash-protection//g' -e 's/$/-Qunused-arguments -Wno-unknown-warning-option -Wno-deprecated-declarations/') %endif # Decrease debuginfo verbosity to reduce memory consumption... -%if %{with mindbg} %ifarch x86_64 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %else %global optflags %(echo %{optflags} | sed 's/-g /-g2 /') %endif -%endif Name: telegram-desktop -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -50,12 +38,16 @@ Summary: Telegram Desktop official messaging app ExclusiveArch: x86_64 # Source files... -Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}%{tarsuffix}.tar.gz +Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz # Telegram Desktop require exact version of Qt due to Qt private API usage. %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: qt5-qtimageformats%{?_isa} Requires: hicolor-icon-theme +Requires: open-sans-fonts + +# Short alias for the main package... +Provides: telegram%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} # Telegram Desktop require patched version of rlottie since 1.8.0. # Pull Request pending: https://github.com/Samsung/rlottie/pull/252 @@ -90,38 +82,23 @@ BuildRequires: openal-soft-devel BuildRequires: qt5-qtbase-devel BuildRequires: libstdc++-devel BuildRequires: expected-devel +BuildRequires: hunspell-devel BuildRequires: openssl-devel BuildRequires: xxhash-devel BuildRequires: json11-devel BuildRequires: ninja-build +BuildRequires: glib2-devel BuildRequires: opus-devel BuildRequires: lz4-devel BuildRequires: xz-devel BuildRequires: python3 -%if %{with gtk3} -BuildRequires: libappindicator-gtk3-devel -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -Recommends: libappindicator-gtk3%{?_isa} -Requires: gtk3%{?_isa} -%endif - -%if %{with spellcheck} -BuildRequires: hunspell-devel -BuildRequires: glib2-devel -%endif - %if %{with clang} BuildRequires: compiler-rt BuildRequires: clang BuildRequires: llvm %endif -%if %{with fonts} -Requires: open-sans-fonts -%endif - %description Telegram is a messaging app with a focus on speed and security, it’s super fast, simple and free. You can use Telegram on all your devices at the same @@ -137,36 +114,27 @@ business messaging needs. %prep # Unpacking Telegram Desktop source archive... -%autosetup -n %{appname}-%{version}%{tarsuffix} -p1 +%autosetup -n %{appname}-%{version}-full -p1 mkdir -p %{_target_platform} # Unbundling libraries... -rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,hunspell,libdbusmenu-qt,libtgvoip,lz4,minizip,variant,xxHash} +rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,hime,hunspell,libdbusmenu-qt,libqtxdg,libtgvoip,lxqt-qtplugin,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,variant,xxHash} +# Unbundling rlottie if build against packaged version... %if %{with rlottie} rm -rf Telegram/ThirdParty/rlottie %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 - %build # Building Telegram Desktop using cmake... pushd %{_target_platform} %cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -%if %{without gtk3} - -DTDESKTOP_DISABLE_GTK_INTEGRATION:BOOL=ON \ -%endif -%if %{without spellcheck} - -DDESKTOP_APP_DISABLE_SPELLCHECK:BOOL=ON \ -%endif -%if %{without fonts} - -DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=OFF \ -%endif -%if %{with ipo} && %{with mindbg} && %{without clang} +%ifarch x86_64 +%if %{with ipo} && %{without clang} -DDESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS:BOOL=ON \ %endif +%endif %if %{with rlottie} -DDESKTOP_APP_USE_PACKAGED_RLOTTIE:BOOL=ON \ -DDESKTOP_APP_LOTTIE_USE_CACHE:BOOL=OFF \ @@ -193,9 +161,11 @@ pushd %{_target_platform} -DDESKTOP_APP_USE_PACKAGED_EXPECTED:BOOL=ON \ -DDESKTOP_APP_USE_PACKAGED_VARIANT:BOOL=ON \ -DDESKTOP_APP_USE_PACKAGED_QRCODE:BOOL=ON \ + -DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=ON \ -DDESKTOP_APP_USE_GLIBC_WRAPS:BOOL=OFF \ -DDESKTOP_APP_DISABLE_CRASH_REPORTS:BOOL=ON \ -DTDESKTOP_USE_PACKAGED_TGVOIP:BOOL=ON \ + -DTDESKTOP_DISABLE_GTK_INTEGRATION:BOOL=ON \ -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME:BOOL=ON \ -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION:BOOL=ON \ -DTDESKTOP_USE_FONTCONFIG_FALLBACK:BOOL=OFF \ @@ -220,11 +190,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop %{_metainfodir}/%{launcher}.appdata.xml %changelog +* Tue May 05 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.1.2-1 +- Updated to version 2.1.2. + * Fri May 01 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.1.1-1 - Updated to version 2.1.1. * 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.