Beta version 2.4.9.

- Fix crash in tray icon removing. (macOS only)

Telegram/Resources/uwp/AppX/AppxManifest.xml

@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="2.4.7.0" />
+    Version="2.4.9.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,7,0
- PRODUCTVERSION 2,4,7,0
+ FILEVERSION 2,4,9,0
+ PRODUCTVERSION 2,4,9,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "2.4.7.0"
+            VALUE "FileVersion", "2.4.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.7.0"
+            VALUE "ProductVersion", "2.4.9.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/Resources/winrc/Updater.rc

@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,7,0
- PRODUCTVERSION 2,4,7,0
+ FILEVERSION 2,4,9,0
+ PRODUCTVERSION 2,4,9,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "2.4.7.0"
+            VALUE "FileVersion", "2.4.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.7.0"
+            VALUE "ProductVersion", "2.4.9.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/apiwrap.cpp

@@ -42,6 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "base/openssl_help.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "base/call_delayed.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
@@ -3277,7 +3278,7 @@ void ApiWrap::requestMessageAfterDate(
 	// So we request a message with offset_date = desired_date - 1 and add_offset = -1.
 	// This should give us the first message with date >= desired_date.
 	auto offsetId = 0;
-	auto offsetDate = static_cast<int>(QDateTime(date).toTime_t()) - 1;
+	auto offsetDate = static_cast<int>(base::QDateToDateTime(date).toTime_t()) - 1;
 	auto addOffset = -1;
 	auto limit = 1;
 	auto maxId = 0;
@@ -3365,7 +3366,7 @@ void ApiWrap::jumpToHistoryDate(not_null<PeerData*> peer, const QDate &date) {
 //		const QDate &date,
 //		Callback &&callback) {
 //	const auto offsetId = 0;
-//	const auto offsetDate = static_cast<TimeId>(QDateTime(date).toTime_t());
+//	const auto offsetDate = static_cast<TimeId>(base::QDateToDateTime(date).toTime_t());
 //	const auto addOffset = -2;
 //	const auto limit = 1;
 //	const auto hash = 0;

Telegram/SourceFiles/boxes/peer_list_box.cpp

@@ -178,7 +178,7 @@ void PeerListBox::resizeEvent(QResizeEvent *e) {
 
 void PeerListBox::paintEvent(QPaintEvent *e) {
 	Painter p(this);
-	for (auto rect : e->region().rects()) {
+	for (const auto rect : e->region()) {
 		p.fillRect(rect, st::contactsBg);
 	}
 }

Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp

@@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "core/core_cloud_password.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "apiwrap.h"
 #include "main/main_session.h"
 #include "styles/style_layers.h"
@@ -694,7 +695,7 @@ void EditRestrictedBox::showRestrictUntil() {
 			highlighted,
 			[this](const QDate &date) {
 				setRestrictUntil(
-					static_cast<int>(QDateTime(date).toTime_t()));
+					static_cast<int>(base::QDateToDateTime(date).toTime_t()));
 			}),
 		Ui::LayerOption::KeepOther);
 	_restrictUntilBox->setMaxDate(

Telegram/SourceFiles/calls/calls_panel.cpp

@@ -981,7 +981,7 @@ void Panel::paint(QRect clip) {
 	if (!_incoming->isHidden()) {
 		region = region.subtracted(QRegion(_incoming->geometry()));
 	}
-	for (const auto rect : region.rects()) {
+	for (const auto rect : region) {
 		p.fillRect(rect, st::callBgOpaque);
 	}
 	if (_incoming && _incoming->isHidden()) {

Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp

@@ -171,10 +171,8 @@ bool SuggestionsWidget::eventHook(QEvent *e) {
 }
 
 void SuggestionsWidget::scrollByWheelEvent(not_null<QWheelEvent*> e) {
-	const auto horizontal = (e->angleDelta().x() != 0)
-		|| (e->orientation() == Qt::Horizontal);
-	const auto vertical = (e->angleDelta().y() != 0)
-		|| (e->orientation() == Qt::Vertical);
+	const auto horizontal = (e->angleDelta().x() != 0);
+	const auto vertical = (e->angleDelta().y() != 0);
 	const auto current = scrollCurrent();
 	const auto scroll = [&] {
 		if (horizontal) {

Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp

@@ -614,8 +614,8 @@ bool StickersListWidget::Footer::eventHook(QEvent *e) {
 
 void StickersListWidget::Footer::scrollByWheelEvent(
 		not_null<QWheelEvent*> e) {
-	auto horizontal = (e->angleDelta().x() != 0 || e->orientation() == Qt::Horizontal);
-	auto vertical = (e->angleDelta().y() != 0 || e->orientation() == Qt::Vertical);
+	auto horizontal = (e->angleDelta().x() != 0);
+	auto vertical = (e->angleDelta().y() != 0);
 	if (horizontal) {
 		_horizontal = true;
 	}

Telegram/SourceFiles/core/application.cpp

@@ -79,6 +79,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtWidgets/QDesktopWidget>
 #include <QtCore/QMimeDatabase>
 #include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
 
 namespace Core {
 namespace {
@@ -941,7 +942,7 @@ QPoint Application::getPointForCallPanelCenter() const {
 	if (const auto window = activeWindow()) {
 		return window->getPointForCallPanelCenter();
 	}
-	return QApplication::desktop()->screenGeometry().center();
+	return QGuiApplication::primaryScreen()->geometry().center();
 }
 
 // macOS Qt bug workaround, sometimes no leaveEvent() gets to the nested widgets.

Telegram/SourceFiles/core/changelogs.cpp

@@ -85,6 +85,10 @@ std::map<int, const char*> BetaLogs() {
 
 		"- Bug fixes and other minor improvements.\n"
 	},
+	{
+		2004008,
+		"- Upgrade several third party libraries to latest versions.\n"
+	},
 	};
 };
 

Telegram/SourceFiles/core/crash_report_window.cpp

@@ -39,7 +39,7 @@ PreLaunchWindow::PreLaunchWindow(QString title) {
 	setWindowTitle(title.isEmpty() ? qsl("Telegram") : title);
 
 	QPalette p(palette());
-	p.setColor(QPalette::Background, QColor(255, 255, 255));
+	p.setColor(QPalette::Window, QColor(255, 255, 255));
 	setPalette(p);
 
 	QLabel tmp(this);
@@ -79,7 +79,7 @@ PreLaunchLabel::PreLaunchLabel(QWidget *parent) : QLabel(parent) {
 	setFont(labelFont);
 
 	QPalette p(palette());
-	p.setColor(QPalette::Foreground, QColor(0, 0, 0));
+	p.setColor(QPalette::WindowText, QColor(0, 0, 0));
 	setPalette(p);
 	show();
 };
@@ -97,7 +97,7 @@ PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(paren
 	setFont(logFont);
 
 	QPalette p(palette());
-	p.setColor(QPalette::Foreground, QColor(0, 0, 0));
+	p.setColor(QPalette::WindowText, QColor(0, 0, 0));
 	setPalette(p);
 
 	QLineEdit::setTextMargins(0, 0, 0, 0);
@@ -115,7 +115,7 @@ PreLaunchLog::PreLaunchLog(QWidget *parent) : QTextEdit(parent) {
 	setFont(logFont);
 
 	QPalette p(palette());
-	p.setColor(QPalette::Foreground, QColor(96, 96, 96));
+	p.setColor(QPalette::WindowText, QColor(96, 96, 96));
 	setPalette(p);
 
 	setReadOnly(true);
@@ -783,7 +783,7 @@ void LastCrashedWindow::updateControls() {
 	}
 
 	QRect scr(QApplication::primaryScreen()->availableGeometry());
-	QSize s(2 * padding + QFontMetrics(_label.font()).width(qsl("Last time Telegram Desktop was not closed properly.")) + padding + _networkSettings.width(), h);
+	QSize s(2 * padding + QFontMetrics(_label.font()).horizontalAdvance(qsl("Last time Telegram Desktop was not closed properly.")) + padding + _networkSettings.width(), h);
 	if (s == size()) {
 		resizeEvent(0);
 	} else {

Telegram/SourceFiles/core/sandbox.cpp

@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/invoke_queued.h"
 #include "base/qthelp_url.h"
 #include "base/qthelp_regex.h"
+#include "base/qt_adapters.h"
 #include "ui/effects/animations.h"
 #include "facades.h"
 #include "app.h"
@@ -35,9 +36,6 @@ namespace {
 
 constexpr auto kEmptyPidForCommandResponse = 0ULL;
 
-using ErrorSignal = void(QLocalSocket::*)(QLocalSocket::LocalSocketError);
-const auto QLocalSocket_error = ErrorSignal(&QLocalSocket::error);
-
 QChar _toHex(ushort v) {
 	v = v & 0x000F;
 	return QChar::fromLatin1((v >= 10) ? ('a' + (v - 10)) : ('0' + v));
@@ -112,7 +110,7 @@ int Sandbox::start() {
 		[=] { socketDisconnected(); });
 	connect(
 		&_localSocket,
-		QLocalSocket_error,
+		base::QLocalSocket_error,
 		[=](QLocalSocket::LocalSocketError error) { socketError(error); });
 	connect(
 		&_localSocket,

Telegram/SourceFiles/core/update_checker.cpp

@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/bytes.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "storage/localstorage.h"
 #include "core/application.h"
 #include "core/changelogs.h"
@@ -58,9 +59,6 @@ bool UpdaterIsDisabled = false;
 
 std::weak_ptr<Updater> UpdaterInstance;
 
-using ErrorSignal = void(QNetworkReply::*)(QNetworkReply::NetworkError);
-const auto QNetworkReply_error = ErrorSignal(&QNetworkReply::error);
-
 using Progress = UpdateChecker::Progress;
 using State = UpdateChecker::State;
 
@@ -626,7 +624,7 @@ void HttpChecker::start() {
 	_reply->connect(_reply, &QNetworkReply::finished, [=] {
 		gotResponse();
 	});
-	_reply->connect(_reply, QNetworkReply_error, [=](auto e) {
+	_reply->connect(_reply, base::QNetworkReply_error, [=](auto e) {
 		gotFailure(e);
 	});
 }
@@ -665,7 +663,7 @@ void HttpChecker::clearSentRequest() {
 		return;
 	}
 	reply->disconnect(reply, &QNetworkReply::finished, nullptr, nullptr);
-	reply->disconnect(reply, QNetworkReply_error, nullptr, nullptr);
+	reply->disconnect(reply, base::QNetworkReply_error, nullptr, nullptr);
 	reply->abort();
 	reply->deleteLater();
 	_manager = nullptr;
@@ -819,7 +817,7 @@ void HttpLoaderActor::sendRequest() {
 		&HttpLoaderActor::partFinished);
 	connect(
 		_reply.get(),
-		QNetworkReply_error,
+		base::QNetworkReply_error,
 		this,
 		&HttpLoaderActor::partFailed);
 	connect(

Telegram/SourceFiles/core/utils.cpp

@@ -170,17 +170,10 @@ namespace ThirdParty {
 			LOG(("MTP Error: dynlock_create callback is set without dynlock_lock callback!"));
 		}
 
-		av_register_all();
-		avcodec_register_all();
-
-		av_lockmgr_register(_ffmpegLockManager);
-
 		_sslInited = true;
 	}
 
 	void finish() {
-		av_lockmgr_register(nullptr);
-
 		CRYPTO_cleanup_all_ex_data();
 #ifndef LIBRESSL_VERSION_NUMBER
 		FIPS_mode_set(0);

Telegram/SourceFiles/core/version.h

@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 2004007;
-constexpr auto AppVersionStr = "2.4.7";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 2004009;
+constexpr auto AppVersionStr = "2.4.9";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;

Telegram/SourceFiles/data/data_peer_values.cpp

@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat.h"
 #include "data/data_user.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 
 namespace Data {
 namespace {
@@ -39,7 +40,7 @@ int OnlinePhraseChangeInSeconds(TimeId online, TimeId now) {
 		return (hours + 1) * 3600 - (now - online);
 	}
 	const auto nowFull = base::unixtime::parse(now);
-	const auto tomorrow = QDateTime(nowFull.date().addDays(1));
+	const auto tomorrow = base::QDateToDateTime(nowFull.date().addDays(1));
 	return std::max(static_cast<TimeId>(nowFull.secsTo(tomorrow)), 0);
 }
 

Telegram/SourceFiles/data/data_web_page.cpp

@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo.h"
 #include "data/data_channel.h"
 #include "data/data_document.h"
+#include "base/qt_adapters.h"
 #include "ui/image/image.h"
 #include "ui/text/text_entity.h"
 
@@ -26,7 +27,7 @@ QString SiteNameFromUrl(const QString &url) {
 	if (m.hasMatch()) pretty = pretty.mid(m.capturedLength());
 	int32 slash = pretty.indexOf('/');
 	if (slash > 0) pretty = pretty.mid(0, slash);
-	QStringList components = pretty.split('.', QString::SkipEmptyParts);
+	QStringList components = pretty.split('.', base::QStringSkipEmptyParts);
 	if (components.size() >= 2) {
 		components = components.mid(components.size() - 2);
 		return components.at(0).at(0).toUpper() + components.at(0).mid(1) + '.' + components.at(1);

Telegram/SourceFiles/export/view/export_view_settings.cpp

@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/file_utilities.h"
 #include "boxes/calendar_box.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "main/main_session.h"
 #include "styles/style_widgets.h"
 #include "styles/style_export.h"
@@ -478,7 +479,7 @@ void SettingsWidget::editDateLimit(
 		}));
 	};
 	const auto callback = crl::guard(this, [=](const QDate &date) {
-		done(base::unixtime::serialize(QDateTime(date)));
+		done(base::unixtime::serialize(base::QDateToDateTime(date)));
 		if (const auto weak = shared->data()) {
 			weak->closeBox();
 		}

Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp

@@ -174,7 +174,7 @@ CodecPointer MakeCodecPointer(not_null<AVStream*> stream) {
 		LogError(qstr("avcodec_parameters_to_context"), error);
 		return {};
 	}
-	av_codec_set_pkt_timebase(context, stream->time_base);
+	context->pkt_timebase = stream->time_base;
 	av_opt_set(context, "threads", "auto", 0);
 	av_opt_set_int(context, "refcounted_frames", 1, 0);
 

Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp

@@ -1503,13 +1503,13 @@ void InnerWidget::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton but
 	_mouseSelectType = TextSelectType::Letters;
 	//_widget->noSelectingScroll(); // TODO
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-	if (_selectedItem && _selectedText.from != _selectedText.to) {
+	if (QGuiApplication::clipboard()->supportsSelection()
+		&& _selectedItem
+		&& _selectedText.from != _selectedText.to) {
 		TextUtilities::SetClipboardText(
 			_selectedItem->selectedText(_selectedText),
 			QClipboard::Selection);
 	}
-#endif // Q_OS_UNIX && !Q_OS_MAC
 }
 
 void InnerWidget::updateSelected() {

Telegram/SourceFiles/history/history_inner_widget.cpp

@@ -1382,8 +1382,9 @@ void HistoryInner::mouseActionFinish(
 	_widget->noSelectingScroll();
 	_widget->updateTopBarSelection();
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-	if (!_selected.empty() && _selected.cbegin()->second != FullSelection) {
+	if (QGuiApplication::clipboard()->supportsSelection()
+		&& !_selected.empty()
+		&& _selected.cbegin()->second != FullSelection) {
 		const auto [item, selection] = *_selected.cbegin();
 		if (const auto view = item->mainView()) {
 			TextUtilities::SetClipboardText(
@@ -1391,7 +1392,6 @@ void HistoryInner::mouseActionFinish(
 				QClipboard::Selection);
 		}
 	}
-#endif // Q_OS_UNIX && !Q_OS_MAC
 }
 
 void HistoryInner::mouseReleaseEvent(QMouseEvent *e) {

Telegram/SourceFiles/history/history_item_components.cpp

@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 #include "facades.h"
+#include "base/qt_adapters.h"
 #include "styles/style_widgets.h"
 #include "styles/style_chat.h"
 
@@ -109,7 +110,7 @@ HiddenSenderInfo::HiddenSenderInfo(const QString &name)
 , colorPeerId(Data::FakePeerIdForJustName(name))
 , userpic(Data::PeerUserpicColor(colorPeerId), name) {
 	nameText.setText(st::msgNameStyle, name, Ui::NameTextOptions());
-	const auto parts = name.trimmed().split(' ', QString::SkipEmptyParts);
+	const auto parts = name.trimmed().split(' ', base::QStringSkipEmptyParts);
 	firstName = parts[0];
 	for (const auto &part : parts.mid(1)) {
 		if (!lastName.isEmpty()) {

Telegram/SourceFiles/history/view/history_view_list_widget.cpp

@@ -2222,16 +2222,15 @@ void ListWidget::mouseActionFinish(
 	_mouseSelectType = TextSelectType::Letters;
 	//_widget->noSelectingScroll(); // #TODO select scroll
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-	if (_selectedTextItem
+	if (QGuiApplication::clipboard()->supportsSelection()
+		&& _selectedTextItem
 		&& _selectedTextRange.from != _selectedTextRange.to) {
 		if (const auto view = viewForItem(_selectedTextItem)) {
 			TextUtilities::SetClipboardText(
 				view->selectedText(_selectedTextRange),
 				QClipboard::Selection);
-}
+		}
 	}
-#endif // Q_OS_UNIX && !Q_OS_MAC
 }
 
 void ListWidget::mouseActionUpdate() {

Telegram/SourceFiles/info/media/info_media_list_widget.cpp

@@ -2118,11 +2118,9 @@ void ListWidget::mouseActionFinish(
 	//_widget->noSelectingScroll(); // #TODO scroll by drag
 	//_widget->updateTopBarSelection();
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-	//if (hasSelectedText()) { // #TODO linux clipboard
+	//if (QGuiApplication::clipboard()->supportsSelection() && hasSelectedText()) { // #TODO linux clipboard
 	//	TextUtilities::SetClipboardText(_selected.cbegin()->first->selectedText(_selected.cbegin()->second), QClipboard::Selection);
 	//}
-#endif // Q_OS_UNIX && !Q_OS_MAC
 }
 
 void ListWidget::applyDragSelection() {

Telegram/SourceFiles/media/audio/media_audio_capture.cpp

@@ -253,8 +253,9 @@ void Instance::Inner::start(Fn<void(Update)> updated, Fn<void()> error) {
 	d->ioContext = avio_alloc_context(d->ioBuffer, FFmpeg::kAVBlockSize, 1, static_cast<void*>(d.get()), &Private::_read_data, &Private::_write_data, &Private::_seek_data);
 	int res = 0;
 	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-	AVOutputFormat *fmt = 0;
-	while ((fmt = av_oformat_next(fmt))) {
+	const AVOutputFormat *fmt = nullptr;
+	void *i = nullptr;
+	while ((fmt = av_muxer_iterate(&i))) {
 		if (fmt->name == qstr("opus")) {
 			break;
 		}
@@ -265,7 +266,7 @@ void Instance::Inner::start(Fn<void(Update)> updated, Fn<void()> error) {
 		return;
 	}
 
-	if ((res = avformat_alloc_output_context2(&d->fmtContext, fmt, 0, 0)) < 0) {
+	if ((res = avformat_alloc_output_context2(&d->fmtContext, (AVOutputFormat*)fmt, 0, 0)) < 0) {
 		LOG(("Audio Error: Unable to avformat_alloc_output_context2 for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
 		fail();
 		return;

Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp

@@ -550,7 +550,7 @@ bool FFMpegLoader::openCodecContext() {
 			));
 		return false;
 	}
-	av_codec_set_pkt_timebase(_codecContext, stream->time_base);
+	_codecContext->pkt_timebase = stream->time_base;
 	av_opt_set_int(_codecContext, "refcounted_frames", 1, 0);
 
 	if ((res = avcodec_open2(_codecContext, codec, 0)) < 0) {

Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp

@@ -312,7 +312,7 @@ bool FFMpegReaderImplementation::start(Mode mode, crl::time &positionMs) {
 		LOG(("Gif Error: Unable to avcodec_parameters_to_context %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
 		return false;
 	}
-	av_codec_set_pkt_timebase(_codecContext, _fmtContext->streams[_streamId]->time_base);
+	_codecContext->pkt_timebase = _fmtContext->streams[_streamId]->time_base;
 	av_opt_set_int(_codecContext, "refcounted_frames", 1, 0);
 
 	const auto codec = avcodec_find_decoder(_codecContext->codec_id);

Telegram/SourceFiles/media/clip/media_clip_reader.h

@@ -226,7 +226,7 @@ public:
 	~Manager();
 
 	int loadLevel() const {
-		return _loadLevel.load();
+		return _loadLevel;
 	}
 	void append(Reader *reader, const Core::FileLocation &location, const QByteArray &data);
 	void start(Reader *reader);

Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp

@@ -350,6 +350,12 @@ OverlayWidget::OverlayWidget()
 	if (Platform::IsLinux()) {
 		setWindowFlags(Qt::FramelessWindowHint
 			| Qt::MaximizeUsingFullscreenGeometryHint);
+	} else if (Platform::IsMac()) {
+		// Without Qt::Tool starting with Qt 5.15.1 this widget
+		// when being opened from a fullscreen main window was
+		// opening not as overlay over the main window, but as
+		// a separate fullscreen window with a separate space.
+		setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);
 	} else {
 		setWindowFlags(Qt::FramelessWindowHint);
 	}
@@ -2962,13 +2968,11 @@ void OverlayWidget::validatePhotoCurrentImage() {
 
 void OverlayWidget::paintEvent(QPaintEvent *e) {
 	const auto r = e->rect();
-	const auto &region = e->region();
-	const auto rects = region.rects();
-
+	const auto region = e->region();
 	const auto contentShown = _photo || documentContentShown();
-	const auto bgRects = contentShown
-		? (region - contentRect()).rects()
-		: rects;
+	const auto bgRegion = contentShown
+		? (region - contentRect())
+		: region;
 
 	auto ms = crl::now();
 
@@ -2982,7 +2986,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 	const auto m = p.compositionMode();
 	p.setCompositionMode(QPainter::CompositionMode_Source);
 	const auto bgColor = _fullScreenVideo ? st::mediaviewVideoBg : st::mediaviewBg;
-	for (const auto &rect : bgRects) {
+	for (const auto rect : bgRegion) {
 		p.fillRect(rect, bgColor);
 	}
 	p.setCompositionMode(m);
@@ -3078,7 +3082,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 			auto o = overLevel(OverLeftNav);
 			if (o > 0) {
 				p.setOpacity(o * co);
-				for (const auto &rect : rects) {
+				for (const auto &rect : region) {
 					const auto fill = _leftNav.intersected(rect);
 					if (!fill.isEmpty()) p.fillRect(fill, st::mediaviewControlBg);
 				}
@@ -3094,7 +3098,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 			auto o = overLevel(OverRightNav);
 			if (o > 0) {
 				p.setOpacity(o * co);
-				for (const auto &rect : rects) {
+				for (const auto &rect : region) {
 					const auto fill = _rightNav.intersected(rect);
 					if (!fill.isEmpty()) p.fillRect(fill, st::mediaviewControlBg);
 				}
@@ -3110,7 +3114,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 			auto o = overLevel(OverClose);
 			if (o > 0) {
 				p.setOpacity(o * co);
-				for (const auto &rect : rects) {
+				for (const auto &rect : region) {
 					const auto fill = _closeNav.intersected(rect);
 					if (!fill.isEmpty()) p.fillRect(fill, st::mediaviewControlBg);
 				}
@@ -4145,7 +4149,7 @@ bool OverlayWidget::eventHook(QEvent *e) {
 		} else {
 			_accumScroll += ev->angleDelta();
 			if (ev->phase() == Qt::ScrollEnd) {
-				if (ev->orientation() == Qt::Horizontal) {
+				if (ev->angleDelta().x() != 0) {
 					if (_accumScroll.x() * _accumScroll.x() > _accumScroll.y() * _accumScroll.y() && _accumScroll.x() != 0) {
 						moveToNext(_accumScroll.x() > 0 ? -1 : 1);
 					}

Telegram/SourceFiles/media/view/media_view_pip.cpp

@@ -334,7 +334,7 @@ Qt::Edges RectPartToQtEdges(RectPart rectPart) {
 		return Qt::BottomEdge;
 	}
 
-	return 0;
+	return Qt::Edges();
 }
 
 } // namespace
@@ -591,7 +591,7 @@ void PipPanel::paintEvent(QPaintEvent *e) {
 	QPainter p(this);
 
 	if (_useTransparency) {
-		Ui::Platform::StartTranslucentPaint(p, e->region().rects());
+		Ui::Platform::StartTranslucentPaint(p, e->region());
 	}
 
 	auto request = FrameRequest();

Telegram/SourceFiles/mtproto/details/mtproto_tcp_socket.cpp

@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/details/mtproto_tcp_socket.h"
 
 #include "base/invoke_queued.h"
+#include "base/qt_adapters.h"
 
 namespace MTP::details {
 
@@ -33,12 +34,9 @@ TcpSocket::TcpSocket(not_null<QThread*> thread, const QNetworkProxy &proxy)
 		&_socket,
 		&QTcpSocket::readyRead,
 		wrap([=] { _readyRead.fire({}); }));
-
-	using ErrorSignal = void(QTcpSocket::*)(QAbstractSocket::SocketError);
-	const auto QTcpSocket_error = ErrorSignal(&QAbstractSocket::error);
 	connect(
 		&_socket,
-		QTcpSocket_error,
+		base::QTcpSocket_error,
 		wrap([=](Error e) { handleError(e); }));
 }
 

Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp

@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/bytes.h"
 #include "base/invoke_queued.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 
 #include <QtCore/QtEndian>
 #include <range/v3/algorithm/reverse.hpp>
@@ -470,12 +471,9 @@ TlsSocket::TlsSocket(
 		&_socket,
 		&QTcpSocket::readyRead,
 		wrap([=] { plainReadyRead(); }));
-
-	using ErrorSignal = void(QTcpSocket::*)(QAbstractSocket::SocketError);
-	const auto QTcpSocket_error = ErrorSignal(&QAbstractSocket::error);
 	connect(
 		&_socket,
-		QTcpSocket_error,
+		base::QTcpSocket_error,
 		wrap([=](Error e) { handleError(e); }));
 }
 

Telegram/SourceFiles/mtproto/mtproto_dc_options.cpp

@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/facade.h"
 #include "mtproto/connection_tcp.h"
 #include "storage/serialize_common.h"
+#include "base/qt_adapters.h"
 
 #include <QtCore/QFile>
 #include <QtCore/QRegularExpression>
@@ -779,7 +780,7 @@ bool DcOptions::loadFromFile(const QString &path) {
 	stream.setCodec("UTF-8");
 	while (!stream.atEnd()) {
 		auto line = stream.readLine();
-		auto components = line.split(QRegularExpression(R"(\s)"), QString::SkipEmptyParts);
+		auto components = line.split(QRegularExpression(R"(\s)"), base::QStringSkipEmptyParts);
 		if (components.isEmpty() || components[0].startsWith('#')) {
 			continue;
 		}

Telegram/SourceFiles/mtproto/special_config_request.cpp

@@ -79,9 +79,9 @@ bool CheckPhoneByPrefixesRules(const QString &phone, const QString &rules) {
 }
 
 QByteArray ConcatenateDnsTxtFields(const std::vector<DnsEntry> &response) {
-	auto entries = QMap<int, QString>();
+	auto entries = QMultiMap<int, QString>();
 	for (const auto &entry : response) {
-		entries.insertMulti(INT_MAX - entry.data.size(), entry.data);
+		entries.insert(INT_MAX - entry.data.size(), entry.data);
 	}
 	return QStringList(entries.values()).join(QString()).toLatin1();
 }

Telegram/SourceFiles/overview/overview_layout.cpp

@@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_components.h"
 #include "history/view/history_view_cursor_state.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "ui/effects/round_checkbox.h"
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
@@ -1518,7 +1519,7 @@ Link::Link(
 			domain = parts.at(2);
 		}
 
-		parts = domain.split('@').back().split('.', QString::SkipEmptyParts);
+		parts = domain.split('@').back().split('.', base::QStringSkipEmptyParts);
 		if (parts.size() > 1) {
 			_letter = parts.at(parts.size() - 2).at(0).toUpper();
 			if (_title.isEmpty()) {

Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp

@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/linux_desktop_environment.h"
 #include "platform/linux/specific_linux.h"
 #include "storage/localstorage.h"
+#include "base/qt_adapters.h"
 
 #include <QtGui/QDesktopServices>
 
@@ -113,15 +114,17 @@ bool UseNative(Type type = Type::ReadFile) {
 	// or if QT_QPA_PLATFORMTHEME=(gtk2|gtk3)
 	// or if portals are used and operation is to open folder
 	// and portal doesn't support folder choosing
+	const auto sandboxedOrCustomPortal = InFlatpak()
+		|| InSnap()
+		|| UseXDGDesktopPortal();
+
 	const auto neededForPortal = (type == Type::ReadFolder)
 		&& !CanOpenDirectoryWithPortal();
 
 	const auto neededNonForced = DesktopEnvironment::IsGtkBased()
-		|| (UseXDGDesktopPortal() && neededForPortal);
+		|| (sandboxedOrCustomPortal && neededForPortal);
 
-	const auto excludeNonForced = InFlatpak()
-		|| InSnap()
-		|| (UseXDGDesktopPortal() && !neededForPortal);
+	const auto excludeNonForced = sandboxedOrCustomPortal && !neededForPortal;
 
 	return IsGtkIntegrationForced()
 		|| (neededNonForced && !excludeNonForced);
@@ -385,7 +388,7 @@ QStringList cleanFilterList(const QString &filter) {
 	int i = regexp.indexIn(f);
 	if (i >= 0)
 		f = regexp.cap(2);
-	return f.split(QLatin1Char(' '), QString::SkipEmptyParts);
+	return f.split(QLatin1Char(' '), base::QStringSkipEmptyParts);
 }
 
 } // namespace
@@ -583,7 +586,6 @@ GtkFileChooserAction gtkFileChooserAction(QFileDialog::FileMode fileMode, QFileD
 		else
 			return GTK_FILE_CHOOSER_ACTION_SAVE;
 	case QFileDialog::Directory:
-	case QFileDialog::DirectoryOnly:
 	default:
 		if (acceptMode == QFileDialog::AcceptOpen)
 			return GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;

Telegram/SourceFiles/platform/linux/file_utilities_linux.h

@@ -141,7 +141,7 @@ private:
 	void hideHelper();
 
 	// Options
-	QFileDialog::Options _options = { 0 };
+	QFileDialog::Options _options;
 	QString _windowTitle = "Choose file";
 	QString _initialDirectory;
 	QStringList _initialFiles;

Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp

@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/linux_desktop_environment.h"
 
 #include "platform/linux/specific_linux.h"
+#include "base/qt_adapters.h"
 
 namespace Platform {
 namespace DesktopEnvironment {
@@ -22,7 +23,7 @@ QString GetEnv(const char *name) {
 
 Type Compute() {
 	auto xdgCurrentDesktop = GetEnv("XDG_CURRENT_DESKTOP").toLower();
-	auto list = xdgCurrentDesktop.split(':', QString::SkipEmptyParts);
+	auto list = xdgCurrentDesktop.split(':', base::QStringSkipEmptyParts);
 	auto desktopSession = GetEnv("DESKTOP_SESSION").toLower();
 	auto slash = desktopSession.lastIndexOf('/');
 	auto kdeSession = GetEnv("KDE_SESSION_VERSION");

Telegram/SourceFiles/platform/linux/linux_glibc_wraps.c

@@ -1,30 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-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 <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-void *__wrap_aligned_alloc(size_t alignment, size_t size) {
-	void *result = NULL;
-	return (posix_memalign(&result, alignment, size) == 0)
-		? result
-		: NULL;
-}
-
-int enable_secure_inited = 0;
-int enable_secure = 1;
-
-char *__wrap_secure_getenv(const char *name) {
-	if (enable_secure_inited == 0) {
-		enable_secure_inited = 1;
-		enable_secure = (geteuid() != getuid())
-		|| (getegid() != getgid());
-	}
-	return enable_secure ? NULL : getenv(name);
-}
-

Telegram/SourceFiles/platform/linux/linux_glibc_wraps_32.c

@@ -1,50 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-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 <time.h>
-#include <stdint.h>
-
-#if defined(_M_IX86) || defined(__i386__)
-#define GETTIME_GLIBC_VERSION "2.2"
-#elif defined(_M_ARM) || defined(__arm__)
-#define GETTIME_GLIBC_VERSION "2.4"
-#else
-#error Please add glibc wraps for your architecture
-#endif
-
-int __clock_gettime_glibc_old(clockid_t clk_id, struct timespec *tp);
-__asm__(".symver __clock_gettime_glibc_old,clock_gettime@GLIBC_" GETTIME_GLIBC_VERSION);
-
-int __wrap_clock_gettime(clockid_t clk_id, struct timespec *tp) {
-	return __clock_gettime_glibc_old(clk_id, tp);
-}
-
-uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem_p);
-
-int64_t __wrap___divmoddi4(int64_t num, int64_t den, int64_t *rem_p) {
-	int minus = 0;
-	int64_t v;
-
-	if (num < 0) {
-		num = -num;
-		minus = 1;
-	}
-	if (den < 0) {
-		den = -den;
-		minus ^= 1;
-	}
-
-	v = __udivmoddi4(num, den, (uint64_t *)rem_p);
-	if (minus) {
-		v = -v;
-		if (rem_p)
-			*rem_p = -(*rem_p);
-	}
-
-	return v;
-}
-

Telegram/SourceFiles/platform/linux/linux_glibc_wraps_64.c

@@ -1,25 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-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 <time.h>
-
-#if defined(_M_X64) || defined(__x86_64__)
-#define GETTIME_GLIBC_VERSION "2.2.5"
-#elif defined(__aarch64__)
-#define GETTIME_GLIBC_VERSION "2.17"
-#else
-#error Please add glibc wraps for your architecture
-#endif
-
-int __clock_gettime_glibc_old(clockid_t clk_id, struct timespec *tp);
-__asm__(".symver __clock_gettime_glibc_old,clock_gettime@GLIBC_" GETTIME_GLIBC_VERSION);
-
-
-int __wrap_clock_gettime(clockid_t clk_id, struct timespec *tp) {
-	return __clock_gettime_glibc_old(clk_id, tp);
-}
-

Telegram/SourceFiles/platform/linux/specific_linux.cpp

@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/linux_libs.h"
 #include "base/platform/base_platform_info.h"
 #include "base/platform/linux/base_xcb_utilities_linux.h"
+#include "base/qt_adapters.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
@@ -124,6 +125,14 @@ void PortalAutostart(bool autostart, bool silent = false) {
 	}
 }
 
+bool IsXDGDesktopPortalPresent() {
+	static const auto Result = QDBusInterface(
+		kXDGDesktopPortalService.utf16(),
+		kXDGDesktopPortalObjectPath.utf16()).isValid();
+
+	return Result;
+}
+
 bool IsXDGDesktopPortalKDEPresent() {
 	static const auto Result = QDBusInterface(
 		qsl("org.freedesktop.impl.portal.desktop.kde"),
@@ -240,14 +249,14 @@ bool GenerateDesktopFile(
 					QRegularExpression::MultilineOption),
 				qsl("TryExec=")
 					+ QFile::encodeName(cExeDir() + cExeName())
-						.replace('\\', qsl("\\\\")));
+						.replace('\\', "\\\\"));
 			fileText = fileText.replace(
 				QRegularExpression(
 					qsl("^Exec=.*$"),
 					QRegularExpression::MultilineOption),
 				qsl("Exec=")
 					+ EscapeShell(QFile::encodeName(cExeDir() + cExeName()))
-						.replace('\\', qsl("\\\\"))
+						.replace('\\', "\\\\")
 					+ (args.isEmpty() ? QString() : ' ' + args));
 		} else {
 			fileText = fileText.replace(
@@ -635,34 +644,29 @@ bool IsGtkIntegrationForced() {
 }
 
 bool AreQtPluginsBundled() {
-#ifdef DESKTOP_APP_USE_PACKAGED_LAZY
+#if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
 	return true;
-#else // DESKTOP_APP_USE_PACKAGED_LAZY
-	return false;
-#endif // !DESKTOP_APP_USE_PACKAGED_LAZY
-}
-
-bool IsXDGDesktopPortalPresent() {
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-	static const auto Result = QDBusInterface(
-		kXDGDesktopPortalService.utf16(),
-		kXDGDesktopPortalObjectPath.utf16()).isValid();
-
-	return Result;
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-
+#else // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY
 	return false;
+#endif // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY
 }
 
 bool UseXDGDesktopPortal() {
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	static const auto Result = [&] {
+		const auto onlyIn = AreQtPluginsBundled()
+			// it is handled by Qt for flatpak and snap
+			&& !InFlatpak()
+			&& !InSnap();
+
 		const auto envVar = qEnvironmentVariableIsSet("TDESKTOP_USE_PORTAL");
 		const auto portalPresent = IsXDGDesktopPortalPresent();
 		const auto neededForKde = DesktopEnvironment::IsKDE()
 			&& IsXDGDesktopPortalKDEPresent();
 
-		return (neededForKde || envVar) && portalPresent;
+		return onlyIn
+			&& portalPresent
+			&& (neededForKde || envVar);
 	}();
 
 	return Result;
@@ -1022,7 +1026,7 @@ namespace Platform {
 
 void start() {
 	PlatformThemes = QString::fromUtf8(qgetenv("QT_QPA_PLATFORMTHEME"))
-		.split(':', QString::SkipEmptyParts);
+		.split(':', base::QStringSkipEmptyParts);
 
 	LOG(("Launcher filename: %1").arg(GetLauncherFilename()));
 
@@ -1086,27 +1090,22 @@ void start() {
 		qputenv("QT_WAYLAND_DECORATION", "material");
 	}
 
-	if (AreQtPluginsBundled()
-		// it is handled by Qt for flatpak and snap
-		&& !InFlatpak()
-		&& !InSnap()) {
-		LOG(("Checking for XDG Desktop Portal..."));
-		// this can give us a chance to use
-		// a proper file dialog for current session
-		if (IsXDGDesktopPortalPresent()) {
-			LOG(("XDG Desktop Portal is present!"));
-			if (UseXDGDesktopPortal()) {
-				LOG(("Using XDG Desktop Portal."));
-				qputenv("QT_QPA_PLATFORMTHEME", "xdgdesktopportal");
-			} else {
-				LOG(("Not using XDG Desktop Portal."));
-			}
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+	// this can give us a chance to use
+	// a proper file dialog for current session
+	DEBUG_LOG(("Checking for XDG Desktop Portal..."));
+	if (IsXDGDesktopPortalPresent()) {
+		DEBUG_LOG(("XDG Desktop Portal is present!"));
+		if (UseXDGDesktopPortal()) {
+			LOG(("Using XDG Desktop Portal."));
+			qputenv("QT_QPA_PLATFORMTHEME", "xdgdesktopportal");
 		} else {
-			LOG(("XDG Desktop Portal is not present :("));
+			DEBUG_LOG(("Not using XDG Desktop Portal."));
 		}
+	} else {
+		DEBUG_LOG(("XDG Desktop Portal is not present :("));
 	}
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	// IBus has changed its socket path several times
 	// and each change should be synchronized with Qt.
 	// Moreover, the last time Qt changed the path,
@@ -1251,27 +1250,35 @@ void OpenSystemSettingsForPermission(PermissionType type) {
 
 bool OpenSystemSettings(SystemSettingsType type) {
 	if (type == SystemSettingsType::Audio) {
-		auto options = std::vector<QString>();
-		const auto add = [&](const char *option) {
-			options.emplace_back(option);
+		struct Command {
+			QString command;
+			QStringList arguments;
+		};
+		auto options = std::vector<Command>();
+		const auto add = [&](const char *option, const char *arg = nullptr) {
+			auto command = Command{ .command = option };
+			if (arg) {
+				command.arguments.push_back(arg);
+			}
+			options.push_back(std::move(command));
 		};
 		if (DesktopEnvironment::IsUnity()) {
-			add("unity-control-center sound");
+			add("unity-control-center", "sound");
 		} else if (DesktopEnvironment::IsKDE()) {
-			add("kcmshell5 kcm_pulseaudio");
-			add("kcmshell4 phonon");
+			add("kcmshell5", "kcm_pulseaudio");
+			add("kcmshell4", "phonon");
 		} else if (DesktopEnvironment::IsGnome()) {
-			add("gnome-control-center sound");
+			add("gnome-control-center", "sound");
 		} else if (DesktopEnvironment::IsCinnamon()) {
-			add("cinnamon-settings sound");
+			add("cinnamon-settings", "sound");
 		} else if (DesktopEnvironment::IsMATE()) {
 			add("mate-volume-control");
 		}
 		add("pavucontrol-qt");
 		add("pavucontrol");
 		add("alsamixergui");
-		return ranges::any_of(options, [](const QString &command) {
-			return QProcess::startDetached(command);
+		return ranges::any_of(options, [](const Command &command) {
+			return QProcess::startDetached(command.command, command.arguments);
 		});
 	}
 	return true;

Telegram/SourceFiles/platform/linux/specific_linux.h

@@ -23,26 +23,22 @@ inline void SetWatchingMediaKeys(bool watching) {
 bool InFlatpak();
 bool InSnap();
 bool IsStaticBinary();
+bool AreQtPluginsBundled();
 bool UseGtkIntegration();
 bool IsGtkIntegrationForced();
-bool AreQtPluginsBundled();
-
-bool IsXDGDesktopPortalPresent();
 bool UseXDGDesktopPortal();
 bool CanOpenDirectoryWithPortal();
 
 QString AppRuntimeDirectory();
-
 QString GetLauncherBasename();
 QString GetLauncherFilename();
-
 QString GetIconName();
 
+void InstallLauncher(bool force = false);
+
 inline void IgnoreApplicationActivationRightNow() {
 }
 
-void InstallLauncher(bool force = false);
-
 } // namespace Platform
 
 inline void psCheckLocalSocket(const QString &serverName) {

Telegram/SourceFiles/platform/mac/file_utilities_mac.mm

@@ -9,10 +9,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/platform/mac/base_utilities_mac.h"
 #include "lang/lang_keys.h"
+#include "base/qt_adapters.h"
 #include "styles/style_window.h"
 
 #include <QtWidgets/QApplication>
-#include <QtWidgets/QDesktopWidget>
+#include <QtGui/QScreen>
 
 #include <Cocoa/Cocoa.h>
 #include <CoreFoundation/CFURL.h>
@@ -398,7 +399,11 @@ bool UnsafeShowOpenWithDropdown(const QString &filepath, QPoint menuPosition) {
 	NSString *file = Q2NSString(filepath);
 	@try {
 		OpenFileWithInterface *menu = [[[OpenFileWithInterface alloc] init:file] autorelease];
-		auto r = QApplication::desktop()->screenGeometry(menuPosition);
+		const auto screen = base::QScreenNearestTo(menuPosition);
+		if (!screen) {
+			return false;
+		}
+		const auto r = screen->availableGeometry();
 		auto x = menuPosition.x();
 		auto y = r.y() + r.height() - menuPosition.y();
 		return !![menu popupAtX:x andY:y];

Telegram/SourceFiles/platform/mac/main_window_mac.h

@@ -65,7 +65,6 @@ protected:
 	void titleVisibilityChangedHook() override;
 	void unreadCounterChangedHook() override;
 
-	QImage psTrayIcon(bool selected = false) const;
 	bool hasTrayIcon() const override {
 		return trayIcon;
 	}
@@ -77,8 +76,6 @@ protected:
 	QSystemTrayIcon *trayIcon = nullptr;
 	QMenu *trayIconMenu = nullptr;
 
-	QImage trayImg, trayImgSel;
-
 	void psTrayMenuUpdated();
 	void psSetupTrayIcon();
 	virtual void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift, style::color color) = 0;
@@ -95,6 +92,7 @@ private:
 	void hideAndDeactivate();
 	void updateTitleCounter();
 	void updateIconCounters();
+	[[nodiscard]] QIcon generateIconForTray(int counter, bool muted) const;
 
 	std::unique_ptr<Private> _private;
 

Telegram/SourceFiles/platform/mac/main_window_mac.mm

@@ -124,6 +124,17 @@ private:
 
 };
 
+[[nodiscard]] QImage TrayIconBack(bool darkMode) {
+	static const auto WithColor = [](QColor color) {
+		return st::macTrayIcon.instance(color, 100);
+	};
+	static const auto DarkModeResult = WithColor({ 255, 255, 255 });
+	static const auto LightModeResult = WithColor({ 0, 0, 0, 180 });
+	auto result = darkMode ? DarkModeResult : LightModeResult;
+	result.detach();
+	return result;
+}
+
 } // namespace
 
 class MainWindow::Private {
@@ -200,7 +211,6 @@ private:
 - (void) darkModeChanged:(NSNotification *)aNotification {
 	Core::Sandbox::Instance().customEnterFromEventLoop([&] {
 		Core::App().settings().setSystemDarkMode(Platform::IsDarkMode());
-		Core::App().domain().notifyUnreadBadgeChanged();
 	});
 }
 
@@ -485,9 +495,6 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
 	auto forceOpenGL = std::make_unique<QOpenGLWidget>(this);
 #endif // !OS_MAC_OLD
 
-	trayImg = st::macTrayIcon.instance(QColor(0, 0, 0, 180), 100);
-	trayImgSel = st::macTrayIcon.instance(QColor(255, 255, 255), 100);
-
 	_hideAfterFullScreenTimer.setCallback([this] { hideAndDeactivate(); });
 
 	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &data) {
@@ -543,10 +550,6 @@ void MainWindow::hideAndDeactivate() {
 	hide();
 }
 
-QImage MainWindow::psTrayIcon(bool selected) const {
-	return selected ? trayImgSel : trayImg;
-}
-
 void MainWindow::psShowTrayMenu() {
 }
 
@@ -566,14 +569,13 @@ void MainWindow::psTrayMenuUpdated() {
 void MainWindow::psSetupTrayIcon() {
 	if (!trayIcon) {
 		trayIcon = new QSystemTrayIcon(this);
-
-		QIcon icon(QPixmap::fromImage(psTrayIcon(), Qt::ColorOnly));
-		icon.addPixmap(QPixmap::fromImage(psTrayIcon(true), Qt::ColorOnly), QIcon::Selected);
-
-		trayIcon->setIcon(icon);
+		trayIcon->setIcon(generateIconForTray(
+			Core::App().unreadBadge(),
+			Core::App().unreadBadgeMuted()));
 		attachToTrayIcon(trayIcon);
+	} else {
+		updateIconCounters();
 	}
-	updateIconCounters();
 
 	trayIcon->show();
 }
@@ -651,21 +653,31 @@ void MainWindow::updateIconCounters() {
 	_private->setWindowBadge(string);
 
 	if (trayIcon) {
-		bool dm = Platform::IsDarkMenuBar();
-		auto &bg = (muted ? st::trayCounterBgMute : st::trayCounterBg);
-		QIcon icon;
-		QImage img(psTrayIcon(dm)), imgsel(psTrayIcon(true));
-		img.detach();
-		imgsel.detach();
-		int32 size = 22 * cIntRetinaFactor();
-		_placeCounter(img, size, counter, bg, (dm && muted) ? st::trayCounterFgMacInvert : st::trayCounterFg);
-		_placeCounter(imgsel, size, counter, st::trayCounterBgMacInvert, st::trayCounterFgMacInvert);
-		icon.addPixmap(App::pixmapFromImageInPlace(std::move(img)));
-		icon.addPixmap(App::pixmapFromImageInPlace(std::move(imgsel)), QIcon::Selected);
-		trayIcon->setIcon(icon);
+		trayIcon->setIcon(generateIconForTray(counter, muted));
 	}
 }
 
+QIcon MainWindow::generateIconForTray(int counter, bool muted) const {
+	auto result = QIcon();
+	auto lightMode = TrayIconBack(false);
+	auto darkMode = TrayIconBack(true);
+	auto lightModeActive = darkMode;
+	auto darkModeActive = darkMode;
+	lightModeActive.detach();
+	darkModeActive.detach();
+	const auto size = 22 * cIntRetinaFactor();
+	const auto &bg = (muted ? st::trayCounterBgMute : st::trayCounterBg);
+	_placeCounter(lightMode, size, counter, bg, st::trayCounterFg);
+	_placeCounter(darkMode, size, counter, bg, muted ? st::trayCounterFgMacInvert : st::trayCounterFg);
+	_placeCounter(lightModeActive, size, counter, st::trayCounterBgMacInvert, st::trayCounterFgMacInvert);
+	_placeCounter(darkModeActive, size, counter, st::trayCounterBgMacInvert, st::trayCounterFgMacInvert);
+	result.addPixmap(App::pixmapFromImageInPlace(std::move(lightMode)), QIcon::Normal, QIcon::Off);
+	result.addPixmap(App::pixmapFromImageInPlace(std::move(darkMode)), QIcon::Normal, QIcon::On);
+	result.addPixmap(App::pixmapFromImageInPlace(std::move(lightModeActive)), QIcon::Active, QIcon::Off);
+	result.addPixmap(App::pixmapFromImageInPlace(std::move(darkModeActive)), QIcon::Active, QIcon::On);
+	return result;
+}
+
 void MainWindow::initShadows() {
 	_private->enableShadow(winId());
 }

Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm

@@ -47,8 +47,6 @@ using Manager = Platform::Notifications::Manager;
 
 } // namespace
 
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
-
 @interface NotificationDelegate : NSObject<NSUserNotificationCenterDelegate> {
 }
 
@@ -267,7 +265,7 @@ void Manager::Private::showNotification(
 			: peer->isRepliesChat()
 			? Ui::EmptyUserpic::GenerateRepliesMessages(st::notifyMacPhotoSize)
 			: peer->genUserpic(userpicView, st::notifyMacPhotoSize);
-		NSImage *img = [qt_mac_create_nsimage(userpic) autorelease];
+		NSImage *img = Q2NSImage(userpic.toImage());
 		[notification setContentImage:img];
 	}
 

Telegram/SourceFiles/platform/mac/specific_mac_p.mm

@@ -39,8 +39,6 @@ constexpr auto kIgnoreActivationTimeoutMs = 500;
 
 } // namespace
 
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
-
 using Platform::Q2NSString;
 using Platform::NS2QString;
 
@@ -214,10 +212,9 @@ void SetApplicationIcon(const QIcon &icon) {
 	if (!icon.isNull()) {
 		auto pixmap = icon.pixmap(1024, 1024);
 		pixmap.setDevicePixelRatio(cRetinaFactor());
-		image = static_cast<NSImage*>(qt_mac_create_nsimage(pixmap));
+		image = Q2NSImage(pixmap.toImage());
 	}
 	[[NSApplication sharedApplication] setApplicationIconImage:image];
-	[image release];
 }
 
 } // namespace Platform

Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm

@@ -43,7 +43,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #import <AppKit/NSSegmentedControl.h>
 #import <AppKit/NSTextField.h>
 
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
 using TouchBar::kCircleDiameter;
 using TouchBar::CreateNSImageFromStyleIcon;
 
@@ -96,32 +95,32 @@ struct PickerScrubberItem {
 	}
 
 	void updateThumbnail() {
-		if (!document || !qpixmap.isNull()) {
+		if (!document || !image.isNull()) {
 			return;
 		}
-		const auto image = mediaView->getStickerSmall();
-		if (!image) {
+		const auto sticker = mediaView->getStickerSmall();
+		if (!sticker) {
 			return;
 		}
-		const auto size = image->size()
+		const auto size = sticker->size()
 			.scaled(kCircleDiameter, kCircleDiameter, Qt::KeepAspectRatio);
-		qpixmap = image->pixSingle(
+		image = sticker->pixSingle(
 			size.width(),
 			size.height(),
 			kCircleDiameter,
 			kCircleDiameter,
-			ImageRoundRadius::None);
+			ImageRoundRadius::None).toImage();
 	}
 
 	bool isStickerLoaded() const {
-		return !qpixmap.isNull();
+		return !image.isNull();
 	}
 
 	QString title = QString();
 
 	DocumentData *document = nullptr;
 	std::shared_ptr<Data::DocumentMedia> mediaView = nullptr;
-	QPixmap qpixmap;
+	QImage image;
 
 	EmojiPtr emoji = nullptr;
 };
@@ -140,21 +139,25 @@ struct PickerScrubberItemsHolder {
 };
 
 using Platform::Q2NSString;
+using Platform::Q2NSImage;
 
 NSImage *CreateNSImageFromEmoji(EmojiPtr emoji) {
-	const auto s = kIdealIconSize * cIntRetinaFactor();
-	auto pixmap = QPixmap(s, s);
-	pixmap.setDevicePixelRatio(cRetinaFactor());
-	pixmap.fill(Qt::black);
-	Painter paint(&pixmap);
-	PainterHighQualityEnabler hq(paint);
-	Ui::Emoji::Draw(
-		paint,
-		std::move(emoji),
-		Ui::Emoji::GetSizeTouchbar(),
-		0,
-		0);
-	return [qt_mac_create_nsimage(pixmap) autorelease];
+	auto image = QImage(
+		QSize(kIdealIconSize, kIdealIconSize) * cIntRetinaFactor(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(cRetinaFactor());
+	image.fill(Qt::black);
+	{
+		Painter paint(&image);
+		PainterHighQualityEnabler hq(paint);
+		Ui::Emoji::Draw(
+			paint,
+			emoji,
+			Ui::Emoji::GetSizeTouchbar(),
+			0,
+			0);
+	}
+	return Q2NSImage(image);
 }
 
 auto ActiveChat(not_null<Window::Controller*> controller) {
@@ -421,8 +424,7 @@ void AppendEmojiPacks(
 		PickerScrubberItemView *itemView = [scrubber
 			makeItemWithIdentifier:kStickerItemIdentifier
 			owner:self];
-		itemView.imageView.image = [qt_mac_create_nsimage(item.qpixmap)
-			autorelease];
+		itemView.imageView.image = Q2NSImage(item.image);
 		itemView->documentId = document->id;
 		return itemView;
 	} else if (const auto emoji = item.emoji) {

Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm

@@ -20,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #import <AppKit/NSSlider.h>
 #import <AppKit/NSSliderTouchBarItem.h>
 
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
 using TouchBar::kCircleDiameter;
 using TouchBar::CreateNSImageFromStyleIcon;
 

Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.mm

@@ -9,9 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #ifndef OS_OSX
 
-#import <AppKit/NSTextField.h>
+#include "base/platform/mac/base_utilities_mac.h"
 
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
+#import <AppKit/NSTextField.h>
 
 namespace TouchBar {
 
@@ -21,10 +21,9 @@ int WidthFromString(NSString *s) {
 }
 
 NSImage *CreateNSImageFromStyleIcon(const style::icon &icon, int size) {
-	const auto instance = icon.instance(QColor(255, 255, 255, 255), 100);
-	auto pixmap = QPixmap::fromImage(instance);
-	pixmap.setDevicePixelRatio(cRetinaFactor());
-	NSImage *image = [qt_mac_create_nsimage(pixmap) autorelease];
+	auto instance = icon.instance(QColor(255, 255, 255, 255), 100);
+	instance.setDevicePixelRatio(cRetinaFactor());
+	NSImage *image = Platform::Q2NSImage(instance);
 	[image setSize:NSMakeSize(size, size)];
 	return image;
 }

Telegram/SourceFiles/platform/win/file_utilities_win.cpp

@@ -358,11 +358,7 @@ bool Get(
 		dialog.setAcceptMode(QFileDialog::AcceptOpen);
 	} else if (type == Type::ReadFolder) { // save dir
 		dialog.setAcceptMode(QFileDialog::AcceptOpen);
-
-		// We use "obsolete" value ::DirectoryOnly instead of ::Directory + ::ShowDirsOnly
-		// because in Windows XP native dialog this one works, while the "preferred" one
-		// shows a native file choose dialog where you can't choose a directory, only open one.
-		dialog.setFileMode(QFileDialog::DirectoryOnly);
+		dialog.setFileMode(QFileDialog::Directory);
 		dialog.setOption(QFileDialog::ShowDirsOnly);
 	} else { // save file
 		dialog.setFileMode(QFileDialog::AnyFile);

Telegram/SourceFiles/platform/win/main_window_win.cpp

@@ -199,7 +199,7 @@ void MainWindow::psRefreshTaskbarIcon() {
 	refresher->setWindowFlags(static_cast<Qt::WindowFlags>(Qt::Tool) | Qt::FramelessWindowHint);
 	refresher->setGeometry(x() + 1, y() + 1, 1, 1);
 	auto palette = refresher->palette();
-	palette.setColor(QPalette::Background, (isActiveWindow() ? st::titleBgActive : st::titleBg)->c);
+	palette.setColor(QPalette::Window, (isActiveWindow() ? st::titleBgActive : st::titleBg)->c);
 	refresher->setPalette(palette);
 	refresher->show();
 	refresher->activateWindow();

Telegram/SourceFiles/profile/profile_block_peer_list.h

@@ -72,7 +72,7 @@ public:
 	}
 	template <typename Predicate>
 	void sortItems(Predicate predicate) {
-		qSort(_items.begin(), _items.end(), std::move(predicate));
+		std::sort(_items.begin(), _items.end(), std::move(predicate));
 	}
 
 	void setPreloadMoreCallback(Fn<void()> callback) {

Telegram/SourceFiles/storage/file_download_web.cpp

@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/file_download_web.h"
 
 #include "storage/cache/storage_cache_types.h"
+#include "base/qt_adapters.h"
 
 #include <QtNetwork/QAuthenticator>
 
@@ -19,9 +20,6 @@ constexpr auto kResetDownloadPrioritiesTimeout = crl::time(200);
 
 std::weak_ptr<WebLoadManager> GlobalLoadManager;
 
-using ErrorSignal = void(QNetworkReply::*)(QNetworkReply::NetworkError);
-const auto QNetworkReply_error = ErrorSignal(&QNetworkReply::error);
-
 [[nodiscard]] std::shared_ptr<WebLoadManager> GetManager() {
 	auto result = GlobalLoadManager.lock();
 	if (!result) {
@@ -270,7 +268,7 @@ not_null<QNetworkReply*> WebLoadManager::send(int id, const QString &url) {
 		failed(id, result, error);
 	};
 	connect(result, &QNetworkReply::downloadProgress, handleProgress);
-	connect(result, QNetworkReply_error, handleError);
+	connect(result, base::QNetworkReply_error, handleError);
 	return result;
 }
 

Telegram/SourceFiles/support/support_autocomplete.cpp

@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "base/unixtime.h"
 #include "base/call_delayed.h"
+#include "base/qt_adapters.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "apiwrap.h"
@@ -484,7 +485,7 @@ void Autocomplete::submitValue(const QString &value) {
 		const auto contact = value.mid(
 			prefix.size(),
 			(line > 0) ? (line - prefix.size()) : -1);
-		const auto parts = contact.split(' ', QString::SkipEmptyParts);
+		const auto parts = contact.split(' ', base::QStringSkipEmptyParts);
 		if (parts.size() > 1) {
 			const auto phone = parts[0];
 			const auto firstName = parts[1];

Telegram/SourceFiles/ui/countryinput.cpp

@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/multi_select.h"
 #include "ui/effects/ripple_animation.h"
 #include "data/data_countries.h"
+#include "base/qt_adapters.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_intro.h"
@@ -248,7 +249,7 @@ CountrySelectBox::Inner::Inner(QWidget *parent, Type type)
 				: QString());
 		const auto namesList = std::move(full).toLower().split(
 			QRegularExpression("[\\s\\-]"),
-			QString::SkipEmptyParts);
+			base::QStringSkipEmptyParts);
 		auto &names = _namesList.emplace_back();
 		names.reserve(namesList.size());
 		for (const auto &name : namesList) {

Telegram/SourceFiles/ui/widgets/separate_panel.cpp

@@ -358,7 +358,6 @@ void SeparatePanel::initGeometry(QSize size) {
 			st::lineWidth,
 			st::lineWidth);
 	setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);
-	const auto screen = QApplication::desktop()->screenGeometry(center);
 	const auto rect = [&] {
 		const QRect initRect(QPoint(), size);
 		return initRect.translated(center - initRect.center()).marginsAdded(_padding);

Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp

@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/edit_color_box.h"
 #include "lang/lang_keys.h"
 #include "base/call_delayed.h"
+#include "base/qt_adapters.h"
 
 namespace Window {
 namespace Theme {
@@ -154,7 +155,7 @@ void EditorBlock::Row::fillSearchIndex() {
 	_searchWords.clear();
 	_searchStartChars.clear();
 	auto toIndex = _name + ' ' + _copyOf + ' ' + TextUtilities::RemoveAccents(_description.toString()) + ' ' + _valueString;
-	auto words = toIndex.toLower().split(SearchSplitter, QString::SkipEmptyParts);
+	auto words = toIndex.toLower().split(SearchSplitter, base::QStringSkipEmptyParts);
 	for_const (auto &word, words) {
 		_searchWords.insert(word);
 		_searchStartChars.insert(word[0]);

Telegram/SourceFiles/window/window_title_qt.cpp

@@ -393,7 +393,7 @@ Qt::Edges TitleWidgetQt::edgesFromPos(const QPoint &pos) {
 		>= (window()->height() - getResizeArea(Qt::BottomEdge))) {
 		return Qt::BottomEdge;
 	} else {
-		return 0;
+		return Qt::Edges();
 	}
 }
 

Telegram/build/build.sh

@@ -134,73 +134,13 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
     Error "Backup folder not found!"
   fi
 
-  ./configure.sh
+  ./build/docker/centos_env/run.sh /usr/src/tdesktop/Telegram/build/docker/build.sh
 
-  cd $ProjectPath
-  cmake --build . --config Release --target Telegram -- -j8
-  cd $ReleasePath
-
-  echo "$BinaryName build complete!"
-
-  if [ ! -f "$ReleasePath/$BinaryName" ]; then
-    Error "$BinaryName not found!"
-  fi
-
-  # BadCount=`objdump -T $ReleasePath/$BinaryName | grep GLIBC_2\.1[6-9] | wc -l`
-  # if [ "$BadCount" != "0" ]; then
-  #   Error "Bad GLIBC usages found: $BadCount"
-  # fi
-
-  # BadCount=`objdump -T $ReleasePath/$BinaryName | grep GLIBC_2\.2[0-9] | wc -l`
-  # if [ "$BadCount" != "0" ]; then
-  #   Error "Bad GLIBC usages found: $BadCount"
-  # fi
-
-  BadCount=`objdump -T $ReleasePath/$BinaryName | grep GCC_4\.[3-9] | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GCC usages found: $BadCount"
-  fi
-
-  BadCount=`objdump -T $ReleasePath/$BinaryName | grep GCC_[5-9]\. | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GCC usages found: $BadCount"
-  fi
-
-  if [ ! -f "$ReleasePath/Updater" ]; then
-    Error "Updater not found!"
-  fi
-
-  BadCount=`objdump -T $ReleasePath/Updater | grep GLIBC_2\.1[6-9] | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GLIBC usages found: $BadCount"
-  fi
-
-  BadCount=`objdump -T $ReleasePath/Updater | grep GLIBC_2\.2[0-9] | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GLIBC usages found: $BadCount"
-  fi
-
-  BadCount=`objdump -T $ReleasePath/Updater | grep GCC_4\.[3-9] | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GCC usages found: $BadCount"
-  fi
-
-  BadCount=`objdump -T $ReleasePath/Updater | grep GCC_[5-9]\. | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GCC usages found: $BadCount"
-  fi
-
-  echo "Dumping debug symbols.."
-  "$HomePath/../../Libraries/breakpad/out/Default/dump_syms" "$ReleasePath/$BinaryName" > "$ReleasePath/$BinaryName.sym"
-  echo "Done!"
-
-  echo "Stripping the executable.."
-  strip -s "$ReleasePath/$BinaryName"
-  echo "Done!"
-
-  echo "Removing RPATH.."
-  chrpath -d "$ReleasePath/$BinaryName"
-  echo "Done!"
+  echo "Copying from docker result folder."
+  cp "$ReleasePath/root/$BinaryName" "$ReleasePath/$BinaryName"
+  cp "$ReleasePath/root/$BinaryName.sym" "$ReleasePath/$BinaryName.sym"
+  cp "$ReleasePath/root/Updater" "$ReleasePath/Updater"
+  cp "$ReleasePath/root/Packer" "$ReleasePath/Packer"
 
   echo "Preparing version $AppVersionStrFull, executing Packer.."
   cd "$ReleasePath"

Telegram/build/docker/build.sh

@@ -0,0 +1,102 @@
+#!/bin/bash
+
+set -e
+FullExecPath=$PWD
+pushd `dirname $0` > /dev/null
+FullScriptPath=`pwd`
+popd > /dev/null
+
+if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then
+  echo ""
+  echo "This script is for building the production version of Telegram Desktop."
+  echo ""
+  echo "For building custom versions please visit the build instructions page at:"
+  echo "https://github.com/telegramdesktop/tdesktop/#build-instructions"
+  exit
+fi
+
+Run () {
+  scl enable devtoolset-8 -- "$@"
+}
+
+HomePath="$FullScriptPath/../.."
+cd $HomePath
+
+ProjectPath="$HomePath/../out"
+ReleasePath="$ProjectPath/Release"
+BinaryName="Telegram"
+
+if [ ! -f "/usr/bin/cmake" ]; then
+  ln -s cmake3 /usr/bin/cmake
+fi
+
+Run ./configure.sh
+
+cd $ProjectPath
+Run cmake --build . --config Release --target Telegram -- -j8
+cd $ReleasePath
+
+echo "$BinaryName build complete!"
+
+if [ ! -f "$ReleasePath/$BinaryName" ]; then
+Error "$BinaryName not found!"
+fi
+
+# BadCount=`objdump -T $ReleasePath/$BinaryName | grep GLIBC_2\.1[6-9] | wc -l`
+# if [ "$BadCount" != "0" ]; then
+#   Error "Bad GLIBC usages found: $BadCount"
+# fi
+
+# BadCount=`objdump -T $ReleasePath/$BinaryName | grep GLIBC_2\.2[0-9] | wc -l`
+# if [ "$BadCount" != "0" ]; then
+#   Error "Bad GLIBC usages found: $BadCount"
+# fi
+
+BadCount=`objdump -T $ReleasePath/$BinaryName | grep GCC_4\.[3-9] | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GCC usages found: $BadCount"
+fi
+
+BadCount=`objdump -T $ReleasePath/$BinaryName | grep GCC_[5-9]\. | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GCC usages found: $BadCount"
+fi
+
+if [ ! -f "$ReleasePath/Updater" ]; then
+Error "Updater not found!"
+fi
+
+BadCount=`objdump -T $ReleasePath/Updater | grep GLIBC_2\.1[6-9] | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GLIBC usages found: $BadCount"
+fi
+
+BadCount=`objdump -T $ReleasePath/Updater | grep GLIBC_2\.2[0-9] | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GLIBC usages found: $BadCount"
+fi
+
+BadCount=`objdump -T $ReleasePath/Updater | grep GCC_4\.[3-9] | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GCC usages found: $BadCount"
+fi
+
+BadCount=`objdump -T $ReleasePath/Updater | grep GCC_[5-9]\. | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GCC usages found: $BadCount"
+fi
+
+echo "Dumping debug symbols.."
+/dump_syms "$ReleasePath/$BinaryName" > "$ReleasePath/$BinaryName.sym"
+echo "Done!"
+
+echo "Stripping the executable.."
+strip -s "$ReleasePath/$BinaryName"
+echo "Done!"
+
+rm -rf "$ReleasePath/root"
+mkdir "$ReleasePath/root"
+mv "$ReleasePath/$BinaryName" "$ReleasePath/root/"
+mv "$ReleasePath/$BinaryName.sym" "$ReleasePath/root/"
+mv "$ReleasePath/Updater" "$ReleasePath/root/"
+mv "$ReleasePath/Packer" "$ReleasePath/root/"

Telegram/build/docker/centos_env/Dockerfile

@@ -2,8 +2,9 @@ FROM centos:7 AS builder
 
 ENV GIT https://github.com
 ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig
-ENV QT 5_12_8
-ENV QT_PREFIX /usr/local/desktop-app/Qt-5.12.8
+ENV QT 5_15_1
+ENV QT_TAG v5.15.1
+ENV QT_PREFIX /usr/local/desktop-app/Qt-5.15.1
 ENV OPENSSL_VER 1_1_1
 ENV OPENSSL_PREFIX /usr/local/desktop-app/openssl-1.1.1
 
@@ -18,6 +19,7 @@ RUN yum -y install git cmake3 zlib-devel gtk2-devel libICE-devel \
 	devtoolset-8-make devtoolset-8-gcc devtoolset-8-gcc-c++ \
 	devtoolset-8-binutils
 
+SHELL [ "scl", "enable", "devtoolset-8", "--", "bash", "-c" ]
 RUN ln -s cmake3 /usr/bin/cmake
 
 ENV LibrariesPath /usr/src/Libraries
@@ -25,16 +27,16 @@ WORKDIR $LibrariesPath
 
 FROM builder AS patches
 RUN git clone $GIT/desktop-app/patches.git
-RUN cd patches && git checkout b00f25d
+RUN cd patches && git checkout e052c49
 
 FROM builder AS libffi
 RUN git clone -b v3.3 --depth=1 $GIT/libffi/libffi.git
 
 WORKDIR libffi
-RUN scl enable devtoolset-8 -- ./autogen.sh
-RUN scl enable devtoolset-8 -- ./configure --enable-static --disable-docs
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libffi-cache" install
+RUN ./autogen.sh
+RUN ./configure --enable-static --disable-docs
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libffi-cache" install
 
 WORKDIR ..
 RUN rm -rf libffi
@@ -43,9 +45,9 @@ FROM builder AS xz
 RUN git clone -b v5.2.5 https://git.tukaani.org/xz.git
 
 WORKDIR xz
-RUN scl enable devtoolset-8 -- cmake3 -B build . -DCMAKE_BUILD_TYPE=Release
-RUN scl enable devtoolset-8 -- cmake3 --build build -j$(nproc)
-RUN DESTDIR="$LibrariesPath/xz-cache" scl enable devtoolset-8 -- cmake3 --install build
+RUN cmake3 -B build . -DCMAKE_BUILD_TYPE=Release
+RUN cmake3 --build build -j$(nproc)
+RUN DESTDIR="$LibrariesPath/xz-cache" cmake3 --install build
 
 WORKDIR ..
 RUN rm -rf xz
@@ -54,14 +56,14 @@ FROM builder AS mozjpeg
 RUN git clone -b v4.0.1-rc2 --depth=1 $GIT/mozilla/mozjpeg.git
 
 WORKDIR mozjpeg
-RUN scl enable devtoolset-8 -- cmake3 -B build . \
+RUN cmake3 -B build . \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_INSTALL_PREFIX=/usr/local \
 	-DWITH_JPEG8=ON \
 	-DPNG_SUPPORTED=OFF
 
-RUN scl enable devtoolset-8 -- cmake3 --build build -j$(nproc)
-RUN DESTDIR="$LibrariesPath/mozjpeg-cache" scl enable devtoolset-8 -- cmake3 --install build
+RUN cmake3 --build build -j$(nproc)
+RUN DESTDIR="$LibrariesPath/mozjpeg-cache" cmake3 --install build
 
 WORKDIR ..
 RUN rm -rf mozjpeg
@@ -70,10 +72,10 @@ FROM builder AS opus
 RUN git clone -b v1.3 --depth=1 $GIT/xiph/opus.git
 
 WORKDIR opus
-RUN scl enable devtoolset-8 -- ./autogen.sh
-RUN scl enable devtoolset-8 -- ./configure
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/opus-cache" install
+RUN ./autogen.sh
+RUN ./configure
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/opus-cache" install
 
 WORKDIR ..
 RUN rm -rf opus
@@ -82,9 +84,9 @@ FROM builder AS xcb-proto
 RUN git clone -b xcb-proto-1.14 --depth=1 https://gitlab.freedesktop.org/xorg/proto/xcbproto.git
 
 WORKDIR xcbproto
-RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/xcb-proto-cache" install
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-proto-cache" install
 
 WORKDIR ..
 RUN rm -rf xcbproto
@@ -95,20 +97,71 @@ COPY --from=xcb-proto ${LibrariesPath}/xcb-proto-cache /
 RUN git clone -b libxcb-1.14 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxcb.git
 
 WORKDIR libxcb
-RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/xcb-cache" install
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-cache" install
 
 WORKDIR ..
 RUN rm -rf libxcb
 
+FROM builder AS xcb-wm
+
+RUN git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git
+
+WORKDIR libxcb-wm
+RUN git checkout 0.4.1
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-wm-cache" install
+
+FROM builder AS xcb-util
+
+RUN git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git
+
+WORKDIR libxcb-util
+RUN git checkout 0.4.0
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-util-cache" install
+
+FROM builder AS xcb-image
+COPY --from=xcb-util ${LibrariesPath}/xcb-util-cache /
+
+RUN git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git
+
+WORKDIR libxcb-image
+RUN git checkout 0.4.0
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-image-cache" install
+
+FROM builder AS xcb-keysyms
+
+RUN git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git
+
+WORKDIR libxcb-keysyms
+RUN git checkout 0.4.0
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-keysyms-cache" install
+
+FROM builder AS xcb-render-util
+
+RUN git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util.git
+
+WORKDIR libxcb-render-util
+RUN git checkout 0.3.9
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-render-util-cache" install
+
 FROM builder AS libXext
 RUN git clone -b libXext-1.3.4 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxext.git
 
 WORKDIR libxext
-RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libXext-cache" install
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libXext-cache" install
 
 WORKDIR ..
 RUN rm -rf libxext
@@ -117,9 +170,9 @@ FROM builder AS libXfixes
 RUN git clone -b libXfixes-5.0.3 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxfixes.git
 
 WORKDIR libxfixes
-RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libXfixes-cache" install
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libXfixes-cache" install
 
 WORKDIR ..
 RUN rm -rf libxfixes
@@ -128,9 +181,9 @@ FROM builder AS libXi
 RUN git clone -b libXi-1.7.10 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxi.git
 
 WORKDIR libxi
-RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libXi-cache" install
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libXi-cache" install
 
 WORKDIR ..
 RUN rm -rf libxi
@@ -139,9 +192,9 @@ FROM builder AS libXrender
 RUN git clone -b libXrender-0.9.10 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxrender.git
 
 WORKDIR libxrender
-RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libXrender-cache" install
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libXrender-cache" install
 
 WORKDIR ..
 RUN rm -rf libxrender
@@ -152,13 +205,13 @@ COPY --from=libffi ${LibrariesPath}/libffi-cache /
 RUN git clone -b 1.18.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayland.git
 
 WORKDIR wayland
-RUN scl enable devtoolset-8 -- ./autogen.sh \
+RUN ./autogen.sh \
 	--enable-static \
 	--disable-documentation \
 	--disable-dtd-validation
 
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/wayland-cache" install
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/wayland-cache" install
 
 WORKDIR ..
 RUN rm -rf wayland
@@ -173,9 +226,9 @@ COPY --from=wayland ${LibrariesPath}/wayland-cache /
 RUN git clone -b 2.9.0 --depth=1 $GIT/intel/libva.git
 
 WORKDIR libva
-RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libva-cache" install
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libva-cache" install
 
 WORKDIR ..
 RUN rm -rf libva
@@ -184,9 +237,9 @@ FROM builder AS libvdpau
 RUN git clone -b libvdpau-1.2 --depth=1 https://gitlab.freedesktop.org/vdpau/libvdpau.git
 
 WORKDIR libvdpau
-RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libvdpau-cache" install
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libvdpau-cache" install
 
 WORKDIR ..
 RUN rm -rf libvdpau
@@ -197,10 +250,10 @@ COPY --from=opus ${LibrariesPath}/opus-cache /
 COPY --from=libva ${LibrariesPath}/libva-cache /
 COPY --from=libvdpau ${LibrariesPath}/libvdpau-cache /
 
-RUN git clone -b release/3.4 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg
+RUN git clone -b release/4.2 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg
 
 WORKDIR ffmpeg
-RUN scl enable devtoolset-8 -- ./configure \
+RUN ./configure \
 	--disable-debug \
 	--disable-programs \
 	--disable-doc \
@@ -302,14 +355,14 @@ RUN scl enable devtoolset-8 -- ./configure \
 	--enable-muxer=ogg \
 	--enable-muxer=opus
 
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/ffmpeg-cache" install
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/ffmpeg-cache" install
 
 FROM builder AS openal
-RUN git clone -b openal-soft-1.20.1 --depth=1 $GIT/kcat/openal-soft.git
+RUN git clone -b fix_mono --depth=1 $GIT/telegramdesktop/openal-soft.git
 
 WORKDIR openal-soft
-RUN scl enable devtoolset-8 -- cmake3 -B build . \
+RUN cmake3 -B build . \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DLIBTYPE:STRING=STATIC \
 	-DALSOFT_EXAMPLES=OFF \
@@ -317,8 +370,8 @@ RUN scl enable devtoolset-8 -- cmake3 -B build . \
 	-DALSOFT_UTILS=OFF \
 	-DALSOFT_CONFIG=OFF
 
-RUN scl enable devtoolset-8 -- cmake3 --build build -j$(nproc)
-RUN DESTDIR="$LibrariesPath/openal-cache" scl enable devtoolset-8 -- cmake3 --install build
+RUN cmake3 --build build -j$(nproc)
+RUN DESTDIR="$LibrariesPath/openal-cache" cmake3 --install build
 
 WORKDIR ..
 RUN rm -rf openal
@@ -329,9 +382,9 @@ RUN git clone -b OpenSSL_${OPENSSL_VER}-stable --depth=1 \
 	$GIT/openssl/openssl.git $opensslDir
 
 WORKDIR ${opensslDir}
-RUN scl enable devtoolset-8 -- ./config --prefix="$OPENSSL_PREFIX" no-tests
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/openssl-cache" install_sw
+RUN ./config --prefix="$OPENSSL_PREFIX" no-tests
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/openssl-cache" install_sw
 
 WORKDIR ..
 RUN rm -rf $opensslDir
@@ -340,14 +393,14 @@ FROM builder AS xkbcommon
 RUN git clone -b xkbcommon-0.8.4 --depth=1 $GIT/xkbcommon/libxkbcommon.git
 
 WORKDIR libxkbcommon
-RUN scl enable devtoolset-8 -- ./autogen.sh \
+RUN ./autogen.sh \
 	--disable-docs \
 	--disable-wayland \
 	--with-xkb-config-root=/usr/share/X11/xkb \
 	--with-x-locale-root=/usr/share/X11/locale
 
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/xkbcommon-cache" install
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xkbcommon-cache" install
 
 WORKDIR ..
 RUN rm -rf libxkbcommon
@@ -357,6 +410,11 @@ FROM patches AS qt
 COPY --from=libffi ${LibrariesPath}/libffi-cache /
 COPY --from=mozjpeg ${LibrariesPath}/mozjpeg-cache /
 COPY --from=xcb ${LibrariesPath}/xcb-cache /
+COPY --from=xcb-wm ${LibrariesPath}/xcb-wm-cache /
+COPY --from=xcb-util ${LibrariesPath}/xcb-util-cache /
+COPY --from=xcb-image ${LibrariesPath}/xcb-image-cache /
+COPY --from=xcb-keysyms ${LibrariesPath}/xcb-keysyms-cache /
+COPY --from=xcb-render-util ${LibrariesPath}/xcb-render-util-cache /
 COPY --from=libXext ${LibrariesPath}/libXext-cache /
 COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
 COPY --from=libXi ${LibrariesPath}/libXi-cache /
@@ -365,37 +423,42 @@ COPY --from=wayland ${LibrariesPath}/wayland-cache /
 COPY --from=openssl ${LibrariesPath}/openssl-cache /
 COPY --from=xkbcommon ${LibrariesPath}/xkbcommon-cache /
 
-RUN git clone -b v5.12.8 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
+RUN git clone -b ${QT_TAG} --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
 WORKDIR qt_${QT}
 RUN perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg
 RUN git submodule update qtbase qtwayland qtimageformats qtsvg
 
 WORKDIR qtbase
 RUN find ../../patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply
-WORKDIR ../qtwayland
-RUN find ../../patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
 WORKDIR ..
 
-RUN scl enable devtoolset-8 -- ./configure -prefix "$QT_PREFIX" \
+# I couldn't make it work with direct ./configure call :(
+RUN echo './configure -prefix '$'\"''$QT_PREFIX'$'\"'' \
 	-release \
 	-opensource \
 	-confirm-license \
+	-xcb \
 	-qt-libpng \
 	-qt-harfbuzz \
 	-qt-pcre \
-	-qt-xcb \
 	-no-icu \
 	-no-gtk \
+	-no-feature-wayland-server \
 	-static \
 	-dbus-runtime \
 	-openssl-linked \
-	-I "$OPENSSL_PREFIX/include" OPENSSL_LIBS="$OPENSSL_PREFIX/lib/libssl.a $OPENSSL_PREFIX/lib/libcrypto.a -lz -ldl -lpthread" \
+	-I '$'\"''$OPENSSL_PREFIX/include'$'\"'' \
+	OPENSSL_LIBS='$'\"''$OPENSSL_PREFIX/lib/libssl.a $OPENSSL_PREFIX/lib/libcrypto.a -lz -ldl -lpthread'$'\"'' \
 	-nomake examples \
 	-nomake tests \
-	-L /usr/local/lib64
+	-L /usr/local/lib64' >> ./run_configure.sh
+RUN cat ./run_configure.sh
+RUN chmod a+x ./run_configure.sh
+RUN ./run_configure.sh
+RUN rm ./run_configure.sh
 
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make INSTALL_ROOT="$LibrariesPath/qt-cache" install
+RUN make -j$(nproc)
+RUN make INSTALL_ROOT="$LibrariesPath/qt-cache" install
 
 WORKDIR ..
 RUN rm -rf qt_${QT}
@@ -419,9 +482,9 @@ RUN git checkout 9f2a7bb1
 RUN git apply ../patches/gyp.diff
 
 WORKDIR ../breakpad
-RUN scl enable devtoolset-8 -- ./configure
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make DESTDIR="$BreakpadCache" install
+RUN ./configure
+RUN make -j$(nproc)
+RUN make DESTDIR="$BreakpadCache" install
 
 WORKDIR src
 RUN rm -rf testing
@@ -432,8 +495,8 @@ RUN sed -i 's/minidump_upload.m/minidump_upload.cc/' linux/tools_linux.gypi
 RUN ../../../gyp/gyp  --depth=. --generator-output=.. -Goutput_dir=../out tools.gyp --format=cmake
 
 WORKDIR ../../out/Default
-RUN scl enable devtoolset-8 -- cmake3 .
-RUN scl enable devtoolset-8 -- cmake3 --build . --target dump_syms -j$(nproc)
+RUN cmake3 .
+RUN cmake3 --build . --target dump_syms -j$(nproc)
 RUN mv dump_syms $BreakpadCache
 
 WORKDIR ..
@@ -451,7 +514,7 @@ RUN git clone $GIT/desktop-app/tg_owt.git
 WORKDIR tg_owt
 RUN git checkout c73a471
 
-RUN scl enable devtoolset-8 -- cmake3 -B out/Release . \
+RUN cmake3 -B out/Release . \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DTG_OWT_SPECIAL_TARGET=linux \
 	-DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
@@ -459,7 +522,17 @@ RUN scl enable devtoolset-8 -- cmake3 -B out/Release . \
 	-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
 	-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include
 
-RUN scl enable devtoolset-8 -- cmake3 --build out/Release
+RUN cmake3 --build out/Release -- -j8
+
+RUN cmake3 -B out/Debug . \
+	-DCMAKE_BUILD_TYPE=Debug \
+	-DTG_OWT_SPECIAL_TARGET=linux \
+	-DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
+	-DTG_OWT_OPENSSL_INCLUDE_PATH=$OPENSSL_PREFIX/include \
+	-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
+	-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include
+
+RUN cmake3 --build out/Debug -- -j8
 
 FROM builder
 
@@ -468,6 +541,11 @@ COPY --from=xz ${LibrariesPath}/xz-cache /
 COPY --from=mozjpeg ${LibrariesPath}/mozjpeg-cache /
 COPY --from=opus ${LibrariesPath}/opus-cache /
 COPY --from=xcb ${LibrariesPath}/xcb-cache /
+COPY --from=xcb-wm ${LibrariesPath}/xcb-wm-cache /
+COPY --from=xcb-util ${LibrariesPath}/xcb-util-cache /
+COPY --from=xcb-image ${LibrariesPath}/xcb-image-cache /
+COPY --from=xcb-keysyms ${LibrariesPath}/xcb-keysyms-cache /
+COPY --from=xcb-render-util ${LibrariesPath}/xcb-render-util-cache /
 COPY --from=libXext ${LibrariesPath}/libXext-cache /
 COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
 COPY --from=libXi ${LibrariesPath}/libXi-cache /

Telegram/build/docker/centos_env/prepare.sh

@@ -0,0 +1,7 @@
+set -e
+FullExecPath=$PWD
+pushd `dirname $0` > /dev/null
+FullScriptPath=`pwd`
+popd > /dev/null
+
+docker build -t tdesktop:centos_env "$FullScriptPath/"

Telegram/build/docker/centos_env/run.sh

@@ -0,0 +1,21 @@
+set -e
+FullExecPath=$PWD
+pushd `dirname $0` > /dev/null
+FullScriptPath=`pwd`
+popd > /dev/null
+
+if [ ! -d "$FullScriptPath/../../../../../DesktopPrivate" ]; then
+  echo ""
+  echo "This script is for building the production version of Telegram Desktop."
+  echo ""
+  echo "For building custom versions please visit the build instructions page at:"
+  echo "https://github.com/telegramdesktop/tdesktop/#build-instructions"
+  exit
+fi
+
+Command="$1"
+if [ "$Command" == "" ]; then
+  Command="scl enable devtoolset-8 -- bash"
+fi
+
+docker run -it --rm --cpus=8 --memory=10g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $Command

Telegram/build/version

@@ -1,7 +1,7 @@
-AppVersion         2004007
+AppVersion         2004009
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.7
-AppVersionStr      2.4.7
-BetaChannel        0
+AppVersionStrSmall 2.4.9
+AppVersionStr      2.4.9
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 2.4.7
+AppVersionOriginal 2.4.9.beta

changelog.txt

@@ -1,3 +1,13 @@
+2.4.9 beta (06.11.20)
+
+- Fix crash in tray icon removing. (macOS only)
+
+2.4.8 beta (06.11.20)
+
+- Upgrade Qt to version 5.15.1.
+- Upgrade FFmpeg to version 4.2.
+- Upgrade OpenAL to version 1.20.1.
+
 2.4.7 (05.11.20)
 
 - Fix playback display in albums of music files.

docs/building-cmake.md

@@ -1,5 +1,7 @@
 ## Build instructions for CMake under Ubuntu 14.04
 
+**NB** These are outdated.
+
 ### Prepare folder
 
 Choose an empty folder for the future build, for example **/home/user/TBuild**. It will be named ***BuildPath*** in the rest of this document.

docs/building-msvc.md

@@ -33,7 +33,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cd ThirdParty
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout ddd4084
+    git checkout e052c49
     cd ../
     git clone https://chromium.googlesource.com/external/gyp
     cd gyp
@@ -63,7 +63,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout ddd4084
+    git checkout e052c49
     cd ..
 
     git clone https://github.com/desktop-app/lzma.git
@@ -125,7 +125,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     git clone https://github.com/google/breakpad
     cd breakpad
     git checkout a1dbcdcb43
-    git apply ../../tdesktop/Telegram/Patches/breakpad.diff
+    git apply ../patches/breakpad.diff
     cd src
     git clone https://github.com/google/googletest testing
     cd client\windows
@@ -152,27 +152,27 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
     cd ffmpeg
-    git checkout release/3.4
+    git checkout release/4.2
 
     set CHERE_INVOKING=enabled_from_arguments
     set MSYS2_PATH_TYPE=inherit
-    bash --login ../../tdesktop/Telegram/Patches/build_ffmpeg_win.sh
+    bash --login ../patches/build_ffmpeg_win.sh
 
     SET PATH=%PATH_BACKUP_%
     cd ..
 
     SET LibrariesPath=%cd%
-    git clone git://code.qt.io/qt/qt5.git qt_5_12_8
-    cd qt_5_12_8
+    git clone git://code.qt.io/qt/qt5.git qt_5_15_1
+    cd qt_5_15_1
     perl init-repository --module-subset=qtbase,qtimageformats
-    git checkout v5.12.8
+    git checkout v5.15.1
     git submodule update qtbase qtimageformats
     cd qtbase
-    for /r %i in (..\..\patches\qtbase_5_12_8\*) do git apply %i
+    for /r %i in (..\..\patches\qtbase_5_15_1\*) do git apply %i
     cd ..
 
     configure ^
-        -prefix "%LibrariesPath%\Qt-5.12.8" ^
+        -prefix "%LibrariesPath%\Qt-5.15.1" ^
         -debug-and-release ^
         -force-debug-info ^
         -opensource ^
@@ -181,7 +181,6 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
         -static-runtime ^
         -no-opengl ^
         -openssl-linked ^
-        -recheck ^
         -I "%LibrariesPath%\openssl_1_1_1\include" ^
         OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
         OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out32\libssl.lib %LibrariesPath%\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
@@ -193,8 +192,8 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
         -nomake tests ^
         -platform win32-msvc
 
-    jom -j4
-    jom -j4 install
+    jom -j8
+    jom -j8 install
     cd ..
 
     git clone https://github.com/desktop-app/tg_owt.git

docs/building-xcode.md

@@ -29,7 +29,7 @@ Go to ***BuildPath*** and run
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout a77e4d5
+    git checkout e052c49
     cd ../
     git clone https://chromium.googlesource.com/external/gyp
     git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@@ -39,14 +39,26 @@ Go to ***BuildPath*** and run
     git apply ../patches/gyp.diff
     ./setup.py build
     sudo ./setup.py install
-    cd ../..
+    cd ..
 
+    git clone -b macos_padding https://github.com/desktop-app/yasm.git
+    cd yasm
+    ./autogen.sh
+    make $MAKE_THREADS_CNT
+    cd ..
+
+    git clone https://github.com/desktop-app/macho_edit.git
+    cd macho_edit
+    xcodebuild build -configuration Release -project macho_edit.xcodeproj -target macho_edit
+    cd ..
+
+    cd ..
     mkdir -p Libraries/macos
     cd Libraries/macos
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout a77e4d5
+    git checkout e052c49
     cd ..
 
     git clone https://git.tukaani.org/xz.git
@@ -115,16 +127,19 @@ Go to ***BuildPath*** and run
 
     git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
     cd ffmpeg
-    git checkout release/3.4
+    git checkout release/4.2
     CFLAGS=`freetype-config --cflags`
     LDFLAGS=`freetype-config --libs`
     PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig
+    cp ../patches/macos_yasm_wrap.sh ./
 
     ./configure --prefix=/usr/local/macos \
     --extra-cflags="$MIN_VER $UNGUARDED" \
     --extra-cxxflags="$MIN_VER $UNGUARDED" \
     --extra-ldflags="$MIN_VER" \
-    --enable-protocol=file --enable-libopus \
+    --x86asmexe=`pwd`/macos_yasm_wrap.sh \
+    --enable-protocol=file \
+    --enable-libopus \
     --disable-programs \
     --disable-doc \
     --disable-network \
@@ -225,9 +240,9 @@ Go to ***BuildPath*** and run
     sudo make install
     cd ..
 
-    git clone git://repo.or.cz/openal-soft.git
+    git clone https://github.com/telegramdesktop/openal-soft.git
     cd openal-soft
-    git checkout v1.19
+    git checkout fix_mono
     cd build
     CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/macos -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12 ..
     make $MAKE_THREADS_CNT
@@ -254,16 +269,16 @@ Go to ***BuildPath*** and run
     ninja -C out/Release
     cd ..
 
-    git clone git://code.qt.io/qt/qt5.git qt_5_12_8
-    cd qt_5_12_8
+    git clone git://code.qt.io/qt/qt5.git qt_5_15_1
+    cd qt_5_15_1
     perl init-repository --module-subset=qtbase,qtimageformats
-    git checkout v5.12.8
+    git checkout v5.15.1
     git submodule update qtbase qtimageformats
     cd qtbase
-    find ../../patches/qtbase_5_12_8 -type f -print0 | sort -z | xargs -0 git apply
+    find ../../patches/qtbase_5_15_1 -type f -print0 | sort -z | xargs -0 git apply
     cd ..
 
-    ./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \
+    ./configure -prefix "/usr/local/desktop-app/Qt-5.15.1" \
         -debug-and-release \
         -force-debug-info \
         -opensource \