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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 01F86158245 for ; Sun, 8 Dec 2024 09:38:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98EAFE08E8; Sun, 8 Dec 2024 09:38:20 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 9432AE08E8 for ; Sun, 8 Dec 2024 09:38:17 +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 768C5343135 for ; Sun, 8 Dec 2024 09:38:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1C431AB5 for ; Sun, 8 Dec 2024 09:38:14 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1733650245.0bbb8412c6ea23abfc045ab91d4fc3f40361a9f8.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-im/nheko/files/, net-im/nheko/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-im/nheko/files/nheko-0.12.0-fmt11.patch net-im/nheko/nheko-0.12.0-r1.ebuild X-VCS-Directories: net-im/nheko/ net-im/nheko/files/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: 0bbb8412c6ea23abfc045ab91d4fc3f40361a9f8 X-VCS-Branch: dev Date: Sun, 8 Dec 2024 09:38:14 +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: 4d55d9ce-9209-4ded-9347-ae23b9143c9a X-Archives-Hash: bd24cee6c262a410cc9505ede9f7c1d4 commit: 0bbb8412c6ea23abfc045ab91d4fc3f40361a9f8 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Dec 8 09:30:45 2024 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Sun Dec 8 09:30:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0bbb8412 net-im/nheko: fix build with libfmt 11 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> net-im/nheko/files/nheko-0.12.0-fmt11.patch | 51 +++++++++++++++++++++++++++++ net-im/nheko/nheko-0.12.0-r1.ebuild | 5 ++- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/net-im/nheko/files/nheko-0.12.0-fmt11.patch b/net-im/nheko/files/nheko-0.12.0-fmt11.patch new file mode 100644 index 000000000..fd08b7c2a --- /dev/null +++ b/net-im/nheko/files/nheko-0.12.0-fmt11.patch @@ -0,0 +1,51 @@ +From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001 +From: Vitaly +Date: Tue, 16 Jul 2024 12:30:45 +0200 +Subject: [PATCH] Fixed build against fmt 11. + +--- + src/RegisterPage.cpp | 2 ++ + src/Utils.cpp | 1 + + src/encryption/DeviceVerificationFlow.cpp | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp +index 93e2cf1b..562d2c82 100644 +--- a/src/RegisterPage.cpp ++++ b/src/RegisterPage.cpp +@@ -4,6 +4,8 @@ + + #include + ++#include ++ + #include + #include + #include +diff --git a/src/Utils.cpp b/src/Utils.cpp +index 3e7340f4..99d337c4 100644 +--- a/src/Utils.cpp ++++ b/src/Utils.cpp +@@ -26,6 +26,7 @@ + #include + #include + ++#include + #include + + #include +diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp +index cb595df0..0757d88c 100644 +--- a/src/encryption/DeviceVerificationFlow.cpp ++++ b/src/encryption/DeviceVerificationFlow.cpp +@@ -9,6 +9,7 @@ + #include + #include + ++#include + #include + + #include "Cache.h" +-- +2.47.1 + diff --git a/net-im/nheko/nheko-0.12.0-r1.ebuild b/net-im/nheko/nheko-0.12.0-r1.ebuild index 1160dc354..a94486186 100644 --- a/net-im/nheko/nheko-0.12.0-r1.ebuild +++ b/net-im/nheko/nheko-0.12.0-r1.ebuild @@ -76,7 +76,10 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}"/${P}-remove-wayland-dep-on-x11.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-0.12.0-fmt11.patch + "${FILESDIR}"/${PN}-0.12.0-remove-wayland-dep-on-x11.patch +) src_configure() { local -a mycmakeargs=(