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

[Jiachen Yang]

    Date: Monday, November 2, 2020 @ 01:41:22
  Author: farseerfc
Revision: 739063

upgpkg: telegram-desktop 2.4.5-1: telegram-desktop 2.4.5

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

-----------------------+
 Fix_xcb_wayland.patch |   35 -----------------------------------
 PKGBUILD              |    9 ++++++---
 2 files changed, 6 insertions(+), 38 deletions(-)

Deleted: Fix_xcb_wayland.patch
===================================================================
--- Fix_xcb_wayland.patch	2020-11-02 00:38:29 UTC (rev 739062)
+++ Fix_xcb_wayland.patch	2020-11-02 01:41:22 UTC (rev 739063)
@@ -1,35 +0,0 @@
-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-11-02 00:38:29 UTC (rev 739062)
+++ PKGBUILD	2020-11-02 01:41:22 UTC (rev 739063)
@@ -1,7 +1,7 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
 # Contributor: hexchain <i at hexchain.org>
 pkgname=telegram-desktop
-pkgver=2.4.4
+pkgver=2.4.5
 pkgrel=1
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
@@ -14,13 +14,16 @@
 source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
 "Use-tg_owt-webrtc-fork.patch"
 "Update-webrtc-packaged-build-for-tg_owt.patch::https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d.patch"
+"Add_external_jpeg.patch::https://github.com/desktop-app/cmake_helpers/commit/ed9fa2e798a1f175840479417d760c51181959b8.patch"
 )
-sha512sums=('db212cc9aef7de21e4e4fa30fdabb88224cda5ab164935de118cab507af730f5773602f8cd7acd83a53daa5bf35fe28fdb18fb192c01e2e484069a9ac69c7c57'
+sha512sums=('d0c792fcd890a95b24233f37cdfc34008e814f6f0730722a41916e25d2efff405fd472bd6b45bbfc79787ed117dc5f87271c438d92ec1ce29335cabe76a1062e'
             '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43'
-            'b3c44e76a3907f7acc197746b471564577e912bf0561e9576dc8459211c88f400716437bcaa10967376461c69c8a98a56477d26d3feb9ca34747d9208bf5f6c6')
+            'b3c44e76a3907f7acc197746b471564577e912bf0561e9576dc8459211c88f400716437bcaa10967376461c69c8a98a56477d26d3feb9ca34747d9208bf5f6c6'
+            '3891f191f720e77d463365d1415ff8c20866d0d898909dcbe757d334c582c38975d47c33e82ae54e3cfbce7f46c257e9f2eb76b673a76c37446ecf1e9a9c681b')
 
 prepare() {
     cd tdesktop-$pkgver-full/cmake
+    patch -R -Np1 -i ${srcdir}/Add_external_jpeg.patch
     patch -R -Np1 -i ${srcdir}/Update-webrtc-packaged-build-for-tg_owt.patch
     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