2:26 p.m.
commit bdd2e66e281d5fc1ac8b3aa2330afbbbd74805e3
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Jun 1 16:25:30 2019 +0200
Updated to version 1.7.3.
.gitignore | 2 ++
sources | 4 ++--
telegram-desktop-build-fixes.patch | 10 +++++-----
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 6 +++---
telegram-desktop.spec | 14 ++++++++++++--
6 files changed, 25 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9268b18..c7386f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,3 +84,5 @@
/crl-d259aeb.tar.gz
/qtlottie-6cd5e32.tar.gz
/tdesktop-1.7.1.tar.gz
+/qtlottie-ddccffe.tar.gz
+/tdesktop-1.7.3.tar.gz
diff --git a/sources b/sources
index ca56694..5a8950f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
22d696169c7e4ae7dbd2ab1e979cadd7 crl-d259aeb.tar.gz
-a2346ad2b0fb2d43b9882058bc65a03f qtlottie-6cd5e32.tar.gz
-4cd9ec4fb81acd45cff94424ad4353e5 tdesktop-1.7.1.tar.gz
+76de58d74aa53accb2ad1e13985e3cd2 qtlottie-ddccffe.tar.gz
+d3089ab1fd5523586541d7254cef0515 tdesktop-1.7.3.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index dcbcd57..6ce2f6d 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From c2ac9062ba855d63d9fcdc3337eedd0a4779a872 Mon Sep 17 00:00:00 2001
+From 600fe56f65749506b4a71bacf218e952b0439961 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
@@ -204,7 +204,7 @@ index dfe1193be..75bcd675d 100644
IMPLICIT_DEPENDS CXX "${_pch_header}"
COMMENT "Precompiling header ${_name} for ${_target} (C++)")
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 7370115f0..b48eb774c 100644
+index 57d81be5f..65c98afb4 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -51,15 +51,13 @@
@@ -268,8 +268,8 @@ index 7370115f0..b48eb774c 100644
],
'sources': [
'<@(qrc_files)',
-@@ -132,7 +114,6 @@
- 'TDESKTOP_OFFICIAL_TARGET=<(official_build_target)',
+@@ -133,7 +115,6 @@
+ 'TDESKTOP_FORCE_GTK_FILE_DIALOG',
],
'dependencies': [
- 'utils.gyp:Packer',
@@ -815,7 +815,7 @@ index ffe0e5a96..9bc686d44 100644
],
}], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 43e043a55..bdf6f80f2 100644
+index bd8dc1a67..a043c3869 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -861,7 +861,7 @@
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 2e2714f..0da5933 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 67936057480c18f23723d95cfa9bf5ad4913a226 Mon Sep 17 00:00:00 2001
+From 94d2e8d53304dcb0eb3223277e6a8adf8638940f Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun, 24 Jun 2018 22:59:34 +0200
Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer
diff --git a/telegram-desktop-unbundle-minizip.patch
b/telegram-desktop-unbundle-minizip.patch
index 7817fa7..c59ad4c 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From 1792a6c2892fef18a1b09f0a58c6ef0632f0c5f2 Mon Sep 17 00:00:00 2001
+From d6708c89d73c8984a79972514b97f8e21c4640ef Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed, 17 Oct 2018 17:57:59 +0200
Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29.
@@ -10,7 +10,7 @@ Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <=
29.
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index b48eb774c..c34617aa2 100644
+index 65c98afb4..063f2b053 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -18,7 +18,6 @@
@@ -50,7 +50,7 @@ index 9bc686d44..806374202 100644
'lzma',
'xxhash',
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index bdf6f80f2..c20b61824 100644
+index a043c3869..7d319595f 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -868,13 +868,6 @@
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index e8ef23d..3dcb4ba 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -19,7 +19,7 @@
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# Git revision of qtlottie...
-%global commit2 6cd5e323645746620f96450487e05900a0fbc7ce
+%global commit2 ddccffed3c87ce6763dd73a6453b1edfb1389743
%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
# Decrease debuginfo verbosity to reduce memory consumption...
@@ -32,20 +32,24 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.7.1
+Version: 1.7.3
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 (qtlottie) - GPLv3+ -- build-time dependency;
# * P0 (qt_functions.cpp) - LGPLv3 -- build-time dependency.
License: GPLv3+ and LGPLv3
URL: %{upstreambase}/%{appname}
ExclusiveArch: i686 x86_64
+# Source files...
Source0: %{url}/archive/v%{version}.tar.gz#/%{appname}-%{version}.tar.gz
Source1: %{upstreambase}/crl/archive/%{commit1}.tar.gz#/crl-%{shortcommit1}.tar.gz
Source2:
%{upstreambase}/qtlottie/archive/%{commit2}.tar.gz#/qtlottie-%{shortcommit2}.tar.gz
+
+# Downstream patches...
Patch0: %{name}-build-fixes.patch
Patch1: %{name}-system-fonts.patch
Patch2: %{name}-unbundle-minizip.patch
@@ -55,6 +59,9 @@ Requires: qt5-qtimageformats%{?_isa}
Requires: hicolor-icon-theme
Requires: open-sans-fonts
+# Special patched version of qtlottie required.
+Provides: bundled(qtlottie) = 0
+
# Compilers and tools...
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -208,6 +215,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Sat Jun 01 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.7.3-1
+- Updated to 1.7.3.
+
* Wed May 29 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.7.1-1
- Updated to 1.7.1 (beta).