commit c352c71d34db7ef946c248e2bbe5525c14af3d6c Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Mon Mar 30 18:52:05 2020 +0200 Updated to version 2.0.0. .gitignore | 1 + sources | 2 +- telegram-desktop-13e8b60.patch | 24 ---------- telegram-desktop-6c46194.patch | 21 --------- telegram-desktop-d2291f5.patch | 99 ------------------------------------------ telegram-desktop-ea854e5.patch | 28 ------------ telegram-desktop.spec | 43 ++++++++---------- 7 files changed, 20 insertions(+), 198 deletions(-) --- diff --git a/.gitignore b/.gitignore index a24b2c0..3610b6b 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,4 @@ /tdesktop-1.9.13-full.tar.gz /tdesktop-1.9.14-full.tar.gz /tdesktop-1.9.21-full.tar.gz +/tdesktop-2.0.0-full.tar.gz diff --git a/sources b/sources index 6407555..ae07128 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tdesktop-1.9.21-full.tar.gz) = ea02fc69e88ed6244ed420516bb7a93827cb85efaa0a7e9af7562aa1bc29184c5a2102caca8693c976b25d374832e0deb2ccbf00144d5340b5ffacbdc9dcebf1 +SHA512 (tdesktop-2.0.0-full.tar.gz) = 53ea3bb0e1d7cb1fc9d8c8725801295e89f8765b6560f046065dde89aef501d7ddb8aa268aa82f33e3674164a825506c4276cd07c0b59c242dd78ab59d659508 diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 3b46040..062abca 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -5,17 +5,17 @@ %bcond_without spellcheck %bcond_without fonts %bcond_without mindbg +%ifarch x86_64 %bcond_without ipo +%else +%bcond_with ipo +%endif # Telegram Desktop's constants... %global appname tdesktop %global launcher telegramdesktop %global tarsuffix -full -# Telegram API tokens... -%global apiid 208164 -%global apihash dfbe1bc42dc9d20507e17d1814cc2f0a - # 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/') @@ -23,12 +23,16 @@ # 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: 1.9.21 -Release: 4%{?dist} +Version: 2.0.0 +Release: 1%{?dist} # Application and 3rd-party modules licensing: # * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball; @@ -42,18 +46,6 @@ ExclusiveArch: x86_64 # Source files... Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}%{tarsuffix}.tar.gz -# https://github.com/telegramdesktop/tdesktop/commit/d2291f5b17e0c169083a34... -Patch100: %{name}-d2291f5.patch - -# https://github.com/telegramdesktop/tdesktop/commit/ea854e5be3c89157c282f7... -Patch101: %{name}-ea854e5.patch - -# https://github.com/telegramdesktop/tdesktop/commit/6c46194009a0bf26c1f383... -Patch102: %{name}-6c46194.patch - -# https://github.com/telegramdesktop/tdesktop/commit/13e8b60d6c396b128cfd73... -Patch103: %{name}-13e8b60.patch - # Telegram Desktop require exact version of Qt due to Qt private API usage. %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: qt5-qtimageformats%{?_isa} @@ -172,8 +164,8 @@ pushd %{_target_platform} -DDESKTOP_APP_USE_PACKAGED_RLOTTIE:BOOL=OFF \ %endif %if %{with clang} - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_C_COMPILER=%{_bindir}/clang \ + -DCMAKE_CXX_COMPILER=%{_bindir}/clang++ \ -DCMAKE_AR=%{_bindir}/llvm-ar \ -DCMAKE_RANLIB=%{_bindir}/llvm-ranlib \ -DCMAKE_LINKER=%{_bindir}/llvm-ld \ @@ -184,8 +176,8 @@ pushd %{_target_platform} -DCMAKE_RANLIB=%{_bindir}/gcc-ranlib \ -DCMAKE_NM=%{_bindir}/gcc-nm \ %endif - -DTDESKTOP_API_ID=%{apiid} \ - -DTDESKTOP_API_HASH=%{apihash} \ + -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 \ @@ -196,6 +188,7 @@ pushd %{_target_platform} -DTDESKTOP_USE_PACKAGED_TGVOIP:BOOL=ON \ -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME:BOOL=ON \ -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION:BOOL=ON \ + -DTDESKTOP_USE_FONTCONFIG_FALLBACK:BOOL=OFF \ -DTDESKTOP_LAUNCHER_BASENAME=%{launcher} \ .. popd @@ -217,11 +210,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop %{_metainfodir}/%{launcher}.appdata.xml %changelog +* 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. * Mon Mar 23 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.9.21-3 - Disabled aarch64 and ppc64le again due to not enough RAM on builders. - -* Mon Mar 23 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.9.21-2 -- Enabled aarch64 and ppc64le architectures.