[telegram-desktop/f29: 2/2] Updated to version 1.7.14.
by Vitaly Zaitsev
commit ab912f41088593d20231540dfe18f7daa4afacc5
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Jul 9 16:11:39 2019 +0200
Updated to version 1.7.14.
.gitignore | 2 +
sources | 5 +-
telegram-desktop-build-fixes.patch | 94 ++++++++++-------
telegram-desktop-system-fonts.patch | 4 +-
telegram-desktop-unbundle-minizip.patch | 12 +--
telegram-desktop-upstream-0710dde.patch | 172 ++++++++++++++++++++++++++++++++
telegram-desktop-upstream-9c909c8.patch | 88 ++++++++++++++++
telegram-desktop.spec | 34 +++----
8 files changed, 347 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f76a94..45ad6fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,5 @@
/qtlottie-eeeb4ed.tar.gz
/tdesktop-1.7.9.tar.gz
/tdesktop-1.7.10.tar.gz
+/crl-9ea8700.tar.gz
+/tdesktop-1.7.14.tar.gz
diff --git a/sources b/sources
index 4beaa3d..9819f27 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-22d696169c7e4ae7dbd2ab1e979cadd7 crl-d259aeb.tar.gz
-b969606543aaa6e77ecc15ad303385ad qtlottie-eeeb4ed.tar.gz
-6c0064eab60f7d4839b23dca846f2f7a tdesktop-1.7.10.tar.gz
+80f1e713be05746a3ee27aca5514ef18 crl-9ea8700.tar.gz
+57441d43a61f9a59f0e622c203a036f5 tdesktop-1.7.14.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 85aa916..3960f22 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 271e12bfb420f17b085305d4f8eb0bb65ab8cbbd Mon Sep 17 00:00:00 2001
+From 5c4d3c3fe20ab30d721ab45a03775791ce12e660 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.
@@ -8,29 +8,30 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
Telegram/Resources/qrc/telegram_linux.qrc | 6 --
Telegram/SourceFiles/core/launcher.cpp | 1 +
Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++
- Telegram/gyp/CMakeLists.inj | 7 ++
+ Telegram/gyp/CMakeLists.inj | 6 ++
Telegram/gyp/PrecompiledHeader.cmake | 4 +-
Telegram/gyp/Telegram.gyp | 23 +-----
Telegram/gyp/codegen_rules.gypi | 6 +-
Telegram/gyp/lib_base.gyp | 8 +-
Telegram/gyp/lib_export.gyp | 7 +-
- Telegram/gyp/lib_lottie.gyp | 9 +--
+ Telegram/gyp/lib_ffmpeg.gyp | 7 +-
+ Telegram/gyp/lib_lottie.gyp | 14 +---
Telegram/gyp/lib_scheme.gyp | 4 +-
Telegram/gyp/lib_storage.gyp | 8 +-
Telegram/gyp/qt.gypi | 87 ++++++---------------
Telegram/gyp/qt_moc.gypi | 5 +-
Telegram/gyp/qt_rcc.gypi | 2 +-
Telegram/gyp/settings_linux.gypi | 25 +-----
- Telegram/gyp/telegram_linux.gypi | 73 +++++-------------
+ Telegram/gyp/telegram_linux.gypi | 75 +++++-------------
Telegram/gyp/telegram_sources.txt | 2 +-
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 5 +-
- 21 files changed, 176 insertions(+), 205 deletions(-)
+ 22 files changed, 180 insertions(+), 214 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
diff --git a/Telegram/Resources/qrc/telegram.qrc b/Telegram/Resources/qrc/telegram.qrc
-index 99f66c5cb..8e39756ac 100644
+index bd88f8aa4..4db29b204 100644
--- a/Telegram/Resources/qrc/telegram.qrc
+++ b/Telegram/Resources/qrc/telegram.qrc
@@ -62,9 +62,6 @@
@@ -170,17 +171,16 @@ index 000000000..4a722b8d7
+}
diff --git a/Telegram/gyp/CMakeLists.inj b/Telegram/gyp/CMakeLists.inj
new file mode 100644
-index 000000000..3a98b10a1
+index 000000000..a04c9c3c9
--- /dev/null
+++ b/Telegram/gyp/CMakeLists.inj
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,6 @@
+set_target_properties(Telegram PROPERTIES SKIP_BUILD_RPATH TRUE)
+include(../../Telegram/gyp/PrecompiledHeader.cmake)
+add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h)
+add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h)
+add_precompiled_header(lib_base ../../Telegram/SourceFiles/base/base_pch.h)
+add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h)
-+add_precompiled_header(lib_lottie ../../Telegram/SourceFiles/lottie/lottie_pch.h)
diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
index dfe1193be..75bcd675d 100644
--- a/Telegram/gyp/PrecompiledHeader.cmake
@@ -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 57d81be5f..65c98afb4 100644
+index 27e180de3..737735a9f 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -51,15 +51,13 @@
@@ -234,7 +234,7 @@ index 57d81be5f..65c98afb4 100644
'crl.gyp:crl',
'lib_base.gyp:lib_base',
'lib_export.gyp:lib_export',
-@@ -85,32 +80,19 @@
+@@ -86,32 +81,19 @@
],
'defines': [
@@ -268,7 +268,7 @@ index 57d81be5f..65c98afb4 100644
],
'sources': [
'<@(qrc_files)',
-@@ -133,7 +115,6 @@
+@@ -134,7 +116,6 @@
'TDESKTOP_FORCE_GTK_FILE_DIALOG',
],
'dependencies': [
@@ -357,38 +357,62 @@ index f73aabdb1..24493f159 100644
'<(submodules_loc)/crl/src',
],
'sources': [
+diff --git a/Telegram/gyp/lib_ffmpeg.gyp b/Telegram/gyp/lib_ffmpeg.gyp
+index 9971d76ae..0fb455d12 100644
+--- a/Telegram/gyp/lib_ffmpeg.gyp
++++ b/Telegram/gyp/lib_ffmpeg.gyp
+@@ -36,10 +36,9 @@
+ 'include_dirs': [
+ '<(src_loc)',
+ '<(SHARED_INTERMEDIATE_DIR)',
+- '<(libs_loc)/ffmpeg',
+- '<(libs_loc)/range-v3/include',
+- '<(submodules_loc)/GSL/include',
+- '<(submodules_loc)/variant/include',
++ '<!(rpm --eval "%{_includedir}")/ffmpeg',
++ '<!(rpm --eval "%{_includedir}")/guidelines-support-library',
++ '<!(rpm --eval "%{_includedir}")/mapbox',
+ '<(submodules_loc)/crl/src',
+ ],
+ 'sources': [
diff --git a/Telegram/gyp/lib_lottie.gyp b/Telegram/gyp/lib_lottie.gyp
-index 6ca841f17..515c238a0 100644
+index ada149e85..5d3c7fa21 100644
--- a/Telegram/gyp/lib_lottie.gyp
+++ b/Telegram/gyp/lib_lottie.gyp
-@@ -13,7 +13,6 @@
- 'type': 'static_library',
- 'includes': [
- 'common.gypi',
-- 'openssl.gypi',
- 'qt.gypi',
- 'telegram_linux.gypi',
- 'pch.gypi',
-@@ -43,16 +42,14 @@
+@@ -29,16 +29,12 @@
+ 'dependencies': [
+ 'crl.gyp:crl',
+ 'lib_base.gyp:lib_base',
+- 'lib_rlottie.gyp:lib_rlottie',
+ 'lib_ffmpeg.gyp:lib_ffmpeg',
+- 'lib_lz4.gyp:lib_lz4',
+ ],
+ 'export_dependent_settings': [
+ 'crl.gyp:crl',
+ 'lib_base.gyp:lib_base',
+- 'lib_rlottie.gyp:lib_rlottie',
+ 'lib_ffmpeg.gyp:lib_ffmpeg',
+- 'lib_lz4.gyp:lib_lz4',
+ ],
+ 'defines': [
+ 'LOT_BUILD',
+@@ -46,13 +42,9 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
- '<(libs_loc)/range-v3/include',
- '<(libs_loc)/zlib',
- '<(lottie_loc)',
- '<(lottie_loc)/bodymovin',
- '<(lottie_loc)/imports',
- '<(lottie_helper_loc)',
+- '<(libs_loc)/ffmpeg',
+- '<(rlottie_loc)',
+- '<(lz4_loc)',
- '<(submodules_loc)/GSL/include',
- '<(submodules_loc)/variant/include',
++ '<!(rpm --eval "%{_includedir}")',
+ '<!(rpm --eval "%{_includedir}")/guidelines-support-library',
+ '<!(rpm --eval "%{_includedir}")/mapbox',
-+ '<!(rpm --eval "%{_includedir}")',
'<(submodules_loc)/crl/src',
-- '<(submodules_loc)/rapidjson/include',
],
'sources': [
- # interface for tdesktop
diff --git a/Telegram/gyp/lib_scheme.gyp b/Telegram/gyp/lib_scheme.gyp
index b52a9d071..4850157a8 100644
--- a/Telegram/gyp/lib_scheme.gyp
@@ -696,7 +720,7 @@ index 17f7a5c9c..726b689ac 100644
'Debug': {
},
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index ffe0e5a96..9bc686d44 100644
+index ffe0e5a96..f01692ca3 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
@@ -10,7 +10,7 @@
@@ -708,7 +732,7 @@ index ffe0e5a96..9bc686d44 100644
'pkgconfig_libs': [
# In order to work libxkbcommon must be linked statically,
# PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon"
-@@ -18,51 +18,28 @@
+@@ -18,51 +18,30 @@
# QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create
#'xkbcommon',
],
@@ -773,10 +797,12 @@ index ffe0e5a96..9bc686d44 100644
+ 'tgvoip',
+ 'lzma',
+ 'xxhash',
++ 'lz4',
++ 'rlottie',
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
-@@ -70,35 +47,23 @@
+@@ -70,35 +49,23 @@
'-Wno-maybe-uninitialized',
],
'ldflags': [
@@ -815,10 +841,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 927071480..8f5e18ebf 100644
+index 35a4c5740..c3d6db974 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -889,7 +889,7 @@
+@@ -888,7 +888,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 c451422..63a6602 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 52f4d0319a247fcb132438ff09c56fa68a758b0b Mon Sep 17 00:00:00 2001
+From 31cbef1756e5f4c02d7b2cd6a72f3407c07ffe3d 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
@@ -11,7 +11,7 @@ Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Telegram/Resources/qrc/telegram.qrc b/Telegram/Resources/qrc/telegram.qrc
-index 8e39756ac..29b3d55e6 100644
+index 4db29b204..52028412c 100644
--- a/Telegram/Resources/qrc/telegram.qrc
+++ b/Telegram/Resources/qrc/telegram.qrc
@@ -42,9 +42,6 @@
diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch
index d2216a9..12c0c30 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From 75c1f5c8611b47abca9e5546020addcc42dead6b Mon Sep 17 00:00:00 2001
+From d56251039a2e13d8dfeefbf70c1aeead6206026e 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 65c98afb4..063f2b053 100644
+index 737735a9f..4bcf8eb0f 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -18,7 +18,6 @@
@@ -21,7 +21,7 @@ index 65c98afb4..063f2b053 100644
'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions',
'style_files': [
-@@ -90,7 +89,6 @@
+@@ -91,7 +90,6 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -30,7 +30,7 @@ index 65c98afb4..063f2b053 100644
'<(submodules_loc)/crl/src',
],
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index 9bc686d44..806374202 100644
+index f01692ca3..1287c5e51 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
@@ -22,6 +22,7 @@
@@ -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 8f5e18ebf..45137aec6 100644
+index c3d6db974..b96a3fa83 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -896,13 +896,6 @@
+@@ -895,13 +895,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop-upstream-0710dde.patch b/telegram-desktop-upstream-0710dde.patch
new file mode 100644
index 0000000..1d600b1
--- /dev/null
+++ b/telegram-desktop-upstream-0710dde.patch
@@ -0,0 +1,172 @@
+From 0710dde4d5526454318b2748331e887c01ecfdce Mon Sep 17 00:00:00 2001
+From: John Preston <johnprestonmail(a)gmail.com>
+Date: Tue, 9 Jul 2019 13:43:57 +0200
+Subject: [PATCH] Use private Qt color API only in official build.
+
+Fixes #6219.
+---
+ .../SourceFiles/ffmpeg/ffmpeg_utility.cpp | 100 ++++++++++++------
+ Telegram/gyp/lib_ffmpeg.gyp | 6 +-
+ 2 files changed, 71 insertions(+), 35 deletions(-)
+
+diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+index 5d0e50926..3775f7503 100644
+--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
++++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+@@ -11,7 +11,10 @@ For license and copyright information please follow this link:
+ #include "logs.h"
+
+ #include <QImage>
++
++#ifdef TDESKTOP_OFFICIAL_TARGET
+ #include <private/qdrawhelper_p.h>
++#endif // TDESKTOP_OFFICIAL_TARGET
+
+ extern "C" {
+ #include <libavutil/opt.h>
+@@ -44,6 +47,58 @@ void AlignedImageBufferCleanupHandler(void* data) {
+ && !(image.bytesPerLine() % kAlignImageBy);
+ }
+
++void UnPremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
++#ifdef TDESKTOP_OFFICIAL_TARGET
++ const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
++ const auto convert = layout->convertFromARGB32PM;
++#else // TDESKTOP_OFFICIAL_TARGET
++ const auto layout = nullptr;
++ const auto convert = [](
++ uint *dst,
++ const uint *src,
++ int count,
++ std::nullptr_t,
++ std::nullptr_t) {
++ for (auto i = 0; i != count; ++i) {
++ dst[i] = qUnpremultiply(src[i]);
++ }
++ };
++#endif // TDESKTOP_OFFICIAL_TARGET
++
++ convert(
++ reinterpret_cast<uint*>(dst),
++ reinterpret_cast<const uint*>(src),
++ intsCount,
++ layout,
++ nullptr);
++}
++
++void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
++#ifdef TDESKTOP_OFFICIAL_TARGET
++ const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
++ const auto convert = layout->convertToARGB32PM;
++#else // TDESKTOP_OFFICIAL_TARGET
++ const auto layout = nullptr;
++ const auto convert = [](
++ uint *dst,
++ const uint *src,
++ int count,
++ std::nullptr_t,
++ std::nullptr_t) {
++ for (auto i = 0; i != count; ++i) {
++ dst[i] = qPremultiply(src[i]);
++ }
++ };
++#endif // TDESKTOP_OFFICIAL_TARGET
++
++ convert(
++ reinterpret_cast<uint*>(dst),
++ reinterpret_cast<const uint*>(src),
++ intsCount,
++ layout,
++ nullptr);
++}
++
+ } // namespace
+
+ IOPointer MakeIOPointer(
+@@ -360,58 +415,35 @@ void UnPremultiply(QImage &to, const QImage &from) {
+ if (!GoodStorageForFrame(to, from.size())) {
+ to = CreateFrameStorage(from.size());
+ }
+-
+- const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
+- const auto convert = layout->convertFromARGB32PM;
+ const auto fromPerLine = from.bytesPerLine();
+ const auto toPerLine = to.bytesPerLine();
+ const auto width = from.width();
++ const auto height = from.height();
++ auto fromBytes = from.bits();
++ auto toBytes = to.bits();
+ if (fromPerLine != width * 4 || toPerLine != width * 4) {
+- auto fromBytes = from.bits();
+- auto toBytes = to.bits();
+- for (auto i = 0; i != to.height(); ++i) {
+- convert(
+- reinterpret_cast<uint*>(toBytes),
+- reinterpret_cast<const uint*>(fromBytes),
+- width,
+- layout,
+- nullptr);
++ for (auto i = 0; i != height; ++i) {
++ UnPremultiplyLine(toBytes, fromBytes, width);
+ fromBytes += fromPerLine;
+ toBytes += toPerLine;
+ }
+ } else {
+- convert(
+- reinterpret_cast<uint*>(to.bits()),
+- reinterpret_cast<const uint*>(from.bits()),
+- from.width() * from.height(),
+- layout,
+- nullptr);
++ UnPremultiplyLine(toBytes, fromBytes, width * height);
+ }
+ }
+
+ void PremultiplyInplace(QImage &image) {
+- const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
+- const auto convert = layout->convertToARGB32PM;
+ const auto perLine = image.bytesPerLine();
+ const auto width = image.width();
++ const auto height = image.height();
++ auto bytes = image.bits();
+ if (perLine != width * 4) {
+- auto bytes = image.bits();
+- for (auto i = 0; i != image.height(); ++i) {
+- convert(
+- reinterpret_cast<uint*>(bytes),
+- reinterpret_cast<const uint*>(bytes),
+- width,
+- layout,
+- nullptr);
++ for (auto i = 0; i != height; ++i) {
++ PremultiplyLine(bytes, bytes, width);
+ bytes += perLine;
+ }
+ } else {
+- convert(
+- reinterpret_cast<uint*>(image.bits()),
+- reinterpret_cast<const uint*>(image.bits()),
+- image.width() * image.height(),
+- layout,
+- nullptr);
++ PremultiplyLine(bytes, bytes, width * height);
+ }
+ }
+
+diff --git a/Telegram/gyp/lib_ffmpeg.gyp b/Telegram/gyp/lib_ffmpeg.gyp
+index 9971d76ae..b9ada5362 100644
+--- a/Telegram/gyp/lib_ffmpeg.gyp
++++ b/Telegram/gyp/lib_ffmpeg.gyp
+@@ -46,7 +46,11 @@
+ '<(src_loc)/ffmpeg/ffmpeg_utility.cpp',
+ '<(src_loc)/ffmpeg/ffmpeg_utility.h',
+ ],
+- 'conditions': [[ 'build_macold', {
++ 'conditions': [[ '"<(official_build_target)" != ""', {
++ 'defines': [
++ 'TDESKTOP_OFFICIAL_TARGET=<(official_build_target)',
++ ],
++ }], [ 'build_macold', {
+ 'xcode_settings': {
+ 'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
+ },
diff --git a/telegram-desktop-upstream-9c909c8.patch b/telegram-desktop-upstream-9c909c8.patch
new file mode 100644
index 0000000..5b9db78
--- /dev/null
+++ b/telegram-desktop-upstream-9c909c8.patch
@@ -0,0 +1,88 @@
+From 9c909c8992ab52b278c718ecf50c9ac41fb207a6 Mon Sep 17 00:00:00 2001
+From: John Preston <johnprestonmail(a)gmail.com>
+Date: Tue, 9 Jul 2019 14:49:24 +0200
+Subject: [PATCH] Lower the animated sticker requirements.
+
+Fixes #6237.
+---
+ Telegram/SourceFiles/lottie/lottie_animation.cpp | 6 +++++-
+ Telegram/SourceFiles/lottie/lottie_cache.cpp | 2 +-
+ Telegram/SourceFiles/lottie/lottie_common.h | 2 +-
+ Telegram/SourceFiles/lottie/lottie_frame_renderer.h | 6 ++++--
+ 4 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/Telegram/SourceFiles/lottie/lottie_animation.cpp b/Telegram/SourceFiles/lottie/lottie_animation.cpp
+index ab21f635a..6a37ce534 100644
+--- a/Telegram/SourceFiles/lottie/lottie_animation.cpp
++++ b/Telegram/SourceFiles/lottie/lottie_animation.cpp
+@@ -22,6 +22,8 @@ For license and copyright information please follow this link:
+ namespace Lottie {
+ namespace {
+
++const auto kIdealSize = QSize(512, 512);
++
+ std::string UnpackGzip(const QByteArray &bytes) {
+ const auto original = [&] {
+ return std::string(bytes.constData(), bytes.size());
+@@ -87,7 +89,7 @@ details::InitData Init(
+ return animation
+ ? CheckSharedState(std::make_unique<SharedState>(
+ std::move(animation),
+- request,
++ request.empty() ? FrameRequest{ kIdealSize } : request,
+ quality))
+ : Error::ParseFailed;
+ }
+@@ -98,6 +100,8 @@ details::InitData Init(
+ const QByteArray &cached,
+ const FrameRequest &request,
+ Quality quality) {
++ Expects(!request.empty());
++
+ if (const auto error = ContentError(content)) {
+ return *error;
+ }
+diff --git a/Telegram/SourceFiles/lottie/lottie_cache.cpp b/Telegram/SourceFiles/lottie/lottie_cache.cpp
+index 10eb55b35..4f742773d 100644
+--- a/Telegram/SourceFiles/lottie/lottie_cache.cpp
++++ b/Telegram/SourceFiles/lottie/lottie_cache.cpp
+@@ -438,7 +438,7 @@ bool Cache::readHeader(const FrameRequest &request) {
+ || (original.width() > kMaxSize)
+ || (original.height() > kMaxSize)
+ || (frameRate <= 0)
+- || (frameRate > kMaxFrameRate)
++ || (frameRate > kNormalFrameRate && frameRate != kMaxFrameRate)
+ || (framesCount <= 0)
+ || (framesCount > kMaxFramesCount)
+ || (framesReady <= 0)
+diff --git a/Telegram/SourceFiles/lottie/lottie_common.h b/Telegram/SourceFiles/lottie/lottie_common.h
+index 7239644bd..53e9c66b6 100644
+--- a/Telegram/SourceFiles/lottie/lottie_common.h
++++ b/Telegram/SourceFiles/lottie/lottie_common.h
+@@ -17,7 +17,7 @@ For license and copyright information please follow this link:
+ namespace Lottie {
+
+ inline constexpr auto kTimeUnknown = std::numeric_limits<crl::time>::min();
+-inline constexpr auto kMaxFileSize = 1024 * 1024;
++inline constexpr auto kMaxFileSize = 2 * 1024 * 1024;
+
+ class Animation;
+
+diff --git a/Telegram/SourceFiles/lottie/lottie_frame_renderer.h b/Telegram/SourceFiles/lottie/lottie_frame_renderer.h
+index a399bc505..abcf778c9 100644
+--- a/Telegram/SourceFiles/lottie/lottie_frame_renderer.h
++++ b/Telegram/SourceFiles/lottie/lottie_frame_renderer.h
+@@ -23,9 +23,11 @@ class Animation;
+
+ namespace Lottie {
+
++// Frame rate can be 1, 2, ... , 29, 30 or 60.
++inline constexpr auto kNormalFrameRate = 30;
+ inline constexpr auto kMaxFrameRate = 60;
+-inline constexpr auto kMaxSize = 512;
+-inline constexpr auto kMaxFramesCount = 180;
++inline constexpr auto kMaxSize = 4096;
++inline constexpr auto kMaxFramesCount = 210;
+ inline constexpr auto kFrameDisplayTimeAlreadyDone
+ = std::numeric_limits<crl::time>::max();
+ inline constexpr auto kDisplayedInitial = crl::time(-1);
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 3536a4f..c423230 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -15,13 +15,9 @@
%global upstreambase https://github.com/telegramdesktop
# Git revision of crl...
-%global commit1 d259aebc11df52cb6ff8c738580dc4d8f245d681
+%global commit1 9ea870038a2a667add7f621be6252db909068386
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
-# Git revision of qtlottie...
-%global commit2 eeeb4edb2a087c3f8175dafafcad330864d3efc0
-%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
-
# Decrease debuginfo verbosity to reduce memory consumption...
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
@@ -32,8 +28,8 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.7.10
-Release: 2%{?dist}
+Version: 1.7.14
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -47,21 +43,21 @@ 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
+# Upstream patches...
+Patch100: %{name}-upstream-0710dde.patch
+Patch101: %{name}-upstream-9c909c8.patch
+
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
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
@@ -79,13 +75,14 @@ BuildRequires: ffmpeg-devel >= 3.1
BuildRequires: openal-soft-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: libstdc++-devel
-BuildRequires: rapidjson-devel
BuildRequires: range-v3-devel
BuildRequires: openssl-devel
+BuildRequires: rlottie-devel
BuildRequires: xxhash-devel
BuildRequires: json11-devel
BuildRequires: glib2-devel
BuildRequires: opus-devel
+BuildRequires: lz4-devel
BuildRequires: xz-devel
BuildRequires: python3
@@ -133,13 +130,6 @@ pushd Telegram/ThirdParty
mv crl-%{commit1} crl
popd
-# Unpacking qtlottie...
-pushd Telegram/ThirdParty
- rm -rf qtlottie
- tar -xf %{SOURCE2}
- mv qtlottie-%{commit2} qtlottie
-popd
-
%build
# Setting build definitions...
%if %{without gtk3}
@@ -215,6 +205,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Tue Jul 09 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.7.14-1
+- Updated to 1.7.14.
+
+* Fri Jul 05 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.7.11-1
+- Updated to 1.7.11 (beta).
+
* Wed Jul 03 2019 Vasiliy Glazov <vascom2(a)gmail.com> - 1.7.10-2
- Rebuild for new Qt5
5 years, 5 months
[ffmpeg/f30: 5/5] Merge branch 'master' into f30
by Leigh Scott
commit 37b51db23e5c45603f14ec41e0ee9dbe2831afce
Merge: 13b691b 447488b
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Jul 9 07:27:04 2019 +0100
Merge branch 'master' into f30
ffmpeg.spec | 17 ++++++++++++++---
sources | 2 +-
2 files changed, 15 insertions(+), 4 deletions(-)
---
5 years, 5 months
[ffmpeg/f30] (5 commits) ...Merge branch 'master' into f30
by Leigh Scott
Summary of changes:
1670f1d... Bump to latest cuda (*)
d72b341... Only el7 and el8 will be tested, el8 still wip (*)
06e40d4... Rebuilt (*)
447488b... Update to 4.1.4 release (*)
37b51db... Merge branch 'master' into f30
(*) This commit already existed in another branch; no separate mail sent
5 years, 5 months
[ffmpeg] Update to 4.1.4 release
by Leigh Scott
commit 447488be7b8cc27a3d72b83fdcb26b1a99916bba
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Jul 9 07:25:23 2019 +0100
Update to 4.1.4 release
ffmpeg.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 8429ad1..423c75a 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -86,8 +86,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 4.1.3
-Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 4.1.4
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -429,6 +429,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Tue Jul 09 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.1.4-1
+- Update to 4.1.4 release
+
* Fri Jun 28 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.3-3
- Rebuilt for x265
diff --git a/sources b/sources
index 346cc97..fcf0ca9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcc20dd2682ea01c678b7b8324339d43 ffmpeg-4.1.3.tar.xz
+5307931aeb7aaee5e1509d9996040661 ffmpeg-4.1.4.tar.xz
5 years, 5 months
[vdr-tvguideng/f29] Update to 9.3.1
by Martin Gansser
Summary of changes:
a8934ef... Update to 9.3.1 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 5 months
[vdr-tvguideng/f30] Update to 9.3.1
by Martin Gansser
Summary of changes:
a8934ef... Update to 9.3.1 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 5 months
[vdr-tvguideng] Update to 9.3.1
by Martin Gansser
commit a8934efd51a245a1780e80caba94a05b3892de62
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri Jul 5 22:26:15 2019 +0200
Update to 9.3.1
.gitignore | 1 +
sources | 2 +-
tvguideng-gcc6.patch | 45 ---------------------------------------------
tvguideng_235.diff | 49 -------------------------------------------------
vdr-tvguideng.spec | 11 +++++------
5 files changed, 7 insertions(+), 101 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f87621d..7484cc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/vdr-plugin-tvguideng-0.3.0.tar.bz2
+/vdr-plugin-tvguideng-0.3.1.tar.bz2
diff --git a/sources b/sources
index f5161fb..a7bfbc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd810a231a1718444d4f02180ae39bb5 vdr-plugin-tvguideng-0.3.0.tar.bz2
+f6e6040886ba075e19072a29df6e50d9 vdr-plugin-tvguideng-0.3.1.tar.bz2
diff --git a/vdr-tvguideng.spec b/vdr-tvguideng.spec
index 7c3c690..965322b 100644
--- a/vdr-tvguideng.spec
+++ b/vdr-tvguideng.spec
@@ -1,16 +1,12 @@
%global pname tvguideng
Name: vdr-%{pname}
-Version: 0.3.0
-Release: 12%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
Summary: TvGuideNG is a highly customizable 2D EPG viewer plugin
License: GPLv2+
URL: http://projects.vdr-developer.org/projects/plg-tvguideng
Source0: https://projects.vdr-developer.org/git/vdr-plugin-tvguideng.git/snapshot/...
-# https://projects.vdr-developer.org/issues/2427
-Patch0: %{pname}-gcc6.patch
-# https://www.vdr-portal.de/index.php?attachment/41876-tvguideng-235-diff/
-Patch1: tvguideng_235.diff
BuildRequires: gcc-c++
BuildRequires: vdr-devel >= 2.0.0
@@ -45,6 +41,9 @@ make install DESTDIR=%{buildroot}
%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
%changelog
+* Fri Jul 05 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 0.3.1-1
+- Update to 9.3.1
+
* Mon Jul 01 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 0.3.0-12
- Rebuilt for new VDR API version 2.4.1
5 years, 5 months
