<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0abd9cd5310fc3998f9b19734223fbef81dd821d">https://github.com/macports/macports-ports/commit/0abd9cd5310fc3998f9b19734223fbef81dd821d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0abd9cd5310fc3998f9b19734223fbef81dd821d
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Feb 21 14:02:55 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> toxic: update to 0.14.1
</span>---
net/toxic/Portfile | 18 ++++++++-------
net/toxic/files/0002-Config-make-paths-sane.patch | 2 +-
net/toxic/files/0006-Fix-static-asserts.patch | 27 +++++++++++++++++++++++
3 files changed, 38 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/toxic/Portfile b/net/toxic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a88b8d0a2f..6102008a27c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/toxic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/toxic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup makefile 1.0
</span> # clock_gettime in game_base
legacysupport.newest_darwin_requires_legacy 15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup JFreegman toxic 0.13.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup JFreegman toxic 0.14.1 v
</span> revision 0
categories net security
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,9 +16,9 @@ license GPL-3
</span> description An ncurses-based Tox client
long_description Toxic is a Tox-based instant messaging and video chat client.
homepage https://toktok.ltd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c44e017ba9065450211f8422143e3b12f5e3bb60 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f178fd29b071df6a7ad7567147dd143a2d7812a8d4c83dc96bb4cb34b01fffe8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1226663
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b2a1f6bd5c546f269a036f1c0740c446b149d22f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 232b72e2546694c668a6cb6e96ac109df3770ddd124361acce30366713880278 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1238139
</span> github.tarball_from archive
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +42,9 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> patchfiles-append 0005-Remove-hardcoded-osx_video.patch
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/TokTok/toxic/pull/358
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0006-Fix-static-asserts.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cfg/global_vars.mk
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,9 +61,8 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.c_standard 1999
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ENABLE_RELEASE is turned off for compatibility: it adds -flto flag, unsupported with older Apple compilers.
</span> build.env-append DESTDIR=${destroot}${prefix} \
DISABLE_AV=1 \
DISABLE_DESKTOP_NOTIFY=0 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +73,7 @@ build.env-append DESTDIR=${destroot}${prefix} \
</span> DISABLE_X11=0 \
ENABLE_ASAN=0 \
ENABLE_PYTHON=0 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ENABLE_RELEASE=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENABLE_RELEASE=1
</span> build.target
notes "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +94,7 @@ destroot.env DESTDIR=${destroot}${prefix} \
</span> DISABLE_X11=0 \
ENABLE_ASAN=0 \
ENABLE_PYTHON=0 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ENABLE_RELEASE=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENABLE_RELEASE=1
</span> destroot.target install
post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/toxic/files/0002-Config-make-paths-sane.patch b/net/toxic/files/0002-Config-make-paths-sane.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 11042fed94b..fee2c21fb8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/toxic/files/0002-Config-make-paths-sane.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/toxic/files/0002-Config-make-paths-sane.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ index ca83644..32bacd8 100644
</span> -# OS X ships a usable, recent version of ncurses, but calls it ncurses not ncursesw.
LDFLAGS += -lncurses -lalut -ltoxcore -lcurl -lconfig -lqrencode -lpng -lopenal -g
-CFLAGS += -I/usr/local/opt/freealut/include/AL -I/usr/local/opt/glib/include/glib-2.0 -g
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS += -std=c99 -I@PREFIX@/include/AL -I@PREFIX@/include/glib-2.0 -g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -std=c11 -I@PREFIX@/include/AL -I@PREFIX@/include/glib-2.0 -g
</span>
OSX_LIBRARIES = -lobjc -lresolv
OSX_FRAMEWORKS = -framework Foundation -framework CoreFoundation -framework AVFoundation \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/toxic/files/0006-Fix-static-asserts.patch b/net/toxic/files/0006-Fix-static-asserts.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8853b4b98f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/toxic/files/0006-Fix-static-asserts.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 40b77981d22f636d161ad77055b4ea978c78c86a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 25 Feb 2024 15:11:42 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] toxic.h: fix static assert
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/toxic.h | 7 +++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/toxic.h src/toxic.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e40f895..2a188a5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/toxic.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/toxic.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SIGINT 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <assert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(static_assert) && (defined(__GNUC__) || defined(__clang__)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && __STDC_VERSION__ <= 201710L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define static_assert _Static_assert
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <curses.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>