1:20 p.m.
commit a993fa008649194e98a89d86e50adef840f0f695
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Mar 20 14:19:59 2019 +0100
Updated to version 1.6.1.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 2 +-
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 2 +-
telegram-desktop.spec | 25 +++++++++++++++++++------
6 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96acccc..171f1cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@
/tdesktop-1.5.15.tar.gz
/crl-84072fb.tar.gz
/tdesktop-1.6.0.tar.gz
+/tdesktop-1.6.1.tar.gz
diff --git a/sources b/sources
index f162a4b..788b844 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ae7f024486ddce3b598477bf40a86c79 crl-84072fb.tar.gz
-aa8f161c8314003cf49ca5813e21e008 tdesktop-1.6.0.tar.gz
+20e911bcbe859e6452a94dbe1c7fdba6 tdesktop-1.6.1.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 8522b34..634c604 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From aeb2b6c8bfe83a6511a6245076c299de60b436d0 Mon Sep 17 00:00:00 2001
+From d3ce618457aaba716ba73afbbbe41489ead42165 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.
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 4b6adc3..8deff54 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 06a812327cd60c1164eae92f6a5afa558d0d7c6e Mon Sep 17 00:00:00 2001
+From 9fa7543843f219b7ae8e4e1f682d998bb7ce4f1b 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 9991795..f00910b 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From 7cc1976441b5668c4e6e2323e6342a0a2755b335 Mon Sep 17 00:00:00 2001
+From 8c38418c06056f7c9f9b46aadd829bb65d912735 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.
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 67e7b2d..8e560f1 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -1,3 +1,6 @@
+# Build conditionals...
+%bcond_without gtk3
+
# Telegram Desktop's constants...
%global appname tdesktop
%global apiid 208164
@@ -12,7 +15,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.6.0
+Version: 1.6.1
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -33,11 +36,9 @@ Patch1: %{name}-system-fonts.patch
Patch2: %{name}-unbundle-minizip.patch
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-Recommends: libappindicator-gtk3%{?_isa}
Requires: qt5-qtimageformats%{?_isa}
Requires: hicolor-icon-theme
Requires: open-sans-fonts
-Requires: gtk3%{?_isa}
# Compilers and tools...
BuildRequires: desktop-file-utils
@@ -52,7 +53,6 @@ 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: libappindicator-devel
BuildRequires: ffmpeg-devel >= 3.1
BuildRequires: openal-soft-devel
BuildRequires: qt5-qtbase-devel
@@ -61,12 +61,19 @@ BuildRequires: range-v3-devel
BuildRequires: openssl-devel
BuildRequires: xxhash-devel
BuildRequires: json11-devel
+BuildRequires: glib2-devel
BuildRequires: opus-devel
-BuildRequires: gtk3-devel
-BuildRequires: dee-devel
BuildRequires: xz-devel
BuildRequires: python3
+%if %{with gtk3}
+Recommends: libappindicator-gtk3%{?_isa}
+BuildRequires: libappindicator-devel
+BuildRequires: gtk3-devel
+BuildRequires: dee-devel
+Requires: gtk3%{?_isa}
+%endif
+
%if 0%{?fedora} >= 30
BuildRequires: minizip-compat-devel
%else
@@ -99,6 +106,9 @@ popd
%build
# Setting build definitions...
+%if %{without gtk3}
+TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_GTK_INTEGRATION,'
+%endif
TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_OPENAL_EFFECTS,'
TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_AUTOUPDATE,'
TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME,'
@@ -157,6 +167,9 @@ appstream-util validate-relax --nonet
"%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Wed Mar 20 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.6.1-1
+- Updated to 1.6.1.
+
* Mon Mar 18 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.6.0-1
- Updated to 1.6.0.