diff options
author | Allen Wild | 2018-03-15 19:03:04 -0400 |
---|---|---|
committer | Allen Wild | 2018-03-15 19:03:04 -0400 |
commit | 87db1627e68c489ba8f236432cbea378edc3600f (patch) | |
tree | 55c6e7607cf69f4c1f680ec2c6517bb08bed09c4 | |
parent | 10519bd48700892be36ed7693944e0225e749491 (diff) | |
download | aur-87db1627e68c489ba8f236432cbea378edc3600f.tar.gz |
upgpkg: telegram-desktop 1.2.12-1
Back in sync with [community]
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rw-r--r-- | tdesktop.patch | 86 |
3 files changed, 48 insertions, 48 deletions
@@ -1,6 +1,6 @@ pkgbase = telegram-desktop-systemqt-notoemoji pkgdesc = Official Telegram Desktop client - pkgver = 1.2.11 + pkgver = 1.2.12 pkgrel = 1 url = https://desktop.telegram.org/ arch = x86_64 @@ -21,7 +21,7 @@ pkgbase = telegram-desktop-systemqt-notoemoji optdepends = libnotify: desktop notifications provides = telegram-desktop conflicts = telegram-desktop - source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.2.11 + source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.2.12 source = GSL::git+https://github.com/Microsoft/GSL.git source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip.git source = variant::git+https://github.com/mapbox/variant.git @@ -40,7 +40,7 @@ pkgbase = telegram-desktop-systemqt-notoemoji sha256sums = 0b520c1227010f2357c52208c3937a394534bd3aa30c78810cd4d309afa94bd7 sha256sums = d4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb sha256sums = 7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82 - sha256sums = 6b4cc00293dac9973dc4ef28449eef4ad7d63a16b6ba394c3322af90baacb0b0 + sha256sums = 36b817ec9843b261af7a246f9ec51feb828203bd90e76aef7383457f23a0d4cb sha256sums = 8d707debe027c7cb658825501dc30fb3beb57ab21b1b6df2f01c5f76ca39a0e6 sha256sums = 0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075 @@ -6,7 +6,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop-systemqt-notoemoji -pkgver=1.2.11 +pkgver=1.2.12 pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -40,7 +40,7 @@ sha256sums=('SKIP' '0b520c1227010f2357c52208c3937a394534bd3aa30c78810cd4d309afa94bd7' 'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb' '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82' - '6b4cc00293dac9973dc4ef28449eef4ad7d63a16b6ba394c3322af90baacb0b0' + '36b817ec9843b261af7a246f9ec51feb828203bd90e76aef7383457f23a0d4cb' '8d707debe027c7cb658825501dc30fb3beb57ab21b1b6df2f01c5f76ca39a0e6' '0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075') diff --git a/tdesktop.patch b/tdesktop.patch index bae005329c3e..2d3662c6c288 100644 --- a/tdesktop.patch +++ b/tdesktop.patch @@ -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 @@ index 0554fa179..3ea027406 100644 </qresource> </RCC> diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index 7f1735655..d6c5d5a00 100644 +index bf21d14d..6b63016e 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -31,9 +31,10 @@ void Launcher::init() { +@@ -44,9 +44,10 @@ void Launcher::init() { QCoreApplication::setApplicationName(qsl("TelegramDesktop")); @@ -25,7 +25,7 @@ index 7f1735655..d6c5d5a00 100644 initHook(); } -@@ -51,6 +52,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 @@ -40,10 +40,10 @@ index 7f1735655..d6c5d5a00 100644 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 6f93d69cd..df185d5a2 100644 +index e9e349be..d82963fa 100644 --- a/Telegram/SourceFiles/platform/linux/linux_libs.h +++ b/Telegram/SourceFiles/platform/linux/linux_libs.h -@@ -17,7 +17,7 @@ extern "C" { +@@ -30,7 +30,7 @@ extern "C" { } // extern "C" #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION @@ -54,7 +54,7 @@ index 6f93d69cd..df185d5a2 100644 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,10 +153,10 @@ index 000000000..4a722b8d7 + flags |= QTextItem::StrikeOut; +} diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp -index e29f348c8..122ff0f5d 100644 +index b975c7a8..f2f876b3 100644 --- a/Telegram/SourceFiles/qt_static_plugins.cpp +++ b/Telegram/SourceFiles/qt_static_plugins.cpp -@@ -15,13 +15,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) +@@ -28,13 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) #elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC @@ -171,10 +171,10 @@ index e29f348c8..122ff0f5d 100644 -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 61af38ce1..c75a9af7d 100644 +index 7d34a19b..a4b3d31a 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp -@@ -1735,11 +1735,11 @@ private: +@@ -1707,11 +1707,11 @@ private: if (item == -1) return; @@ -190,10 +190,10 @@ index 61af38ce1..c75a9af7d 100644 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 d39addab5..abdcd2398 100644 +index a10b5393..4e1eb62d 100644 --- a/Telegram/SourceFiles/ui/text/text_block.cpp +++ b/Telegram/SourceFiles/ui/text/text_block.cpp -@@ -320,6 +320,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi +@@ -333,6 +333,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi QStackTextEngine engine(part, blockFont->f); BlockParser parser(&engine, this, minResizeWidth, _from, part); @@ -204,10 +204,10 @@ index d39addab5..abdcd2398 100644 CrashReports::ClearAnnotationRef("CrashString"); } diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp -index 1441ea475..033b7b587 100644 +index dacb848a..f64c9b66 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp -@@ -235,9 +235,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() @@ -220,7 +220,7 @@ index 1441ea475..033b7b587 100644 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) @@ -242,10 +242,10 @@ index 5d6830e96..c3f08d3f6 100644 IMPLICIT_DEPENDS CXX "${_pch_header}" COMMENT "Precompiling ${_name} for ${_target} (C++)") diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp -index 62a4197f8..aef8683f3 100644 +index 84a06153..fd7ca47f 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp -@@ -69,13 +69,11 @@ +@@ -82,13 +82,11 @@ 'codegen.gyp:codegen_numbers', 'codegen.gyp:codegen_style', 'tests/tests.gyp:tests', @@ -259,7 +259,7 @@ index 62a4197f8..aef8683f3 100644 'AL_ALEXT_PROTOTYPES', 'TGVOIP_USE_CXX11_LIB', '<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")', -@@ -84,15 +82,7 @@ +@@ -97,15 +95,7 @@ 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', @@ -277,7 +277,7 @@ index 62a4197f8..aef8683f3 100644 '<(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 824708c3a..451de5680 100644 +index 07a8276f..99ac4cac 100644 --- a/Telegram/gyp/linux_glibc_wraps.gyp +++ b/Telegram/gyp/linux_glibc_wraps.gyp @@ -14,7 +14,7 @@ @@ -290,10 +290,10 @@ index 824708c3a..451de5680 100644 '../SourceFiles/platform/linux/linux_glibc_wraps_64.c', ], diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi -index 0b783ec21..3f917765a 100644 +index dea127a3..62c95e68 100644 --- a/Telegram/gyp/qt.gypi +++ b/Telegram/gyp/qt.gypi -@@ -14,25 +14,21 @@ +@@ -27,25 +27,21 @@ [ 'build_macold', { 'qt_version%': '5.3.2', }, { @@ -321,7 +321,7 @@ index 0b783ec21..3f917765a 100644 }] ] }, -@@ -72,32 +68,13 @@ +@@ -85,32 +81,13 @@ ], }], [ 'build_linux', { @@ -357,7 +357,7 @@ index 0b783ec21..3f917765a 100644 ], }], ], -@@ -127,11 +104,6 @@ +@@ -140,11 +117,6 @@ # '<!@(python <(DEPTH)/list_sources.py [sources] <(qt_moc_list_sources_arg))' # where [sources] contains all your source files 'qt_moc_list_sources_arg': '--moc-prefix SHARED_INTERMEDIATE_DIR/<(_target_name)/moc/moc_', @@ -369,7 +369,7 @@ index 0b783ec21..3f917765a 100644 }, 'configurations': { -@@ -180,14 +152,14 @@ +@@ -193,14 +165,14 @@ }, 'include_dirs': [ @@ -392,7 +392,7 @@ index 0b783ec21..3f917765a 100644 ], 'library_dirs': [ '<(qt_loc)/lib', -@@ -212,17 +184,10 @@ +@@ -225,17 +197,10 @@ ], 'libraries': [ '<(PRODUCT_DIR)/obj.target/liblinux_glibc_wraps.a', @@ -411,7 +411,7 @@ index 0b783ec21..3f917765a 100644 '-lglib-2.0', '-lpthread', ], -@@ -230,7 +195,6 @@ +@@ -243,7 +208,6 @@ '<(qt_loc)/mkspecs/linux-g++', ], 'ldflags': [ @@ -420,10 +420,10 @@ index 0b783ec21..3f917765a 100644 '-rdynamic', ], diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi -index 464d3c818..f350da8f3 100644 +index fae668dc..99e184a3 100644 --- a/Telegram/gyp/qt_moc.gypi +++ b/Telegram/gyp/qt_moc.gypi -@@ -12,7 +12,7 @@ +@@ -25,7 +25,7 @@ '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp', ], 'action': [ @@ -433,10 +433,10 @@ index 464d3c818..f350da8f3 100644 # 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 f5624a82b..1129a95c5 100644 +index eebc6967..19a346fe 100644 --- a/Telegram/gyp/qt_rcc.gypi +++ b/Telegram/gyp/qt_rcc.gypi -@@ -15,7 +15,7 @@ +@@ -28,7 +28,7 @@ '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp', ], 'action': [ @@ -446,10 +446,10 @@ index f5624a82b..1129a95c5 100644 '-no-compress', '<(RULE_INPUT_PATH)', diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi -index 842b19555..b3a779eef 100644 +index b93bace4..0fcdfd56 100644 --- a/Telegram/gyp/settings_linux.gypi +++ b/Telegram/gyp/settings_linux.gypi -@@ -11,7 +11,6 @@ +@@ -24,7 +24,6 @@ 'linux_common_flags': [ '-pipe', '-Wall', @@ -457,7 +457,7 @@ index 842b19555..b3a779eef 100644 '-W', '-fPIC', '-Wno-unused-variable', -@@ -25,7 +24,7 @@ +@@ -25,7 +25,7 @@ ], }, 'conditions': [ @@ -466,7 +466,7 @@ index 842b19555..b3a779eef 100644 'defines': [ 'Q_OS_LINUX64', ], -@@ -47,7 +46,6 @@ +@@ -60,7 +59,6 @@ ], 'defines': [ '_REENTRANT', @@ -475,10 +475,10 @@ index 842b19555..b3a779eef 100644 ], 'cflags_c': [ diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index a5b4b1970..a755fc585 100644 +index f6918c22..50f0d8c7 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi -@@ -20,10 +20,11 @@ +@@ -33,10 +33,11 @@ 'linux_path_va%': '/usr/local', 'linux_path_vdpau%': '/usr/local', 'linux_path_breakpad%': '/usr/local', @@ -491,7 +491,7 @@ index a5b4b1970..a755fc585 100644 '/usr/local/include', '<(linux_path_ffmpeg)/include', '<(linux_path_openal)/include', -@@ -32,6 +33,7 @@ +@@ -45,6 +46,7 @@ '<(linux_path_range)/include', ], 'library_dirs': [ @@ -499,7 +499,7 @@ index a5b4b1970..a755fc585 100644 '/usr/local/lib', '<(linux_path_ffmpeg)/lib', '<(linux_path_openal)/lib', -@@ -40,25 +42,15 @@ +@@ -53,25 +55,15 @@ '<(linux_path_breakpad)/lib', ], 'libraries': [ @@ -534,7 +534,7 @@ index a5b4b1970..a755fc585 100644 # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ -@@ -86,7 +78,7 @@ +@@ -99,7 +91,7 @@ }, }, 'conditions': [ @@ -543,7 +543,7 @@ index a5b4b1970..a755fc585 100644 # 32 bit version can't be linked with debug info or LTO, # virtual memory exhausted :( 'cflags_c': [ '-g' ], -@@ -105,10 +97,8 @@ +@@ -118,10 +110,8 @@ ], }], ['not_need_gtk!="True"', { 'cflags_cc': [ @@ -557,10 +557,10 @@ index a5b4b1970..a755fc585 100644 }] ], diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index a9c36e092..26b2bb182 100644 +index 5d2f627e..defd475d 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -760,14 +760,7 @@ +@@ -713,14 +713,7 @@ <(emoji_suggestions_loc)/emoji_suggestions.cpp <(emoji_suggestions_loc)/emoji_suggestions.h |