From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5882E1581EE for ; Tue, 25 Mar 2025 10:20:13 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 4685B3431D7 for ; Tue, 25 Mar 2025 10:20:13 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 39C7F110296; Tue, 25 Mar 2025 10:20:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 3262E110296 for ; Tue, 25 Mar 2025 10:20:12 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6C2434313C for ; Tue, 25 Mar 2025 10:20:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FCE52035 for ; Tue, 25 Mar 2025 10:20:10 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1742897857.cfef50a4102a42c11c6bfadcfbd74059c679f511.dlan@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-5.12.3-fix-webview.patch net-im/telegram-desktop/telegram-desktop-5.12.3-r2.ebuild X-VCS-Directories: net-im/telegram-desktop/ net-im/telegram-desktop/files/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: cfef50a4102a42c11c6bfadcfbd74059c679f511 X-VCS-Branch: master Date: Tue, 25 Mar 2025 10:20:10 +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: 10095c40-670b-4101-9f5a-480f5484b9c0 X-Archives-Hash: 9d137c68db37176606f806a991ba59f6 commit: cfef50a4102a42c11c6bfadcfbd74059c679f511 Author: Esteve Varela Colominas gmail com> AuthorDate: Tue Mar 25 08:34:56 2025 +0000 Commit: Yixun Lan gentoo org> CommitDate: Tue Mar 25 10:17:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfef50a4 net-im/telegram-desktop: Fix USE=webkit Closes: https://github.com/gentoo/gentoo/pull/41274 Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Yixun Lan gentoo.org> .../files/tdesktop-5.12.3-fix-webview.patch | 34 ++++++++++++++++++++++ .../telegram-desktop-5.12.3-r2.ebuild | 1 + 2 files changed, 35 insertions(+) diff --git a/net-im/telegram-desktop/files/tdesktop-5.12.3-fix-webview.patch b/net-im/telegram-desktop/files/tdesktop-5.12.3-fix-webview.patch new file mode 100644 index 000000000000..fa50da2627fd --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-5.12.3-fix-webview.patch @@ -0,0 +1,34 @@ +Fix error in building with USE=webkit + +In file included from /var/tmp/portage/net-im/telegram-desktop-5.12.3-r2/work/tdesktop-5.12.3-full/Telegram/lib_webview/webview/webview_dialog.cpp:13: +/var/tmp/portage/net-im/telegram-desktop-5.12.3-r2/work/tdesktop-5.12.3-full/Telegram/lib_ui/ui/widgets/buttons.h:276:3: error: unknown type name 'nullptr_t'; did you mean 'std::nullptr_t'? + 276 | nullptr_t, + | ^~~~~~~~~ + | std::nullptr_t +/usr/lib/gcc/x86_64-pc-linux-gnu/14/include/g++-v14/x86_64-pc-linux-gnu/bits/c++config.h:314:29: note: 'std::nullptr_t' declared here + 314 | typedef decltype(nullptr) nullptr_t; + | ^ +1 error generated. + +--- tdesktop-5.12.3-full.orig/Telegram/lib_ui/ui/widgets/buttons.cpp ++++ tdesktop-5.12.3-full/Telegram/lib_ui/ui/widgets/buttons.cpp +@@ -795,7 +795,7 @@ + + SettingsButton::SettingsButton( + QWidget *parent, +- nullptr_t, ++ std::nullptr_t, + const style::SettingsButton &st) + : RippleButton(parent, st.ripple) + , _st(st) +--- tdesktop-5.12.3-full.orig/Telegram/lib_ui/ui/widgets/buttons.h ++++ tdesktop-5.12.3-full/Telegram/lib_ui/ui/widgets/buttons.h +@@ -273,7 +273,7 @@ + const style::SettingsButton &st = st::defaultSettingsButton); + SettingsButton( + QWidget *parent, +- nullptr_t, ++ std::nullptr_t, + const style::SettingsButton &st = st::defaultSettingsButton); + ~SettingsButton(); + diff --git a/net-im/telegram-desktop/telegram-desktop-5.12.3-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-5.12.3-r2.ebuild index c0b0c7b8f65d..2f3cd07f8ed1 100644 --- a/net-im/telegram-desktop/telegram-desktop-5.12.3-r2.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-5.12.3-r2.ebuild @@ -80,6 +80,7 @@ PATCHES=( "${FILESDIR}"/tdesktop-5.2.2-libdispatch.patch "${FILESDIR}"/tdesktop-5.7.2-cstring.patch "${FILESDIR}"/tdesktop-5.8.3-cstdint.patch + "${FILESDIR}"/tdesktop-5.12.3-fix-webview.patch ) pkg_pretend() {