diff --git a/ftp/coeurl/Makefile b/ftp/coeurl/Makefile index fd2e1535413d..b5e712acc127 100644 --- a/ftp/coeurl/Makefile +++ b/ftp/coeurl/Makefile @@ -1,26 +1,26 @@ PORTNAME= coeurl DISTVERSIONPREFIX=v DISTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= ftp www MAINTAINER= adridg@FreeBSD.org COMMENT= Simple async wrapper around CURL for C++ 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/ GL_ACCOUNT= nheko-reborn GL_TAGNAME= 2a20a129240a1a017b37b6874faab499ca4e523b .include 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,31 +1,31 @@ PORTNAME= mtxclient DISTVERSIONPREFIX= v DISTVERSION= 0.9.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org COMMENT= Client API library for the Matrix protocol WWW= https://nheko.im/nheko-reborn/mtxclient/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nlohmann-json>=3:devel/nlohmann-json LIB_DEPENDS= \ libcoeurl.so:ftp/coeurl \ libolm.so:security/olm \ libsodium.so:security/libsodium \ libre2.so:devel/re2 \ libspdlog.so:devel/spdlog USES= cmake compiler:c++17-lang pkgconfig ssl \ tar:xz CMAKE_OFF= BUILD_LIB_TESTS USE_GITHUB= yes GH_ACCOUNT= Nheko-Reborn PLIST_SUB= SOVER=${DISTVERSION} .include 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,55 +1,55 @@ PORTNAME= nheko DISTVERSIONPREFIX=v DISTVERSION= 0.11.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org COMMENT= Matrix IM client based on Qt technologies WWW= https://nheko.im/nheko-reborn/nheko/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= nlohmann-json>=3:devel/nlohmann-json \ asciidoc>=10:textproc/asciidoc # All those boost-libs are pulled in through mtxclient, which # links to them but stage-qa still complains. LIB_DEPENDS= \ libcmark.so:textproc/cmark \ libcoeurl.so:ftp/coeurl \ libfmt.so:devel/libfmt \ liblmdb.so:databases/lmdb \ libmatrix_client.so:net-im/mtxclient \ libolm.so:security/olm \ libqt5keychain.so:security/qtkeychain@qt5 \ libspdlog.so:devel/spdlog USES= cmake compiler:c++17-lang desktop-file-utils \ localbase:ldflags pkgconfig qt:5 ssl tar:xz USE_QT= concurrent core dbus declarative gui multimedia network \ quickcontrols2 svg widgets \ graphicaleffects:run \ buildtools:build linguist:build qmake:build OPTIONS_DEFINE= VOIP OPTIONS_DEFAULT= VOIP_DESC= Enable VOIP calls (experimental) VOIP_CMAKE_BOOL= VOIP VOIP_USES= gstreamer gettext-runtime xorg gnome VOIP_USE= gstreamer=bad,dtls,srtp xorg=xcb gnome=glib20 VOIP_LIB_DEPENDS= libnice.so:net-im/libnice # There is one external dependency: lmdb++ # - lmdb++ is a single header file, it just needs to be included CMAKE_ARGS= -DLMDBXX_INCLUDE_DIR=${WRKSRC}/deps/lmdb \ -DCMAKE_INSTALL_MANDIR=share/man CFLAGS+= -DSPDLOG_FMT_EXTERNAL=1 LDFLAGS+= -L${LOCALBASE}/lib -lfmt USE_GITHUB= yes GH_ACCOUNT= Nheko-Reborn GH_TUPLE= hoytech:lmdbxx:029fb681213af3020f5e3a86045445552bd024c5:lmdb/deps/lmdb .include