From nobody Thu Dec 14 15:50:09 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SrcHj5MFFz52f6f; Thu, 14 Dec 2023 15:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SrcHj4mvyz3Q93; Thu, 14 Dec 2023 15:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702569009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XhJm5ZxNshE+BZIAZvlIHyudCA9aCjUV4c1e4+UE3o4=; b=WxSfP2y3Fn6raTkFMZlfs+6VJ1flIiOXZXZbcXOmJvLVzOq7ChZfOIeCtoyyKXtiuXVqyI Q0FUFiXWNk3ETSxTzx+Fw5EAXmFBV1/sbXnyCdDfW535SrN9eUAdSz5kJhBLFaRTe2Q+jM AMSyOv843YJQ2F2NkrKhj272cBk4rGYqai089kYguKKZJsBezmP1Wcwf8hhKevLraaFxNr s6IisVOXvuolnvuDJJELwwcI3JeFx033lWipMUDT+lC6jRW7rh+8hEnjBS98jZ5uggcVUa kje68XpAwGk29muIk3SgiNduFMemRKwAEXx3hnf4C9HYMyOoMs/OrDzBDpzY2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702569009; a=rsa-sha256; cv=none; b=GRdxTXDX0ZNWeNWohuEVdF1nbvs5wO2xCri1HRQuIDepccbiahaK0GQjHtixQ7XianCMSa UYw7o2PADeYVgxuRWGcGFL9crLShU0wV0vWVHHn/Z0xKMKHwF5vyvAYfn1p1I7duUZ8q4T 90lzvNnbu8jZtPn1lw9dCU+49A/P/psY0osCyqTI4nfrILOJfitR3npz2JJFYd9cFy0D0m Og+hdP4kk5Xa3o1oSYY2/uo4AUXQCxkLkTXgi9nO2LHPpy7waL3sjE8+3T/8adGLB9JCUn SgNKCp+nH/8eKMu1CMwu/qjxtbgdI4GMcz/o5q8ntg6l42HF9YY9SCHjs43Iig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702569009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XhJm5ZxNshE+BZIAZvlIHyudCA9aCjUV4c1e4+UE3o4=; b=o5iJEAAML3dMaqMZYmAl+bLUTvoEFEZMa5foyQV3tsb2pPZdJbfDCCsbgDU6McUditTYRg 9/Qgj3FSr/52p7sJA1udzOca/GYVS443Epk3kercjoMY+ZSWWVatDmIOwC65N4fZpGEyFQ piccDrB5UyPcHBjD+kfklkiqsEZ2eYseodcp7pwaEO4M9YWy28+Unm3KEuQZbEcu+Y8Ie8 1qB3bJuhHVoK3QreQWUw1EPWxK/dWtiSsDwhdT7+0MQLT0uOzGMVycZONaToszWeVU5h/P evEJsRy11gqqLjZVvn14yNTPwg6SCTLtDPNXOvNB0hP3bR3uHoBCRtc0VjS96A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SrcHj3stczYrp; Thu, 14 Dec 2023 15:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BEFo9YP085455; Thu, 14 Dec 2023 15:50:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEFo9OP085447; Thu, 14 Dec 2023 15:50:09 GMT (envelope-from git) Date: Thu, 14 Dec 2023 15:50:09 GMT Message-Id: <202312141550.3BEFo9OP085447@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: c2e5d6a56028 - main - net-im/nheko: Fix build with libfmt 10.1.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2e5d6a560286cd550bc5a07f3ca14728d7ffced Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2e5d6a560286cd550bc5a07f3ca14728d7ffced commit c2e5d6a560286cd550bc5a07f3ca14728d7ffced Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 15:40:03 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 15:49:39 +0000 net-im/nheko: Fix build with libfmt 10.1.0+ Obtained from: https://nheko.im/nheko-reborn/nheko/-/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0 https://nheko.im/nheko-reborn/nheko/-/commit/871e403f6799df48cfbbe08eba56d473a0c34216 --- net-im/nheko/Makefile | 2 +- net-im/nheko/files/patch-libfmt | 71 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/net-im/nheko/Makefile b/net-im/nheko/Makefile index ab0e3ded4a1d..b743e1143248 100644 --- a/net-im/nheko/Makefile +++ b/net-im/nheko/Makefile @@ -1,5 +1,5 @@ PORTNAME= nheko -DISTVERSIONPREFIX=v +DISTVERSIONPREFIX= v DISTVERSION= 0.11.3 PORTREVISION= 3 CATEGORIES= net-im diff --git a/net-im/nheko/files/patch-libfmt b/net-im/nheko/files/patch-libfmt new file mode 100644 index 000000000000..3b6e5fe2c0aa --- /dev/null +++ b/net-im/nheko/files/patch-libfmt @@ -0,0 +1,71 @@ +Obtained from: https://nheko.im/nheko-reborn/nheko/-/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0 + https://nheko.im/nheko-reborn/nheko/-/commit/871e403f6799df48cfbbe08eba56d473a0c34216 + +--- src/Cache.cpp.orig 2023-02-22 23:50:45 UTC ++++ src/Cache.cpp +@@ -438,7 +438,7 @@ Cache::loadSecretsFromStore( + if (job->error() && job->error() != QKeychain::Error::EntryNotFound) { + nhlog::db()->error("Restoring secret '{}' failed ({}): {}", + name.toStdString(), +- job->error(), ++ static_cast(job->error()), + job->errorString().toStdString()); + + fatalSecretError(); +--- src/ChatPage.cpp.orig 2023-02-22 23:50:45 UTC ++++ src/ChatPage.cpp +@@ -1248,7 +1248,7 @@ ChatPage::getBackupVersion() + nhlog::crypto()->info("Our backup key {} does not match the one " + "used in the online backup {}", + pubkey, +- auth_data["public_key"]); ++ auth_data["public_key"].get()); + cache::client()->deleteBackupVersion(); + return; + } +--- src/encryption/DeviceVerificationFlow.cpp.orig 2023-02-22 23:50:45 UTC ++++ src/encryption/DeviceVerificationFlow.cpp +@@ -39,7 +39,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject + , deviceIds(std::move(deviceIds_)) + , model_(model) + { +- nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", flow_type, (void *)this); ++ nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", static_cast(flow_type), (void *)this); + if (deviceIds.size() == 1) + deviceId = deviceIds.front(); + +--- src/timeline/InputBar.cpp.orig 2023-02-22 23:50:45 UTC ++++ src/timeline/InputBar.cpp +@@ -948,14 +948,14 @@ MediaUpload::MediaUpload(std::unique_ptr so + this, + [mediaPlayer](QMediaPlayer::Error error) { + nhlog::ui()->debug("Media player error {} and errorStr {}", +- error, ++ static_cast(error), + mediaPlayer->errorString().toStdString()); + }); + connect(mediaPlayer, + &QMediaPlayer::mediaStatusChanged, + [mediaPlayer](QMediaPlayer::MediaStatus status) { + nhlog::ui()->debug( +- "Media player status {} and error {}", status, mediaPlayer->error()); ++ "Media player status {} and error {}", static_cast(status), static_cast(mediaPlayer->error())); + }); + connect(mediaPlayer, + qOverload(&QMediaPlayer::metaDataChanged), +--- src/ui/MxcMediaProxy.cpp.orig 2023-02-22 23:50:45 UTC ++++ src/ui/MxcMediaProxy.cpp +@@ -37,11 +37,11 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent) + qOverload(&MxcMediaProxy::error), + [this](QMediaPlayer::Error error) { + nhlog::ui()->info("Media player error {} and errorStr {}", +- error, ++ static_cast(error), + this->errorString().toStdString()); + }); + connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) { +- nhlog::ui()->info("Media player status {} and error {}", status, this->error()); ++ nhlog::ui()->info("Media player status {} and error {}", static_cast(status), static_cast(this->error())); + }); + connect(this, + qOverload(&MxcMediaProxy::metaDataChanged),