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

[Sven-Hendrik Haase]

    Date: Wednesday, September 2, 2020 @ 08:55:23
  Author: svenstaro
Revision: 696268

upgpkg: telegram-desktop 2.3.2-2

Added:
  telegram-desktop/trunk/Fix_xcb_wayland.patch
Modified:
  telegram-desktop/trunk/PKGBUILD

-----------------------+
 Fix_xcb_wayland.patch |   35 +++++++++++++++++++++++++++++++++++
 PKGBUILD              |    8 ++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

Added: Fix_xcb_wayland.patch
===================================================================
--- Fix_xcb_wayland.patch	                        (rev 0)
+++ Fix_xcb_wayland.patch	2020-09-02 08:55:23 UTC (rev 696268)
@@ -0,0 +1,35 @@
+diff -Naur tdesktop-2.3.2-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp tdesktop-2.3.2-full.patched/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+--- tdesktop-2.3.2-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp	2020-08-23 15:36:52.000000000 +0200
++++ tdesktop-2.3.2-full.patched/Telegram/SourceFiles/platform/linux/specific_linux.cpp	2020-09-02 08:38:32.950087151 +0200
+@@ -298,6 +298,20 @@
+ }
+ #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
+ 
++bool IsXCBExtensionPresent(
++		xcb_connection_t *connection,
++		xcb_extension_t *ext) {
++	const auto reply = xcb_get_extension_data(
++		connection,
++		ext);
++
++	if (!reply) {
++		return false;
++	}
++
++	return reply->present;
++}
++
+ std::optional<crl::time> XCBLastUserInputTime() {
+ 	const auto native = QGuiApplication::platformNativeInterface();
+ 	if (!native) {
+@@ -311,6 +325,10 @@
+ 		return std::nullopt;
+ 	}
+ 
++	if (!IsXCBExtensionPresent(connection, &xcb_screensaver_id)) {
++		return std::nullopt;
++	}
++
+ 	const auto screen = xcb_setup_roots_iterator(xcb_get_setup(connection)).data;
+ 	if (!screen) {
+ 		return std::nullopt;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-02 08:48:44 UTC (rev 696267)
+++ PKGBUILD	2020-09-02 08:55:23 UTC (rev 696268)
@@ -2,7 +2,7 @@
 # Contributor: hexchain <i at hexchain.org>
 pkgname=telegram-desktop
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -13,14 +13,18 @@
 optdepends=('ttf-opensans: default Open Sans font family')
 source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
 "Use-tg_owt-webrtc-fork.patch"
+"Fix_xcb_wayland.patch"
 )
 sha512sums=('757e57389ce24656c1d6676d6f0808e3d444785394e916b9f5fb47511662f01b6742c88c2a27274c4d9bb58263ae281218579c78cce7db119e2c863c1eaacc90'
-            '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43')
+            '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43'
+            'b318ae7a78bcacc27d3cbfce34b60f16197d8fdb9f8fcc8a9125ecf0d0760a1ed3bb526167013de61c5b6cf9a53102a901826d019bf6e9ba879953ede7d07823')
 
 prepare() {
     cd tdesktop-$pkgver-full/cmake
     patch -R -Np1 -i ${srcdir}/Use-tg_owt-webrtc-fork.patch
     sed 's|set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)|set(webrtc_build_loc /usr/lib)|' -i external/webrtc/CMakeLists.txt
+    cd ../
+    patch -p1 < ${srcdir}/Fix_xcb_wayland.patch
 }
 
 build() {