[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD tdesktop.patch)
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 === --- PKGBUILD2019-06-12 11:47:33 UTC (rev 480742) +++ PKGBUILD2019-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));
[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD tdesktop.patch)
Date: Friday, May 10, 2019 @ 12:29:28 Author: svenstaro Revision: 464796 upgpkg: telegram-desktop 1.7.0-1 Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch + PKGBUILD |4 ++-- tdesktop.patch | 15 ++- 2 files changed, 8 insertions(+), 11 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-05-10 10:55:57 UTC (rev 464795) +++ PKGBUILD2019-05-10 12:29:28 UTC (rev 464796) @@ -5,7 +5,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.6.7 +pkgver=1.7.0 pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -40,7 +40,7 @@ 'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' - '0784a00b7dcf12d1662cd2fdc410b4e578fd80a6c6329edfc0090442e112eb9fd8a392e9f7bcbb2780d9403448898c53cd5d4d38025c40c4fbe1a8aabfd10b84' + '710af6c851aa8535aec8fb32e8c05d934970bab227f935dec0e2fbcad5b8b2ad277793e4226bd1d4e46e77150fa05bc3326cce1118f91de87e1b0e477315523f' 'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0' Modified: tdesktop.patch === --- tdesktop.patch 2019-05-10 10:55:57 UTC (rev 464795) +++ tdesktop.patch 2019-05-10 12:29:28 UTC (rev 464796) @@ -9,19 +9,16 @@ diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index d4bdadc17..8a420c74b 100644 +index b1246588a..7f522cc86 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -39,9 +39,10 @@ void Launcher::init() { - - QApplication::setApplicationName(qsl("TelegramDesktop")); - +@@ -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 -+#if !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -+ // Retina display support is working fine, others are not. - QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); +- QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); -#endif // OS_MAC_OLD -+#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0 initHook(); }
[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD tdesktop.patch)
Date: Friday, February 1, 2019 @ 14:22:39 Author: farseerfc Revision: 429111 upgpkg: telegram-desktop 1.5.10-1 telegram-desktop 1.5.10 Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch + PKGBUILD |4 ++-- tdesktop.patch | 13 - 2 files changed, 2 insertions(+), 15 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-02-01 14:03:40 UTC (rev 429110) +++ PKGBUILD2019-02-01 14:22:39 UTC (rev 429111) @@ -5,7 +5,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.5.9 +pkgver=1.5.10 pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -40,7 +40,7 @@ 'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' - 'e941d71b582e8dee58391dac08ff0eaceafcb0c2eb0ce7c3057d09efcd3791a66d5db8154cf239fdfa5db488dc5d15216488dfa34b1ec3f6831eeb6aa4ab859c' + '0784a00b7dcf12d1662cd2fdc410b4e578fd80a6c6329edfc0090442e112eb9fd8a392e9f7bcbb2780d9403448898c53cd5d4d38025c40c4fbe1a8aabfd10b84' 'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0' Modified: tdesktop.patch === --- tdesktop.patch 2019-02-01 14:03:40 UTC (rev 429110) +++ tdesktop.patch 2019-02-01 14:22:39 UTC (rev 429111) @@ -39,19 +39,6 @@ auto result = executeApplication(); DEBUG_LOG(("Telegram finished, result: %1").arg(result)); -diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h -index 6f93d69cd..df185d5a2 100644 a/Telegram/SourceFiles/platform/linux/linux_libs.h -+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h -@@ -17,7 +17,7 @@ extern "C" { - } // extern "C" - - #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION --#include -+typedef void UnityLauncherEntry; - #endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION - #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION - diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp new file mode 100644 index 0..4a722b8d7
[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD tdesktop.patch)
Date: Friday, February 1, 2019 @ 03:40:51 Author: svenstaro Revision: 428981 upgpkg: telegram-desktop 1.5.9-1 Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch + PKGBUILD |4 ++-- tdesktop.patch |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-02-01 03:05:34 UTC (rev 428980) +++ PKGBUILD2019-02-01 03:40:51 UTC (rev 428981) @@ -5,7 +5,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.5.8 +pkgver=1.5.9 pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -40,7 +40,7 @@ 'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' - 'd85caca626a11aab15d5d443912dd48b5b6797409ecd1d6b34618a77bd969c33170bcdee3b43f9c1acce1b91dc0fe3b1c3bdefb2d567a0e085ee924bcede83c2' + 'e941d71b582e8dee58391dac08ff0eaceafcb0c2eb0ce7c3057d09efcd3791a66d5db8154cf239fdfa5db488dc5d15216488dfa34b1ec3f6831eeb6aa4ab859c' 'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0' Modified: tdesktop.patch === --- tdesktop.patch 2019-02-01 03:05:34 UTC (rev 428980) +++ tdesktop.patch 2019-02-01 03:40:51 UTC (rev 428981) @@ -14,12 +14,12 @@ +++ b/Telegram/SourceFiles/core/launcher.cpp @@ -39,9 +39,10 @@ void Launcher::init() { - QCoreApplication::setApplicationName(qsl("TelegramDesktop")); + QApplication::setApplicationName(qsl("TelegramDesktop")); -#ifndef OS_MAC_OLD +#if !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + // Retina display support is working fine, others are not. - QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); + QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); -#endif // OS_MAC_OLD +#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0
[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD tdesktop.patch)
Date: Thursday, March 22, 2018 @ 13:41:31 Author: svenstaro Revision: 310557 upgpkg: telegram-desktop 1.2.14-1 Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch + PKGBUILD |6 +++--- tdesktop.patch | 22 -- 2 files changed, 3 insertions(+), 25 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-03-22 13:22:24 UTC (rev 310556) +++ PKGBUILD2018-03-22 13:41:31 UTC (rev 310557) @@ -5,8 +5,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.2.12 -pkgrel=3 +pkgver=1.2.14 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; @@ -34,7 +34,7 @@ 'SKIP' 'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb' '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82' -'7879740fa0e3c5fbb5e35014c749dce5532acd16d61bd3ddfebb3079cea624df' +'aea18527d47228dcdb42b8c1d74398fcf0fdcd7b3c2246e87198f8d9b2dfe0bc' '8d707debe027c7cb658825501dc30fb3beb57ab21b1b6df2f01c5f76ca39a0e6' '4dd2b1674b1a5bcfc5b640612278fe3a53b454192fbcc06b7476ff54ed6d2f6d' '07ca232b91e9ad0fb9c1501b8b83275cc62b00477c7e5edde5e4cfd2852f1f26') Modified: tdesktop.patch === --- tdesktop.patch 2018-03-22 13:22:24 UTC (rev 310556) +++ tdesktop.patch 2018-03-22 13:41:31 UTC (rev 310557) @@ -276,19 +276,6 @@ '<(emoji_suggestions_loc)', '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', -diff --git a/Telegram/gyp/linux_glibc_wraps.gyp b/Telegram/gyp/linux_glibc_wraps.gyp -index 07a8276f..99ac4cac 100644 a/Telegram/gyp/linux_glibc_wraps.gyp -+++ b/Telegram/gyp/linux_glibc_wraps.gyp -@@ -14,7 +14,7 @@ - 'sources': [ - '../SourceFiles/platform/linux/linux_glibc_wraps.c', - ], --'conditions': [[ '"
[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD tdesktop.patch)
Date: Wednesday, March 14, 2018 @ 05:49:15 Author: svenstaro Revision: 307555 upgpkg: telegram-desktop 1.2.12-1 Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch + PKGBUILD |6 +++--- tdesktop.patch | 12 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-03-14 05:39:27 UTC (rev 307554) +++ PKGBUILD2018-03-14 05:49:15 UTC (rev 307555) @@ -5,8 +5,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.2.8 -pkgrel=2 +pkgver=1.2.12 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; @@ -33,7 +33,7 @@ 'SKIP' 'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb' '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82' -'c0a71a540c6263d4e6cbba326a9b9d61cd57ef6db6054e87058dc49cbb707a23' +'36b817ec9843b261af7a246f9ec51feb828203bd90e76aef7383457f23a0d4cb' '8d707debe027c7cb658825501dc30fb3beb57ab21b1b6df2f01c5f76ca39a0e6' '0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075') Modified: tdesktop.patch === --- tdesktop.patch 2018-03-14 05:39:27 UTC (rev 307554) +++ tdesktop.patch 2018-03-14 05:49:15 UTC (rev 307555) @@ -280,12 +280,12 @@ index 07a8276f..99ac4cac 100644 --- a/Telegram/gyp/linux_glibc_wraps.gyp +++ b/Telegram/gyp/linux_glibc_wraps.gyp -@@ -27,7 +27,7 @@ +@@ -14,7 +14,7 @@ 'sources': [ '../SourceFiles/platform/linux/linux_glibc_wraps.c', ], --'conditions': [[ '"
[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD tdesktop.patch)
Date: Monday, January 8, 2018 @ 23:17:57 Author: bgyorgy Revision: 280597 upgpkg: telegram-desktop 1.2.6-3 Reduce dependencies to turn this package into a pure Qt5 application Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch + PKGBUILD | 10 +- tdesktop.patch |5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-01-08 22:51:03 UTC (rev 280596) +++ PKGBUILD2018-01-08 23:17:57 UTC (rev 280597) @@ -6,13 +6,13 @@ pkgname=telegram-desktop pkgver=1.2.6 -pkgrel=2 +pkgrel=3 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; license=('GPL3') -depends=('ffmpeg' 'hicolor-icon-theme' 'minizip' 'openal' 'qt5-base' 'qt5-imageformats' 'openssl-1.0' 'libappindicator-gtk3') -makedepends=('cmake' 'git' 'gyp' 'libexif' 'libva' 'libwebp' 'mtdev' 'range-v3' 'python' 'python2' 'gtk3' 'dee') +depends=('ffmpeg' 'hicolor-icon-theme' 'minizip' 'openal' 'qt5-base' 'qt5-imageformats' 'openssl-1.0') +makedepends=('cmake' 'git' 'gyp' 'range-v3' 'python') source=( "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v$pkgver; "GSL::git+https://github.com/Microsoft/GSL.git; @@ -33,7 +33,7 @@ 'b12b6d25fc2e6fb0a60a14bbab8b600ec71cf4651279180730c1a469afd1173c' 'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb' '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82' -'9011d01340549d8a7b6627c44de5355356342a7e83789672e9e0aa92657ee04f' +'c0a71a540c6263d4e6cbba326a9b9d61cd57ef6db6054e87058dc49cbb707a23' '0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075') prepare() { @@ -53,7 +53,7 @@ build() { cd "$srcdir/tdesktop" export LANG=en_US.UTF-8 -export GYP_DEFINES="TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME,TDESKTOP_DISABLE_UNITY_INTEGRATION" +export GYP_DEFINES="TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME,TDESKTOP_DISABLE_UNITY_INTEGRATION,TDESKTOP_DISABLE_GTK_INTEGRATION" export EXTRA_FLAGS="-Winvalid-pch" export CPPFLAGS="$CPPFLAGS $EXTRA_FLAGS" export CXXFLAGS="$CXXFLAGS $EXTRA_FLAGS" Modified: tdesktop.patch === --- tdesktop.patch 2018-01-08 22:51:03 UTC (rev 280596) +++ tdesktop.patch 2018-01-08 23:17:57 UTC (rev 280597) @@ -543,7 +543,7 @@ # 32 bit version can't be linked with debug info or LTO, # virtual memory exhausted :( 'cflags_c': [ '-g' ], -@@ -118,9 +110,8 @@ +@@ -118,10 +110,8 @@ ], }], ['not_need_gtk!="True"', { 'cflags_cc': [ @@ -550,11 +550,12 @@ - ' /dev/null --cflags appindicator-0.1)', - ' /dev/null --cflags gtk+-2.0)', - ' /dev/null --cflags glib-2.0)', +- ' /dev/null --cflags dee-1.0)', + ' /dev/null --cflags appindicator3-0.1)', + ' /dev/null --cflags gtk+-3.0)', - ' /dev/null --cflags dee-1.0)', ], }] + ], diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index 5d2f627e..defd475d 100644 --- a/Telegram/gyp/telegram_sources.txt
[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD tdesktop.patch)
Date: Saturday, December 30, 2017 @ 22:10:37 Author: svenstaro Revision: 277497 upgpkg: telegram-desktop 1.2.6-1 Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch + PKGBUILD |6 ++--- tdesktop.patch | 64 --- 2 files changed, 36 insertions(+), 34 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-12-30 22:00:36 UTC (rev 277496) +++ PKGBUILD2017-12-30 22:10:37 UTC (rev 277497) @@ -5,8 +5,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.2.1 -pkgrel=4 +pkgver=1.2.6 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; @@ -34,7 +34,7 @@ 'b12b6d25fc2e6fb0a60a14bbab8b600ec71cf4651279180730c1a469afd1173c' 'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb' '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82' -'35ca9d917254ee71141ebfbae1b8447b8d3a5601f8d3a78db2cceedfe83c54f2' +'9011d01340549d8a7b6627c44de5355356342a7e83789672e9e0aa92657ee04f' '0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075') prepare() { Modified: tdesktop.patch === --- tdesktop.patch 2017-12-30 22:00:36 UTC (rev 277496) +++ tdesktop.patch 2017-12-30 22:10:37 UTC (rev 277497) @@ -1,5 +1,5 @@ diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc -index 0554fa179..3ea027406 100644 +index 0554fa17..3ea02740 100644 --- a/Telegram/Resources/qrc/telegram_linux.qrc +++ b/Telegram/Resources/qrc/telegram_linux.qrc @@ -1,5 +1,4 @@ @@ -9,10 +9,10 @@ diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index c05915976..9b19941df 100644 +index bf21d14d..6b63016e 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -43,9 +43,10 @@ void Launcher::init() { +@@ -44,9 +44,10 @@ void Launcher::init() { QCoreApplication::setApplicationName(qsl("TelegramDesktop")); @@ -25,7 +25,7 @@ initHook(); } -@@ -63,6 +64,13 @@ int Launcher::exec() { +@@ -64,6 +65,13 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started Platform::start(); // must be started before QApplication is created @@ -36,11 +36,11 @@ + // Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943 + unsetenv("QT_QPA_PLATFORMTHEME"); + - auto result = 0; - { - Application app(this, _argc, _argv); + auto result = executeApplication(); + + DEBUG_LOG(("Telegram finished, result: %1").arg(result)); diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h -index e9e349be9..d82963fa2 100644 +index e9e349be..d82963fa 100644 --- a/Telegram/SourceFiles/platform/linux/linux_libs.h +++ b/Telegram/SourceFiles/platform/linux/linux_libs.h @@ -30,7 +30,7 @@ extern "C" { @@ -54,7 +54,7 @@ diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp new file mode 100644 -index 0..4a722b8d7 +index ..4a722b8d --- /dev/null +++ b/Telegram/SourceFiles/qt_functions.cpp @@ -0,0 +1,94 @@ @@ -153,7 +153,7 @@ +flags |= QTextItem::StrikeOut; +} diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp -index b975c7a84..f2f876b30 100644 +index b975c7a8..f2f876b3 100644 --- a/Telegram/SourceFiles/qt_static_plugins.cpp +++ b/Telegram/SourceFiles/qt_static_plugins.cpp @@ -28,13 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) @@ -171,7 +171,7 @@ -Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp -index 710277fe2..5eb4465d6 100644 +index 7d34a19b..a4b3d31a 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -1707,11 +1707,11 @@ private: @@ -190,23 +190,24 @@ auto blockIndex = _lineStartBlock; auto currentBlock = _t->_blocks[blockIndex].get(); diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp -index e435b50dc..893496b4f 100644 +index a10b5393..4e1eb62d 100644 --- a/Telegram/SourceFiles/ui/text/text_block.cpp +++ b/Telegram/SourceFiles/ui/text/text_block.cpp -@@ -332,7 +332,7 @@ TextBlock::TextBlock(const style::font , const QString , QFixed minResi - CrashReports::SetAnnotationRef("CrashString", ); +@@ -333,6 +333,9 @@ TextBlock::TextBlock(const style::font , const QString , QFixed minResi