From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2624B15808B for ; Fri, 15 Apr 2022 06:04:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21163E08D3; Fri, 15 Apr 2022 06:04:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52E28E08D3 for ; Fri, 15 Apr 2022 06:04:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB402341914 for ; Fri, 15 Apr 2022 06:04:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52CD03AB for ; Fri, 15 Apr 2022 06:04:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650002659.eabc16b768077a41ec4b4cd74d8088e52b024ccd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/, net-im/telegram-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild X-VCS-Directories: net-im/telegram-desktop/files/ net-im/telegram-desktop/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: eabc16b768077a41ec4b4cd74d8088e52b024ccd X-VCS-Branch: master Date: Fri, 15 Apr 2022 06:04:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3c28e519-ac88-4b96-ac59-0ef31884b733 X-Archives-Hash: 325551d3f1d7b04c6e65fe8eebd17f4b commit: eabc16b768077a41ec4b4cd74d8088e52b024ccd Author: Esteve Varela Colominas gmail com> AuthorDate: Mon Apr 11 22:28:30 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Apr 15 06:04:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabc16b7 net-im/telegram-desktop: Fix building with KWayland 5.93 Closes: https://bugs.gentoo.org/837569 Thanks-to: Nick Sarnie gentoo.org> Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24998 Signed-off-by: Sam James gentoo.org> .../files/tdesktop-3.6.1-fix-kwayland-5.93.patch | 55 ++++++++++++++++++++++ .../telegram-desktop-3.5.2-r1.ebuild | 1 + .../telegram-desktop/telegram-desktop-3.6.1.ebuild | 1 + 3 files changed, 57 insertions(+) diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch new file mode 100644 index 000000000000..e818ffe46456 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch @@ -0,0 +1,55 @@ +Fix compatibility with kwayland-5.93.0 + +The header files were moved, the include directory wasn't being added correctly. + +https://bugs.gentoo.org/837569 + +--- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp ++++ tdesktop-3.6.1-full/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +@@ -9,10 +9,10 @@ + + #include "base/platform/base_platform_info.h" + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + using namespace KWayland::Client; + +--- tdesktop-3.6.1-full.orig/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp ++++ tdesktop-3.6.1-full/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp +@@ -13,11 +13,11 @@ + #include + #include + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + using namespace KWayland::Client; + +--- tdesktop-3.6.1-full.orig/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp ++++ tdesktop-3.6.1-full/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp +@@ -24,8 +24,8 @@ + #include + #include + +-#include +-#include ++#include ++#include + + Q_DECLARE_METATYPE(QMargins); + diff --git a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild index fd97841de5b2..e5bd2fb2c389 100644 --- a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild @@ -73,6 +73,7 @@ PATCHES=( "${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch" "${FILESDIR}/tdesktop-3.5.2-musl.patch" "${FILESDIR}/tdesktop-3.5.2-jemalloc-optional.patch" + "${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch" ) # Current desktop-file-utils-0.26 does not understand Version=1.5 diff --git a/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild index 5d77d8964fd7..d2fc536e145f 100644 --- a/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild @@ -76,6 +76,7 @@ PATCHES=( "${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch" "${FILESDIR}/tdesktop-3.5.2-musl.patch" "${FILESDIR}/tdesktop-3.6.0-support-ffmpeg5.patch" + "${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch" ) # Current desktop-file-utils-0.26 does not understand Version=1.5