Attachment 198081 Details for Bug 232212 – patch for 1.4.2

[patch] patch for 1.4.2

telegram-desktop-1.4.2.patch (text/plain), 6.82 KB, created by Henry Hu on 2018-10-13 01:10:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henry Hu

Created: 2018-10-13 01:10:29 UTC

Size: 6.82 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/distinfo ./distinfo
>--- /usr/ports/net-im/telegram-desktop/distinfo	2018-10-12 20:26:36.166492000 -0400
>+++ ./distinfo	2018-10-12 20:28:32.893208000 -0400
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1538948703
>-SHA256 (telegramdesktop-tdesktop-v1.4.0_GH0.tar.gz) = e3ee54461dae5552b41b6b56f12225a4d546118b2e2d4d864442e4462da97a9b
>-SIZE (telegramdesktop-tdesktop-v1.4.0_GH0.tar.gz) = 17318129
>+TIMESTAMP = 1539390512
>+SHA256 (telegramdesktop-tdesktop-v1.4.2_GH0.tar.gz) = f8e90949e2b52c2df7dca35d33731880fa8f3d526431ad82f197ece7dce773aa
>+SIZE (telegramdesktop-tdesktop-v1.4.2_GH0.tar.gz) = 17340759
> SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2
> SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264
> SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354
>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_gyp_telegram__sources.txt ./files/patch-Telegram_gyp_telegram__sources.txt
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt	2018-10-12 20:26:36.221243000 -0400
>+++ ./files/patch-Telegram_gyp_telegram__sources.txt	2018-10-12 20:41:39.588383000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/gyp/telegram_sources.txt.orig	2018-09-28 13:08:38 UTC
>+--- Telegram/gyp/telegram_sources.txt.orig	2018-10-09 21:21:48 UTC
> +++ Telegram/gyp/telegram_sources.txt
>-@@ -755,14 +755,7 @@
>+@@ -761,14 +761,7 @@
>  <(emoji_suggestions_loc)/emoji_suggestions.cpp
>  <(emoji_suggestions_loc)/emoji_suggestions.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_core_utils.h ./files/patch-Telegram_SourceFiles_core_utils.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h	2018-10-12 20:26:36.215850000 -0400
>+++ ./files/patch-Telegram_SourceFiles_core_utils.h	2018-10-12 20:41:39.528316000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/core/utils.h.orig	2018-09-28 13:08:38 UTC
>+--- Telegram/SourceFiles/core/utils.h.orig	2018-10-09 21:21:48 UTC
> +++ Telegram/SourceFiles/core/utils.h
>-@@ -411,6 +411,7 @@ enum DBIPlatform {
>+@@ -406,6 +406,7 @@ enum DBIPlatform {
>  	dbipLinux64 = 2,
>  	dbipLinux32 = 3,
>  	dbipMacOld = 4,
>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	2018-10-12 20:26:36.166963000 -0400
>+++ ./files/patch-Telegram_SourceFiles_logs.cpp	2018-10-12 20:41:39.536357000 -0400
>@@ -1,16 +1,16 @@
>---- Telegram/SourceFiles/logs.cpp.orig	2018-09-28 13:08:38 UTC
>+--- Telegram/SourceFiles/logs.cpp.orig	2018-10-09 21:21:48 UTC
> +++ Telegram/SourceFiles/logs.cpp
>-@@ -332,7 +332,7 @@ void start(not_null<Core::Launcher*> lau
>- 
>+@@ -333,7 +333,7 @@ void start(not_null<Core::Launcher*> lau
>  	if (cAlphaVersion()) {
>  		workingDirChosen = true;
>+ 
> -#if defined Q_OS_MAC || defined Q_OS_LINUX
> +#if defined Q_OS_MAC || defined Q_OS_LINUX || defined Q_OS_FREEBSD
>  	} else {
>- #ifdef _DEBUG
>- 		cForceWorkingDir(cExeDir());
>-@@ -346,15 +346,15 @@ void start(not_null<Core::Launcher*> lau
>- #endif // !_DEBUG
>+ 		if (!cWorkingDir().isEmpty()) {
>+ 			// This value must come from TelegramForcePortable
>+@@ -348,16 +348,16 @@ void start(not_null<Core::Launcher*> lau
>+ 		}
>  		workingDirChosen = true;
>  
> -#if defined Q_OS_LINUX && !defined _DEBUG // fix first version
>@@ -24,15 +24,16 @@
>  	} else {
>  		cForceWorkingDir(psAppDataPath());
>  		workingDirChosen = true;
>+ 
> -#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT
> +#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_FREEBSD
>  #ifdef _DEBUG
>  		cForceWorkingDir(cExeDir());
>  #else // _DEBUG
>-@@ -368,7 +368,7 @@ void start(not_null<Core::Launcher*> lau
>- 			cForceWorkingDir(cWorkingDir());
>+@@ -374,7 +374,7 @@ void start(not_null<Core::Launcher*> lau
>  			workingDirChosen = true;
>  		}
>+ 
> -#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE
> +#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE || Q_OS_FREEBSD
>  	}
>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_settings.cpp ./files/patch-Telegram_SourceFiles_settings.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp	2018-08-25 16:34:53.491729000 -0400
>+++ ./files/patch-Telegram_SourceFiles_settings.cpp	2018-10-12 20:41:39.552315000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/settings.cpp.orig	2018-08-04 18:53:40 UTC
>+--- Telegram/SourceFiles/settings.cpp.orig	2018-10-09 21:21:48 UTC
> +++ Telegram/SourceFiles/settings.cpp
>-@@ -81,6 +81,8 @@ DBIPlatform gPlatform = dbipMac;
>+@@ -79,6 +79,8 @@ DBIPlatform gPlatform = dbipMac;
>  DBIPlatform gPlatform = dbipLinux64;
>  #elif defined Q_OS_LINUX32
>  DBIPlatform gPlatform = dbipLinux32;
>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	2018-08-25 16:34:53.472632000 -0400
>+++ ./files/patch-Telegram_SourceFiles_window_main__window.cpp	2018-10-12 20:41:39.559171000 -0400
>@@ -1,6 +1,6 @@
>---- Telegram/SourceFiles/window/main_window.cpp.orig	2018-08-04 18:53:40 UTC
>+--- Telegram/SourceFiles/window/main_window.cpp.orig	2018-10-09 21:21:48 UTC
> +++ Telegram/SourceFiles/window/main_window.cpp
>-@@ -421,7 +421,7 @@ bool MainWindow::minimizeToTray() {
>+@@ -496,7 +496,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()) {
>-@@ -436,7 +436,7 @@ void MainWindow::reActivateWindow() {
>+@@ -511,7 +511,7 @@ void MainWindow::reActivateWindow() {
>  	};
>  	crl::on_main(this, reActivate);
>  	App::CallDelayed(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/Makefile ./Makefile
>--- /usr/ports/net-im/telegram-desktop/Makefile	2018-10-12 20:26:36.149432000 -0400
>+++ ./Makefile	2018-10-12 20:28:28.974862000 -0400
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	telegram-desktop
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.4.0
>+DISTVERSION=	1.4.2
> CATEGORIES=	net-im
> 
> MAINTAINER=	henry.hu.sh@gmail.com

Flags:

henry.hu.sh: maintainer-approval+

Actions: View | Diff

Attachments on bug 232212: 198081