commit 28e9b0405abdb1c23279ed3c82195dbaaa8f6362 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri Jan 17 20:33:04 2020 +0100 Updated to version 1.9.4. .gitignore | 5 + cmake_helpers-system-expected.patch | 4 +- cmake_helpers-system-gsl.patch | 4 +- cmake_helpers-system-libraries.patch | 1233 ---------------------- cmake_helpers-system-qrcode.patch | 4 +- cmake_helpers-system-variant.patch | 4 +- lib_ui-remove-configs.patch | 25 - sources | 10 +- telegram-desktop-commit-100fed3.patch | 30 - telegram-desktop-commit-322367c.patch | 104 -- telegram-desktop-fix-appdata.patch | 4 +- telegram-desktop-fix-desktop.patch | 4 +- telegram-desktop-pr6956.patch | 1819 --------------------------------- telegram-desktop-pr6985.patch | 30 - telegram-desktop.spec | 36 +- 15 files changed, 32 insertions(+), 3284 deletions(-) --- diff --git a/.gitignore b/.gitignore index d2b5eab..0519238 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,8 @@ /lib_ui-4ec9e32.tar.gz /rlottie-c490c7a.tar.gz /tdesktop-1.9.3.tar.gz +/cmake_helpers-458fec9.tar.gz +/lib_base-8ba8607.tar.gz +/lib_spellcheck-4784796.tar.gz +/lib_ui-c0b0745.tar.gz +/tdesktop-1.9.4.tar.gz diff --git a/cmake_helpers-system-expected.patch b/cmake_helpers-system-expected.patch index f6833c0..bb7ab96 100644 --- a/cmake_helpers-system-expected.patch +++ b/cmake_helpers-system-expected.patch @@ -1,7 +1,7 @@ -From 506b42ad9db309231e21e33bcc35995a135261c0 Mon Sep 17 00:00:00 2001 +From 03300739a87eba33e28f0ee5299745f9100bb0c9 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 2/5] Use packaged version of expected library. +Subject: [PATCH 1/4] Use packaged version of expected library. --- external/expected/CMakeLists.txt | 12 ++++++++---- diff --git a/cmake_helpers-system-gsl.patch b/cmake_helpers-system-gsl.patch index 923cf57..eff43f1 100644 --- a/cmake_helpers-system-gsl.patch +++ b/cmake_helpers-system-gsl.patch @@ -1,7 +1,7 @@ -From 5a25232dbf1b69e7497602e1d439115b76d0f9ff Mon Sep 17 00:00:00 2001 +From 5365f0e2a6228873b4ac625d113d9d1a733abe2c 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 3/5] Use packaged version of guidelines-support-library. +Subject: [PATCH 2/4] Use packaged version of guidelines-support-library. --- external/gsl/CMakeLists.txt | 12 ++++++++---- diff --git a/cmake_helpers-system-qrcode.patch b/cmake_helpers-system-qrcode.patch index d3cd399..ac5c631 100644 --- a/cmake_helpers-system-qrcode.patch +++ b/cmake_helpers-system-qrcode.patch @@ -1,7 +1,7 @@ -From 82de89301519043e392c4475f7aee5c24e94fd69 Mon Sep 17 00:00:00 2001 +From fee202d3b1f86a2a1d63c8f7eb828deb439a3d85 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 4/5] Use packaged version of qr-code-generator library. +Subject: [PATCH 3/4] Use packaged version of qr-code-generator library. --- external/qr_code_generator/CMakeLists.txt | 41 +++++++++++++---------- diff --git a/cmake_helpers-system-variant.patch b/cmake_helpers-system-variant.patch index d8a5d3d..03fa271 100644 --- a/cmake_helpers-system-variant.patch +++ b/cmake_helpers-system-variant.patch @@ -1,7 +1,7 @@ -From 08551b891e74445c6d7093edc1db54a819d7268b Mon Sep 17 00:00:00 2001 +From 539fe57aa89160ef775fe6995dd7173bd040a8e3 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 5/5] Use packaged version of mapbox-variant library. +Subject: [PATCH 4/4] Use packaged version of mapbox-variant library. --- external/variant/CMakeLists.txt | 13 +++++++++---- diff --git a/sources b/sources index c8c9f89..e78ebce 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (cmake_helpers-652bbaf.tar.gz) = 609ad8196eb3a7dbbe3b2f3daf9edf993bff9e1e9a1015ecf64842baabd05f951f5b2fa67a3cce7857943d1d2b7599ffddb9ab6a994f6550086cdd5bdda876d7 +SHA512 (cmake_helpers-458fec9.tar.gz) = a8e423165a149a17f5f58441d460e3157c9d21af76f29aeef93e273e093df90788782edde5b8183313570d333b95398ca05bbbb9325757d05d02a2b4c4bdcfbc SHA512 (codegen-d14ae77.tar.gz) = 721139f88b468e87109869bab7f6685ff1753d7fec22a9f57adf10ebbeb915f82cf5bfda8766aabd782c0b6c6d1f638be2d9388bd87503fcb322bbe0919f0f74 -SHA512 (lib_base-baae6cd.tar.gz) = 28c4020f17414b216d9071169ec0942345ef407a9e8d1fda84296f2b77f2b970d64022a47f2bd46dd139f1beee33d0b28756151f857a62d905ce82485235e3f7 +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-d305de6.tar.gz) = 9470177e1ce3b507ae155695c75bc69db997913940001fc09846d0eeae9a1be9f565b6278549aa1158ecb8d5761aa7d2eb17f34db85b72c24f0e3898ed9d2c4a +SHA512 (lib_spellcheck-4784796.tar.gz) = 0b5a6fb05c5cfcb23ad2576f040ff87be60419b1f449b21bcf5c1c8fe2c346853032220a9a383dbfda22ac9a17c0ce8f2c34772d5b79531e463c93c6b29752a1 SHA512 (lib_storage-b0388a1.tar.gz) = 0cab9532c60709a1906dba833fbef9f4d3d08e69200f482648ea81454770eda5bebc36aaeecb905ee9eab8e21fbb18afa1be2eecc72eea253ca6058502de92a3 SHA512 (lib_storage-cb56ad4.tar.gz) = dc617272ef3963582c8738358cda56ae7dee201bb99bbf8e123a49c3838d2ea690aec8a0cae71b1498fcb96df615e714a5c425949ba9910a7a6e8ce14e324040 -SHA512 (lib_ui-4ec9e32.tar.gz) = 3e214b59c509a0e4c6468a78ccaed82ad48708aab0db6e79f11aa45c660040c80f25cc31943da62993b0d32c63bbee4b74eca7452ad9ca024cf803d2c3258eac +SHA512 (lib_ui-c0b0745.tar.gz) = 519a4277a63e4346e6bfaeeb68aecf534e781d00eab6d42bbf60cd7509d18feeac7fd40ff45ac8b274bbf40fb5997e0a0696e378a9a7debf04bce816c9442e41 SHA512 (rlottie-c490c7a.tar.gz) = 30891b6550c29b71506e5a476844acc23bcfb1a3f749aeec02917a6b62f8d60f7c88edcfc7a38b249eb4a4d32dd89f914c6ae3cc70154d1a2e178bf2176adef4 -SHA512 (tdesktop-1.9.3.tar.gz) = 94f5e3cade2b8ebe8b03cd106d84d588fc8d60877292ddbc3a106a5e6621baf4341d1386cdf829e32af175f16ca417050ac160019651b4e02f023b29dfbf2e9e +SHA512 (tdesktop-1.9.4.tar.gz) = 54947a7557bce97654914170f302949b9bc8a2be8dc8d5835cbc2377e0aa41fe4b0d119910824ea5333c33dcb2531b6e04e7698d6d784add626a57c5f81741de diff --git a/telegram-desktop-fix-appdata.patch b/telegram-desktop-fix-appdata.patch index d024b30..d085ed3 100644 --- a/telegram-desktop-fix-appdata.patch +++ b/telegram-desktop-fix-appdata.patch @@ -1,6 +1,6 @@ -From aa1bf7309fad9d556551756e5501cf0306955dd2 Mon Sep 17 00:00:00 2001 +From 0b4699365b6a4818aa46ee00d43c0e8249c14876 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; -Date: Thu, 9 Jan 2020 15:06:32 +0100 +Date: Fri, 17 Jan 2020 19:35:45 +0100 Subject: [PATCH 2/2] Updated AppData file. --- diff --git a/telegram-desktop-fix-desktop.patch b/telegram-desktop-fix-desktop.patch index 3e665d3..7370df4 100644 --- a/telegram-desktop-fix-desktop.patch +++ b/telegram-desktop-fix-desktop.patch @@ -1,6 +1,6 @@ -From 6503d4a1943f0a43ab31e20563d1ce5d2b0eaf18 Mon Sep 17 00:00:00 2001 +From 444234974cb7aae6b7d85002f382a8d0635956d4 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; -Date: Thu, 9 Jan 2020 15:05:52 +0100 +Date: Fri, 17 Jan 2020 19:35:22 +0100 Subject: [PATCH 1/2] Updated desktop file. --- diff --git a/telegram-desktop.spec b/telegram-desktop.spec index e1e5d1d..07e49e9 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -9,7 +9,7 @@ %global apihash dfbe1bc42dc9d20507e17d1814cc2f0a # Git revision of cmake_helpers... -%global commit1 652bbaf002546ae1822fff4474ffe95091bfc2e4 +%global commit1 458fec94999b82145bffaaab114ee9baa8708dd3 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # Git revision of patched rlottie... @@ -21,7 +21,7 @@ %global shortcommit3 %(c=%{commit3}; echo ${c:0:7}) # Git revision of lib_base... -%global commit4 baae6cdd9ba5216732222e7dec9a76b9ea3a7c83 +%global commit4 8ba86078fbe71ab857ee1b6e35acc4def4cc0d1c %global shortcommit4 %(c=%{commit4}; echo ${c:0:7}) # Git revision of lib_lottie... @@ -37,7 +37,7 @@ %global shortcommit7 %(c=%{commit7}; echo ${c:0:7}) # Git revision of lib_spellcheck... -%global commit8 d305de6d67ca4f3891bad96a0e49e40f5c904189 +%global commit8 47847963bf491dfd266da916478de5cc479342f6 %global shortcommit8 %(c=%{commit8}; echo ${c:0:7}) # Git revision of lib_storage... @@ -49,7 +49,7 @@ %global shortcommit10 %(c=%{commit10}; echo ${c:0:7}) # Git revision of lib_ui... -%global commit11 4ec9e32f8f5f6b8192fd60d73ae0b575e82c1c60 +%global commit11 c0b07457fa5df905f7926025302f66065dc4d52b %global shortcommit11 %(c=%{commit11}; echo ${c:0:7}) # Git revision of codegen... @@ -62,7 +62,7 @@ %endif Name: telegram-desktop -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -97,14 +97,6 @@ Patch10: cmake_helpers-system-expected.patch Patch11: cmake_helpers-system-gsl.patch Patch12: cmake_helpers-system-qrcode.patch Patch13: cmake_helpers-system-variant.patch -Patch20: lib_ui-remove-configs.patch - -# Temporary upstream and proposed to upstream patches... -Patch100: %{name}-pr6956.patch -Patch101: cmake_helpers-system-libraries.patch -Patch102: %{name}-commit-100fed3.patch -Patch103: %{name}-commit-322367c.patch -Patch104: %{name}-pr6985.patch %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: qt5-qtimageformats%{?_isa} @@ -127,7 +119,7 @@ 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 -BuildRequires: range-v3-devel >= 0.9.1 +BuildRequires: range-v3-devel >= 0.10.0 BuildRequires: libqrcodegencpp-devel BuildRequires: ffmpeg-devel >= 3.1 BuildRequires: openal-soft-devel @@ -260,6 +252,7 @@ pushd Telegram rm -rf lib_ui tar -xf %{SOURCE11} mv lib_ui-%{commit11} lib_ui + rm -f lib_ui/qt_conf/linux.qrc popd # Unpacking codegen... @@ -272,21 +265,13 @@ popd # Applying patches for core application... %patch0 -p1 -b .desktop %patch1 -p1 -b .appdata -%patch102 -p1 -b .commit-100fed3 -%patch103 -p1 -b .commit-322367c -%patch100 -p1 -b .pr6956 -%patch104 -p1 -b .pr6985 # Applying patches for build system... -%patch101 -d cmake -p1 -b .system-libraries %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 -# Applying patches for lib_ui... -%patch20 -d Telegram/lib_ui -p1 -b .remove-configs - %build # Building Telegram Desktop using cmake... pushd %{_target_platform} @@ -358,12 +343,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_metainfodir}/%{name}.appdata.xml %changelog +* Fri Jan 17 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.9.4-1 +- Updated to version 1.9.4. + * 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. - -* Tue Dec 17 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.8.15-2 -- Fixed issue with menu bar on Gnome. -- Rebuilt due to Qt 5.13.2 update on Rawhide.