Date: Saturday, December 30, 2017 @ 22:10:37 Author: svenstaro Revision: 277497
upgpkg: telegram-desktop 1.2.6-1 Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch ----------------+ PKGBUILD | 6 ++--- tdesktop.patch | 64 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 36 insertions(+), 34 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-12-30 22:00:36 UTC (rev 277496) +++ PKGBUILD 2017-12-30 22:10:37 UTC (rev 277497) @@ -5,8 +5,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.2.1 -pkgrel=4 +pkgver=1.2.6 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/"; @@ -34,7 +34,7 @@ 'b12b6d25fc2e6fb0a60a14bbab8b600ec71cf4651279180730c1a469afd1173c' 'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb' '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82' - '35ca9d917254ee71141ebfbae1b8447b8d3a5601f8d3a78db2cceedfe83c54f2' + '9011d01340549d8a7b6627c44de5355356342a7e83789672e9e0aa92657ee04f' '0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075') prepare() { Modified: tdesktop.patch =================================================================== --- tdesktop.patch 2017-12-30 22:00:36 UTC (rev 277496) +++ tdesktop.patch 2017-12-30 22:10:37 UTC (rev 277497) @@ -1,5 +1,5 @@ diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc -index 0554fa179..3ea027406 100644 +index 0554fa17..3ea02740 100644 --- a/Telegram/Resources/qrc/telegram_linux.qrc +++ b/Telegram/Resources/qrc/telegram_linux.qrc @@ -1,5 +1,4 @@ @@ -9,10 +9,10 @@ </qresource> </RCC> diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index c05915976..9b19941df 100644 +index bf21d14d..6b63016e 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -43,9 +43,10 @@ void Launcher::init() { +@@ -44,9 +44,10 @@ void Launcher::init() { QCoreApplication::setApplicationName(qsl("TelegramDesktop")); @@ -25,7 +25,7 @@ initHook(); } -@@ -63,6 +64,13 @@ int Launcher::exec() { +@@ -64,6 +65,13 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started Platform::start(); // must be started before QApplication is created @@ -36,11 +36,11 @@ + // Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943 + unsetenv("QT_QPA_PLATFORMTHEME"); + - auto result = 0; - { - Application app(this, _argc, _argv); + auto result = executeApplication(); + + DEBUG_LOG(("Telegram finished, result: %1").arg(result)); diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h -index e9e349be9..d82963fa2 100644 +index e9e349be..d82963fa 100644 --- a/Telegram/SourceFiles/platform/linux/linux_libs.h +++ b/Telegram/SourceFiles/platform/linux/linux_libs.h @@ -30,7 +30,7 @@ extern "C" { @@ -54,7 +54,7 @@ diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp new file mode 100644 -index 000000000..4a722b8d7 +index 00000000..4a722b8d --- /dev/null +++ b/Telegram/SourceFiles/qt_functions.cpp @@ -0,0 +1,94 @@ @@ -153,7 +153,7 @@ + flags |= QTextItem::StrikeOut; +} diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp -index b975c7a84..f2f876b30 100644 +index b975c7a8..f2f876b3 100644 --- a/Telegram/SourceFiles/qt_static_plugins.cpp +++ b/Telegram/SourceFiles/qt_static_plugins.cpp @@ -28,13 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) @@ -171,7 +171,7 @@ -Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) #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 710277fe2..5eb4465d6 100644 +index 7d34a19b..a4b3d31a 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -1707,11 +1707,11 @@ private: @@ -190,23 +190,24 @@ 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 e435b50dc..893496b4f 100644 +index a10b5393..4e1eb62d 100644 --- a/Telegram/SourceFiles/ui/text/text_block.cpp +++ b/Telegram/SourceFiles/ui/text/text_block.cpp -@@ -332,7 +332,7 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi - CrashReports::SetAnnotationRef("CrashString", &part); +@@ -333,6 +333,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi QStackTextEngine engine(part, blockFont->f); -- QTextLayout layout(&engine); + BlockParser parser(&engine, this, minResizeWidth, _from, part); + QTextLayout layout(part, blockFont->f); - layout.beginLayout(); - layout.createLine(); ++ layout.beginLayout(); ++ layout.createLine(); + CrashReports::ClearAnnotationRef("CrashString"); + } diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp -index a78af59dd..feee450ea 100644 +index dacb848a..f64c9b66 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp -@@ -234,9 +234,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton +@@ -248,9 +248,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton , button , QGuiApplication::mouseButtons() | button , QGuiApplication::keyboardModifiers() @@ -219,7 +220,7 @@ ev.setTimestamp(getms()); QGuiApplication::sendEvent(windowHandle, &ev); diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake -index 5d6830e96..c3f08d3f6 100644 +index 5d6830e9..c3f08d3f 100644 --- a/Telegram/gyp/PrecompiledHeader.cmake +++ b/Telegram/gyp/PrecompiledHeader.cmake @@ -112,7 +112,7 @@ function(add_precompiled_header _target _input) @@ -241,15 +242,16 @@ IMPLICIT_DEPENDS CXX "${_pch_header}" COMMENT "Precompiling ${_name} for ${_target} (C++)") diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp -index 31480945b..fd300ad19 100644 +index 84a06153..fd7ca47f 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp -@@ -82,12 +82,10 @@ +@@ -82,13 +82,11 @@ 'codegen.gyp:codegen_numbers', 'codegen.gyp:codegen_style', 'tests/tests.gyp:tests', - 'utils.gyp:Updater', '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', + 'crl.gyp:crl', ], 'defines': [ @@ -257,7 +259,7 @@ 'AL_ALEXT_PROTOTYPES', 'TGVOIP_USE_CXX11_LIB', '<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")', -@@ -96,15 +94,7 @@ +@@ -97,15 +95,7 @@ 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', @@ -275,7 +277,7 @@ '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', diff --git a/Telegram/gyp/linux_glibc_wraps.gyp b/Telegram/gyp/linux_glibc_wraps.gyp -index 07a8276f0..99ac4cacb 100644 +index 07a8276f..99ac4cac 100644 --- a/Telegram/gyp/linux_glibc_wraps.gyp +++ b/Telegram/gyp/linux_glibc_wraps.gyp @@ -27,7 +27,7 @@ @@ -288,7 +290,7 @@ '../SourceFiles/platform/linux/linux_glibc_wraps_64.c', ], diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi -index dea127a33..62c95e682 100644 +index dea127a3..62c95e68 100644 --- a/Telegram/gyp/qt.gypi +++ b/Telegram/gyp/qt.gypi @@ -27,25 +27,21 @@ @@ -418,7 +420,7 @@ '-rdynamic', ], diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi -index fae668dcb..99e184a37 100644 +index fae668dc..99e184a3 100644 --- a/Telegram/gyp/qt_moc.gypi +++ b/Telegram/gyp/qt_moc.gypi @@ -25,7 +25,7 @@ @@ -431,7 +433,7 @@ # 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 -index eebc69676..19a346fe1 100644 +index eebc6967..19a346fe 100644 --- a/Telegram/gyp/qt_rcc.gypi +++ b/Telegram/gyp/qt_rcc.gypi @@ -28,7 +28,7 @@ @@ -444,7 +446,7 @@ '-no-compress', '<(RULE_INPUT_PATH)', diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi -index b93bace41..0fcdfd566 100644 +index b93bace4..0fcdfd56 100644 --- a/Telegram/gyp/settings_linux.gypi +++ b/Telegram/gyp/settings_linux.gypi @@ -24,7 +24,6 @@ @@ -473,7 +475,7 @@ ], 'cflags_c': [ diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index f6918c224..50f0d8c7c 100644 +index f6918c22..50f0d8c7 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi @@ -33,10 +33,11 @@ @@ -554,10 +556,10 @@ ], }] diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index bbf2b2ade..2d380810f 100644 +index 5d2f627e..defd475d 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -693,14 +693,7 @@ +@@ -713,14 +713,7 @@ <(emoji_suggestions_loc)/emoji_suggestions.cpp <(emoji_suggestions_loc)/emoji_suggestions.h
