[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD tdesktop.patch)

[Jiachen Yang]

    Date: Wednesday, June 12, 2019 @ 11:47:34
  Author: farseerfc
Revision: 480743

upgpkg: telegram-desktop 1.7.7-2

telegram-desktop 1.7.7-2 unset QT scale env vars per FS#62594

Modified:
  telegram-desktop/trunk/PKGBUILD
  telegram-desktop/trunk/tdesktop.patch

----------------+
 PKGBUILD       |    4 ++--
 tdesktop.patch |   18 +++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-12 11:47:33 UTC (rev 480742)
+++ PKGBUILD	2019-06-12 11:47:34 UTC (rev 480743)
@@ -6,7 +6,7 @@
 
 pkgname=telegram-desktop
 pkgver=1.7.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -44,7 +44,7 @@
             'SKIP'
             'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
             'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e'
-            '710af6c851aa8535aec8fb32e8c05d934970bab227f935dec0e2fbcad5b8b2ad277793e4226bd1d4e46e77150fa05bc3326cce1118f91de87e1b0e477315523f'
+            '3b6a0450f7981c2ce5f90c1ea46d9fb504194609f357b957b5c4a741681d3c531252394df116f8b77780a3a110783c047c9a081f9651e0792e7423573e390392'
             'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5'
             'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
             '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0'

Modified: tdesktop.patch
===================================================================
--- tdesktop.patch	2019-06-12 11:47:33 UTC (rev 480742)
+++ tdesktop.patch	2019-06-12 11:47:34 UTC (rev 480743)
@@ -12,17 +12,7 @@
 index b1246588a..7f522cc86 100644
 --- a/Telegram/SourceFiles/core/launcher.cpp
 +++ b/Telegram/SourceFiles/core/launcher.cpp
-@@ -248,9 +248,6 @@ void Launcher::init() {
- #elif defined(Q_OS_LINUX) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
- 	QApplication::setDesktopFileName(qsl("telegramdesktop.desktop"));
- #endif
--#ifndef OS_MAC_OLD
--	QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
--#endif // OS_MAC_OLD
- 
- 	initHook();
- }
-@@ -59,6 +60,13 @@ int Launcher::exec() {
+@@ -59,6 +60,19 @@ int Launcher::exec() {
  	Logs::start(this); // must be started before Platform is started
  	Platform::start(); // must be started before QApplication is created
  
@@ -33,6 +23,12 @@
 +	// Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943
 +	unsetenv("QT_QPA_PLATFORMTHEME");
 +
++       // unset QT screen scale related envvars
++	unsetenv("QT_SCREEN_SCALE_FACTORS");
++	unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR");
++	unsetenv("QT_SCALE_FACTOR");
++	unsetenv("QT_DEVICE_PIXEL_RATIO");
++
  	auto result = executeApplication();
  
  	DEBUG_LOG(("Telegram finished, result: %1").arg(result));