Date: Monday, October 1, 2018 @ 06:50:07 Author: svenstaro Revision: 388730
upgpkg: telegram-desktop 1.4.0-2 Modified: telegram-desktop/trunk/CMakeLists.inj telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch ----------------+ CMakeLists.inj | 7 - PKGBUILD | 6 - tdesktop.patch | 314 ------------------------------------------------------- 3 files changed, 8 insertions(+), 319 deletions(-) Modified: CMakeLists.inj =================================================================== --- CMakeLists.inj 2018-10-01 06:15:53 UTC (rev 388729) +++ CMakeLists.inj 2018-10-01 06:50:07 UTC (rev 388730) @@ -1,4 +1,3 @@ -# ------------- debian/CMakeLists.inj begin ------------- # The text will be put into the appropriate CMakeLists by the PKGBUILD # Avoid rpath compiler parameter @@ -9,7 +8,11 @@ # lines. include(../../Telegram/gyp/PrecompiledHeader.cmake) add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h) +add_precompiled_header(lib_base ../../Telegram/SourceFiles/base/base_pch.h) add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h) +add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h) +# You can discover new PCHs using this link: +# https://github.com/telegramdesktop/tdesktop/search?q=pch_header&unscoped_q=pch_header + # vim: ft=cmake -# -------------- debian/CMakeLists.inj end -------------- Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-01 06:15:53 UTC (rev 388729) +++ PKGBUILD 2018-10-01 06:50:07 UTC (rev 388730) @@ -6,7 +6,7 @@ pkgname=telegram-desktop pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/"; @@ -36,8 +36,8 @@ 'SKIP' 'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' - '0a2de8fc761e1222f622235c4023f5092179986750f3de53039eca9f4ea43a789f0cf408f2958d5e0dae70b85796d79de018901376344a22f2dcf915f06b6fb9' - 'cd4c6c931d55e5d414e46ea1d9dd4fbcba152d7ac57247162cf33cb74d69f48bed43d735eb6a188cb33eaab0232daea0ec4ae017e18bb05f5a1a1acc83446f91' + 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' + '47c0d1e00401d7899b2ce710c06ceac6caffddbe1a4c85bc407918b43051cba292f6e6131cc0f390a66520e92f0ffa3761f8d973a25986dfe21c54f113062c33' '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39') Modified: tdesktop.patch =================================================================== --- tdesktop.patch 2018-10-01 06:15:53 UTC (rev 388729) +++ tdesktop.patch 2018-10-01 06:50:07 UTC (rev 388730) @@ -8,187 +8,6 @@ - <file alias="etc/qt.conf">../etc/qt_linux.conf</file> </qresource> </RCC> -diff --git a/Telegram/SourceFiles/app.h b/Telegram/SourceFiles/app.h -index d9a5517bf..050af045e 100644 ---- a/Telegram/SourceFiles/app.h -+++ b/Telegram/SourceFiles/app.h -@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #pragma once - -+#include "base/assertion.h" - #include "data/data_types.h" - #include "data/data_peer.h" - -diff --git a/Telegram/SourceFiles/base/algorithm.h b/Telegram/SourceFiles/base/algorithm.h -index 0369859db..0d389d2fa 100644 ---- a/Telegram/SourceFiles/base/algorithm.h -+++ b/Telegram/SourceFiles/base/algorithm.h -@@ -7,6 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #pragma once - -+#include <utility> -+#include <cstddef> -+#include <QLatin1String> -+ - namespace base { - - template <typename Type> -diff --git a/Telegram/SourceFiles/base/concurrent_timer.cpp b/Telegram/SourceFiles/base/concurrent_timer.cpp -index 4f9fb82f8..126dcc000 100644 ---- a/Telegram/SourceFiles/base/concurrent_timer.cpp -+++ b/Telegram/SourceFiles/base/concurrent_timer.cpp -@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #include <QtCore/QThread> - #include <QtCore/QCoreApplication> -+#include <QtCore/QMutex> -+#include <QtCore/QMutexLocker> - - using namespace base::details; - -diff --git a/Telegram/SourceFiles/base/concurrent_timer.h b/Telegram/SourceFiles/base/concurrent_timer.h -index b279b1d1e..dd8f560e7 100644 ---- a/Telegram/SourceFiles/base/concurrent_timer.h -+++ b/Telegram/SourceFiles/base/concurrent_timer.h -@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #include "base/binary_guard.h" -+#include "base/basic_types.h" - #include <crl/crl_time.h> - #include <crl/crl_object_on_queue.h> - #include <QtCore/QThread> -diff --git a/Telegram/SourceFiles/base/observer.cpp b/Telegram/SourceFiles/base/observer.cpp -index 1c1245071..1507633ac 100644 ---- a/Telegram/SourceFiles/base/observer.cpp -+++ b/Telegram/SourceFiles/base/observer.cpp -@@ -6,6 +6,7 @@ For license and copyright information please follow this link: - https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #include "base/observer.h" -+#include "base/ordered_set.h" - - namespace base { - namespace internal { -diff --git a/Telegram/SourceFiles/base/observer.h b/Telegram/SourceFiles/base/observer.h -index 75bc0e722..61a266263 100644 ---- a/Telegram/SourceFiles/base/observer.h -+++ b/Telegram/SourceFiles/base/observer.h -@@ -10,6 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include <vector> - #include <deque> - #include <rpl/producer.h> -+#include "base/assertion.h" -+#include "base/algorithm.h" -+#include "base/basic_types.h" - #include "base/type_traits.h" - - namespace base { -diff --git a/Telegram/SourceFiles/base/openssl_help.h b/Telegram/SourceFiles/base/openssl_help.h -index 2af1ba65c..c917e9c08 100644 ---- a/Telegram/SourceFiles/base/openssl_help.h -+++ b/Telegram/SourceFiles/base/openssl_help.h -@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #include "base/bytes.h" - #include "base/algorithm.h" -+#include "base/assertion.h" - #include "base/basic_types.h" - - extern "C" { -diff --git a/Telegram/SourceFiles/base/parse_helper.h b/Telegram/SourceFiles/base/parse_helper.h -index ce96690b0..e3751c737 100644 ---- a/Telegram/SourceFiles/base/parse_helper.h -+++ b/Telegram/SourceFiles/base/parse_helper.h -@@ -7,6 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #pragma once - -+#include "base/assertion.h" -+#include <QByteArray> -+#include <QLatin1String> -+ - namespace base { - namespace parse { - -diff --git a/Telegram/SourceFiles/base/qthelp_url.cpp b/Telegram/SourceFiles/base/qthelp_url.cpp -index 0cdc486f8..20d64f6d6 100644 ---- a/Telegram/SourceFiles/base/qthelp_url.cpp -+++ b/Telegram/SourceFiles/base/qthelp_url.cpp -@@ -5,7 +5,11 @@ the official desktop application for the Telegram messaging service. - For license and copyright information please follow this link: - https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ -+#include "base/assertion.h" -+#include "base/algorithm.h" - #include "base/qthelp_url.h" -+#include <QString> -+#include <QLatin1String> - - namespace qthelp { - namespace { -diff --git a/Telegram/SourceFiles/base/qthelp_url.h b/Telegram/SourceFiles/base/qthelp_url.h -index c0e10bc6d..5efda73cc 100644 ---- a/Telegram/SourceFiles/base/qthelp_url.h -+++ b/Telegram/SourceFiles/base/qthelp_url.h -@@ -7,6 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #pragma once - -+#include <QRegularExpression> -+#include <QString> -+#include <QMap> -+#include <QUrl> -+ - namespace qthelp { - - const QRegularExpression &RegExpDomain(); -diff --git a/Telegram/SourceFiles/base/runtime_composer.cpp b/Telegram/SourceFiles/base/runtime_composer.cpp -index eec3cdca3..67d3acd9f 100644 ---- a/Telegram/SourceFiles/base/runtime_composer.cpp -+++ b/Telegram/SourceFiles/base/runtime_composer.cpp -@@ -6,6 +6,10 @@ For license and copyright information please follow this link: - https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #include "base/runtime_composer.h" -+#include <map> -+#include <cstdint> -+#include <QMutex> -+#include <QMutexLocker> - - struct RuntimeComposerMetadatasMap { - std::map<uint64, std::unique_ptr<RuntimeComposerMetadata>> data; -diff --git a/Telegram/SourceFiles/base/runtime_composer.h b/Telegram/SourceFiles/base/runtime_composer.h -index 461f3888e..8e54f3ba5 100644 ---- a/Telegram/SourceFiles/base/runtime_composer.h -+++ b/Telegram/SourceFiles/base/runtime_composer.h -@@ -7,6 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #pragma once - -+#include <cstddef> -+#include <QAtomicInt> -+#include "base/assertion.h" -+#include "base/algorithm.h" -+#include "base/basic_types.h" -+ - template <typename Base> - class RuntimeComposer; - -diff --git a/Telegram/SourceFiles/base/timer.cpp b/Telegram/SourceFiles/base/timer.cpp -index 32388c1e9..cf41307d9 100644 ---- a/Telegram/SourceFiles/base/timer.cpp -+++ b/Telegram/SourceFiles/base/timer.cpp -@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #include "base/timer.h" - -+#include <crl/crl_time.h> - #include <QtCore/QTimerEvent> - - namespace base { diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp index d4bdadc17..8a420c74b 100644 --- a/Telegram/SourceFiles/core/launcher.cpp @@ -351,139 +170,6 @@ -Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin) -Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX -diff --git a/Telegram/SourceFiles/storage/cache/storage_cache_cleaner.cpp b/Telegram/SourceFiles/storage/cache/storage_cache_cleaner.cpp -index 664ca5257..1158f2094 100644 ---- a/Telegram/SourceFiles/storage/cache/storage_cache_cleaner.cpp -+++ b/Telegram/SourceFiles/storage/cache/storage_cache_cleaner.cpp -@@ -7,9 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #include "storage/cache/storage_cache_cleaner.h" - -+#include <range/v3/all.hpp> -+#include <base/basic_types.h> - #include <crl/crl.h> - #include <QtCore/QDir> - #include <QtCore/QFile> -+#include <QtCore/QString> - #include <unordered_map> - #include <set> - -diff --git a/Telegram/SourceFiles/storage/cache/storage_cache_cleaner.h b/Telegram/SourceFiles/storage/cache/storage_cache_cleaner.h -index 26f6f28b8..5f8cd762b 100644 ---- a/Telegram/SourceFiles/storage/cache/storage_cache_cleaner.h -+++ b/Telegram/SourceFiles/storage/cache/storage_cache_cleaner.h -@@ -8,7 +8,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #include "storage/cache/storage_cache_types.h" -+#include <crl/crl_object_on_queue.h> -+#include "base/assertion.h" - #include "base/binary_guard.h" -+#include "base/basic_types.h" -+#include <QString> - - namespace Storage { - namespace Cache { -diff --git a/Telegram/SourceFiles/storage/cache/storage_cache_database_object.cpp b/Telegram/SourceFiles/storage/cache/storage_cache_database_object.cpp -index 373c742b0..ec1207ad1 100644 ---- a/Telegram/SourceFiles/storage/cache/storage_cache_database_object.cpp -+++ b/Telegram/SourceFiles/storage/cache/storage_cache_database_object.cpp -@@ -14,11 +14,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include "storage/storage_encrypted_file.h" - #include "base/flat_map.h" - #include "base/algorithm.h" -+#include "base/openssl_help.h" - #include <crl/crl.h> - #include <xxhash.h> - #include <QtCore/QDir> - #include <unordered_map> - #include <set> -+#include <range/v3/all.hpp> - - namespace Storage { - namespace Cache { -diff --git a/Telegram/SourceFiles/storage/cache/storage_cache_types.cpp b/Telegram/SourceFiles/storage/cache/storage_cache_types.cpp -index 7bec686bd..adabbb6f0 100644 ---- a/Telegram/SourceFiles/storage/cache/storage_cache_types.cpp -+++ b/Telegram/SourceFiles/storage/cache/storage_cache_types.cpp -@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include "storage/cache/storage_cache_types.h" - - #include <QtCore/QDir> -+#include <range/v3/all.hpp> - - namespace Storage { - namespace Cache { -diff --git a/Telegram/SourceFiles/storage/storage_clear_legacy.cpp b/Telegram/SourceFiles/storage/storage_clear_legacy.cpp -index 993d79d63..d79f5e6af 100644 ---- a/Telegram/SourceFiles/storage/storage_clear_legacy.cpp -+++ b/Telegram/SourceFiles/storage/storage_clear_legacy.cpp -@@ -8,6 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include "storage/storage_clear_legacy.h" - - #include <crl/crl_async.h> -+#include <QString> -+#include <QFile> - - namespace Storage { - namespace { -diff --git a/Telegram/SourceFiles/storage/storage_clear_legacy.h b/Telegram/SourceFiles/storage/storage_clear_legacy.h -index 09ee4f959..2ed3b9eb8 100644 ---- a/Telegram/SourceFiles/storage/storage_clear_legacy.h -+++ b/Telegram/SourceFiles/storage/storage_clear_legacy.h -@@ -7,6 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #pragma once - -+#include <QString> -+#include <vector> -+#include "base/basic_types.h" -+#include "base/flat_set.h" -+ - namespace Storage { - - using CollectGoodFiles = Fn<void(FnMut<void(base::flat_set<QString>&&)>)>; -diff --git a/Telegram/SourceFiles/storage/storage_clear_legacy_posix.cpp b/Telegram/SourceFiles/storage/storage_clear_legacy_posix.cpp -index bb92db8f3..cdf2136e6 100644 ---- a/Telegram/SourceFiles/storage/storage_clear_legacy_posix.cpp -+++ b/Telegram/SourceFiles/storage/storage_clear_legacy_posix.cpp -@@ -10,6 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include <sys/stat.h> - #include <dirent.h> - #include <unistd.h> -+#include <QString> -+#include <QByteArray> -+#include <QFile> - - namespace Storage { - namespace details { -diff --git a/Telegram/SourceFiles/storage/storage_encrypted_file.cpp b/Telegram/SourceFiles/storage/storage_encrypted_file.cpp -index c2c8d1339..8a39f8728 100644 ---- a/Telegram/SourceFiles/storage/storage_encrypted_file.cpp -+++ b/Telegram/SourceFiles/storage/storage_encrypted_file.cpp -@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #include "storage/storage_encrypted_file.h" - -+#include <QFileInfo> -+#include <QDir> - #include "base/openssl_help.h" - - namespace Storage { -diff --git a/Telegram/SourceFiles/storage/storage_encryption.cpp b/Telegram/SourceFiles/storage/storage_encryption.cpp -index 61d0db392..1e8600d90 100644 ---- a/Telegram/SourceFiles/storage/storage_encryption.cpp -+++ b/Telegram/SourceFiles/storage/storage_encryption.cpp -@@ -9,6 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #include "base/openssl_help.h" - -+#include <QDir> -+#include <QFileInfo> -+ - namespace Storage { - - CtrState::CtrState(bytes::const_span key, bytes::const_span iv) { diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp index 944f58479..887c1982f 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp
