commit 62cb460b66c33524d4d3326f20561c8c9355a524
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon Mar 18 14:10:29 2019 +0100
Updated to version 1.6.0.
.gitignore | 2 ++
sources | 4 ++--
telegram-desktop-build-fixes.patch | 14 +++++++-------
telegram-desktop-system-fonts.patch | 4 ++--
telegram-desktop-unbundle-minizip.patch | 6 +++---
telegram-desktop.spec | 20 ++++++++++++++++----
6 files changed, 32 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37b1dd8..96acccc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,5 @@
/tdesktop-1.5.12.tar.gz
/tdesktop-1.5.13.tar.gz
/tdesktop-1.5.15.tar.gz
+/crl-84072fb.tar.gz
+/tdesktop-1.6.0.tar.gz
diff --git a/sources b/sources
index 334f8d6..f162a4b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b38cf6bd3d30a3b9a9602e2e7ab2efea crl-40063ab.tar.gz
-49a432104b8318433d4dfad8c9cb51bf tdesktop-1.5.15.tar.gz
+ae7f024486ddce3b598477bf40a86c79 crl-84072fb.tar.gz
+aa8f161c8314003cf49ca5813e21e008 tdesktop-1.6.0.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index ac9d584..8522b34 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 65a07035c36c579de566e84363cab038044efd23 Mon Sep 17 00:00:00 2001
+From aeb2b6c8bfe83a6511a6245076c299de60b436d0 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.
@@ -610,7 +610,7 @@ index f5624a82b..b644ce29f 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index 17219fa2c..072c15d94 100644
+index 22160515c..2ee5cc7ab 100644
--- a/Telegram/gyp/settings_linux.gypi
+++ b/Telegram/gyp/settings_linux.gypi
@@ -9,10 +9,6 @@
@@ -624,7 +624,7 @@ index 17219fa2c..072c15d94 100644
'-fPIC',
'-Wno-unused-variable',
'-Wno-unused-parameter',
-@@ -46,9 +42,6 @@
+@@ -47,9 +43,6 @@
}], [ '"<!(uname -p)" == "x86_64"', {
# 32 bit version can't be linked with debug info or LTO,
# virtual memory exhausted :(
@@ -634,7 +634,7 @@ index 17219fa2c..072c15d94 100644
'configurations': {
'Release': {
'cflags_c': [ '-flto' ],
-@@ -60,7 +53,6 @@
+@@ -61,7 +54,6 @@
],
'defines': [
'_REENTRANT',
@@ -642,7 +642,7 @@ index 17219fa2c..072c15d94 100644
'QT_PLUGIN',
],
'cflags_c': [
-@@ -72,11 +64,6 @@
+@@ -73,11 +65,6 @@
'-std=c++1z',
'-Wno-register',
],
@@ -774,10 +774,10 @@ 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 57519d64f..090134d31 100644
+index 8d21ef0c5..9d21a054f 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -828,7 +828,7 @@
+@@ -848,7 +848,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 0f5d431..4b6adc3 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 83a347102104ba34366ed2387de4e4fb854045a5 Mon Sep 17 00:00:00 2001
+From 06a812327cd60c1164eae92f6a5afa558d0d7c6e 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
@@ -25,7 +25,7 @@ index 8e39756ac..29b3d55e6 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 d105f78c2..550bd50db 100644
+index 9ebe6cb22..1df6ce596 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -70,9 +70,9 @@ void Start() {
diff --git a/telegram-desktop-unbundle-minizip.patch
b/telegram-desktop-unbundle-minizip.patch
index 098cbdf..9991795 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From c9eb4a57f4de9596c5a33683b7e3b7105b821a8f Mon Sep 17 00:00:00 2001
+From 7cc1976441b5668c4e6e2323e6342a0a2755b335 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.
@@ -50,10 +50,10 @@ index 9bc686d44..806374202 100644
'lzma',
'xxhash',
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 090134d31..9de94f749 100644
+index 9d21a054f..54305eb60 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -835,13 +835,6 @@
+@@ -855,13 +855,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 187045c..67e7b2d 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -4,7 +4,7 @@
%global apihash dfbe1bc42dc9d20507e17d1814cc2f0a
# Git revision of crl...
-%global commit1 40063abec74e560220891443f6d5157de15e1b62
+%global commit1 84072fba75f14620935e5e91788ce603daeb1988
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# Decrease debuginfo verbosity to reduce memory consumption...
@@ -12,8 +12,8 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.5.15
-Release: 2%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -51,7 +51,7 @@ BuildRequires: gyp
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.2
+BuildRequires: libtgvoip-devel >= 2.4.4
BuildRequires: libappindicator-devel
BuildRequires: ffmpeg-devel >= 3.1
BuildRequires: openal-soft-devel
@@ -157,6 +157,18 @@ appstream-util validate-relax --nonet
"%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Mon Mar 18 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.6.0-1
+- Updated to 1.6.0.
+
+* Fri Mar 15 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.18-1
+- Updated to 1.5.18 (beta).
+
+* Wed Mar 13 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.17-1
+- Updated to 1.5.17 (beta).
+
+* Tue Mar 12 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.16-1
+- Updated to 1.5.16 (beta).
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
1.5.15-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild