Attachment 214825 Details for Bug 246709 – patch for 2.1.7

[patch] patch for 2.1.7

telegram-desktop-2.1.7.patch (text/plain), 19.22 KB, created by Henry Hu on 2020-05-25 02:18:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henry Hu

Created: 2020-05-25 02:18:54 UTC

Size: 19.22 KB

patch

obsolete

>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/Makefile ./Makefile
>--- /usr/ports/net-im/telegram-desktop/Makefile	2020-05-02 12:46:54.000000000 -0400
>+++ ./Makefile	2020-05-24 18:16:05.646767000 -0400
>@@ -1,7 +1,7 @@
>-# $FreeBSD: head/net-im/telegram-desktop/Makefile 533695 2020-05-02 16:46:54Z tz $
>+# $FreeBSD: head/net-im/telegram-desktop/Makefile 528738 2020-03-19 18:14:39Z fernape $
> 
> PORTNAME=	telegram-desktop
>-DISTVERSION=	2.1.0
>+DISTVERSION=	2.1.7
> CATEGORIES=	net-im
> MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
> DISTNAME=	tdesktop-${DISTVERSION}-full
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/distinfo ./distinfo
>--- /usr/ports/net-im/telegram-desktop/distinfo	2020-05-02 12:46:54.000000000 -0400
>+++ ./distinfo	2020-05-24 18:16:14.295053000 -0400
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1587747983
>-SHA256 (tdesktop-2.1.0-full.tar.gz) = 86d2acc2dfd426ea222ae94984d81e60774f16f3ecc3405578377d90f809a950
>-SIZE (tdesktop-2.1.0-full.tar.gz) = 26133964
>+TIMESTAMP = 1590358574
>+SHA256 (tdesktop-2.1.7-full.tar.gz) = c944b07f1a7d600a32cea9e4ce45b4954fe0d18176a7491c2f1e98f3425cca62
>+SIZE (tdesktop-2.1.7-full.tar.gz) = 36509059
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp ./files/patch-Telegram_SourceFiles_core_launcher.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp	2020-03-15 04:12:54.000000000 -0400
>+++ ./files/patch-Telegram_SourceFiles_core_launcher.cpp	2020-05-24 19:10:20.909530000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/core/launcher.cpp.orig	2020-02-18 08:28:06 UTC
>+--- Telegram/SourceFiles/core/launcher.cpp.orig	2020-05-24 07:59:19 UTC
> +++ Telegram/SourceFiles/core/launcher.cpp
>-@@ -248,7 +248,7 @@ void Launcher::init() {
>+@@ -275,7 +275,7 @@ void Launcher::init() {
>  
>  	QApplication::setApplicationName(qsl("TelegramDesktop"));
>  
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp ./files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp	2020-03-15 04:12:54.000000000 -0400
>+++ ./files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp	2020-05-24 19:10:20.911937000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig	2020-02-18 08:28:06 UTC
>+--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig	2020-05-24 07:59:19 UTC
> +++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
>-@@ -1451,13 +1451,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
>+@@ -1458,13 +1458,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
>  	_mouseSelectType = TextSelectType::Letters;
>  	//_widget->noSelectingScroll(); // TODO
>  
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp ./files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp	2020-03-19 14:14:39.000000000 -0400
>+++ ./files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp	2020-05-24 19:10:20.913132000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig	2020-03-16 18:49:16 UTC
>+--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig	2020-05-24 07:59:19 UTC
> +++ Telegram/SourceFiles/history/history_inner_widget.cpp
>-@@ -1420,7 +1420,7 @@ void HistoryInner::mouseActionFinish(
>+@@ -1421,7 +1421,7 @@ void HistoryInner::mouseActionFinish(
>  	_widget->noSelectingScroll();
>  	_widget->updateTopBarSelection();
>  
>@@ -9,7 +9,7 @@
>  	if (!_selected.empty() && _selected.cbegin()->second != FullSelection) {
>  		const auto [item, selection] = *_selected.cbegin();
>  		if (const auto view = item->mainView()) {
>-@@ -1429,7 +1429,7 @@ void HistoryInner::mouseActionFinish(
>+@@ -1430,7 +1430,7 @@ void HistoryInner::mouseActionFinish(
>  				QClipboard::Selection);
>  		}
>  	}
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp ./files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp	2020-03-15 04:12:54.000000000 -0400
>+++ ./files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp	2020-05-24 19:10:20.914259000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig	2020-02-18 08:28:06 UTC
>+--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig	2020-05-24 07:59:19 UTC
> +++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp
>-@@ -2066,7 +2066,7 @@ void ListWidget::mouseActionFinish(
>+@@ -2072,7 +2072,7 @@ void ListWidget::mouseActionFinish(
>  	_mouseSelectType = TextSelectType::Letters;
>  	//_widget->noSelectingScroll(); // #TODO select scroll
>  
>@@ -9,7 +9,7 @@
>  	if (_selectedTextItem
>  		&& _selectedTextRange.from != _selectedTextRange.to) {
>  		if (const auto view = viewForItem(_selectedTextItem)) {
>-@@ -2075,7 +2075,7 @@ void ListWidget::mouseActionFinish(
>+@@ -2081,7 +2081,7 @@ void ListWidget::mouseActionFinish(
>  				QClipboard::Selection);
>  }
>  	}
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp ./files/patch-Telegram_SourceFiles_logs.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp	2020-05-02 12:46:54.000000000 -0400
>+++ ./files/patch-Telegram_SourceFiles_logs.cpp	2020-05-24 19:10:20.915387000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/logs.cpp.orig	2020-02-18 08:28:06 UTC
>+--- Telegram/SourceFiles/logs.cpp.orig	2020-05-24 07:59:19 UTC
> +++ Telegram/SourceFiles/logs.cpp
>-@@ -342,7 +342,7 @@ void start(not_null<Core::Launcher*> launcher) {
>+@@ -343,7 +343,7 @@ void start(not_null<Core::Launcher*> launcher) {
>  		workingDirChosen = true;
>  	} else {
>  
>@@ -9,7 +9,7 @@
>  
>  		if (!cWorkingDir().isEmpty()) {
>  			// This value must come from TelegramForcePortable
>-@@ -357,16 +357,16 @@ void start(not_null<Core::Launcher*> launcher) {
>+@@ -358,16 +358,16 @@ void start(not_null<Core::Launcher*> launcher) {
>  		}
>  		workingDirChosen = true;
>  
>@@ -30,7 +30,7 @@
>  
>  #ifdef _DEBUG
>  		cForceWorkingDir(cExeDir());
>-@@ -383,7 +383,7 @@ void start(not_null<Core::Launcher*> launcher) {
>+@@ -385,7 +385,7 @@ void start(not_null<Core::Launcher*> launcher) {
>  			workingDirChosen = true;
>  		}
>  
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h ./files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h	2018-08-22 12:09:42.000000000 -0400
>+++ ./files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h	2020-05-24 19:10:20.917668000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/platform/platform_file_utilities.h.orig	2018-08-04 18:53:40 UTC
>+--- Telegram/SourceFiles/platform/platform_file_utilities.h.orig	2020-05-24 07:59:19 UTC
> +++ Telegram/SourceFiles/platform/platform_file_utilities.h
>-@@ -45,8 +45,8 @@ bool Get(
>+@@ -46,8 +46,8 @@ bool Get(
>  
>  #ifdef Q_OS_MAC
>  #include "platform/mac/file_utilities_mac.h"
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h ./files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h	2018-08-22 12:09:42.000000000 -0400
>+++ ./files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h	2020-05-24 19:10:20.920882000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/platform/platform_notifications_manager.h.orig	2018-08-04 18:53:40 UTC
>+--- Telegram/SourceFiles/platform/platform_notifications_manager.h.orig	2020-05-24 07:59:19 UTC
> +++ Telegram/SourceFiles/platform/platform_notifications_manager.h
>-@@ -26,8 +26,8 @@ void FlashBounce();
>+@@ -27,8 +27,8 @@ namespace Notifications {
>  
>  #ifdef Q_OS_MAC
>  #include "platform/mac/notifications_manager_mac.h"
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp ./files/patch-Telegram_SourceFiles_qt__static__plugins.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp	2020-03-19 14:14:39.000000000 -0400
>+++ ./files/patch-Telegram_SourceFiles_qt__static__plugins.cpp	2020-05-24 19:10:20.924206000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/qt_static_plugins.cpp.orig	2020-03-16 18:49:16 UTC
>+--- Telegram/SourceFiles/qt_static_plugins.cpp.orig	2020-05-24 07:59:19 UTC
> +++ Telegram/SourceFiles/qt_static_plugins.cpp
>-@@ -19,7 +19,7 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
>+@@ -20,7 +20,7 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
>  #elif defined Q_OS_MAC // Q_OS_WIN
>  Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
>  Q_IMPORT_PLUGIN(QGenericEnginePlugin)
>@@ -9,9 +9,16 @@
>  Q_IMPORT_PLUGIN(ShmServerBufferPlugin)
>  Q_IMPORT_PLUGIN(DmaBufServerBufferPlugin)
>  Q_IMPORT_PLUGIN(DrmEglServerBufferPlugin)
>-@@ -45,4 +45,4 @@ Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
>- Q_IMPORT_PLUGIN(NimfInputContextPlugin)
>+@@ -44,10 +44,10 @@ Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin)
>+ Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
>  Q_IMPORT_PLUGIN(QXdgDesktopPortalThemePlugin)
>  #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
> -#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
> +#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX | Q_OS_FREEBSD
>+ #endif // !DESKTOP_APP_USE_PACKAGED
>+ 
>+-#ifdef Q_OS_LINUX
>++#if defined Q_OS_LINUX || defined Q_OS_FREEBSD
>+ #if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
>+ Q_IMPORT_PLUGIN(QWaylandMaterialDecorationPlugin)
>+ Q_IMPORT_PLUGIN(NimfInputContextPlugin)
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp ./files/patch-Telegram_SourceFiles_window_main__window.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp	2020-03-15 04:12:54.000000000 -0400
>+++ ./files/patch-Telegram_SourceFiles_window_main__window.cpp	2020-05-24 19:10:20.926355000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/window/main_window.cpp.orig	2020-02-18 08:28:06 UTC
>+--- Telegram/SourceFiles/window/main_window.cpp.orig	2020-05-24 07:59:19 UTC
> +++ Telegram/SourceFiles/window/main_window.cpp
>-@@ -589,7 +589,7 @@ bool MainWindow::minimizeToTray() {
>+@@ -603,7 +603,7 @@ bool MainWindow::minimizeToTray() {
>  }
>  
>  void MainWindow::reActivateWindow() {
>@@ -9,7 +9,7 @@
>  	const auto reActivate = [=] {
>  		if (const auto w = App::wnd()) {
>  			if (auto f = QApplication::focusWidget()) {
>-@@ -604,7 +604,7 @@ void MainWindow::reActivateWindow() {
>+@@ -618,7 +618,7 @@ void MainWindow::reActivateWindow() {
>  	};
>  	crl::on_main(this, reActivate);
>  	base::call_delayed(200, this, reActivate);
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_rlottie_src_lottie_rapidjson_document.h ./files/patch-Telegram_ThirdParty_rlottie_src_lottie_rapidjson_document.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_rlottie_src_lottie_rapidjson_document.h	2020-03-23 08:43:39.000000000 -0400
>+++ ./files/patch-Telegram_ThirdParty_rlottie_src_lottie_rapidjson_document.h	1969-12-31 19:00:00.000000000 -0500
>@@ -1,30 +0,0 @@
>---- Telegram/ThirdParty/rlottie/src/lottie/rapidjson/document.h.orig	2020-01-23 12:47:53 UTC
>-+++ Telegram/ThirdParty/rlottie/src/lottie/rapidjson/document.h
>-@@ -24,6 +24,9 @@
>- #include "encodedstream.h"
>- #include <new>      // placement new
>- #include <limits>
>-+#ifdef __cpp_impl_three_way_comparison
>-+#include <compare>
>-+#endif
>- 
>- RAPIDJSON_DIAG_PUSH
>- #ifdef __clang__
>-@@ -175,12 +178,17 @@ class GenericMemberIterator { (public)
>- 
>-     //! @name relations
>-     //@{
>-+#ifdef __cpp_impl_three_way_comparison
>-+    template <bool Const_> bool operator==(const GenericMemberIterator<Const_,Encoding,Allocator>& that) const { return ptr_ == that.ptr_; }
>-+    template <bool Const_> std::strong_ordering operator<=>(const GenericMemberIterator<Const_,Encoding,Allocator>& that) const { return ptr_ <=> that.ptr_; }
>-+#else
>-     bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; }
>-     bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; }
>-     bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; }
>-     bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; }
>-     bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; }
>-     bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; }
>-+#endif
>-     //@}
>- 
>-     //! @name dereference
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake ./files/patch-Telegram_cmake_lib__tgvoip.cmake
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake	2020-05-02 12:46:54.000000000 -0400
>+++ ./files/patch-Telegram_cmake_lib__tgvoip.cmake	2020-05-24 19:10:20.939629000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/cmake/lib_tgvoip.cmake.orig	2020-04-30 01:34:51 UTC
>+--- Telegram/cmake/lib_tgvoip.cmake.orig	2020-05-24 07:59:19 UTC
> +++ Telegram/cmake/lib_tgvoip.cmake
>-@@ -778,11 +778,17 @@ else()
>+@@ -793,11 +793,17 @@ else()
>          )
>      endif()
>  
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_bytes.h ./files/patch-Telegram_lib__base_base_bytes.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_bytes.h	2020-03-15 04:12:54.000000000 -0400
>+++ ./files/patch-Telegram_lib__base_base_bytes.h	2020-05-24 19:10:20.940733000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/lib_base/base/bytes.h.orig	2020-01-29 09:41:30 UTC
>+--- Telegram/lib_base/base/bytes.h.orig	2020-05-12 13:19:31 UTC
> +++ Telegram/lib_base/base/bytes.h
>-@@ -136,7 +136,7 @@ template <
>+@@ -145,7 +145,7 @@ template <
>  vector concatenate(Args &&...args) {
>  	const auto size = details::spansLength(args...);
>  	auto result = vector(size);
>@@ -9,7 +9,7 @@
>  	return result;
>  }
>  
>-@@ -148,7 +148,7 @@ vector concatenate(SpanRange args) {
>+@@ -157,7 +157,7 @@ vector concatenate(SpanRange args) {
>  		size += bytes::make_span(arg).size();
>  	}
>  	auto result = vector(size);
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h ./files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h	2020-03-15 04:12:54.000000000 -0400
>+++ ./files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h	2020-05-24 19:10:20.941847000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/lib_base/base/platform/base_platform_file_utilities.h.orig	2020-01-29 09:41:30 UTC
>+--- Telegram/lib_base/base/platform/base_platform_file_utilities.h.orig	2020-05-12 13:19:31 UTC
> +++ Telegram/lib_base/base/platform/base_platform_file_utilities.h
>-@@ -22,8 +22,8 @@ void RemoveQuarantine(const QString &path);
>+@@ -26,8 +26,8 @@ void FlushFileData(QFile &file);
>  
>  #ifdef Q_OS_MAC
>  #include "base/platform/mac/base_file_utilities_mac.h"
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_thread__safe__wrap.h ./files/patch-Telegram_lib__base_base_thread__safe__wrap.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_thread__safe__wrap.h	2020-03-23 08:43:39.000000000 -0400
>+++ ./files/patch-Telegram_lib__base_base_thread__safe__wrap.h	1969-12-31 19:00:00.000000000 -0500
>@@ -1,18 +0,0 @@
>---- Telegram/lib_base/base/thread_safe_wrap.h.orig	2020-01-29 09:41:30 UTC
>-+++ Telegram/lib_base/base/thread_safe_wrap.h
>-@@ -19,13 +19,13 @@ class thread_safe_wrap { (public)
>- 
>- 	template <typename Callback>
>- 	auto with(Callback &&callback) {
>--		QMutexLocker lock(&_mutex);
>-+		QMutexLocker lock((QBasicMutex *)&_mutex);
>- 		return callback(_value);
>- 	}
>- 
>- 	template <typename Callback>
>- 	auto with(Callback &&callback) const {
>--		QMutexLocker lock(&_mutex);
>-+		QMutexLocker lock((QBasicMutex *)&_mutex);
>- 		return callback(_value);
>- 	}
>- 
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_zlib__help.h ./files/patch-Telegram_lib__base_base_zlib__help.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_zlib__help.h	2020-03-15 04:12:54.000000000 -0400
>+++ ./files/patch-Telegram_lib__base_base_zlib__help.h	2020-05-24 19:10:20.945216000 -0400
>@@ -1,11 +1,11 @@
>---- Telegram/lib_base/base/zlib_help.h.orig	2020-01-29 09:41:30 UTC
>+--- Telegram/lib_base/base/zlib_help.h.orig	2020-05-12 13:19:31 UTC
> +++ Telegram/lib_base/base/zlib_help.h
> @@ -6,8 +6,8 @@
>  //
>  #pragma once
>  
>--#include "zip.h"
>--#include "unzip.h"
>+-#include <zip.h>
>+-#include <unzip.h>
> +#include "minizip/zip.h"
> +#include "minizip/unzip.h"
>  #include "logs.h"
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp ./files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp	2020-03-15 04:12:54.000000000 -0400
>+++ ./files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp	2020-05-24 19:10:20.947441000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/lib_ui/ui/style/style_core_font.cpp.orig	2020-02-10 08:12:05 UTC
>+--- Telegram/lib_ui/ui/style/style_core_font.cpp.orig	2020-05-24 07:44:41 UTC
> +++ Telegram/lib_ui/ui/style/style_core_font.cpp
>-@@ -22,7 +22,7 @@ void style_InitFontsResource() {
>+@@ -24,7 +24,7 @@ void style_InitFontsResource() {
>  	Q_INIT_RESOURCE(win);
>  #elif defined Q_OS_MAC // Q_OS_WIN
>  	Q_INIT_RESOURCE(mac);

Flags:

fernape: maintainer-approval+

Actions: View | Diff

Attachments on bug 246709: 214825