From nobody Mon Sep 18 20:24:31 2023 X-Original-To: dev-commits-ports-main@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 4RqGVS1720z4tjRY; Mon, 18 Sep 2023 20:24:32 +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 4RqGVS0XwJz4MtZ; Mon, 18 Sep 2023 20:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695068672; 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=bKQEMhEYf5GjIyxmnl6NXp+1ZFf3rLSI/Ham+tfvkvI=; b=Se+zoAXlyTnzqu+ZVXXbeHbdWAVbtLkRMoKCQ0G+aPfDlp2lvAKxEVt3y9LpnUBKewPLvT wKw7nR5tVzydTm8QXZvddrPTRpuPYI2mnyrVIUMmMbi46q9yCuvU4X4WeQdx4i46TSzms6 e2rX9JsXjlJKFauFCTN06oDTonxPgOIuwSuJiGAJ0eLIPZ1840JA9Zm6QaA5Dh6CdnUBLS b1ng5FBHYlFzsjznR40OYy3Rrzfw9/ot1wBgEWfHcKZ3ou/FQC+I/8KRAHCgMsqLQaA4Dr WEDKO9TVTcjeA4mmyKmXSYO3W077uFMFNXL3n47BvYcePMleU2qPHcAhBVR98Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695068672; a=rsa-sha256; cv=none; b=YfWL++cBcFfxytAUTrwKiXwj9jb0wkGZvH3B0s0QoA1AIgJZoFVniMGabdeXSXtHMl7LCm qg6cw2I3dpw2mS8e5xxV1siODzdZGk0Vp6m/DkxHcLLedkU+nJ6bV/vNnNXddeWiDMo2H8 6fBnP6smf5qpJlTSlgaR3rETEy2ZtvZK0x7Cz67pGAxihEOCQkkwPaIzx2Ud/JP5FUeZ6J DPS+qgDOSKfpF88m24/E6YZQk5W4rf64e6Ai8nyYtYMPMIq5+e9qr7EVDrDg7jDDfUQbJZ ENs+N9l1qT5Fy2KpRXV07AxgCLKvRrhRHwNeh5CJbzRR4wO5y/1SLlKNx4/PLQ== 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=1695068672; 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=bKQEMhEYf5GjIyxmnl6NXp+1ZFf3rLSI/Ham+tfvkvI=; b=uMicbhKxRMHlhtOwiVlSJKw1pIJ1lwdnTTFBgogP7/LwWgzqS6kuyjBZ3qgRpBWwWt50hV 4i8ZhFBNSl5Ufuh9qOMDeNV7Es70FzLaXR0T2jPBLN+yVLm0HhAkfPyMpkhEbJQJduU8Qd NoLAqnGifiHBoB+481UTQBLojIce8MZkwPpubvutH0Ry+nRS339Lz3lZH6ZnlLJEXWFpgT CpjilWXAkmLuijw/Dyja4Nwp04SGkkk94kaLoZ+P7hyIwiop90Ey43Jkbb47CoPexytcGn P4HxS6qWdgVhXnioGXRDsNsSG8X99mC5x2q45Pjnm96atugTXlyRT1vsE/fhkQ== 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 4RqGVR6lY6zlMj; Mon, 18 Sep 2023 20:24:31 +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 38IKOVsk095362; Mon, 18 Sep 2023 20:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IKOVRp095359; Mon, 18 Sep 2023 20:24:31 GMT (envelope-from git) Date: Mon, 18 Sep 2023 20:24:31 GMT Message-Id: <202309182024.38IKOVRp095359@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: c75e8803b5ff - main - ftp/coeurl: fix build with {fmt} 10 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c75e8803b5ff85b592f425bb754860b51b1ac4cc Auto-Submitted: auto-generated The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=c75e8803b5ff85b592f425bb754860b51b1ac4cc commit c75e8803b5ff85b592f425bb754860b51b1ac4cc Author: Daniel Engberg AuthorDate: 2023-09-18 19:12:53 +0000 Commit: Adriaan de Groot CommitDate: 2023-09-18 20:24:13 +0000 ftp/coeurl: fix build with {fmt} 10 - add fmt as a dependency, make it build by pulling in upstream commit 831e2ee8e9cf08ea1ee9736cde8370f9d0312abc PR: 273875 Provided by: diizzy@ --- ftp/coeurl/Makefile | 8 ++++---- ftp/coeurl/files/patch-lib_client.cpp | 19 +++++++++++++++++++ net-im/mtxclient/Makefile | 2 +- net-im/nheko/Makefile | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ftp/coeurl/Makefile b/ftp/coeurl/Makefile index fd2e1535413d..b5e712acc127 100644 --- a/ftp/coeurl/Makefile +++ b/ftp/coeurl/Makefile @@ -1,6 +1,7 @@ PORTNAME= coeurl DISTVERSIONPREFIX=v DISTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= ftp www MAINTAINER= adridg@FreeBSD.org @@ -10,13 +11,12 @@ WWW= https://nheko.im/nheko-reborn/coeurl LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= \ - libcurl.so:ftp/curl \ +LIB_DEPENDS= libcurl.so:ftp/curl \ libevent.so:devel/libevent \ + libfmt.so:devel/libfmt \ libspdlog.so:devel/spdlog -USES= compiler:c++17-lang pkgconfig \ - meson tar:xz +USES= compiler:c++17-lang meson pkgconfig tar:xz USE_GITLAB= yes GL_SITE= https://nheko.im/ diff --git a/ftp/coeurl/files/patch-lib_client.cpp b/ftp/coeurl/files/patch-lib_client.cpp new file mode 100644 index 000000000000..e8e50673879e --- /dev/null +++ b/ftp/coeurl/files/patch-lib_client.cpp @@ -0,0 +1,19 @@ +--- lib/client.cpp.orig 2023-01-10 04:14:36 UTC ++++ lib/client.cpp +@@ -6,6 +6,7 @@ + #include + + #include "coeurl/request.hpp" ++#include "coeurl/errors.hpp" + + namespace coeurl { + std::shared_ptr Client::log = spdlog::null_logger_mt("coeurl_null"); +@@ -352,7 +353,7 @@ void Client::remove_request(Request *r) { + long http_code; + curl_easy_getinfo(req->easy, CURLINFO_RESPONSE_CODE, &http_code); + +- Client::log->trace("DONE: {} => {} ({}) http: {}", req->url_, req->curl_error, req->error, http_code); ++ Client::log->trace("DONE: {} => {} ({}) http: {}", req->url_, coeurl::to_string(req->curl_error), req->error, http_code); + + if (req->on_complete_) + req->on_complete_(*req.get()); diff --git a/net-im/mtxclient/Makefile b/net-im/mtxclient/Makefile index a2eb36e99eac..be7acccc0652 100644 --- a/net-im/mtxclient/Makefile +++ b/net-im/mtxclient/Makefile @@ -1,7 +1,7 @@ PORTNAME= mtxclient DISTVERSIONPREFIX= v DISTVERSION= 0.9.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org diff --git a/net-im/nheko/Makefile b/net-im/nheko/Makefile index cb6a3aa77690..4d58e2a41715 100644 --- a/net-im/nheko/Makefile +++ b/net-im/nheko/Makefile @@ -1,7 +1,7 @@ PORTNAME= nheko DISTVERSIONPREFIX=v DISTVERSION= 0.11.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org