[arch-commits] Commit in telegram-desktop/trunk (9 files)
Jiachen Yang
farseerfc at archlinux.org
Fri Oct 4 18:11:50 UTC 2019
Date: Friday, October 4, 2019 @ 18:11:49
Author: farseerfc
Revision: 512849
upgpkg: telegram-desktop 1.8.13-1
telegram-desktop 1.8.13
Added:
telegram-desktop/trunk/Revert-Change-some-private-header-includes.patch
telegram-desktop/trunk/Revert-Disable-DemiBold-fallback-for-Semibold.patch
Modified:
telegram-desktop/trunk/CMakeLists.inj
telegram-desktop/trunk/PKGBUILD
telegram-desktop/trunk/Use-system-wide-font.patch
telegram-desktop/trunk/no-gtk2.patch
telegram-desktop/trunk/tdesktop.patch
telegram-desktop/trunk/tdesktop_lottie_animation_qtdebug.patch
Deleted:
telegram-desktop/trunk/demibold.patch
-----------------------------------------------------+
CMakeLists.inj | 1
PKGBUILD | 39 +-
Revert-Change-some-private-header-includes.patch | 66 ++++
Revert-Disable-DemiBold-fallback-for-Semibold.patch | 30 ++
Use-system-wide-font.patch | 46 +--
demibold.patch | 27 -
no-gtk2.patch | 7
tdesktop.patch | 262 ++++++------------
tdesktop_lottie_animation_qtdebug.patch | 6
9 files changed, 246 insertions(+), 238 deletions(-)
Modified: CMakeLists.inj
===================================================================
--- CMakeLists.inj 2019-10-04 17:41:27 UTC (rev 512848)
+++ CMakeLists.inj 2019-10-04 18:11:49 UTC (rev 512849)
@@ -12,6 +12,7 @@
add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h)
add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h)
add_precompiled_header(lib_mtproto ../../Telegram/SourceFiles/mtproto/mtp_pch.h)
+add_precompiled_header(lib_ui ../../Telegram/SourceFiles/ui/ui_pch.h)
# You can discover new PCHs using this link:
# https://github.com/telegramdesktop/tdesktop/search?q=pch_header&unscoped_q=pch_header
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-04 17:41:27 UTC (rev 512848)
+++ PKGBUILD 2019-10-04 18:11:49 UTC (rev 512849)
@@ -5,7 +5,7 @@
# https://github.com/mymedia2/tdesktop
pkgname=telegram-desktop
-pkgver=1.8.9
+pkgver=1.8.13
pkgrel=1
pkgdesc='Official Telegram Desktop client'
arch=('x86_64')
@@ -12,7 +12,7 @@
url="https://desktop.telegram.org/"
license=('GPL3')
depends=('ffmpeg' 'hicolor-icon-theme' 'minizip' 'openal' 'qt5-base' 'qt5-imageformats' 'openssl')
-makedepends=('cmake' 'git' 'gyp' 'range-v3' 'python' 'libappindicator-gtk3')
+makedepends=('cmake' 'git' 'gyp' 'range-v3' 'python' 'libappindicator-gtk3' 'dos2unix')
optdepends=('libnotify: desktop notifications'
'ttf-opensans: default Open Sans font family')
source=(
@@ -26,14 +26,14 @@
"rlottie::git+https://github.com/john-preston/rlottie.git"
"tg.protocol"
"CMakeLists.inj"
+ "libtgvoip.patch"
+
"tdesktop.patch"
"no-gtk2.patch"
- "libtgvoip.patch"
- "demibold.patch"
+ "Revert-Disable-DemiBold-fallback-for-Semibold.patch"
+ "tdesktop_lottie_animation_qtdebug.patch"
+ "Revert-Change-some-private-header-includes.patch"
"Use-system-wide-font.patch"
- "tdesktop_lottie_animation_qtdebug.patch"
- "revert-private-headers.patch::https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch"
- "range-v3-0.9-pr6501.patch::https://patch-diff.githubusercontent.com/raw/telegramdesktop/tdesktop/pull/6501.patch"
)
sha512sums=('SKIP'
'SKIP'
@@ -44,15 +44,14 @@
'SKIP'
'SKIP'
'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
- '16874fabcb0d04d6bf8db1ee2fd77fbd09eeb6acc28bb5fd915d378f7a5ed7ebf4aae01c390e516695572cf9ef0e2cb59493e21a35643fd63ddf3fec446858a6'
- '3b6a0450f7981c2ce5f90c1ea46d9fb504194609f357b957b5c4a741681d3c531252394df116f8b77780a3a110783c047c9a081f9651e0792e7423573e390392'
- 'f5c7feb710fa12694c9f4ae9c818259c6ced5dc9d63079556a14c8bac14e3cc0ec4d3322df3650530b8afd8a512e573b4d3d8b3130b6374e842a92daacedd534'
+ 'b759e45282c7bd04e1fdcbfd0c009773782bebde36d96363db9869a9d78e7fad41314ad311b7afbfa57db4e66c0265da17e9f81f6d62a972466cb71d19d4b47c'
'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
- '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0'
- 'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653'
- 'a83b80668b2dc2cc77c857069fdb45b487793fda01ad8a63bab66c6a1c71e5d032050e4ec7efb5b4c3216badc5377c856ef1f4a59c2e02b24ee53b1d83124bf3'
- 'e25dc1c54d6001a7a3740c6cee40a12a2313a3fd2e41986268f0ee5d9d8bf2d34812f539efb0eb5d26d3f263b2e4a7849016711532bf215aa9ff38da30175557'
- '034a850589f35b11943d7a8b91d0c1803c965eb4d03e0320833c21c00b2d744802f9bd72cd31931f2f4b083e1108fe81263d16b96b6f1b083e2c942ffabb85ee')
+ '218f8711eefb5a8115222e099e6d08fc4079584b3aa3594d05a43390f37d5b51fbf1b64511c3a3e7792ef6c32fa6f4c8a65b6188a9efbd340304602552f3a595'
+ '117b0c2bae3d3d3aa94d41382621be4e05c3314a2831dba59e1bcfb443e7b8ff4bcd0403544fa0cb6def85b444146bf59eef9da25f96b041d3ce8f5429b4a867'
+ 'd5cd7ecb5583258462c21a9ae3d4e8ae8c709d47d7ce2c45f8ae23100d24993398b8372021957b9a4607b3988f366e1c0cf64d724d901cb70212665c481217e9'
+ '79fcbee94f09df6b443c2b967afe4cba367985af13004b130da27f7bdf20974f76148a8056e98ce92000fabed80a1ff3cb2d332f6f8c70eed8aa909281533cd5'
+ '087dd821690dfedf1c275f264a0223b123e31ab9ee95050023930470bc9c866958cae00e2fd9132e6f7efbc4f1dfc3fdc20f8fba1fc9472d92bd702eaa60adb0'
+ '2c1bb75449b4634befa3edaac5d20e4b29ede21119549d9a3895dda9d4723f618dd950ee32133e04186fa65d07f80081ba3e3d5585209ba9112aa754d06fbb5c')
prepare() {
cd "$srcdir/tdesktop"
@@ -66,14 +65,16 @@
git config submodule.Telegram/ThirdParty/rlottie.url "$srcdir/rlottie"
git submodule update
+ dos2unix "$srcdir/tdesktop/.appveyor/install.bat"
+
patch -Np1 -i "$srcdir/tdesktop.patch"
patch -Np1 -i "$srcdir/no-gtk2.patch"
- patch -R -Np1 -i "$srcdir/demibold.patch"
+ patch -Np1 -i "$srcdir/Revert-Disable-DemiBold-fallback-for-Semibold.patch"
+ patch -Np1 -i "$srcdir/tdesktop_lottie_animation_qtdebug.patch"
+ patch -Np1 -i "$srcdir/Revert-Change-some-private-header-includes.patch"
patch -Np1 -i "$srcdir/Use-system-wide-font.patch"
- patch -Np1 -i "$srcdir/tdesktop_lottie_animation_qtdebug.patch"
- patch -R -Np1 -i "$srcdir/revert-private-headers.patch"
- patch -Np1 -i "$srcdir/range-v3-0.9-pr6501.patch"
+ unix2dos "$srcdir/tdesktop/.appveyor/install.bat"
# disable static-qt for rlottie
sed "/RLOTTIE_WITH_STATIC_QT/d" -i "$srcdir/tdesktop/Telegram/gyp/lib_rlottie.gyp"
Added: Revert-Change-some-private-header-includes.patch
===================================================================
--- Revert-Change-some-private-header-includes.patch (rev 0)
+++ Revert-Change-some-private-header-includes.patch 2019-10-04 18:11:49 UTC (rev 512849)
@@ -0,0 +1,66 @@
+From 46a55ed8f7ef4ee99ebccf1bdded3d5ccaef33af Mon Sep 17 00:00:00 2001
+From: Jiachen YANG <farseerfc at gmail.com>
+Date: Fri, 4 Oct 2019 17:00:48 +0900
+Subject: [PATCH 5/6] Revert "Change some private header includes."
+
+This reverts commit b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.
+---
+ Telegram/SourceFiles/ui/text/text.cpp | 1 -
+ Telegram/SourceFiles/ui/text/text.h | 2 +-
+ Telegram/SourceFiles/ui/text/text_block.cpp | 2 --
+ Telegram/SourceFiles/ui/text/text_block.h | 1 +
+ 4 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
+index eaeb52b35..2c55f1123 100644
+--- a/Telegram/SourceFiles/ui/text/text.cpp
++++ b/Telegram/SourceFiles/ui/text/text.cpp
+@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+ #include "ui/ui_integration.h"
+ #include "platform/platform_info.h"
+
+-#include <private/qfontengine_p.h>
+ #include <private/qharfbuzz_p.h>
+
+ namespace Ui {
+diff --git a/Telegram/SourceFiles/ui/text/text.h b/Telegram/SourceFiles/ui/text/text.h
+index 5d7c2cd07..3a2de5d3e 100644
+--- a/Telegram/SourceFiles/ui/text/text.h
++++ b/Telegram/SourceFiles/ui/text/text.h
+@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+ #include "ui/click_handler.h"
+ #include "base/flags.h"
+
+-#include <private/qfixed_p.h>
++#include <private/qfontengine_p.h>
+
+ static const QChar TextCommand(0x0010);
+ enum TextCommands {
+diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp
+index 8e6914197..d83073085 100644
+--- a/Telegram/SourceFiles/ui/text/text_block.cpp
++++ b/Telegram/SourceFiles/ui/text/text_block.cpp
+@@ -9,8 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+
+ #include "styles/style_basic.h"
+
+-#include <private/qfontengine_p.h>
+-
+ // COPIED FROM qtextlayout.cpp AND MODIFIED
+ namespace Ui {
+ namespace Text {
+diff --git a/Telegram/SourceFiles/ui/text/text_block.h b/Telegram/SourceFiles/ui/text/text_block.h
+index 6fcf1cd51..27d724ee8 100644
+--- a/Telegram/SourceFiles/ui/text/text_block.h
++++ b/Telegram/SourceFiles/ui/text/text_block.h
+@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+ #include "ui/emoji_config.h"
+
+ #include <private/qfixed_p.h>
++#include <private/qfontengine_p.h>
+
+ namespace Ui {
+ namespace Text {
+--
+2.23.0
+
Added: Revert-Disable-DemiBold-fallback-for-Semibold.patch
===================================================================
--- Revert-Disable-DemiBold-fallback-for-Semibold.patch (rev 0)
+++ Revert-Disable-DemiBold-fallback-for-Semibold.patch 2019-10-04 18:11:49 UTC (rev 512849)
@@ -0,0 +1,30 @@
+From b7effa2fd838afc049ec5cc00df3bd0810a95da4 Mon Sep 17 00:00:00 2001
+From: Jiachen YANG <farseerfc at gmail.com>
+Date: Fri, 4 Oct 2019 16:59:26 +0900
+Subject: [PATCH 3/6] Revert "Disable DemiBold fallback for Semibold."
+
+This reverts commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf.
+---
+ Telegram/SourceFiles/ui/style/style_core_font.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp
+index 653dbfff0..22ccfea7e 100644
+--- a/Telegram/SourceFiles/ui/style/style_core_font.cpp
++++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp
+@@ -161,9 +161,9 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
+
+ f.setPixelSize(size);
+ if (_flags & FontBold) {
+- f.setBold(true);
+- //} else if (fontFamilies[family] == "Open Sans Semibold") {
+- // f.setWeight(QFont::DemiBold);
++ f.setBold(_flags & FontBold);
++ } else if (fontFamilies[family] == "Open Sans Semibold") {
++ f.setWeight(QFont::DemiBold);
+ }
+ f.setItalic(_flags & FontItalic);
+ f.setUnderline(_flags & FontUnderline);
+--
+2.23.0
+
Modified: Use-system-wide-font.patch
===================================================================
--- Use-system-wide-font.patch 2019-10-04 17:41:27 UTC (rev 512848)
+++ Use-system-wide-font.patch 2019-10-04 18:11:49 UTC (rev 512849)
@@ -1,34 +1,32 @@
-Description: Remove links to packaged Open Sans font
- This makes Telegram Desktop use system-wide fonts.
- Warnings about non-existent fonts in resources are also disabled.
-Author: Nicholas Guriev <guriev-ns at ya.ru>
-Bug-Debian: https://bugs.debian.org/890341
-Last-Update: Sat, 31 Mar 2018 14:36:39 +0300
-
---- a/Telegram/Resources/qrc/telegram.qrc
-+++ b/Telegram/Resources/qrc/telegram.qrc
-@@ -42,9 +42,6 @@
- <file alias="js/script.js">../export_html/js/script.js</file>
- </qresource>
+diff --git a/Telegram/Resources/qrc/fonts.qrc b/Telegram/Resources/qrc/fonts.qrc
+index 233b8d572..122d89140 100644
+--- a/Telegram/Resources/qrc/fonts.qrc
++++ b/Telegram/Resources/qrc/fonts.qrc
+@@ -1,7 +1,4 @@
+ <RCC>
<qresource prefix="/gui">
- <file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file>
- <file alias="fonts/OpenSans-Bold.ttf">../fonts/OpenSans-Bold.ttf</file>
- <file alias="fonts/OpenSans-Semibold.ttf">../fonts/OpenSans-Semibold.ttf</file>
- <file alias="art/bg.jpg">../art/bg.jpg</file>
- <file alias="art/bg_initial.jpg">../art/bg_initial.jpg</file>
- <file alias="art/logo_256.png">../art/logo_256.png</file>
---- a/Telegram/SourceFiles/ui/twidget.cpp
-+++ b/Telegram/SourceFiles/ui/twidget.cpp
-@@ -70,9 +70,9 @@ void Start() {
+ </qresource>
+ </RCC>
+diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp
+index 22ccfea7e..36f271f93 100644
+--- a/Telegram/SourceFiles/ui/style/style_core_font.cpp
++++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp
+@@ -84,9 +84,9 @@ void StartFonts() {
}
Started = true;
-- auto regular = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Regular.ttf"), qsl("Open Sans"));
-- auto bold = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Bold.ttf"), qsl("Open Sans"), style::internal::FontBold);
-- auto semibold = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Semibold.ttf"), qsl("Open Sans Semibold"));
-+ auto regular = ValidateFont(qsl("Open Sans"));
-+ auto bold = ValidateFont(qsl("Open Sans"), style::internal::FontBold);
-+ auto semibold = ValidateFont(qsl("Open Sans Semibold"));
+- auto regular = LoadCustomFont(":/gui/fonts/OpenSans-Regular.ttf", "Open Sans");
+- auto bold = LoadCustomFont(":/gui/fonts/OpenSans-Bold.ttf", "Open Sans", style::internal::FontBold);
+- auto semibold = LoadCustomFont(":/gui/fonts/OpenSans-Semibold.ttf", "Open Sans Semibold");
++ auto regular = ValidateFont("Open Sans");
++ auto bold = ValidateFont("Open Sans", style::internal::FontBold);
++ auto semibold = ValidateFont("Open Sans Semibold");
#ifdef Q_OS_WIN
// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
+--
+2.23.0
+
Deleted: demibold.patch
===================================================================
--- demibold.patch 2019-10-04 17:41:27 UTC (rev 512848)
+++ demibold.patch 2019-10-04 18:11:49 UTC (rev 512849)
@@ -1,27 +0,0 @@
-commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf
-Author: John Preston <johnprestonmail at gmail.com>
-Date: Wed Dec 5 14:42:19 2018 +0400
-
- Disable DemiBold fallback for Semibold.
-
- This reverts changes from commit 089c4ceb30.
-
- There were complaints that Persian font becomes unreadable :(
-
-diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp
-index a2ab5f89f..d268a71e1 100644
---- a/Telegram/SourceFiles/ui/style/style_core_font.cpp
-+++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp
-@@ -58,9 +58,9 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
-
- f.setPixelSize(size);
- if (_flags & FontBold) {
-- f.setBold(_flags & FontBold);
-- } else if (fontFamilies[family] == "Open Sans Semibold") {
-- f.setWeight(QFont::DemiBold);
-+ f.setBold(true);
-+ //} else if (fontFamilies[family] == "Open Sans Semibold") {
-+ // f.setWeight(QFont::DemiBold);
- }
- f.setItalic(_flags & FontItalic);
- f.setUnderline(_flags & FontUnderline);
Modified: no-gtk2.patch
===================================================================
--- no-gtk2.patch 2019-10-04 17:41:27 UTC (rev 512848)
+++ no-gtk2.patch 2019-10-04 18:11:49 UTC (rev 512849)
@@ -1,8 +1,8 @@
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
-index f8d74fee1..c9d059fa6 100644
+index 5071d63d1..671d0e661 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
-@@ -240,24 +240,12 @@ void start() {
+@@ -243,24 +243,12 @@ void start() {
indicatorLoaded = setupAppIndicator(lib_indicator);
}
}
@@ -27,3 +27,6 @@
}
if (gtkLoaded) {
+--
+2.23.0
+
Modified: tdesktop.patch
===================================================================
--- tdesktop.patch 2019-10-04 17:41:27 UTC (rev 512848)
+++ tdesktop.patch 2019-10-04 18:11:49 UTC (rev 512849)
@@ -1,20 +1,21 @@
-diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc
-index 0554fa179..3ea027406 100644
---- a/Telegram/Resources/qrc/telegram_linux.qrc
-+++ b/Telegram/Resources/qrc/telegram_linux.qrc
-@@ -1,5 +1,4 @@
+diff --git a/Telegram/Resources/qrc/linux.qrc b/Telegram/Resources/qrc/linux.qrc
+index 164e8d4f2..12319be14 100644
+--- a/Telegram/Resources/qrc/linux.qrc
++++ b/Telegram/Resources/qrc/linux.qrc
+@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/qt">
- <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
</qresource>
- </RCC>
+ <qresource prefix="/fc">
+ <file alias="fc-custom.conf">../fc-custom.conf</file>
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
-index b1246588a..7f522cc86 100644
+index 3ba28309b..e280c44fa 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
-@@ -59,6 +60,19 @@ int Launcher::exec() {
+@@ -272,6 +272,19 @@ int Launcher::exec() {
Logs::start(this); // must be started before Platform is started
- Platform::start(); // must be started before QApplication is created
+ Platform::start(); // must be started before Sandbox is created
+ // I don't know why path is not in QT_PLUGIN_PATH by default
+ QCoreApplication::addLibraryPath("/usr/lib/qt/plugins");
@@ -152,10 +153,10 @@
-Q_IMPORT_PLUGIN(NimfInputContextPlugin)
#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
-index 944f58479..887c1982f 100644
+index 7891995be..eaeb52b35 100644
--- a/Telegram/SourceFiles/ui/text/text.cpp
+++ b/Telegram/SourceFiles/ui/text/text.cpp
-@@ -1750,11 +1750,11 @@ private:
+@@ -1968,11 +1968,11 @@ private:
if (item == -1)
return;
@@ -171,10 +172,10 @@
auto blockIndex = _lineStartBlock;
auto currentBlock = _t->_blocks[blockIndex].get();
diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp
-index 2959cec77..04ad00645 100644
+index 29173c5c2..b47a53d76 100644
--- a/Telegram/SourceFiles/ui/text/text_block.cpp
+++ b/Telegram/SourceFiles/ui/text/text_block.cpp
-@@ -332,6 +332,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
+@@ -334,6 +334,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
QStackTextEngine engine(part, blockFont->f);
BlockParser parser(&engine, this, minResizeWidth, _from, part);
@@ -181,27 +182,11 @@
+ QTextLayout layout(part, blockFont->f);
+ layout.beginLayout();
+ layout.createLine();
+ }
+ }
- CrashReports::ClearAnnotationRef("CrashString");
- }
-diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index 71f318229..461f52278 100644
---- a/Telegram/SourceFiles/ui/twidget.cpp
-+++ b/Telegram/SourceFiles/ui/twidget.cpp
-@@ -233,9 +233,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
- , button
- , QGuiApplication::mouseButtons() | button
- , QGuiApplication::keyboardModifiers()
--#ifndef OS_MAC_OLD
-+#if !defined(OS_MAC_OLD) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
- , Qt::MouseEventSynthesizedByApplication
--#endif // OS_MAC_OLD
-+#endif
- );
- ev.setTimestamp(getms());
- QGuiApplication::sendEvent(windowHandle, &ev);
diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
-index a0e1e0489..223113081 100644
+index dfe1193be..0b13fc098 100644
--- a/Telegram/gyp/PrecompiledHeader.cmake
+++ b/Telegram/gyp/PrecompiledHeader.cmake
@@ -114,7 +114,7 @@ function(add_precompiled_header _target _input)
@@ -222,48 +207,30 @@
DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}"
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 1cab5ae29..465e8276a 100644
---- a/Telegram/gyp/Telegram.gyp
-+++ b/Telegram/gyp/Telegram.gyp
-@@ -75,7 +75,6 @@
- 'codegen.gyp:codegen_numbers',
- 'codegen.gyp:codegen_style',
- 'tests/tests.gyp:tests',
-- 'utils.gyp:Updater',
- '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
- 'crl.gyp:crl',
- 'lib_base.gyp:lib_base',
-@@ -84,7 +83,6 @@
- ],
-
- 'defines': [
-- 'AL_LIBTYPE_STATIC',
- 'AL_ALEXT_PROTOTYPES',
- 'TGVOIP_USE_CXX11_LIB',
- 'XXH_INLINE_ALL',
-@@ -94,16 +92,8 @@
- 'include_dirs': [
- '<(src_loc)',
- '<(SHARED_INTERMEDIATE_DIR)',
-- '<(libs_loc)/breakpad/src',
-- '<(libs_loc)/lzma/C',
-- '<(libs_loc)/zlib',
-- '<(libs_loc)/ffmpeg',
-- '<(libs_loc)/openal-soft/include',
-- '<(libs_loc)/opus/include',
-- '<(libs_loc)/range-v3/include',
-- '<(minizip_loc)',
-- '<(sp_media_key_tap_loc)',
- '<(emoji_suggestions_loc)',
-+ '/usr/include/minizip',
- '<(submodules_loc)/GSL/include',
- '<(submodules_loc)/variant/include',
- '<(submodules_loc)/crl/src',
-diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
+diff --git a/Telegram/gyp/common/linux.gypi b/Telegram/gyp/common/linux.gypi
+index cdcdef1dc..667fbb7f3 100644
+--- a/Telegram/gyp/common/linux.gypi
++++ b/Telegram/gyp/common/linux.gypi
+@@ -11,7 +11,6 @@
+ 'linux_common_flags': [
+ '-pipe',
+ '-Wall',
+- '-Werror',
+ '-W',
+ '-fPIC',
+ '-Wno-unused-variable',
+@@ -86,7 +85,6 @@
+ ],
+ 'defines': [
+ '_REENTRANT',
+- 'QT_STATICPLUGIN',
+ 'QT_PLUGIN',
+ ],
+ 'cflags_c': [
+diff --git a/Telegram/gyp/modules/qt.gypi b/Telegram/gyp/modules/qt.gypi
index 0b783ec21..3f917765a 100644
---- a/Telegram/gyp/qt.gypi
-+++ b/Telegram/gyp/qt.gypi
+--- a/Telegram/gyp/modules/qt.gypi
++++ b/Telegram/gyp/modules/qt.gypi
@@ -14,25 +14,21 @@
[ 'build_macold', {
'qt_version%': '5.3.2',
@@ -390,11 +357,11 @@
'-pthread',
'-rdynamic',
],
-diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi
-index 464d3c818..f350da8f3 100644
---- a/Telegram/gyp/qt_moc.gypi
-+++ b/Telegram/gyp/qt_moc.gypi
-@@ -12,7 +12,7 @@
+diff --git a/Telegram/gyp/modules/qt_moc.gypi b/Telegram/gyp/modules/qt_moc.gypi
+index ebee90a15..75424d4bb 100644
+--- a/Telegram/gyp/modules/qt_moc.gypi
++++ b/Telegram/gyp/modules/qt_moc.gypi
+@@ -15,7 +15,7 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
],
'action': [
@@ -403,10 +370,10 @@
# Silence "Note: No relevant classes found. No output generated."
'--no-notes',
-diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
+diff --git a/Telegram/gyp/modules/qt_rcc.gypi b/Telegram/gyp/modules/qt_rcc.gypi
index f5624a82b..1129a95c5 100644
---- a/Telegram/gyp/qt_rcc.gypi
-+++ b/Telegram/gyp/qt_rcc.gypi
+--- a/Telegram/gyp/modules/qt_rcc.gypi
++++ b/Telegram/gyp/modules/qt_rcc.gypi
@@ -15,7 +15,7 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',
],
@@ -416,89 +383,53 @@
'-name', '<(RULE_INPUT_ROOT)',
'-no-compress',
'<(RULE_INPUT_PATH)',
-diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index 17219fa2c..6853b5c3e 100644
---- a/Telegram/gyp/settings_linux.gypi
-+++ b/Telegram/gyp/settings_linux.gypi
-@@ -11,7 +11,6 @@
- 'linux_common_flags': [
- '-pipe',
- '-Wall',
-- '-Werror',
- '-W',
- '-fPIC',
- '-Wno-unused-variable',
-@@ -60,7 +59,6 @@
+diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
+index 385f2b89f..f3ddf7e83 100644
+--- a/Telegram/gyp/telegram/linux.gypi
++++ b/Telegram/gyp/telegram/linux.gypi
+@@ -19,27 +19,21 @@
+ #'xkbcommon',
],
- 'defines': [
- '_REENTRANT',
-- 'QT_STATICPLUGIN',
- 'QT_PLUGIN',
- ],
- 'cflags_c': [
-diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index ffe0e5a96..bd2ed758f 100644
---- a/Telegram/gyp/telegram_linux.gypi
-+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -23,10 +23,11 @@
- 'linux_path_va%': '/usr/local',
- 'linux_path_vdpau%': '/usr/local',
- 'linux_path_breakpad%': '/usr/local',
-- 'linux_path_opus_include%': '<(libs_loc)/opus/include',
-+ 'linux_path_opus_include%': '/usr/include/opus',
- 'linux_path_range%': '/usr/local',
},
- 'include_dirs': [
-+ '/usr/include/openssl',
- '/usr/local/include',
- '<(linux_path_ffmpeg)/include',
- '<(linux_path_openal)/include',
-@@ -35,6 +36,7 @@
- '<(linux_path_range)/include',
- ],
- 'library_dirs': [
++ 'library_dirs': [
++ '/usr/lib',
+ '/usr/lib/openssl',
- '/usr/local/lib',
- '<(linux_path_ffmpeg)/lib',
- '<(linux_path_openal)/lib',
-@@ -43,26 +45,16 @@
- '<(linux_path_breakpad)/lib',
- ],
++ ],
'libraries': [
-- 'breakpad_client',
-- 'composeplatforminputcontextplugin',
-- 'ibusplatforminputcontextplugin',
-- 'fcitxplatforminputcontextplugin',
-- 'himeplatforminputcontextplugin',
-- 'nimfplatforminputcontextplugin',
-- 'liblzma.a',
-- 'libopenal.a',
-- 'libavformat.a',
-- 'libavcodec.a',
-- 'libswresample.a',
-- 'libswscale.a',
-- 'libavutil.a',
-- 'libopus.a',
-- 'libva-x11.a',
-- 'libva-drm.a',
-- 'libva.a',
-- 'libvdpau.a',
-- 'libdrm.a',
-- 'libz.a',
-+ 'openal',
-+ 'avformat',
-+ 'avcodec',
-+ 'swresample',
-+ 'swscale',
-+ 'avutil',
-+ 'minizip',
-+ 'opus',
-+ 'z',
-+ 'lzma',
+- '-lbreakpad_client',
+- '-lcomposeplatforminputcontextplugin',
+- '-libusplatforminputcontextplugin',
+- '-lfcitxplatforminputcontextplugin',
+- '-lhimeplatforminputcontextplugin',
+- '-lnimfplatforminputcontextplugin',
+- '-llzma',
+ '-lopenal',
+ '-lavformat',
+ '-lavcodec',
+ '-lswresample',
+ '-lswscale',
+ '-lavutil',
++ '-lminizip',
+ '-lopus',
+- '-lva-x11',
+- '-lva-drm',
+- '-lva',
+- '-lvdpau',
+- '-ldrm',
+ '-lz',
++ '-llzma',
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
-@@ -97,9 +89,8 @@
+@@ -51,7 +45,6 @@
+ '-Wl,-wrap,secure_getenv',
+ '-Wl,-wrap,clock_gettime',
+ '-Wl,--no-as-needed,-lrt',
+- '-Wl,-Bstatic',
+ ],
+ 'configurations': {
+ 'Release': {
+@@ -75,9 +68,8 @@
],
}], ['not_need_gtk!="True"', {
'cflags_cc': [
@@ -510,13 +441,13 @@
],
}], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ],
-diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index f02296c8a..46bd016dd 100644
---- a/Telegram/gyp/telegram_sources.txt
-+++ b/Telegram/gyp/telegram_sources.txt
-@@ -755,14 +755,7 @@
- <(emoji_suggestions_loc)/emoji_suggestions.cpp
- <(emoji_suggestions_loc)/emoji_suggestions.h
+diff --git a/Telegram/gyp/telegram/sources.txt b/Telegram/gyp/telegram/sources.txt
+index 38d9d0e64..459919abf 100644
+--- a/Telegram/gyp/telegram/sources.txt
++++ b/Telegram/gyp/telegram/sources.txt
+@@ -863,14 +863,7 @@
+ <(src_loc)/settings.cpp
+ <(src_loc)/settings.h
-platforms: !win
-<(minizip_loc)/crypt.h
@@ -530,3 +461,6 @@
platforms: win
<(res_loc)/winrc/Telegram.rc
+--
+2.23.0
+
Modified: tdesktop_lottie_animation_qtdebug.patch
===================================================================
--- tdesktop_lottie_animation_qtdebug.patch 2019-10-04 17:41:27 UTC (rev 512848)
+++ tdesktop_lottie_animation_qtdebug.patch 2019-10-04 18:11:49 UTC (rev 512849)
@@ -1,5 +1,5 @@
diff --git a/Telegram/SourceFiles/lottie/lottie_animation.cpp b/Telegram/SourceFiles/lottie/lottie_animation.cpp
-index cee1bf7bb..c8adfc343 100644
+index f681c9220..8f80640e1 100644
--- a/Telegram/SourceFiles/lottie/lottie_animation.cpp
+++ b/Telegram/SourceFiles/lottie/lottie_animation.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -10,4 +10,6 @@
#include <rlottie.h>
#include <crl/crl_async.h>
#include <crl/crl_on_main.h>
-
+--
+2.23.0
+
More information about the arch-commits
mailing list