1:48 p.m.
commit 9539a9bd1d80d14de77e99c5f0022db3ef0dab15
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Jan 12 14:48:23 2019 +0100
Updated to 1.5.7 (beta).
DO NOT BUILD FOR STABLE FEDORA RELEASES!
.gitignore | 2 ++
sources | 4 +--
telegram-desktop-build-fixes.patch | 54 +++++++++++----------------------
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 6 ++--
telegram-desktop.spec | 16 ++++++++--
6 files changed, 38 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e2d977..3cead3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,5 @@
/tdesktop-1.5.2.tar.gz
/tdesktop-1.5.3.tar.gz
/tdesktop-1.5.4.tar.gz
+/crl-9b7c6b5.tar.gz
+/tdesktop-1.5.7.tar.gz
diff --git a/sources b/sources
index 8d8b41d..8785428 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b92e75c44c9d4c9fd96b1d19eb3a666d crl-4291015.tar.gz
-25a2a505526a732705e6756f1cfe9549 tdesktop-1.5.4.tar.gz
+3ac19bcca9cb18f67bdb0ccb99445773 crl-9b7c6b5.tar.gz
+60cb64f403dfd0bc157737e435743485 tdesktop-1.5.7.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index bdb505a..ecd5906 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 079c889ab66fec2e0a24b9aeeb2e54c4fe4545b6 Mon Sep 17 00:00:00 2001
+From a5f5d043470a3b4e7387bb4511e5e2d3dca3f48b 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.
@@ -11,10 +11,10 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and
mock.
Telegram/gyp/PrecompiledHeader.cmake | 4 +-
Telegram/gyp/Telegram.gyp | 24 +-----
Telegram/gyp/codegen_rules.gypi | 6 +-
- Telegram/gyp/lib_base.gyp | 10 +--
- Telegram/gyp/lib_export.gyp | 9 +--
+ Telegram/gyp/lib_base.gyp | 8 +-
+ Telegram/gyp/lib_export.gyp | 7 +-
Telegram/gyp/lib_scheme.gyp | 4 +-
- Telegram/gyp/lib_storage.gyp | 10 +--
+ Telegram/gyp/lib_storage.gyp | 8 +-
Telegram/gyp/qt.gypi | 87 ++++++---------------
Telegram/gyp/qt_moc.gypi | 5 +-
Telegram/gyp/qt_rcc.gypi | 2 +-
@@ -23,7 +23,7 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
Telegram/gyp/telegram_sources.txt | 2 +-
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 5 +-
- 19 files changed, 173 insertions(+), 198 deletions(-)
+ 19 files changed, 173 insertions(+), 192 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
@@ -41,7 +41,7 @@ index 164e8d4f2..c67569284 100644
</qresource>
</RCC>
diff --git a/Telegram/SourceFiles/core/launcher.cpp
b/Telegram/SourceFiles/core/launcher.cpp
-index d4bdadc17..728b6b2fe 100644
+index 83f869e36..a3110d826 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -59,6 +59,7 @@ int Launcher::exec() {
@@ -290,19 +290,10 @@ index a901db3bb..28873f8dc 100644
'<@(qrc_files)',
],
diff --git a/Telegram/gyp/lib_base.gyp b/Telegram/gyp/lib_base.gyp
-index d70fe8fad..cd5a69485 100644
+index 12dee1cf9..6346d231b 100644
--- a/Telegram/gyp/lib_base.gyp
+++ b/Telegram/gyp/lib_base.gyp
-@@ -15,8 +15,6 @@
- 'common.gypi',
- 'openssl.gypi',
- 'qt.gypi',
-- 'telegram_win.gypi',
-- 'telegram_mac.gypi',
- 'telegram_linux.gypi',
- 'pch.gypi',
- ],
-@@ -30,7 +28,6 @@
+@@ -28,7 +28,6 @@
'pch_header': '<(src_loc)/base/base_pch.h',
},
'defines': [
@@ -310,7 +301,7 @@ index d70fe8fad..cd5a69485 100644
],
'dependencies': [
'crl.gyp:crl',
-@@ -38,11 +35,10 @@
+@@ -36,11 +35,10 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -326,20 +317,18 @@ index d70fe8fad..cd5a69485 100644
'sources': [
'<(src_loc)/base/algorithm.h',
diff --git a/Telegram/gyp/lib_export.gyp b/Telegram/gyp/lib_export.gyp
-index 2d1ac6c56..24493f159 100644
+index f73aabdb1..24493f159 100644
--- a/Telegram/gyp/lib_export.gyp
+++ b/Telegram/gyp/lib_export.gyp
-@@ -14,9 +14,6 @@
+@@ -14,7 +14,6 @@
'includes': [
'common.gypi',
'qt.gypi',
-- 'telegram_win.gypi',
-- 'telegram_mac.gypi',
- 'telegram_linux.gypi',
'pch.gypi',
],
'variables': {
-@@ -48,9 +45,9 @@
+@@ -46,9 +45,9 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -375,19 +364,10 @@ index b52a9d071..4850157a8 100644
],
'message': 'codegen_scheme-ing scheme.tl..',
diff --git a/Telegram/gyp/lib_storage.gyp b/Telegram/gyp/lib_storage.gyp
-index 527713546..f34340d50 100644
+index d72f4b5a7..f34340d50 100644
--- a/Telegram/gyp/lib_storage.gyp
+++ b/Telegram/gyp/lib_storage.gyp
-@@ -15,8 +15,6 @@
- 'common.gypi',
- 'openssl.gypi',
- 'qt.gypi',
-- 'telegram_win.gypi',
-- 'telegram_mac.gypi',
- 'telegram_linux.gypi',
- 'pch.gypi',
- ],
-@@ -30,7 +28,6 @@
+@@ -28,7 +28,6 @@
'pch_header': '<(src_loc)/storage/storage_pch.h',
},
'defines': [
@@ -395,7 +375,7 @@ index 527713546..f34340d50 100644
],
'dependencies': [
'crl.gyp:crl',
-@@ -43,11 +40,10 @@
+@@ -41,11 +40,10 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -787,10 +767,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 482979736..f8fa95b10 100644
+index 9e6bc94d6..76604ac5a 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -799,7 +799,7 @@
+@@ -813,7 +813,7 @@
<(src_loc)/messenger.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 cc83903..6c44316 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 14683b04dc12bc6c4a5e780285d6df4a71425275 Mon Sep 17 00:00:00 2001
+From cff25cf61be13f36908968359c821df33262c751 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 5117325..deb43bc 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From 814cbd133ea39ba9b5056bcf8d25e29266b9622a Mon Sep 17 00:00:00 2001
+From 4db0d20a95ce9f49d9265baced37ebeea5894024 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 f8fa95b10..20e74b465 100644
+index 76604ac5a..b6252d019 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -806,13 +806,6 @@
+@@ -820,13 +820,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 8cf5d94..0b616d8 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -4,7 +4,7 @@
%global apihash dfbe1bc42dc9d20507e17d1814cc2f0a
# Git revision of crl...
-%global commit1 4291015efab76bda5886a56b5007f4531be17d46
+%global commit1 9b7c6b5d9f1b59d2160bf6e9c4e74510f955efe1
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# Decrease debuginfo verbosity to reduce memory consumption...
@@ -12,7 +12,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.5.4
+Version: 1.5.7
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -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
+BuildRequires: libtgvoip-devel >= 2.4.2
BuildRequires: libappindicator-devel
BuildRequires: ffmpeg-devel >= 3.1
BuildRequires: openal-soft-devel
@@ -60,6 +60,7 @@ BuildRequires: libstdc++-devel
BuildRequires: range-v3-devel
BuildRequires: openssl-devel
BuildRequires: xxhash-devel
+BuildRequires: json11-devel
BuildRequires: opus-devel
BuildRequires: gtk3-devel
BuildRequires: dee-devel
@@ -152,6 +153,15 @@ appstream-util validate-relax --nonet
"%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Fri Jan 11 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.7-1
+- Updated to 1.5.7 (beta).
+
+* Fri Dec 28 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.6-1
+- Updated to 1.5.6 (beta).
+
+* Thu Dec 27 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.5-1
+- Updated to 1.5.5 (beta).
+
* Mon Dec 24 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.4-1
- Updated to 1.5.4.