Skip to content

Commit

Permalink
ftp/coeurl: fix build with {fmt} 10
Browse files Browse the repository at this point in the history
- add fmt as a dependency, make it build by pulling in
  upstream commit 831e2ee8e9cf08ea1ee9736cde8370f9d0312abc

PR:		273875
Provided by:	diizzy@
  • Loading branch information
Daniel Engberg authored and Adriaan de Groot committed Sep 18, 2023
1 parent 12434f9 commit c75e880
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
8 changes: 4 additions & 4 deletions ftp/coeurl/Makefile
@@ -1,6 +1,7 @@
PORTNAME= coeurl
DISTVERSIONPREFIX=v
DISTVERSION= 0.3.0
PORTREVISION= 1
CATEGORIES= ftp www

MAINTAINER= adridg@FreeBSD.org
Expand All @@ -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/
Expand Down
19 changes: 19 additions & 0 deletions 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 <thread>

#include "coeurl/request.hpp"
+#include "coeurl/errors.hpp"

namespace coeurl {
std::shared_ptr<spdlog::logger> 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());
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down

0 comments on commit c75e880

Please sign in to comment.