3:27 p.m.
commit 99fd6902bee448f264b5656048dacfab1a71472e
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu May 9 17:27:10 2019 +0200
Updated to version 1.7.0.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 36 ++++++++++++++++++++-------------
telegram-desktop-system-fonts.patch | 6 +++---
telegram-desktop-unbundle-minizip.patch | 12 +++++------
telegram-desktop.spec | 9 +++++++--
6 files changed, 40 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 18a53fa..e592da9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,4 @@
/tdesktop-1.6.2.tar.gz
/tdesktop-1.6.3.tar.gz
/tdesktop-1.6.7.tar.gz
+/tdesktop-1.7.0.tar.gz
diff --git a/sources b/sources
index 8d9a59f..6fc9698 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ae7f024486ddce3b598477bf40a86c79 crl-84072fb.tar.gz
-716526f36fa6c27d900d947d435104ad tdesktop-1.6.7.tar.gz
+c5160817afb3acb53d65f3dd03108b07 tdesktop-1.7.0.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 114bc20..ff04825 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From fd2263aa3ff825f096c8fd4f20f93be27b4f5d00 Mon Sep 17 00:00:00 2001
+From da1d8b4e977d9b9d834fe2392bfd260d3ce85f57 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.
@@ -6,11 +6,11 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
---
Telegram/Resources/qrc/telegram.qrc | 3 -
Telegram/Resources/qrc/telegram_linux.qrc | 6 --
- Telegram/SourceFiles/core/launcher.cpp | 1 +
+ Telegram/SourceFiles/core/launcher.cpp | 3 +-
Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++
Telegram/gyp/CMakeLists.inj | 6 ++
Telegram/gyp/PrecompiledHeader.cmake | 4 +-
- Telegram/gyp/Telegram.gyp | 24 +-----
+ Telegram/gyp/Telegram.gyp | 23 +-----
Telegram/gyp/codegen_rules.gypi | 6 +-
Telegram/gyp/lib_base.gyp | 8 +-
Telegram/gyp/lib_export.gyp | 7 +-
@@ -24,7 +24,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 +-
- 20 files changed, 172 insertions(+), 188 deletions(-)
+ 20 files changed, 172 insertions(+), 189 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
@@ -56,10 +56,19 @@ index 164e8d4f2..03585ec03 100644
- </qresource>
</RCC>
diff --git a/Telegram/SourceFiles/core/launcher.cpp
b/Telegram/SourceFiles/core/launcher.cpp
-index 129407523..0b5a1c3ef 100644
+index 3efa53eba..098b1f4c0 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
-@@ -228,6 +228,7 @@ int Launcher::exec() {
+@@ -242,7 +242,7 @@ void Launcher::init() {
+ QApplication::setApplicationName(qsl("TelegramDesktop"));
+
+ #if defined(Q_OS_LINUX) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
+- QApplication::setDesktopFileName(qsl("telegramdesktop.desktop"));
++ QApplication::setDesktopFileName(qsl("telegram-desktop.desktop"));
+ #endif
+ #ifndef OS_MAC_OLD
+ QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
+@@ -264,6 +264,7 @@ int Launcher::exec() {
Logs::start(this); // must be started before Platform is started
Platform::start(); // must be started before Sandbox is created
@@ -202,7 +211,7 @@ index a0e1e0489..bd9bce0c1 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 ac7696e1d..f95d88a72 100644
+index e329d06d9..837943bbe 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -51,15 +51,13 @@
@@ -232,13 +241,12 @@ index ac7696e1d..f95d88a72 100644
'crl.gyp:crl',
'lib_base.gyp:lib_base',
'lib_export.gyp:lib_export',
-@@ -84,32 +79,20 @@
+@@ -84,32 +79,19 @@
],
'defines': [
- 'AL_LIBTYPE_STATIC',
'AL_ALEXT_PROTOTYPES',
-+ 'ALC_EXT_EFX',
'TGVOIP_USE_CXX11_LIB',
- 'XXH_INLINE_ALL',
'TDESKTOP_API_ID=<(api_id)',
@@ -267,14 +275,14 @@ index ac7696e1d..f95d88a72 100644
],
'sources': [
'<@(qrc_files)',
-@@ -131,7 +114,6 @@
+@@ -131,7 +113,6 @@
'TDESKTOP_OFFICIAL_TARGET=<(official_build_target)',
],
'dependencies': [
- 'utils.gyp:Packer',
],
}], [ 'build_mac', {
- 'mac_bundle': '1',
+ 'mac_hardened_runtime': 1,
diff --git a/Telegram/gyp/codegen_rules.gypi b/Telegram/gyp/codegen_rules.gypi
index a901db3bb..28873f8dc 100644
--- a/Telegram/gyp/codegen_rules.gypi
@@ -774,10 +782,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 3f8547dcf..43c12927a 100644
+index ed2e3bc14..45e3e019e 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -851,7 +851,7 @@
+@@ -855,7 +855,7 @@
<(src_loc)/mainwindow.h
<(src_loc)/observer_peer.cpp
<(src_loc)/observer_peer.h
@@ -816,5 +824,5 @@ index bb2a8ea79..960eaef0f 100644
StartupWMClass=TelegramDesktop
Type=Application
--
-2.20.1
+2.21.0
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 44b9a8f..a9d411c 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 46c8517905c73e7bc78d72761ff3538d51625e5f Mon Sep 17 00:00:00 2001
+From bc70c8fce71b80f2cefcc537298a2529506ce2a0 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 9ebe6cb22..1df6ce596 100644
+index d40813859..53d0cbc77 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -70,9 +70,9 @@ void Start() {
@@ -42,5 +42,5 @@ index 9ebe6cb22..1df6ce596 100644
#ifdef Q_OS_WIN
// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
--
-2.20.1
+2.21.0
diff --git a/telegram-desktop-unbundle-minizip.patch
b/telegram-desktop-unbundle-minizip.patch
index 8f86556..5a132bf 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From ab0cac8ebe9ced6bf1387b3b04196e503f3ff391 Mon Sep 17 00:00:00 2001
+From 3e81539f998510cde8376db4e5da3dc59cfaaf9a 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 f95d88a72..8d8011b58 100644
+index 837943bbe..2e941316e 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -18,7 +18,6 @@
@@ -21,7 +21,7 @@ index f95d88a72..8d8011b58 100644
'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'emoji_suggestions_loc':
'<(submodules_loc)/emoji_suggestions',
'style_files': [
-@@ -90,7 +89,6 @@
+@@ -89,7 +88,6 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -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 43c12927a..832c19b14 100644
+index 45e3e019e..9c8690dc5 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -858,13 +858,6 @@
+@@ -862,13 +862,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
@@ -68,5 +68,5 @@ index 43c12927a..832c19b14 100644
platforms: win
<(res_loc)/winrc/Telegram.rc
--
-2.20.1
+2.21.0
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index eedd498..1f8f53e 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -15,8 +15,8 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.6.7
-Release: 2%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -109,7 +109,9 @@ popd
%if %{without gtk3}
TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_GTK_INTEGRATION,'
%endif
+%if 0%{?fedora} && 0%{?fedora} < 30
TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_OPENAL_EFFECTS,'
+%endif
TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_AUTOUPDATE,'
TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME,'
TDESKTOP_BUILD_DEFINES+='TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION,'
@@ -167,6 +169,9 @@ appstream-util validate-relax --nonet
"%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Thu May 09 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.7.0-1
+- Updated to 1.7.0.
+
* Tue Apr 16 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.6.7-2
- Rebuilt due to Qt 5.12.1 update.