[telegram-desktop/f31] Updated to version 1.9.7.

commit 05b1e54ef33a088736bf9a8c748f98f3ebff23ad Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Thu Jan 23 14:40:08 2020 +0100 Updated to version 1.9.7. .gitignore | 1 + cmake_helpers-system-expected.patch | 8 +- cmake_helpers-system-gsl.patch | 8 +- cmake_helpers-system-qrcode.patch | 8 +- cmake_helpers-system-variant.patch | 8 +- sources | 14 +-- telegram-desktop.spec | 209 +++++------------------------------- 7 files changed, 47 insertions(+), 209 deletions(-) --- diff --git a/.gitignore b/.gitignore index 0519238..a697f15 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,4 @@ /lib_spellcheck-4784796.tar.gz /lib_ui-c0b0745.tar.gz /tdesktop-1.9.4.tar.gz +/tdesktop-1.9.7-full.tar.gz diff --git a/cmake_helpers-system-expected.patch b/cmake_helpers-system-expected.patch index bb7ab96..cad5466 100644 --- a/cmake_helpers-system-expected.patch +++ b/cmake_helpers-system-expected.patch @@ -1,4 +1,4 @@ -From 03300739a87eba33e28f0ee5299745f9100bb0c9 Mon Sep 17 00:00:00 2001 +From e3037ba4838c69d9f94016395c4108f4f56c9049 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Thu, 9 Jan 2020 14:42:45 +0100 Subject: [PATCH 1/4] Use packaged version of expected library. @@ -7,10 +7,10 @@ Subject: [PATCH 1/4] Use packaged version of expected library. external/expected/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -diff --git a/external/expected/CMakeLists.txt b/external/expected/CMakeLists.txt +diff --git a/cmake/external/expected/CMakeLists.txt b/cmake/external/expected/CMakeLists.txt index 53ec233..a9c78c7 100644 ---- a/external/expected/CMakeLists.txt -+++ b/external/expected/CMakeLists.txt +--- a/cmake/external/expected/CMakeLists.txt ++++ b/cmake/external/expected/CMakeLists.txt @@ -7,7 +7,11 @@ add_library(external_expected INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_expected ALIAS external_expected) diff --git a/cmake_helpers-system-gsl.patch b/cmake_helpers-system-gsl.patch index eff43f1..d9eb3cc 100644 --- a/cmake_helpers-system-gsl.patch +++ b/cmake_helpers-system-gsl.patch @@ -1,4 +1,4 @@ -From 5365f0e2a6228873b4ac625d113d9d1a733abe2c Mon Sep 17 00:00:00 2001 +From b5494d8e85c9afda78c7333eac7b251687eb24c9 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Thu, 9 Jan 2020 14:43:15 +0100 Subject: [PATCH 2/4] Use packaged version of guidelines-support-library. @@ -7,10 +7,10 @@ Subject: [PATCH 2/4] Use packaged version of guidelines-support-library. external/gsl/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -diff --git a/external/gsl/CMakeLists.txt b/external/gsl/CMakeLists.txt +diff --git a/cmake/external/gsl/CMakeLists.txt b/cmake/external/gsl/CMakeLists.txt index c7a0883..84c8632 100644 ---- a/external/gsl/CMakeLists.txt -+++ b/external/gsl/CMakeLists.txt +--- a/cmake/external/gsl/CMakeLists.txt ++++ b/cmake/external/gsl/CMakeLists.txt @@ -7,7 +7,11 @@ add_library(external_gsl INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_gsl ALIAS external_gsl) diff --git a/cmake_helpers-system-qrcode.patch b/cmake_helpers-system-qrcode.patch index ac5c631..3f39a4b 100644 --- a/cmake_helpers-system-qrcode.patch +++ b/cmake_helpers-system-qrcode.patch @@ -1,4 +1,4 @@ -From fee202d3b1f86a2a1d63c8f7eb828deb439a3d85 Mon Sep 17 00:00:00 2001 +From a0be7c6238a051b2cb8a09100a963d0ecb0e33a7 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Thu, 9 Jan 2020 14:44:11 +0100 Subject: [PATCH 3/4] Use packaged version of qr-code-generator library. @@ -7,10 +7,10 @@ Subject: [PATCH 3/4] Use packaged version of qr-code-generator library. external/qr_code_generator/CMakeLists.txt | 41 +++++++++++++---------- 1 file changed, 24 insertions(+), 17 deletions(-) -diff --git a/external/qr_code_generator/CMakeLists.txt b/external/qr_code_generator/CMakeLists.txt +diff --git a/cmake/external/qr_code_generator/CMakeLists.txt b/cmake/external/qr_code_generator/CMakeLists.txt index 0f81125..606d8a5 100644 ---- a/external/qr_code_generator/CMakeLists.txt -+++ b/external/qr_code_generator/CMakeLists.txt +--- a/cmake/external/qr_code_generator/CMakeLists.txt ++++ b/cmake/external/qr_code_generator/CMakeLists.txt @@ -4,24 +4,31 @@ # For license and copyright information please follow this link: # https://github.com/desktop-app/legal/blob/master/LEGAL diff --git a/cmake_helpers-system-variant.patch b/cmake_helpers-system-variant.patch index 03fa271..950308b 100644 --- a/cmake_helpers-system-variant.patch +++ b/cmake_helpers-system-variant.patch @@ -1,4 +1,4 @@ -From 539fe57aa89160ef775fe6995dd7173bd040a8e3 Mon Sep 17 00:00:00 2001 +From 803179f48e46ce5ddc4ad81e1552696cbaa25aed Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Thu, 9 Jan 2020 14:44:54 +0100 Subject: [PATCH 4/4] Use packaged version of mapbox-variant library. @@ -7,10 +7,10 @@ Subject: [PATCH 4/4] Use packaged version of mapbox-variant library. external/variant/CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -diff --git a/external/variant/CMakeLists.txt b/external/variant/CMakeLists.txt +diff --git a/cmake/external/variant/CMakeLists.txt b/cmake/external/variant/CMakeLists.txt index 5b5beef..b0fb6cb 100644 ---- a/external/variant/CMakeLists.txt -+++ b/external/variant/CMakeLists.txt +--- a/cmake/external/variant/CMakeLists.txt ++++ b/cmake/external/variant/CMakeLists.txt @@ -7,7 +7,12 @@ add_library(external_variant INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_variant ALIAS external_variant) diff --git a/sources b/sources index e78ebce..6555536 100644 --- a/sources +++ b/sources @@ -1,13 +1 @@ -SHA512 (cmake_helpers-458fec9.tar.gz) = a8e423165a149a17f5f58441d460e3157c9d21af76f29aeef93e273e093df90788782edde5b8183313570d333b95398ca05bbbb9325757d05d02a2b4c4bdcfbc -SHA512 (codegen-d14ae77.tar.gz) = 721139f88b468e87109869bab7f6685ff1753d7fec22a9f57adf10ebbeb915f82cf5bfda8766aabd782c0b6c6d1f638be2d9388bd87503fcb322bbe0919f0f74 -SHA512 (lib_base-8ba8607.tar.gz) = 75c9712a3e074120e41cdd6d00158bc08561926c046dec797e9227a2438feed90f6d94cb49c0fc50d2fce4e8129f32a90eff87576b1c094ce43de5a8617f2e15 -SHA512 (lib_crl-5a740bf.tar.gz) = 279306cd55a3a48881cd14263aa7c63872934f1fe9ae92d397d39b5b75cfef318e54c204bbf172e7ee08bef576a00990bfdfd603c18baa442de4a53fe9ceec65 -SHA512 (lib_lottie-a0a0269.tar.gz) = c7aebf681ad18465e8db6e0e17a6b946fa0d848a3a1f97ca4df2fa646a4dbd6483383dcb93b486d22a209d82c4412ba9974fcfd5b6230b79e5966a0d049be4f2 -SHA512 (lib_qr-9877397.tar.gz) = 9b6da26294b25e9e215e036a11e14203f98c2c1b099f312bdabf4267af042d90a89892f3672f04a2823fcc3fd048259da306e3b6f277fa65df4ac7843b398e7b -SHA512 (lib_rpl-2888aab.tar.gz) = fa239f0fa2854747ae67a6cd13f02720ac483e9768c46a12e5942ee7ffb5c826f7f7ed516b4d59d7d4c914368f02eed2d86ce7bee0fb3ebd88bc98ff7766e704 -SHA512 (lib_spellcheck-4784796.tar.gz) = 0b5a6fb05c5cfcb23ad2576f040ff87be60419b1f449b21bcf5c1c8fe2c346853032220a9a383dbfda22ac9a17c0ce8f2c34772d5b79531e463c93c6b29752a1 -SHA512 (lib_storage-b0388a1.tar.gz) = 0cab9532c60709a1906dba833fbef9f4d3d08e69200f482648ea81454770eda5bebc36aaeecb905ee9eab8e21fbb18afa1be2eecc72eea253ca6058502de92a3 -SHA512 (lib_storage-cb56ad4.tar.gz) = dc617272ef3963582c8738358cda56ae7dee201bb99bbf8e123a49c3838d2ea690aec8a0cae71b1498fcb96df615e714a5c425949ba9910a7a6e8ce14e324040 -SHA512 (lib_ui-c0b0745.tar.gz) = 519a4277a63e4346e6bfaeeb68aecf534e781d00eab6d42bbf60cd7509d18feeac7fd40ff45ac8b274bbf40fb5997e0a0696e378a9a7debf04bce816c9442e41 -SHA512 (rlottie-c490c7a.tar.gz) = 30891b6550c29b71506e5a476844acc23bcfb1a3f749aeec02917a6b62f8d60f7c88edcfc7a38b249eb4a4d32dd89f914c6ae3cc70154d1a2e178bf2176adef4 -SHA512 (tdesktop-1.9.4.tar.gz) = 54947a7557bce97654914170f302949b9bc8a2be8dc8d5835cbc2377e0aa41fe4b0d119910824ea5333c33dcb2531b6e04e7698d6d784add626a57c5f81741de +SHA512 (tdesktop-1.9.7-full.tar.gz) = 7fd2e2ab8813fad187ca711aafc42c1ad76102ee23ce2dbfa4ccc6898b80a152ecbdf842a175b67db05937c099ddf45889ad493a5bac91da9331ee645bb691bf diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 51cb9f0..67a22fb 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -2,96 +2,37 @@ %bcond_with gtk3 %bcond_with clang %bcond_with spellcheck +%bcond_without fonts # Telegram Desktop's constants... %global appname tdesktop %global launcher telegramdesktop +%global tarsuffix -full # Telegram API tokens... %global apiid 208164 %global apihash dfbe1bc42dc9d20507e17d1814cc2f0a -# Git revision of cmake_helpers... -%global commit1 458fec94999b82145bffaaab114ee9baa8708dd3 -%global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) - -# Git revision of patched rlottie... -%global commit2 c490c7a098b9b3cbc3195b00e90d6fc3989e2ba2 -%global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) - -# Git revision of lib_crl... -%global commit3 5a740bf0b7fe8f1f9a7f3e0878d5238f56502da1 -%global shortcommit3 %(c=%{commit3}; echo ${c:0:7}) - -# Git revision of lib_base... -%global commit4 8ba86078fbe71ab857ee1b6e35acc4def4cc0d1c -%global shortcommit4 %(c=%{commit4}; echo ${c:0:7}) - -# Git revision of lib_lottie... -%global commit5 a0a0269ffa44d1e23f0911eaeb286004a075b089 -%global shortcommit5 %(c=%{commit5}; echo ${c:0:7}) - -# Git revision of lib_qr... -%global commit6 9877397dbf97b7198d539a3994bf0e9619cf653c -%global shortcommit6 %(c=%{commit6}; echo ${c:0:7}) - -# Git revision of lib_rpl... -%global commit7 2888aabf28bf9ca89f3d6d67a523bc5f2ce802ce -%global shortcommit7 %(c=%{commit7}; echo ${c:0:7}) - -# Git revision of lib_spellcheck... -%global commit8 47847963bf491dfd266da916478de5cc479342f6 -%global shortcommit8 %(c=%{commit8}; echo ${c:0:7}) - -# Git revision of lib_storage... -%global commit9 cb56ad46ca1bee22570a7f3f64d21531283ad84d -%global shortcommit9 %(c=%{commit9}; echo ${c:0:7}) - -# Git revision of lib_tl... -%global commit10 b0388a1a02b3f035f1486a6b66a01522c290b198 -%global shortcommit10 %(c=%{commit10}; echo ${c:0:7}) - -# Git revision of lib_ui... -%global commit11 c0b07457fa5df905f7926025302f66065dc4d52b -%global shortcommit11 %(c=%{commit11}; echo ${c:0:7}) - -# Git revision of codegen... -%global commit12 d14ae77ad5ed27ca6ddbc9579c0c5e0afa18ffca -%global shortcommit12 %(c=%{commit12}; echo ${c:0:7}) - # 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/') %endif Name: telegram-desktop -Version: 1.9.4 +Version: 1.9.7 Release: 1%{?dist} # Application and 3rd-party modules licensing: -# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source; -# * S1 (crl) - GPLv3+ -- build-time dependency; -# * S2 (rlottie) - LGPLv2+ -- static dependency; -# * P0 (qt_functions.cpp) - LGPLv3 -- build-time dependency. -License: GPLv3+ and LGPLv3 +# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball; +# * rlottie - LGPLv2+ -- static dependency; +# * qt_functions.cpp - LGPLv3 -- build-time dependency. +License: GPLv3+ and LGPLv2+ and LGPLv3 URL: https://github.com/telegramdesktop/%{appname} Summary: Telegram Desktop official messaging app ExclusiveArch: x86_64 # Source files... -Source0: %{url}/archive/v%{version}/%{appname}-%{version}.tar.gz -Source1: https://github.com/desktop-app/cmake_helpers/archive/%{commit1}/cmake_hel... -Source2: https://github.com/desktop-app/rlottie/archive/%{commit2}/rlottie-%{short... -Source3: https://github.com/desktop-app/lib_crl/archive/%{commit3}/lib_crl-%{short... -Source4: https://github.com/desktop-app/lib_base/archive/%{commit4}/lib_base-%{sho... -Source5: https://github.com/desktop-app/lib_lottie/archive/%{commit5}/lib_lottie-%... -Source6: https://github.com/desktop-app/lib_qr/archive/%{commit6}/lib_qr-%{shortco... -Source7: https://github.com/desktop-app/lib_rpl/archive/%{commit7}/lib_rpl-%{short... -Source8: https://github.com/desktop-app/lib_spellcheck/archive/%{commit8}/lib_spel... -Source9: https://github.com/desktop-app/lib_storage/archive/%{commit9}/lib_storage... -Source10: https://github.com/desktop-app/lib_tl/archive/%{commit10}/lib_storage-%{s... -Source11: https://github.com/desktop-app/lib_ui/archive/%{commit11}/lib_ui-%{shortc... -Source12: https://github.com/desktop-app/codegen/archive/%{commit12}/codegen-%{shor... +Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}%{tarsuffix}.tar.gz # Permanent downstream patches... Patch10: cmake_helpers-system-expected.patch @@ -102,11 +43,10 @@ Patch13: cmake_helpers-system-variant.patch %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: qt5-qtimageformats%{?_isa} Requires: hicolor-icon-theme -Requires: open-sans-fonts # Telegram Desktop require patched version of rlottie since 1.8.0. # Pull Request pending: https://github.com/Samsung/rlottie/pull/252 -Provides: bundled(rlottie) = 0~git%{shortcommit2} +Provides: bundled(rlottie) = 0~git # Compilers and tools... BuildRequires: desktop-file-utils @@ -156,6 +96,10 @@ BuildRequires: clang BuildRequires: llvm %endif +%if %{with fonts} +Requires: open-sans-fonts +%endif + %if 0%{?fedora} && 0%{?fedora} >= 30 BuildRequires: minizip-compat-devel %else @@ -177,97 +121,14 @@ business messaging needs. %prep # Unpacking Telegram Desktop source archive... -%setup -q -n %{appname}-%{version} +%autosetup -n %{appname}-%{version}%{tarsuffix} -p1 mkdir -p %{_target_platform} -# Unpacking cmake_helpers... -rm -rf cmake -tar -xf %{SOURCE1} -mv cmake_helpers-%{commit1} cmake - -# Unpacking patched rlottie... -pushd Telegram/ThirdParty - rm -rf rlottie - tar -xf %{SOURCE2} - mv rlottie-%{commit2} rlottie -popd - -# Unpacking lib_crl... -pushd Telegram - rm -rf lib_crl - tar -xf %{SOURCE3} - mv lib_crl-%{commit3} lib_crl -popd - -# Unpacking lib_base... -pushd Telegram - rm -rf lib_base - tar -xf %{SOURCE4} - mv lib_base-%{commit4} lib_base -popd - -# Unpacking lib_lottie... -pushd Telegram - rm -rf lib_lottie - tar -xf %{SOURCE5} - mv lib_lottie-%{commit5} lib_lottie -popd - -# Unpacking lib_qr... -pushd Telegram - rm -rf lib_qr - tar -xf %{SOURCE6} - mv lib_qr-%{commit6} lib_qr -popd - -# Unpacking lib_rpl... -pushd Telegram - rm -rf lib_rpl - tar -xf %{SOURCE7} - mv lib_rpl-%{commit7} lib_rpl -popd - -# Unpacking lib_spellcheck... -pushd Telegram - rm -rf lib_spellcheck - tar -xf %{SOURCE8} - mv lib_spellcheck-%{commit8} lib_spellcheck -popd - -# Unpacking lib_storage... -pushd Telegram - rm -rf lib_storage - tar -xf %{SOURCE9} - mv lib_storage-%{commit9} lib_storage -popd - -# Unpacking lib_tl... -pushd Telegram - rm -rf lib_tl - tar -xf %{SOURCE10} - mv lib_tl-%{commit10} lib_tl -popd - -# Unpacking lib_ui... -pushd Telegram - rm -rf lib_ui - tar -xf %{SOURCE11} - mv lib_ui-%{commit11} lib_ui - rm -f lib_ui/qt_conf/linux.qrc -popd +# Unbundling libraries... +rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,libtgvoip,lz4,minizip,variant,xxHash} -# Unpacking codegen... -pushd Telegram - rm -rf codegen - tar -xf %{SOURCE12} - mv codegen-%{commit12} codegen -popd - -# Applying patches for build system... -%patch10 -d cmake -p1 -b .system-expected -%patch11 -d cmake -p1 -b .system-gsl -%patch12 -d cmake -p1 -b .system-qrcode -%patch13 -d cmake -p1 -b .system-variant +# Patching default desktop file... +desktop-file-edit --set-key=Exec --set-value=%{_bindir}/%{name} --copy-name-to-generic-name lib/xdg/telegramdesktop.desktop %build # Building Telegram Desktop using cmake... @@ -280,6 +141,9 @@ pushd %{_target_platform} %if %{without spellcheck} -DDESKTOP_APP_DISABLE_SPELLCHECK:BOOL=ON \ %endif +%if %{without fonts} + -DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=OFF \ +%endif %if %{with clang} -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ @@ -296,39 +160,24 @@ pushd %{_target_platform} -DTDESKTOP_API_ID=%{apiid} \ -DTDESKTOP_API_HASH=%{apihash} \ -DDESKTOP_APP_USE_PACKAGED:BOOL=ON \ - -DDESKTOP_APP_USE_PACKAGED_RLOTTIE:BOOL=FALSE \ + -DDESKTOP_APP_USE_PACKAGED_RLOTTIE:BOOL=OFF \ -DDESKTOP_APP_USE_GLIBC_WRAPS:BOOL=OFF \ -DDESKTOP_APP_DISABLE_CRASH_REPORTS:BOOL=ON \ - -DTDESKTOP_USE_PACKAGED_TGVOIP:BOOL=TRUE \ + -DTDESKTOP_USE_PACKAGED_TGVOIP:BOOL=ON \ -DTDESKTOP_DISABLE_AUTOUPDATE:BOOL=ON \ -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME:BOOL=ON \ -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION:BOOL=ON \ - -DTDESKTOP_LAUNCHER_FILENAME=%{launcher}.desktop \ + -DTDESKTOP_LAUNCHER_BASENAME=%{launcher} \ .. popd %ninja_build -C %{_target_platform} %install -# Installing executables... -mkdir -p %{buildroot}%{_bindir} -install -m 0755 -p %{_target_platform}/bin/Telegram %{buildroot}%{_bindir}/%{name} - -# Installing desktop shortcut... -desktop-file-install --set-key=Exec --set-value=%{_bindir}/%{name} --copy-name-to-generic-name --dir=%{buildroot}%{_datadir}/applications lib/xdg/%{launcher}.desktop - -# Installing icons... -for size in 16 32 48 64 128 256 512; do - dir=%{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps - install -d $dir - install -m 0644 -p Telegram/Resources/art/icon${size}.png $dir/telegram.png -done - -# Installing appdata for Gnome Software... -install -d %{buildroot}%{_metainfodir} -install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml %{buildroot}%{_metainfodir}/%{launcher}.appdata.xml +%ninja_install -C %{_target_platform} %check appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{launcher}.appdata.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop %files %doc README.md changelog.txt @@ -339,12 +188,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{launcher}.ap %{_metainfodir}/%{launcher}.appdata.xml %changelog +* Thu Jan 23 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.9.7-1 +- Updated to version 1.9.7. + * Fri Jan 17 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.9.4-1 - Updated to version 1.9.4. - Removed obsolete downstream patches. * Thu Jan 09 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.9.3-1 - Updated to version 1.9.3. - -* Tue Dec 24 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.8.15-3 -- Removed GTK2 from build requirements.