12:43 p.m.
commit 9146c63a4e832786ca03bbbbc3ca11b4bd5f9959
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Oct 2 14:43:15 2020 +0200
Updated to version 2.4.1.
.gitignore | 2 +
sources | 4 +-
telegram-desktop-webrtc-packaged.patch | 191 ---------------------------------
telegram-desktop.spec | 42 ++------
tg_owt-dlopen-linkage.patch | 38 -------
5 files changed, 12 insertions(+), 265 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 55694d9..015a117 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,3 +148,5 @@
/tdesktop-2.2.0-full.tar.gz
/owt-a803835.tar.gz
/tdesktop-2.3.2-full.tar.gz
+/owt-7a9d4bd.tar.gz
+/tdesktop-2.4.1-full.tar.gz
diff --git a/sources b/sources
index 8f19fd2..809b08f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (owt-a803835.tar.gz) =
709b7a179f890267c5c1a125bb18f65a77c83f901f4458f8a739d9e74e3ce44e52d43bdced760aaeb0c26f989ea9361771517717815bc87d9c13d384e2ec6e4c
-SHA512 (tdesktop-2.3.2-full.tar.gz) =
757e57389ce24656c1d6676d6f0808e3d444785394e916b9f5fb47511662f01b6742c88c2a27274c4d9bb58263ae281218579c78cce7db119e2c863c1eaacc90
+SHA512 (owt-7a9d4bd.tar.gz) =
5748985904ee4ab5da6bbfa9e962542e566c799dd5ea40e938d7cba0d34c690b1c52cf9629368623c735b98e24053ab429903e06399d902328a1e69f20579ad0
+SHA512 (tdesktop-2.4.1-full.tar.gz) =
ce9dee9e94db49661ce5608891965de017794ee989ad2a38117158c230489cdac5880eb8e16b192694b7f72f28ff82231aadf411cfa0b7ce5d1f7a9b4f1eb3b7
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 2cbaf86..b4eecef 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -7,12 +7,6 @@
%bcond_with gtk3
%bcond_with clang
-%if 0%{?fedora} && 0%{?fedora} >= 33
-%bcond_with mapbox
-%else
-%bcond_without mapbox
-%endif
-
# F33+ has some issues with LTO: https://bugzilla.redhat.com/show_bug.cgi?id=1880290
%if 0%{?fedora} && 0%{?fedora} >= 33
%bcond_with ipo
@@ -25,7 +19,7 @@
%global launcher telegramdesktop
# Git revision of WebRTC...
-%global commit1 a80383535367dd8961f55f960938d943d6975808
+%global commit1 7a9d4bd6d9a147d15e3c8fa818a716c31f65606a
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# Applying workaround to RHBZ#1559007...
@@ -45,8 +39,8 @@
%endif
Name: telegram-desktop
-Version: 2.3.2
-Release: 3%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball;
@@ -60,11 +54,6 @@ Summary: Telegram Desktop official messaging app
Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz
Source1:
https://github.com/desktop-app/tg_owt/archive/%{commit1}/owt-%{shortcommi...
-#
https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b...
-Patch100: %{name}-webrtc-packaged.patch
-# https://github.com/desktop-app/tg_owt/pull/25
-Patch101: tg_owt-dlopen-linkage.patch
-
# Telegram Desktop require more than 8 GB of RAM on linking stage.
# Disabling all low-memory architectures.
ExclusiveArch: x86_64
@@ -87,13 +76,6 @@ BuildRequires: rlottie-devel
Provides: bundled(rlottie) = 0~git
%endif
-# Breaking API changes in version 1.2.0.
-%if %{with mapbox}
-BuildRequires: mapbox-variant-devel < 1.2.0
-%else
-Provides: bundled(mapbox-variant) = 1.1.6
-%endif
-
# Telegram Desktop require patched version of lxqt-qtplugin.
# Pull Request pending: https://github.com/lxqt/lxqt-qtplugin/pull/52
Provides: bundled(lxqt-qtplugin) = 0.14.0~git
@@ -139,7 +121,7 @@ BuildRequires: libjpeg-turbo-devel
BuildRequires: alsa-lib-devel
BuildRequires: yasm
-Provides: bundled(tg_owt) = 0~git
+Provides: bundled(tg_owt) = 0~git%{shortcommit1}
Provides: bundled(openh264) = 0~git
Provides: bundled(abseil-cpp) = 0~git
Provides: bundled(libsrtp) = 0~git
@@ -176,14 +158,12 @@ business messaging needs.
%prep
# Unpacking Telegram Desktop source archive...
-%setup -q -n %{appname}-%{version}-full
-%patch100 -p1
+%autosetup -n %{appname}-%{version}-full -p1
# Unpacking WebRTC...
%if %{with webrtc}
tar -xf %{SOURCE1}
mv tg_owt-%{commit1} tg_owt
-%patch101 -p1
%endif
# Unbundling libraries...
@@ -194,11 +174,6 @@ rm -rf
Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,fcitx5
rm -rf Telegram/ThirdParty/rlottie
%endif
-# Unbundling mapbox-variant if build against packaged version...
-%if %{with mapbox}
-rm -rf Telegram/ThirdParty/variant
-%endif
-
%build
# Building WebRTC using cmake...
%if %{with webrtc}
@@ -269,7 +244,6 @@ popd
%else
-DTDESKTOP_DISABLE_GTK_INTEGRATION:BOOL=ON \
%endif
- -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME:BOOL=ON \
-DTDESKTOP_LAUNCHER_BASENAME=%{launcher}
%cmake_build
@@ -289,11 +263,11 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
+* Fri Oct 02 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.1-1
+- Updated to version 2.4.1.
+
* Sun Sep 27 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.3.2-3
- Rebuilt due to Qt 5.15.1 update.
* Mon Sep 21 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.3.2-2
- Fixed startup crash on Fedora 33+.
-
-* Sun Aug 30 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.3.2-1
-- Updated to version 2.3.2.