Hello ports@

Here's a update to abaddon that doesn't have much code churn from
upstream but the port changes a bit:

Firstly, this release includes libdave, in which depends on mlspp. both
are needed for voice support, and need to be in the build tree
otherwise it tries to fetch it from your installed system so I added
them to DIST_TUPLE. Discord changed their voice calls to all use
libdave e2ee so this will be needed going forward if point 2 ever gets
fixed.

Secondly, voice support is currently broken at compile time as it needs
mlspp to compile, which currently fails with libressl, so
-DENABLE_VOICE=0. 

Thirdly, we can drop the patch for the paths, that got merged.

Fourthly, I realized I don't need the do-install target as the cmake
script includes install steps already. This also allows for a .desktop
entry and an app icon which will be a welcome change for desktop
environment users.

Thoughts before a commit?

Thanks,

-- 
iz (she/her)

> i like to say mundane things,
> there are too many uninteresting things
> that go unnoticed.

izder456 (dot) neocities (dot) org
diff --git net/abaddon/Makefile net/abaddon/Makefile
index d4c6b61b692..8896cd1ab0c 100755
--- net/abaddon/Makefile
+++ net/abaddon/Makefile
@@ -1,6 +1,6 @@
 COMMENT =	alternative & light Discord client with voice support
 
-V =	0.2.3
+V =	0.2.4
 PKGNAME =	abaddon-${V}
 
 DIST_TUPLE +=	github uowuo abaddon v${V} .
@@ -8,8 +8,12 @@ DIST_TUPLE +=	github machinezone IXWebSocket \
 		bc765e73a31ea5372e36d1b1add036af3218cb17 subprojects/ixwebsocket
 DIST_TUPLE +=	github hrantzsch keychain \
 		502312f59fdc44fa1103e67f8f17cec3affb82d9 subprojects/keychain
+DIST_TUPLE +=	github discord libdave \
+		52cd56dc550f447fb354b3a06c9e2d2e2a4309c6 subprojects/libdave
 DIST_TUPLE +=	github mackron miniaudio \
-		350784a9467a79d0fa65802132668e5afbcf3777 subprojects/miniaudio
+		9634bedb5b5a2ca38c1ee7108a9358a4e233f14d subprojects/miniaudio
+DIST_TUPLE +=	github cisco mlspp \
+		1cc50a124a3bc4e143a787ec934280dc70c1034d subprojects/mlspp
 DIST_TUPLE +=	github nayuki QR-Code-generator \
 		22fac31bdf81da68730c177c0e931c93234d2a30 subprojects/qrcodegen
 
@@ -25,33 +29,27 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += ${COMPILER_LIBCXX} atk-1.0 atkmm-1.6 c cairo cairomm-1.0
 WANTLIB += crypto curl fmt fontconfig freetype gdk-3 gdk_pixbuf-2.0
 WANTLIB += gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0
-WANTLIB += gtk-3 gtkmm-3.0 handy-1 harfbuzz intl m opus pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 rnnoise secret-1
-WANTLIB += sigc-2.0 sodium spdlog sqlite3 ssl z
+WANTLIB += gtk-3 gtkmm-3.0 handy-1 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pangomm-1.4 secret-1 sigc-2.0 spdlog sqlite3
+WANTLIB += ssl z
 
 COMPILER =	base-clang ports-gcc base-gcc
 
 MODULES =	devel/cmake
 
+# mlspp currently broken with libressl
+CONFIGURE_ARGS =	-DENABLE_VOICE=0
+
 BUILD_DEPENDS =	textproc/nlohmann-json
-LIB_DEPENDS =	audio/rnnoise \
-		audio/opus \
-		databases/sqlite3 \
+LIB_DEPENDS =	databases/sqlite3 \
 		devel/atk2mm \
 		devel/fmt \
 		devel/glib2mm \
 		devel/harfbuzz \
 		devel/spdlog \
 		net/curl \
-		security/libsodium \
 		x11/gnome/libsecret \
 		x11/gtk3mm \
 		x11/libhandy
 
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/abaddon
-	cp -R ${WRKSRC}/res/* ${PREFIX}/share/abaddon/
-	${INSTALL_PROGRAM} ${WRKBUILD}/abaddon \
-		${PREFIX}/bin/
-
 .include <bsd.port.mk>
diff --git net/abaddon/distinfo net/abaddon/distinfo
index 1d56921a276..06ea1d330c6 100644
--- net/abaddon/distinfo
+++ net/abaddon/distinfo
@@ -1,10 +1,14 @@
+SHA256 (cisco-mlspp-1cc50a124a3bc4e143a787ec934280dc70c1034d.tar.gz) = ep1jGGJ+VIkDvGXD3FpN5KkCkJg+/qmkmvhWHtP5mfU=
+SHA256 (discord-libdave-52cd56dc550f447fb354b3a06c9e2d2e2a4309c6.tar.gz) = NWTg0m+hQ7u9Blm9krUPuJ2yqfF+Do7bldWGGwRvj/0=
 SHA256 (hrantzsch-keychain-502312f59fdc44fa1103e67f8f17cec3affb82d9.tar.gz) = PFfScqBkGe1YBo2f4UwWgHBBv5ubNyuAlQubCdCM9EE=
 SHA256 (machinezone-IXWebSocket-bc765e73a31ea5372e36d1b1add036af3218cb17.tar.gz) = neqQnQXogqVAUmsV+9yXZKOd61OBDrhq15f9gTWgInU=
-SHA256 (mackron-miniaudio-350784a9467a79d0fa65802132668e5afbcf3777.tar.gz) = KKttDTnDKkbVe1LRBARuizY3v8Udi6sH7FrlQV3I7lI=
+SHA256 (mackron-miniaudio-9634bedb5b5a2ca38c1ee7108a9358a4e233f14d.tar.gz) = Gjp5uA/G8LDMFV4ouVSlmODd+i22Tir6hGa+iMR2+lU=
 SHA256 (nayuki-QR-Code-generator-22fac31bdf81da68730c177c0e931c93234d2a30.tar.gz) = IY4+lt7XiA0F9Hxmiq1lQaCOYzA6xNeDcgOJCH2m9O0=
-SHA256 (uowuo-abaddon-v0.2.3.tar.gz) = BjdTxqetPmodmuSySOfYkskMElOWHrUS+96DsIsIjjU=
+SHA256 (uowuo-abaddon-v0.2.4.tar.gz) = aMs8oE6vJtzPfXdQpl34zyOBnJ1QGyWAijZLKRXDYM8=
+SIZE (cisco-mlspp-1cc50a124a3bc4e143a787ec934280dc70c1034d.tar.gz) = 4459088
+SIZE (discord-libdave-52cd56dc550f447fb354b3a06c9e2d2e2a4309c6.tar.gz) = 112322
 SIZE (hrantzsch-keychain-502312f59fdc44fa1103e67f8f17cec3affb82d9.tar.gz) = 138190
 SIZE (machinezone-IXWebSocket-bc765e73a31ea5372e36d1b1add036af3218cb17.tar.gz) = 637564
-SIZE (mackron-miniaudio-350784a9467a79d0fa65802132668e5afbcf3777.tar.gz) = 4485119
+SIZE (mackron-miniaudio-9634bedb5b5a2ca38c1ee7108a9358a4e233f14d.tar.gz) = 4553616
 SIZE (nayuki-QR-Code-generator-22fac31bdf81da68730c177c0e931c93234d2a30.tar.gz) = 193445
-SIZE (uowuo-abaddon-v0.2.3.tar.gz) = 14516137
+SIZE (uowuo-abaddon-v0.2.4.tar.gz) = 14522194
diff --git net/abaddon/patches/patch-src_platform_cpp net/abaddon/patches/patch-src_platform_cpp
deleted file mode 100644
index 36e84262d77..00000000000
--- net/abaddon/patches/patch-src_platform_cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-# https://github.com/uowuo/abaddon/pull/408
-Index: src/platform.cpp
---- src/platform.cpp.orig
-+++ src/platform.cpp
-@@ -93,7 +93,7 @@ std::string Platform::FindStateCacheFolder() {
-     return ".";
- }
- 
--#elif defined(__linux__) || defined(__FreeBSD__)
-+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
- std::string Platform::FindResourceFolder() {
-     static std::string found_path;
-     static bool found = false;
diff --git net/abaddon/pkg/PLIST net/abaddon/pkg/PLIST
index 2951a1d0541..62799a98b80 100644
--- net/abaddon/pkg/PLIST
+++ net/abaddon/pkg/PLIST
@@ -2,10 +2,6 @@
 share/abaddon/
 share/abaddon/css/
 share/abaddon/css/main.css
-share/abaddon/desktop/
-share/abaddon/desktop/icon.svg
-share/abaddon/desktop/io.github.uowuo.abaddon.desktop
-share/abaddon/desktop/io.github.uowuo.abaddon.metainfo.xml
 share/abaddon/fonts/
 share/abaddon/fonts/Twemoji-15.0.3.ttf
 share/abaddon/fonts/conf.d/
@@ -85,4 +81,7 @@ share/abaddon/res/twitter.png
 share/abaddon/res/typing_indicator.gif
 share/abaddon/res/xbox.png
 share/abaddon/res/youtube.png
+share/applications/icon.svg
+share/applications/io.github.uowuo.abaddon.desktop
+share/applications/io.github.uowuo.abaddon.metainfo.xml
 share/doc/pkg-readmes/${PKGSTEM}

• abaddon-0.2.4.diff (6K)