Hi,
here's diffs for coeurl/mtxclient and nheko, they rely on the re2 port
i sent earlier. Builds & packages, havent tested runtime, feedback
welcome.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/coeurl/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 10 Sep 2022 16:23:35 -0000 1.3
+++ Makefile 19 Feb 2023 15:48:58 -0000
@@ -1,7 +1,7 @@
COMMENT = simple async wrapper around CURL for C++
CATEGORIES = devel
-V = v0.2.1
+V = v0.3.0
DISTNAME = coeurl-${V}
PKGNAME = ${DISTNAME:S/v//}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/coeurl/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 10 Sep 2022 16:23:35 -0000 1.2
+++ distinfo 19 Feb 2023 15:48:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (coeurl-v0.2.1.tar.gz) = CZ/rWVEv3TIfd3VH8NTx/DwtkZNpMw8xi4w23GRsB2Q=
-SIZE (coeurl-v0.2.1.tar.gz) = 51894
+SHA256 (coeurl-v0.3.0.tar.gz) = SLB0gjZO3L7QPjUva4sH4yfDMeqkVwetWOYpMPo2E4I=
+SIZE (coeurl-v0.3.0.tar.gz) = 52744
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/mtxclient/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 10 Sep 2022 16:24:48 -0000 1.2
+++ Makefile 19 Feb 2023 15:49:11 -0000
@@ -5,21 +5,22 @@
GH_ACCOUNT = Nheko-Reborn
GH_PROJECT = mtxclient
-GH_TAGNAME = v0.8.2
+GH_TAGNAME = v0.9.1
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} coeurl crypto m olm ssl
+WANTLIB += ${COMPILER_LIBCXX} coeurl crypto m olm re2 spdlog ssl
MODULES = devel/cmake
BUILD_DEPENDS = devel/gtest \
devel/libevent2 \
- devel/spdlog \
textproc/nlohmann-json
-LIB_DEPENDS = devel/coeurl \
+LIB_DEPENDS = devel/coeurl>=0.3.0 \
+ devel/spdlog \
+ textproc/re2 \
devel/olm>=3.2.7
# C++17
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/mtxclient/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 10 Sep 2022 16:24:48 -0000 1.2
+++ distinfo 19 Feb 2023 15:49:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (mtxclient-0.8.2.tar.gz) = TKoS3flUuUktHsm2yjLvD8ZHhVXyKdsHTUO8XMKanIk=
-SIZE (mtxclient-0.8.2.tar.gz) = 609627
+SHA256 (mtxclient-0.9.1.tar.gz) = uugtqgGeze2yQzF3s9lzty8zfRTnpPSApJBVkjU5EAU=
+SIZE (mtxclient-0.9.1.tar.gz) = 621917
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/mtxclient/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 10 Sep 2022 16:24:48 -0000 1.2
+++ pkg/PLIST 19 Feb 2023 15:49:11 -0000
@@ -25,6 +25,7 @@
include/mtx/events/member.hpp
include/mtx/events/messages/
include/mtx/events/messages/audio.hpp
+include/mtx/events/messages/confetti.hpp
include/mtx/events/messages/emote.hpp
include/mtx/events/messages/file.hpp
include/mtx/events/messages/image.hpp
@@ -74,6 +75,7 @@
include/mtx/responses/register.hpp
include/mtx/responses/sync.hpp
include/mtx/responses/turn_server.hpp
+include/mtx/responses/users.hpp
include/mtx/responses/version.hpp
include/mtx/responses/well-known.hpp
include/mtx/secret_storage.hpp
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nheko/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 5 Oct 2022 09:07:56 -0000 1.6
+++ Makefile 19 Feb 2023 15:50:18 -0000
@@ -2,7 +2,7 @@
GH_ACCOUNT = Nheko-Reborn
GH_PROJECT = nheko
-GH_TAGNAME = v0.10.2
+GH_TAGNAME = v0.11.1
CATEGORIES= net
@@ -34,7 +34,7 @@
LIB_DEPENDS = databases/lmdb \
devel/coeurl \
- devel/mtxclient \
+ devel/mtxclient>=0.9.0 \
devel/olm \
devel/spdlog \
multimedia/gstreamer1/core \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nheko/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 5 Oct 2022 09:07:56 -0000 1.3
+++ distinfo 19 Feb 2023 15:50:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (nheko-0.10.2.tar.gz) = AKDanxNOBwdT7+/DvIaAK2D+OF8t6pN5ecCCRjS0wkg=
-SIZE (nheko-0.10.2.tar.gz) = 1608905
+SHA256 (nheko-0.11.1.tar.gz) = qE1vOm0X/wtv/QeASAS767EZHkJD8AubSbAIkegCO2o=
+SIZE (nheko-0.11.1.tar.gz) = 1753191
Index: patches/patch-src_LoginPage_h
===================================================================
RCS file: /cvs/ports/net/nheko/patches/patch-src_LoginPage_h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_LoginPage_h
--- patches/patch-src_LoginPage_h 28 Jun 2022 12:52:30 -0000 1.1.1.1
+++ patches/patch-src_LoginPage_h 19 Feb 2023 15:50:18 -0000
@@ -1,7 +1,7 @@
Index: src/LoginPage.h
--- src/LoginPage.h.orig
+++ src/LoginPage.h
-@@ -99,6 +99,8 @@ class LoginPage : public QObject (public)
+@@ -100,6 +100,8 @@ class LoginPage : public QObject (public)
return "Nheko on Windows";
#elif defined(Q_OS_FREEBSD)
return "Nheko on FreeBSD";
Index: patches/patch-src_main_cpp
===================================================================
RCS file: /cvs/ports/net/nheko/patches/patch-src_main_cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_main_cpp
--- patches/patch-src_main_cpp 28 Jun 2022 12:52:30 -0000 1.1.1.1
+++ patches/patch-src_main_cpp 19 Feb 2023 15:50:18 -0000
@@ -1,7 +1,7 @@
Index: src/main.cpp
--- src/main.cpp.orig
+++ src/main.cpp
-@@ -157,7 +157,7 @@ main(int argc, char *argv[])
+@@ -160,7 +160,7 @@ main(int argc, char *argv[])
// this needs to be after setting the application name. Or how would we
find our settings
// file then?
