commit 4f03786d7c24fa3359710672aa3c47741ae5b3b3 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Tue Sep 10 18:13:51 2019 +0200 Updated to version 1.8.8. .gitignore | 1 + sources | 2 +- telegram-desktop-build-fixes.patch | 6 +++--- telegram-desktop-system-fonts.patch | 6 +++--- telegram-desktop-unbundle-minizip.patch | 6 +++--- telegram-desktop.spec | 32 ++++++++++++++++++++------------ 6 files changed, 31 insertions(+), 22 deletions(-) --- diff --git a/.gitignore b/.gitignore index 7d9ecc5..5dfc544 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ /tdesktop-1.8.3.tar.gz /tdesktop-1.8.4.tar.gz /rlottie-589db02.tar.gz +/tdesktop-1.8.8.tar.gz diff --git a/sources b/sources index a6b751c..780e258 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 744e77b69697f659a356727be22d4247 crl-52baf11.tar.gz ad8b6f3f07ac4339f5a6fd2d28827825 rlottie-589db02.tar.gz -a624a78f91e07f42794350f9bc702a34 tdesktop-1.8.4.tar.gz +3915d0ea072b06ffc2930a825f558f19 tdesktop-1.8.8.tar.gz diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch index f66fce6..47575bf 100644 --- a/telegram-desktop-build-fixes.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,4 +1,4 @@ -From e3f3dced5d7abb2ea3278f480079403809295cb7 Mon Sep 17 00:00:00 2001 +From 5c0dbdd2130b39a99d7f95abf4bd6e8d1b59dfd6 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri, 31 Mar 2017 14:29:58 +0200 Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock. @@ -860,10 +860,10 @@ index ffe0e5a96..4efd97851 100644 ], }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', { diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index 2e50658fa..023db5ea7 100644 +index 68da81d05..5ef947a78 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -917,7 +917,7 @@ +@@ -925,7 +925,7 @@ <(src_loc)/mainwindow.h <(src_loc)/observer_peer.cpp <(src_loc)/observer_peer.h diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch index 007a039..1c8ac92 100644 --- a/telegram-desktop-system-fonts.patch +++ b/telegram-desktop-system-fonts.patch @@ -1,4 +1,4 @@ -From d89cacaa1c9cb361202aaa13541c3ab69aae4d09 Mon Sep 17 00:00:00 2001 +From 8d70de0234368e30b11299a31f7efaab1a83861b Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Sun, 24 Jun 2018 22:59:34 +0200 Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer @@ -25,10 +25,10 @@ index 4db29b204..52028412c 100644 <file alias="art/bg_initial.jpg">../art/bg_initial.jpg</file> <file alias="art/logo_256.png">../art/logo_256.png</file> diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp -index 3113e597b..7d0b25b55 100644 +index 37b2872a0..e48354e0e 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp -@@ -71,9 +71,9 @@ void Start() { +@@ -75,9 +75,9 @@ void Start() { } Started = true; diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch index 8dbe9f7..ac7cd0c 100644 --- a/telegram-desktop-unbundle-minizip.patch +++ b/telegram-desktop-unbundle-minizip.patch @@ -1,4 +1,4 @@ -From 7b66e06651d026f937fec5c3866f5d2dd4185dc2 Mon Sep 17 00:00:00 2001 +From ccdae65b1e02dcbc16f3d9ba93767d9f385f6caf Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Wed, 17 Oct 2018 17:57:59 +0200 Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29. @@ -50,10 +50,10 @@ index 4efd97851..b314ba137 100644 'lzma', 'xxhash', diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index 023db5ea7..58b8ee1fb 100644 +index 5ef947a78..c00992189 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -924,13 +924,6 @@ +@@ -932,13 +932,6 @@ <(emoji_suggestions_loc)/emoji_suggestions.h platforms: !win diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 8c0cb7c..254320d 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -32,7 +32,7 @@ Summary: Telegram Desktop official messaging app Name: telegram-desktop -Version: 1.8.4 +Version: 1.8.8 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -166,8 +166,7 @@ pushd Telegram/gyp popd # Patching generated cmake script... -LEN=$(($(wc -l < out/Release/CMakeLists.txt) - 2)) -sed -i "$LEN r Telegram/gyp/CMakeLists.inj" out/Release/CMakeLists.txt +sed -i "$(($(wc -l < out/Release/CMakeLists.txt) - 2)) r Telegram/gyp/CMakeLists.inj" out/Release/CMakeLists.txt # Building Telegram Desktop using cmake... pushd out/Release @@ -191,23 +190,23 @@ popd %install # Installing executables... -%{__mkdir_p} "%{buildroot}%{_bindir}" -%{__install} -m 0755 -p out/Release/Telegram "%{buildroot}%{_bindir}/%{name}" +mkdir -p %{buildroot}%{_bindir} +install -m 0755 -p out/Release/Telegram %{buildroot}%{_bindir}/%{name} # Installing desktop shortcut... -%{__mv} lib/xdg/telegramdesktop.desktop lib/xdg/%{name}.desktop -desktop-file-install --dir="%{buildroot}%{_datadir}/applications" lib/xdg/%{name}.desktop +mv lib/xdg/telegramdesktop.desktop lib/xdg/%{name}.desktop +desktop-file-install --dir=%{buildroot}%{_datadir}/applications lib/xdg/%{name}.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/%{name}.png" + dir=%{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps + install -d $dir + install -m 0644 -p Telegram/Resources/art/icon${size}.png $dir/%{name}.png done # Installing appdata for Gnome Software... -%{__install} -d %{buildroot}%{_metainfodir} -%{__install} -m 0644 -p lib/xdg/telegramdesktop.appdata.xml %{buildroot}%{_metainfodir}/%{name}.appdata.xml +install -d %{buildroot}%{_metainfodir} +install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml %{buildroot}%{_metainfodir}/%{name}.appdata.xml %check appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml @@ -221,6 +220,15 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_metainfodir}/%{name}.appdata.xml %changelog +* Tue Sep 10 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.8.8-1 +- Updated to 1.8.8. + +* Tue Sep 10 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.8.7-1 +- Updated to 1.8.7 (beta). + +* Mon Sep 09 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.8.5-1 +- Updated to 1.8.5 (beta). + * Fri Sep 06 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.8.4-1 - Updated to 1.8.4.