Re: Followup after update lang/sbcl
On Fri, 19 Apr 2024 06:24:48 +0200, Sebastien Marie wrote: > > Kirill A. Korinsky writes: > > > Greetings, > > > > I've encountered an edge case with update of sbcl which lead to broken > > stumpwm. > > > > My stumpwm configuration uses mpd modules which requires sb-bsd-sockets, so > > after update of sbcl... it was broken. > > > > To overstep that issue I must rebuild stumpwm because it is saved image > > which includes sbcl which was used when it was build. > > > > To avoid such issue in the future I suggest to add a note inside lang/sbcl > > that after update x11/stumpwm should have increased revision. > > > > I haven't found any other port which depends on lang/sbcl. > > I commited a REVISION bump to x11/stumpwm (REVISION starts at 0). > > if I properly understand the problem, it is due that you are using both > stumpwm (compiled with older sbcl compiler) and sbcl parts (for a mpd > module), and the version mismatches. > > For now, bumping stumpwm is the simpler, but I wonder if it would be > possible to use stumpwm somehow from source and let's sbcl compilation > to refresh the fasl files if updated. Timo, any idea ? > Well, I see another way to fix this issue by load all available .fasl files from sbcl which was used to build it, before it had saved image. A bit ugly. Anyway, stumpwm has one more issue which is triggered by upgrade when embeded version of sbcl is changed. It won't start with complains regarding missed version of .fasl files which was created from user's configuration. When configuration is simple, it won't be reproduced, but as soon as user start to use modules, the hell begins. That can be addreses by enabling global cache which seems to be disabled. -- wbr, Kirill
Re: OpenBSD-7.5 (release) ioquake3 issue
On 2024/04/19 01:46, sda wrote: > Dwarf Error: wrong version in compilation unit header (is 4, should be > 2) [in module /usr/libexec/ld.so] That's because of the ancient gdb that's in base. There's a slightly less old one in ports. See "Debug Packages, Debuggers and Backtraces" in https://www.openbsd.org/faq/ports/ports.html > Program received signal SIGILL, Illegal instruction. > 0x08c46184408b in ?? () > (gdb) > core dumped. (size 160Mb) Most likely this is due to the 'indirect branch tracking' cpu feature being triggered. Building from ports with USE_NOBTCFI=Yes will likely work around it, the proper fix would be to add 'endbr64' instructiond at the location of jump targets in assembly code. See if the above info on gdb will get you a backtrace.
[Update] devel/py-tqdm
This patch updates devel/py-tqdm. [Note that it implicitly relies on the
recent devel/py-test update: without it, there will be a missing
(indirect) dependency that causes `make test` to fail.] Tested working
with audio/ffmpeg-normalize.
Laurie
diff --git devel/py-tqdm/Makefile devel/py-tqdm/Makefile
index 17226fa83b8..1f5c32c214c 100644
--- devel/py-tqdm/Makefile
+++ devel/py-tqdm/Makefile
@@ -1,6 +1,6 @@
COMMENT = progress bar for Python
-MODPY_EGG_VERSION =4.65.0
+MODPY_EGG_VERSION =4.66.2
DISTNAME = tqdm-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -21,4 +21,7 @@ MODPY_PYBUILD = setuptools_scm
FLAVORS = python3
FLAVOR = python3
+TEST_DEPENDS= devel/py-test-asyncio${MODPY_FLAVOR} \
+ devel/py-test-timeout${MODPY_FLAVOR}
+
.include
diff --git devel/py-tqdm/distinfo devel/py-tqdm/distinfo
index a27b592e2e4..074df15d14e 100644
--- devel/py-tqdm/distinfo
+++ devel/py-tqdm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tqdm-4.65.0.tar.gz) = GHH7aKhrj7O1nKTN09zMvH5tYT7u0x9MMyUxl3uJvrU=
-SIZE (tqdm-4.65.0.tar.gz) = 167542
+SHA256 (tqdm-4.66.2.tar.gz) = bNUs3w/vDg9UMpnPyW/skNe4p+iHRfQR7DPrRNXtNTE=
+SIZE (tqdm-4.66.2.tar.gz) = 169462
Re: Followup after update lang/sbcl
On Fri, 19 Apr 2024 09:01:50 +0200, Kirill A. Korinsky wrote: > > That can be addreses by enabling global cache which seems to be disabled. > Which also a bit tricky, because stumpwm is built with ASDF_OUTPUT_TRANSLATIONS=/ that makes cache path like /stumpw-XXX that can't be created from a user. -- wbr, Kirill
Re: [s...@spacehopper.org: Re: [NEW]: misc/openhab - open Home Automation Bus (openHAB)]
Stuart Henderson writes: > I've tweaked DESCR/README slightly for openhab-addons. This has been sitting > on ports@ for quite a while, as is usual for a java port there are some > things which sit a bit awkwardly compared to some other ports but I > think it's basically alright. Any oks to import? ok bentley@
Re: OpenBSD-7.5 (release) ioquake3 issue
Hi, Stuart! Thank You! you've nailed the core of issue. 1) used /usr/local/bin/egdb for ioquake3 from packages. result: Thread 1 received signal SIGILL, Illegal instruction. 0x082c2633008b in ?? () (gdb) address of 'illegal instruction' seems to be a random value.. no other errors appear so far. 2) for current git build used: $ gmake LDFLAGS="-z nobtcfi" result - 100% working binaries (pass instruction to the linker) 3) i'm still not good/comfortable with ports system, so didn't check 'USE_NOBTCFI=Yes' option, sorry.. 4) for c++/eg++ (other builds with similar failure) guess that: -fcf-protection=[full|branch|return] could do the trick (? branch ?). will check later. Thanks again, best regards On Fri, Apr 19, 2024 at 08:04 +0100, Stuart Henderson wrote: > On 2024/04/19 01:46, sda wrote: > > Dwarf Error: wrong version in compilation unit header (is 4, should be > > 2) [in module /usr/libexec/ld.so] > > That's because of the ancient gdb that's in base. There's a slightly > less old one in ports. See "Debug Packages, Debuggers and Backtraces" > in https://www.openbsd.org/faq/ports/ports.html > > > Program received signal SIGILL, Illegal instruction. > > 0x08c46184408b in ?? () > > (gdb) > > core dumped. (size 160Mb) > > Most likely this is due to the 'indirect branch tracking' cpu feature > being triggered. Building from ports with USE_NOBTCFI=Yes will likely > work around it, the proper fix would be to add 'endbr64' instructiond > at the location of jump targets in assembly code. See if the above > info on gdb will get you a backtrace. >
[UPDATE] textproc/uncrustify to 0.78.1
Hi ports@,
Here is a diff to update uncrustify to 0.78.1.
CC'ing MAINTAINER.
All tests pass on amd64 and arm64:
100% tests passed, 0 tests failed out of 14
Comments? OK?
Index: Makefile
===
RCS file: /cvs/ports/textproc/uncrustify/Makefile,v
diff -u -p -r1.30 Makefile
--- Makefile7 Nov 2023 14:19:48 - 1.30
+++ Makefile19 Apr 2024 09:20:30 -
@@ -1,7 +1,6 @@
COMMENT = source code beautifier
-DISTNAME = uncrustify-0.72.0
-REVISION = 0
+DISTNAME = uncrustify-0.78.1
CATEGORIES = textproc devel
@@ -22,8 +21,6 @@ MODULES = devel/cmake \
lang/python
MODPY_RUNDEP = No
-
-WRKDIST = ${WRKDIR}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/uncrustify/
Index: distinfo
===
RCS file: /cvs/ports/textproc/uncrustify/distinfo,v
diff -u -p -r1.15 distinfo
--- distinfo10 Mar 2021 15:40:29 - 1.15
+++ distinfo19 Apr 2024 09:20:30 -
@@ -1,2 +1,2 @@
-SHA256 (uncrustify-0.72.0.tar.gz) =
7vifR4WGANE9MYwNPW2FUHXtuk5PG6pvBzPub5UNY9M=
-SIZE (uncrustify-0.72.0.tar.gz) = 1529996
+SHA256 (uncrustify-0.78.1.tar.gz) =
X5LJBzTha2A8lQunMGv4opWa+kHU7MalK0lmGDoeo80=
+SIZE (uncrustify-0.78.1.tar.gz) = 1732317
Re: [Update] x11/alacritty 0.13.2
On Tue, Apr 16, 2024 at 07:38:33PM +0200, Landry Breuil wrote:
[...]
> > Unfortunately it still doesn't run under wayland, though :-)
>
> same thing here with wayland, blows at startup:
>
> [0.01513s] [INFO ] [alacritty] Welcome to Alacritty
> [0.000192660s] [INFO ] [alacritty] Version 0.13.2
> [0.000206126s] [INFO ] [alacritty] Running on Wayland
> [0.000422622s] [INFO ] [alacritty_config_derive] No config file found; using
> default
> [0.012349299s] [INFO ] [alacritty] Goodbye
> Error: Error { raw_code: None, raw_os_message: None, kind:
> NotSupported("provided display handle is not supported") }
>
> but my wayland setup might be borked as the keymap is completely out.
>
> that updated alacritty runs fine on X11.
Runs fine on X11 here as well.
OK fcambus@
Re: [UPDATE] textproc/uncrustify to 0.78.1
Hi,
sounds good to me, thanks !
Remi.
Le 19/04/2024 à 11:39, Frederic Cambus a écrit :
Hi ports@,
Here is a diff to update uncrustify to 0.78.1.
CC'ing MAINTAINER.
All tests pass on amd64 and arm64:
100% tests passed, 0 tests failed out of 14
Comments? OK?
Index: Makefile
===
RCS file: /cvs/ports/textproc/uncrustify/Makefile,v
diff -u -p -r1.30 Makefile
--- Makefile7 Nov 2023 14:19:48 - 1.30
+++ Makefile19 Apr 2024 09:20:30 -
@@ -1,7 +1,6 @@
COMMENT = source code beautifier
-DISTNAME = uncrustify-0.72.0
-REVISION = 0
+DISTNAME = uncrustify-0.78.1
CATEGORIES = textproc devel
@@ -22,8 +21,6 @@ MODULES = devel/cmake \
lang/python
MODPY_RUNDEP = No
-
-WRKDIST = ${WRKDIR}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/uncrustify/
Index: distinfo
===
RCS file: /cvs/ports/textproc/uncrustify/distinfo,v
diff -u -p -r1.15 distinfo
--- distinfo10 Mar 2021 15:40:29 - 1.15
+++ distinfo19 Apr 2024 09:20:30 -
@@ -1,2 +1,2 @@
-SHA256 (uncrustify-0.72.0.tar.gz) =
7vifR4WGANE9MYwNPW2FUHXtuk5PG6pvBzPub5UNY9M=
-SIZE (uncrustify-0.72.0.tar.gz) = 1529996
+SHA256 (uncrustify-0.78.1.tar.gz) =
X5LJBzTha2A8lQunMGv4opWa+kHU7MalK0lmGDoeo80=
+SIZE (uncrustify-0.78.1.tar.gz) = 1732317
Re: [s...@spacehopper.org: Re: [NEW]: misc/openhab - open Home Automation Bus (openHAB)]
On Fri, Apr 19, 2024 at 01:54:49AM -0600, Anthony J. Bentley wrote: > Stuart Henderson writes: > > I've tweaked DESCR/README slightly for openhab-addons. This has been sitting > > on ports@ for quite a while, as is usual for a java port there are some > > things which sit a bit awkwardly compared to some other ports but I > > think it's basically alright. Any oks to import? > > ok bentley@ > Thank you for the OK. I did have one small edit before commit: openhab.rc: #OPENHAB_BACKUPS=/var/db/openhab/backups The commented out "default" value was pointing to '/var/openhab/backups' which was incorrect. Attached with correct path. Thanks everyone for the review and willingness to commit. -- Chaz openhab.tgz Description: application/gtar-compressed
Fix emulators/dosbox-x build on riscv64
Hi,
Upstream wants to use glibc features but doesn't actually try to
detect it in a way that doesn't affect other platforms. This may fix
other architectures, not just riscv64. amd64, i386, armv7 and arm64
are not affected because there dosbox.h doesn't define
HAS_LONG_DOUBLE.
ok?
Index: Makefile
===
RCS file: /cvs/ports/emulators/dosbox-x/Makefile,v
diff -u -p -r1.3 Makefile
--- Makefile28 Mar 2024 10:26:04 - 1.3
+++ Makefile19 Apr 2024 15:41:09 -
@@ -4,6 +4,7 @@ VERSION=2024.03.01
DISTNAME= dosbox-x-v${VERSION}
PKGNAME= dosbox-x-${VERSION}
CATEGORIES=games x11 emulators
+REVISION= 0
GH_ACCOUNT=joncampbell123
GH_PROJECT=dosbox-x
Index: patches/patch-src_fpu_fpu_instructions_longdouble_h
===
RCS file: patches/patch-src_fpu_fpu_instructions_longdouble_h
diff -N patches/patch-src_fpu_fpu_instructions_longdouble_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_fpu_fpu_instructions_longdouble_h 4 Mar 2024 08:53:15
-
@@ -0,0 +1,29 @@
+Index: src/fpu/fpu_instructions_longdouble.h
+--- src/fpu/fpu_instructions_longdouble.h.orig
src/fpu/fpu_instructions_longdouble.h
+@@ -16,17 +16,21 @@
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+-#include /* for isinf, etc */
++/* for isinf, etc. glibc math.h includes features.h which in turn
++ * defines __GLIBC__ (needed below).
++ */
++#include
++
+ #include "cpu/lazyflags.h"
+
+ #ifdef __GNUC__
+ # if defined(__MINGW32__) || (defined(MACOSX) && !defined(__arm64__))
+ # include "fpu_control_x86.h"
+-# elif defined(ANDROID) || defined(__ANDROID__) || (defined(MACOSX) &&
defined(__arm64__)) || defined(EMSCRIPTEN) || defined(__powerpc__)
++# elif defined(__GLIBC__)
++# include
++# else
+ /* ? */
+ # define _FPU_SETCW(x) /* dummy */
+-# else
+-# include
+ # endif
+ static inline void FPU_SyncCW(void) {
+ uint16_t tmp = fpu.cw | 0x80 | 0x3F; // HACK: Disable all FPU exceptions
until DOSBox-X can catch and reflect FPU exceptions to the guest
--
jca
Fix emulators/qemu on riscv64
Use ucontext_t/struct sigcontext member name from machine/signal.h
instead of Linux/glibc specific name. Fixes the build on riscv64.
ok?
Index: patches/patch-tcg_riscv_tcg-target_c_inc
===
RCS file: patches/patch-tcg_riscv_tcg-target_c_inc
diff -N patches/patch-tcg_riscv_tcg-target_c_inc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tcg_riscv_tcg-target_c_inc29 Feb 2024 12:38:25 -
@@ -0,0 +1,12 @@
+Index: tcg/riscv/tcg-target.c.inc
+--- tcg/riscv/tcg-target.c.inc.orig
tcg/riscv/tcg-target.c.inc
+@@ -2115,7 +2115,7 @@ static void sigill_handler(int signo, siginfo_t *si, v
+ {
+ /* Skip the faulty instruction */
+ ucontext_t *uc = (ucontext_t *)data;
+-uc->uc_mcontext.__gregs[REG_PC] += 4;
++uc->sc_sepc += 4;
+
+ got_sigill = 1;
+ }
--
jca
Re: net/pidgin: openssl: send failed: -1 with purple-teams
I looked at the files/ssl-openssl.c in this port. In the
ssl_openssl_write function, if there is an error other than
SSL_ERROR_WANT_READ or SSL_ERROR_WANT_WRITE then the execution falls
through to return 0.
I changed the code to include the actual result from the SSL_get_error
function in the debug message, and return -1 instead of falling through
to return 0. The ssl_gnutls_write function does that, and it seems quite
similar. Not sure which one is based upon the other. ssl_gnutls_write
also sets errno = EIO in this situation, so I added that as well. The
ssl_openssl_read function is quite similar, and though I have not seen
any errors from that, I made the same changes there.
This has made a big improvement, I still see a few errors, maybe 10 or
12 at a time, which are all "openssl: send failed: 5" but not the many
thousands that I saw before. The cpu load of the finch process stays
quite low.
I tried to make a diff for this. It seems to fix my problem, but don't
know if introduces any others, so I offer it for what it's worth
Index: Makefile
===
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.161
diff -u -p -u -r1.161 Makefile
--- Makefile27 Sep 2023 14:18:28 - 1.161
+++ Makefile19 Apr 2024 02:21:26 -
@@ -3,6 +3,7 @@ COMMENT-finch= multi-protocol instant me
COMMENT-libpurple= multi-protocol instant messaging library
VERSION= 2.14.12
+REVISION= 0
DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
PKGNAME-finch= finch-${VERSION}
Index: files/ssl-openssl.c
===
RCS file: /cvs/ports/net/pidgin/files/ssl-openssl.c,v
retrieving revision 1.11
diff -u -p -u -r1.11 ssl-openssl.c
--- files/ssl-openssl.c 11 Mar 2022 19:46:55 - 1.11
+++ files/ssl-openssl.c 19 Apr 2024 02:21:26 -
@@ -203,8 +203,9 @@ ssl_openssl_read(PurpleSslConnection *gs
return (-1);
}
- purple_debug_error("openssl", "receive failed: %zi\n", s);
- s = 0;
+ purple_debug_error("openssl", "receive failed: %d\n", ret);
+ errno = EIO;
+ return (-1);
}
return (s);
@@ -229,8 +230,9 @@ ssl_openssl_write(PurpleSslConnection *g
return (-1);
}
- purple_debug_error("openssl", "send failed: %zi\n", s);
- s = 0;
+ purple_debug_error("openssl", "send failed: %d\n", ret);
+ errno = EIO;
+ return (-1);
}
return (s);
--
Allan Streib
Luddy School of Informatics, Computing, and Engineering
Indiana University
dpb always rebuild rust-bootstrap
hi, on a fresh current amd64 I had to set up dpb because it seems there was a libc bump at the wrong time for me :) however, now I have my working dpb (easy to setup once you understand it), I don't understand why dpb -R something_depending_on_rust always have to recompile lang/rust, in the packages directory, only the rust bootstrap package is changed everytime I run dpb. I'm not sure which logs I could provide though. This is quite annoying because lang/rust is heavy to compile and I like to trigger dpb every time I try a diff. Am I the only one with this issue?
update games/brogue
this updates brogue to latest version, it introduces a quick game
mode
the Recordings.c patch isn't needed, upstream is now casting the
variable to unsigned long long instead of our long long, I guess
it's good enough to drop the patch?
the -Wformat-overflow=0 part in the Makefile was also dropped
upstream.
diff --git a/games/brogue/Makefile b/games/brogue/Makefile
index 7135bf18124..a73c8e05c4f 100644
--- a/games/brogue/Makefile
+++ b/games/brogue/Makefile
@@ -3,7 +3,7 @@ COMMENT-no_x11 =roguelike game by Brian Walker
GH_ACCOUNT = tmewett
GH_PROJECT = BrogueCE
-GH_TAGNAME = v1.12
+GH_TAGNAME = v1.13
PKGNAME = brogue-${GH_TAGNAME:S/v//}
diff --git a/games/brogue/distinfo b/games/brogue/distinfo
index 6bed27b849e..71416d88ad5 100644
--- a/games/brogue/distinfo
+++ b/games/brogue/distinfo
@@ -1,2 +1,2 @@
-SHA256 (BrogueCE-1.12.tar.gz) = ru0/bKD041ITewGW6d3b3OVCqemd2p7/2RXgGJI81Cg=
-SIZE (BrogueCE-1.12.tar.gz) = 1168482
+SHA256 (BrogueCE-1.13.tar.gz) = TGPpFjmQLVhWWrPChS2JpCBs3WAgC1hfqdk9aliBkGw=
+SIZE (BrogueCE-1.13.tar.gz) = 1294988
diff --git a/games/brogue/patches/patch-Makefile
b/games/brogue/patches/patch-Makefile
index baef5747b1f..c7a2949a183 100644
--- a/games/brogue/patches/patch-Makefile
+++ b/games/brogue/patches/patch-Makefile
@@ -4,21 +4,12 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -2,7 +2,7 @@ include config.mk
-
- cflags := -Isrc/brogue -Isrc/platform -std=c99 \
- -Wall -Wpedantic -Werror=implicit -Wno-parentheses -Wno-unused-result \
-- -Wformat -Werror=format-security -Wformat-overflow=0
-+ -Wformat -Werror=format-security
- libs := -lm
- cppflags := -DDATADIR=$(DATADIR)
-
-@@ -41,7 +41,7 @@ ifeq ($(DEBUG),YES)
- cflags += -g -Og
- cppflags += -DENABLE_PLAYBACK_SWITCH
+@@ -62,7 +62,7 @@ ifeq ($(DEBUG),YES)
+ cflags += -g -Og
+ cppflags += -DENABLE_PLAYBACK_SWITCH
else
-- cflags += -O2
-+ cflags +=
+-cflags += -O2
++cflags +=
endif
- objects := $(sources:.c=.o)
+ # Add user-provided flags.
diff --git a/games/brogue/patches/patch-src_brogue_Recordings_c
b/games/brogue/patches/patch-src_brogue_Recordings_c
deleted file mode 100644
index f173d23598b..000
--- a/games/brogue/patches/patch-src_brogue_Recordings_c
+++ /dev/null
@@ -1,18 +0,0 @@
-cast int64_t to long long for printing
-
-Index: src/brogue/Recordings.c
src/brogue/Recordings.c.orig
-+++ src/brogue/Recordings.c
-@@ -1454,10 +1454,10 @@ void parseFile() {
- numDepths = recallNumber(4);
- fileLength = recallNumber(4);
-
--fprintf(descriptionFile, "Parsed file \"%s\":\n\tVersion: %s\n\tSeed:
%li\n\tNumber of turns: %li\n\tNumber of depth changes: %li\n\tFile length:
%li\n",
-+fprintf(descriptionFile, "Parsed file \"%s\":\n\tVersion: %s\n\tSeed:
%lli\n\tNumber of turns: %li\n\tNumber of depth changes: %li\n\tFile length:
%li\n",
- currentFilePath,
- versionString,
--seed,
-+(long long)seed,
- numTurns,
- numDepths,
- fileLength);
update games/hyperrogue
our hyperrogue version is quite old of a dozen releases
latest release adds a lot of changes
https://github.com/zenorogue/hyperrogue/releases
the Makefile patch had to be reworked a bit because the original
Makefile differed from the patch, but it applies the same changes
as before.
update-plist removed some honeycomb files, I don't know if it's
expected... the game plays fine
diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 4c1a7417f10..b5173d052ca 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,4 +1,4 @@
-V =12.0f
+V =13.0d
COMMENT = roguelike game in a non-Euclidean world
CATEGORIES = games x11
diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo
index 835425d2f49..fe08e61d88c 100644
--- a/games/hyperrogue/distinfo
+++ b/games/hyperrogue/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hyperrogue-12.0f.tar.gz) = ROeOk+0dMZg9680EeR1//Pz73EBpfnCaD2yi04wwID4=
-SIZE (hyperrogue-12.0f.tar.gz) = 79946099
+SHA256 (hyperrogue-13.0d.tar.gz) = 4ApHLRReh9u3dzH+FXCHyB2N5b0rBfogkbyQGFMIDoo=
+SIZE (hyperrogue-13.0d.tar.gz) = 87765129
diff --git a/games/hyperrogue/patches/patch-Makefile
b/games/hyperrogue/patches/patch-Makefile
index 1567a49854b..6d4afc867d8 100644
--- a/games/hyperrogue/patches/patch-Makefile
+++ b/games/hyperrogue/patches/patch-Makefile
@@ -26,9 +26,9 @@ Index: Makefile
-ifeq (${TOOLCHAIN},clang)
- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -march=native -fPIC
-- CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -Werror -pedantic
-- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized -Wno-unknown-warning-option
+- CXXFLAGS_EARLY += -fPIC
+- CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -pedantic
+- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized -Wno-char-subscripts -Wno-unknown-warning-option
- CXXFLAGS_EARLY += -Wno-invalid-offsetof
-endif
+CXXFLAGS_STD = -std=c++11
@@ -39,23 +39,23 @@ Index: Makefile
-ifeq (${TOOLCHAIN},gcc)
- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -march=native -fPIC
-- CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
+- CXXFLAGS_EARLY += -fPIC
+- CXXFLAGS_EARLY += -W -Wall -Wextra -pedantic
- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized
+- CXXFLAGS_EARLY += -Wno-invalid-offsetof
-endif
-
-ifeq (${TOOLCHAIN},mingw)
- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -march=native
-- CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
+- CXXFLAGS_EARLY += -W -Wall -Wextra
- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized
+- CXXFLAGS_EARLY += -Wno-invalid-offsetof
-endif
-
--
- ## We have now finished OS-specific and TOOLCHAIN-specific computations.
- ## Begin customization points for user-specifiable HYPERROGUE_USE_XXX macros.
-
-@@ -139,19 +120,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
+ ifeq (${FONTCONFIG},1)
+ CXXFLAGS_EARLY += -DFONTCONFIG `pkg-config --cflags fontconfig`
+ LDFLAGS_EARLY += `pkg-config --libs fontconfig`
+@@ -144,19 +125,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS}
hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES)
@@ -78,8 +78,8 @@ Index: Makefile
+ $(CXX) $(CXXFLAGS) makeh.cpp $(LDFLAGS) -o $@
autohdr.h: makeh$(EXE_EXTENSION) language-data.cpp *.cpp
- ./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp
geometry.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp
pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp language.cpp
util.cpp complex.cpp *.cpp > autohdr.h
-@@ -160,10 +141,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
+ ./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp
geometry.cpp embeddings.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp
multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp
hprint.cpp language.cpp util.cpp complex.cpp multigame.cpp arbitrile.cpp
rulegen.cpp *.cpp > autohdr.h
+@@ -165,10 +146,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
./langen > language-data.cpp
savepng$(OBJ_EXTENSION): savepng.cpp
diff --git a/games/hyperrogue/pkg/PLIST b/games/hyperrogue/pkg/PLIST
index 3095c30894e..9d6cb6288c1 100644
--- a/games/hyperrogue/pkg/PLIST
+++ b/games/hyperrogue/pkg/PLIST
@@ -3,15 +3,6 @@ share/doc/hyperrogue/
share/doc/hyperrogue/README.md
share/hyperrogue/
share/hyperrogue/DejaVuSans-Bold.ttf
-share/hyperrogue/honeycomb-rules-344.dat
-share/hyperrogue/honeycomb-rules-353.dat
-share/hyperrogue/honeycomb-rules-354.dat
-share/hyperrogue/honeycomb-rules-355.dat
-share/hyperrogue/honeycomb-rules-435.dat
-share/hyperrogue/honeycomb-rules-436.dat
-share/hyperrogue/honeycomb-rules-534.dat
-share/hyperrogue/honeycomb-rules-535.dat
-share/hyperrogue/honeycomb-rules-536.dat
share/hyperrogue/hyp
update audio/cozy
cozy got a new release after 2 years, including a commit we backported
to prevent a crash. This version has a slightly new UI, works fine
for me.
ok?
diff --git a/audio/cozy/Makefile b/audio/cozy/Makefile
index 9491989b6a1..8e4a9fc02ef 100644
--- a/audio/cozy/Makefile
+++ b/audio/cozy/Makefile
@@ -2,7 +2,7 @@ COMMENT = gtk3 audiobook player
GH_ACCOUNT = geigi
GH_PROJECT = cozy
-GH_TAGNAME = 1.2.1
+GH_TAGNAME = 1.3.0
CATEGORIES = audio
diff --git a/audio/cozy/distinfo b/audio/cozy/distinfo
index 4cc6807fb30..c2a3efae4eb 100644
--- a/audio/cozy/distinfo
+++ b/audio/cozy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cozy-1.2.1.tar.gz) = VSLdPiqop1R4UVxK4pnnH6MqkZcDzEpTL7p5c2PMWEQ=
-SIZE (cozy-1.2.1.tar.gz) = 831167
+SHA256 (cozy-1.3.0.tar.gz) = tOXUOPXT9dI2pJ8/y0M8pPpInX1ZlZYaXZZ5ULu2wQI=
+SIZE (cozy-1.3.0.tar.gz) = 332173
diff --git a/audio/cozy/patches/patch-cozy_ui_widgets_whats_new_window_py
b/audio/cozy/patches/patch-cozy_ui_widgets_whats_new_window_py
deleted file mode 100644
index 84f2f21a875..000
--- a/audio/cozy/patches/patch-cozy_ui_widgets_whats_new_window_py
+++ /dev/null
@@ -1,28 +0,0 @@
-this patch is required to make coyz run, until the following commit gets
merged upstream
-https://github.com/geigi/cozy/pull/762
-
-diff --git a/cozy/ui/widgets/whats_new_window.py
b/cozy/ui/widgets/whats_new_window.py
-index 1e80d1ef..1a79005b 100644
cozy/ui/widgets/whats_new_window.py
-+++ cozy/ui/widgets/whats_new_window.py
-@@ -51,12 +51,16 @@ def __init__(self, **kwargs):
- def _fill_window(self):
- self.children = []
-
--last_launched_version =
version.parse(self.app_settings.last_launched_version)
--
--if type(last_launched_version) is version.LegacyVersion:
-+try:
-+last_launched_version =
version.parse(self.app_settings.last_launched_version)
-+except version.InvalidVersion:
- self._fill_welcome()
- else:
--self._fill_whats_new(last_launched_version)
-+if type(last_launched_version) is version.LegacyVersion:
-+self._fill_welcome()
-+else:
-+self._fill_whats_new(last_launched_version)
-+
-
- def _fill_welcome(self):
- from cozy.ui.widgets.welcome import Welcome
diff --git a/audio/cozy/pkg/PLIST b/audio/cozy/pkg/PLIST
index 2e725b67027..0f9e2028bd6 100644
--- a/audio/cozy/pkg/PLIST
+++ b/audio/cozy/pkg/PLIST
@@ -87,10 +87,8 @@ lib/python${MODPY_VERSION}/site-packages/cozy/extensions/
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}gtk_widget.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}is_same_book.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}set.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cozy/extensions/gtk_widget.py
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/is_same_book.py
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/set.py
lib/python${MODPY_VERSION}/site-packages/cozy/media/
@@ -122,7 +120,6 @@
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}chapter.${MO
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}database_importer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}library.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}single_file_chapter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}storage.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}track.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/model/book.py
@@ -130,7 +127,6 @@
lib/python${MODPY_VERSION}/site-packages/cozy/model/chapter.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/database_importer.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/library.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/settings.py
-lib/python${MODPY_VERSION}/site-packages/cozy/model/single_file_chapter.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/storage.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/track.py
lib/python${MODPY_VERSION}/site-packages/cozy/open_view.py
@@ -159,17 +155,14 @@
lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}disk_element.${
lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}file_not_found_dialog.${MODPY_PYC_MAGIC
Re: Fix emulators/dosbox-x build on riscv64
On Fri, Apr 19, 2024 at 05:52:16PM +0200, Jeremie Courreges-Anglas wrote:
>
> Hi,
>
> Upstream wants to use glibc features but doesn't actually try to
> detect it in a way that doesn't affect other platforms. This may fix
> other architectures, not just riscv64. amd64, i386, armv7 and arm64
> are not affected because there dosbox.h doesn't define
> HAS_LONG_DOUBLE.
>
> ok?
Looks like upstream already ripped out this chunk of code and replaced
it with something portable.
Index: Makefile
===
RCS file: /cvs/ports/emulators/dosbox-x/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile28 Mar 2024 10:26:04 - 1.3
+++ Makefile19 Apr 2024 21:21:38 -
@@ -3,6 +3,7 @@ COMMENT=x86 with DOS emulator targeted
VERSION= 2024.03.01
DISTNAME= dosbox-x-v${VERSION}
PKGNAME= dosbox-x-${VERSION}
+REVISION= 0
CATEGORIES=games x11 emulators
GH_ACCOUNT=joncampbell123
Index: patches/patch-src_fpu_fpu_instructions_longdouble_h
===
RCS file: patches/patch-src_fpu_fpu_instructions_longdouble_h
diff -N patches/patch-src_fpu_fpu_instructions_longdouble_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_fpu_fpu_instructions_longdouble_h 19 Apr 2024 21:21:38
-
@@ -0,0 +1,123 @@
+- Disable FP exceptions in a portable way
+ 8b362df1f26fceeccb6f3b37bd26880e72db79b2
+- Update fpu_instructions_longdouble.h
+ 53fe254c9ce25a48dbe11582416cbf3a49516dce
+
+Index: src/fpu/fpu_instructions_longdouble.h
+--- src/fpu/fpu_instructions_longdouble.h.orig
src/fpu/fpu_instructions_longdouble.h
+@@ -16,31 +16,18 @@
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
++#include /* for std::feholdexcept */
+ #include /* for isinf, etc */
+ #include "cpu/lazyflags.h"
+
+-#ifdef __GNUC__
+-# if defined(__MINGW32__) || (defined(MACOSX) && !defined(__arm64__))
+-# include "fpu_control_x86.h"
+-# elif defined(ANDROID) || defined(__ANDROID__) || (defined(MACOSX) &&
defined(__arm64__)) || defined(EMSCRIPTEN) || defined(__powerpc__)
+-/* ? */
+-# define _FPU_SETCW(x) /* dummy */
+-# else
+-# include
+-# endif
+-static inline void FPU_SyncCW(void) {
+-uint16_t tmp = fpu.cw | 0x80 | 0x3F; // HACK: Disable all FPU exceptions
until DOSBox-X can catch and reflect FPU exceptions to the guest
+-_FPU_SETCW(tmp);
+-}
+-#else
+-static inline void FPU_SyncCW(void) {
+-/* nothing */
+-}
+-#endif
+-
+ static void FPU_FINIT(void) {
++ fenv_t buf;
++
+ fpu.cw.init();
+-FPU_SyncCW();
++
++ // HACK: Disable all FPU exceptions until DOSBox-X can catch and
reflect FPU exceptions to the guest
++ std::feholdexcept(&buf);
++
+ fpu.sw.init();
+ fpu.tags[0] = TAG_Empty;
+ fpu.tags[1] = TAG_Empty;
+@@ -290,7 +277,8 @@ static void FPU_FBST(PhysPt addr) {
+ #endif
+
+ static void FPU_FADD(Bitu op1, Bitu op2){
+-FPU_SyncCW();
++ fenv_t buf;
++ std::feholdexcept(&buf);
+ // HACK: Set the denormal flag according to whether the source or final
result is a denormalized number.
+ // This is vital if we don't want certain DOS programs to
mis-detect our FPU emulation as an IIT clone chip when cputype == 286
+ bool was_not_normal = isdenormal(fpu.regs_80[op1].v);
+@@ -324,7 +312,8 @@ static void FPU_FCOS(void){
+ }
+
+ static void FPU_FSQRT(void){
+-FPU_SyncCW();
++ fenv_t buf;
++ std::feholdexcept(&buf);
+ fpu.regs_80[TOP].v = sqrtl(fpu.regs_80[TOP].v);
+ //flags and such :)
+ return;
+@@ -343,35 +332,40 @@ static void FPU_FPTAN(void){
+ return;
+ }
+ static void FPU_FDIV(Bitu st, Bitu other){
+-FPU_SyncCW();
++ fenv_t buf;
++ std::feholdexcept(&buf);
+ fpu.regs_80[st].v = fpu.regs_80[st].v/fpu.regs_80[other].v;
+ //flags and such :)
+ return;
+ }
+
+ static void FPU_FDIVR(Bitu st, Bitu other){
+-FPU_SyncCW();
++ fenv_t buf;
++ std::feholdexcept(&buf);
+ fpu.regs_80[st].v = fpu.regs_80[other].v/fpu.regs_80[st].v;
+ // flags and such :)
+ return;
+ }
+
+ static void FPU_FMUL(Bitu st, Bitu other){
+-FPU_SyncCW();
++ fenv_t buf;
++ std::feholdexcept(&buf);
+ fpu.regs_80[st].v *= fpu.regs_80[other].v;
+ //flags and such :)
+ return;
+ }
+
+ static void FPU_FSUB(Bitu st, Bitu other){
+-FPU_SyncCW();
++ fenv_t buf;
++ std::feholdexcept(&buf);
+ fpu.regs_80[st].v = fpu.regs_80[st].v - fpu.regs_80[other].v;
+ //flags and such :)
+ return;
+ }
+
+ static void FPU_FSUBR(Bitu st, Bitu other){
+-FPU_SyncCW();
++ fenv_t buf;
++ std::feholdexcept(&buf);
+ fpu.regs_80[st].v = fpu.regs_80[other].v - fpu.regs_80[st].v;
+ //flags and such :)
+ return;
+@@ -562,7 +556,8 @@ static void FPU_FLDENV(PhysPt addr, bool op16){
+ tag=
Re: Fix emulators/dosbox-x build on riscv64
Hi, I compared Brad's diff with current DOSBox-X code on GitHub https://github.com/joncampbell123/dosbox-x/commit/53fe254c9ce25a48dbe11582416cbf3a49516dce Copyright date is different (2002-2021 should be 2002-2024) but others are same. I think this is ok. -- SASANO Takayoshi (JG1UAA)
Re: UPDATE: audio/gonic to v0.16.4
Can I get someone to look at this, please? Bump-ingly, -R On Sun, Apr 07, 2024 at 12:41:22AM -0400, Russ Sharek wrote: > Minor update to audio/gonic from 0.16.2 to 0.16.4 > > Tested on amd64, appears to be working as expected. > > OK, please?
Re: [NEW] net/crawley-v1.7.5
Bump! Can someone please check this over? Thanks, -R On Sun, Apr 07, 2024 at 10:33:41PM -0400, Russ Sharek wrote: > Hello all! > > Attached is a port of crawley, the unix-way web crawler. > > It handily crawls web pages and prints any link it can find. > > homepage: https://github.com/s0rg/crawley > > Tested on amd64. > > OK, please?
Re: [NEW] net/crawley-v1.7.5
Hey Russ, On Fri, Apr 19, 2024 at 06:14:49PM -0400, Russ Sharek wrote: > Can someone please check this over? Is `ALL_TARGET = github.com/s0rg/crawley@v1.7.5` needed? Is it supposed to recurse out of the website you start inside, given enough time? I ran it on my own website, and I see links to external sites, but it doesn't appear to follow them looking for more. Maybe that's the intended behaviour? Cheers -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: [NEW] net/crawley-v1.7.5
> Is `ALL_TARGET = github.com/s0rg/crawley@v1.7.5` needed? I couldn't get it to build without. If there is a better way to do this, please suggest and I'll happily improve upon it. > Is it supposed to recurse out of the website you start inside, given enough > time? I ran it on my own website, and I see links to external sites, but it > doesn't appear to follow them looking for more. Maybe that's the intended > behaviour? Crawley's scan depth is limited by host and path by default, and can be configured to crawl further. That was of specific use to me, as other similar tools I've seen have a tendency to run wild.
Re: [NEW] net/crawley-v1.7.5
> > Is `ALL_TARGET = github.com/s0rg/crawley@v1.7.5` needed? > > I couldn't get it to build without. And a moment later, I realized that I was wrong. :) Revision attached. Thank you! crawley-1.7.5.tgz Description: application/tar-gz
Re: Fix emulators/qemu on riscv64
OK.
On 2024-04-19 12:03 p.m., Jeremie Courreges-Anglas wrote:
Use ucontext_t/struct sigcontext member name from machine/signal.h
instead of Linux/glibc specific name. Fixes the build on riscv64.
ok?
Index: patches/patch-tcg_riscv_tcg-target_c_inc
===
RCS file: patches/patch-tcg_riscv_tcg-target_c_inc
diff -N patches/patch-tcg_riscv_tcg-target_c_inc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tcg_riscv_tcg-target_c_inc29 Feb 2024 12:38:25 -
@@ -0,0 +1,12 @@
+Index: tcg/riscv/tcg-target.c.inc
+--- tcg/riscv/tcg-target.c.inc.orig
tcg/riscv/tcg-target.c.inc
+@@ -2115,7 +2115,7 @@ static void sigill_handler(int signo, siginfo_t *si, v
+ {
+ /* Skip the faulty instruction */
+ ucontext_t *uc = (ucontext_t *)data;
+-uc->uc_mcontext.__gregs[REG_PC] += 4;
++uc->sc_sepc += 4;
+
+ got_sigill = 1;
+ }
[Maintainer Update] archivers/zpaqfranz-59.3.diff
Just a small update. Adds an "update" command that seems to work on AMD64 at least, most other new stuff is Windows-only. Patch attached. diff --git a/archivers/zpaqfranz/Makefile b/archivers/zpaqfranz/Makefile index 6bc0775789e..76294371301 100644 --- a/archivers/zpaqfranz/Makefile +++ b/archivers/zpaqfranz/Makefile @@ -1,7 +1,7 @@ BROKEN-sparc64 = SIGBUS due to unaligned access when running tests COMMENT = journaling archiver for incremental backup, fork of ZPAQ -DIST_TUPLE = github fcorbelli zpaqfranz 59.2 . +DIST_TUPLE = github fcorbelli zpaqfranz 59.3 . CATEGORIES = archivers MAINTAINER = tux0r diff --git a/archivers/zpaqfranz/distinfo b/archivers/zpaqfranz/distinfo index f506683a0d2..ce414eb9453 100644 --- a/archivers/zpaqfranz/distinfo +++ b/archivers/zpaqfranz/distinfo @@ -1,2 +1,2 @@ -SHA256 (fcorbelli-zpaqfranz-59.2.tar.gz) = fWSVSZcsFTpOXww+BMY/vfpzf3IkOaJv6Q/3ifENDMo= -SIZE (fcorbelli-zpaqfranz-59.2.tar.gz) = 1927321 +SHA256 (fcorbelli-zpaqfranz-59.3.tar.gz) = oePG1zgFCnuJiB1do5qVoC4Ey63W55bE4DJnaRoYXYM= +SIZE (fcorbelli-zpaqfranz-59.3.tar.gz) = 1934314
x11/qt5 doesn't cleanup some files
ports@, Let assume that I have a system without x11/qt5, and to install it I do something like this: ~ $ ls /usr/local/lib/qt5 ls: /usr/local/lib/qt5: No such file or directory ~ $ doas pkg_add -a py3-qt5 quirks-7.18 signed on 2024-04-18T15:06:29Z py3-qt5-5.15.9p1:py3-ply-3.11p6: ok py3-qt5-5.15.9p1:pcaudiolib-1.2: ok py3-qt5-5.15.9p1:espeak-1.51p2: ok py3-qt5-5.15.9p1:libao-1.2.0p2: ok py3-qt5-5.15.9p1:dotconf-1.3p0: ok py3-qt5-5.15.9p1:py3-xdg-0.28p2: ok py3-qt5-5.15.9p1:speech-dispatcher-0.11.5: ok py3-qt5-5.15.9p1:qtbase-5.15.12pl151p0: ok py3-qt5-5.15.9p1:libsigc++-2.12.1: ok py3-qt5-5.15.9p1:glib2mm-2.66.7: ok py3-qt5-5.15.9p1:gstreamer1mm-1.10.0p9: ok py3-qt5-5.15.9p1:qtdeclarative-5.15.12pl31: ok py3-qt5-5.15.9p1:qtmultimedia-5.15.12pl2: ok py3-qt5-5.15.9p1:qtspeech-5.15.12pl1: ok py3-qt5-5.15.9p1:hyphen-2.8.8p0: ok py3-qt5-5.15.9p1:qtwebsockets-5.15.12pl2: ok py3-qt5-5.15.9p1:qtwebchannel-5.15.12pl3: ok py3-qt5-5.15.9p1:qtserialport-5.15.12: ok py3-qt5-5.15.9p1:qtlocation-5.15.12pl6: ok py3-qt5-5.15.9p1:qtsensors-5.15.12: ok py3-qt5-5.15.9p1:libnotify-0.8.3: ok py3-qt5-5.15.9p1:avahi-glib-0.8p2: ok py3-qt5-5.15.9p1:glib2-networking-2.80.0: ok py3-qt5-5.15.9p1:libpsl-0.21.1: ok py3-qt5-5.15.9p1:libsoup3-3.4.4: ok py3-qt5-5.15.9p1:geoclue2-2.7.1p0: ok py3-qt5-5.15.9p1:qtwebkit-5.212.0alpha4p9v0: ok py3-qt5-5.15.9p1:qtx11extras-5.15.12: ok py3-qt5-5.15.9p1:qtxmlpatterns-5.15.12: ok py3-qt5-5.15.9p1:py3-sip-6.7.11p0v0: ok py3-qt5-5.15.9p1:py3-pyqt5_sip-12.12.2: ok py3-qt5-5.15.9p1:qtconnectivity-5.15.12pl6: ok py3-qt5-5.15.9p1:qtsvg-5.15.12pl6: ok py3-qt5-5.15.9p1:llvm-16.0.6p24: ok py3-qt5-5.15.9p1:qttools-5.15.12pl4: ok py3-qt5-5.15.9p1:qtremoteobjects-5.15.12: ok py3-qt5-5.15.9p1: ok Running tags: ok New and changed readme(s): /usr/local/share/doc/pkg-readmes/llvm-16 ~ $ now, let remove it: ~ $ doas pkg_delete -a lcms2-2.16p0:py3-qt5-5.15.9p1: ok lcms2-2.16p0:qtspeech-5.15.12pl1: ok lcms2-2.16p0:qtmultimedia-5.15.12pl2: ok lame-3.100p2:speech-dispatcher-0.11.5: ok lame-3.100p2:espeak-1.51p2: ok lame-3.100p2:pcaudiolib-1.2: ok gsettings-desktop-schemas-46.0:qtwebkit-5.212.0alpha4p9v0: ok gsettings-desktop-schemas-46.0:geoclue2-2.7.1p0: ok gsettings-desktop-schemas-46.0:libsoup3-3.4.4: ok gsettings-desktop-schemas-46.0:glib2-networking-2.80.0: ok py3-pyqt5_sip-12.12.2: ok qtx11extras-5.15.12: ok qtwebchannel-5.15.12pl3: ok avahi-glib-0.8p2: ok libpsl-0.21.1: ok qtbase-5.15.12pl151p0:qtsensors-5.15.12: ok qtbase-5.15.12pl151p0:qtlocation-5.15.12pl6: ok qtbase-5.15.12pl151p0:qtserialport-5.15.12: ok qtbase-5.15.12pl151p0:qtwebsockets-5.15.12pl2: ok qtbase-5.15.12pl151p0:qttools-5.15.12pl4: ok qtbase-5.15.12pl151p0:qtxmlpatterns-5.15.12: ok qtbase-5.15.12pl151p0:qtconnectivity-5.15.12pl6: ok qtbase-5.15.12pl151p0:qtremoteobjects-5.15.12: ok qtbase-5.15.12pl151p0:qtdeclarative-5.15.12pl31: ok qtbase-5.15.12pl151p0:qtsvg-5.15.12pl6: ok qtbase-5.15.12pl151p0: ok glib2mm-2.66.7:gstreamer1mm-1.10.0p9: ok glib2mm-2.66.7: ok py3-ply-3.11p6:py3-sip-6.7.11p0v0: ok py3-ply-3.11p6: ok libsigc++-2.12.1: ok libao-1.2.0p2: ok dotconf-1.3p0: ok llvm-16.0.6p24: ok hyphen-2.8.8p0: ok libnotify-0.8.3: ok py3-xdg-0.28p2: ok Running tags: ok Read shared items: ok --- -geoclue2-2.7.1p0 --- You should also run /usr/sbin/userdel _geoclue You should also run /usr/sbin/groupdel _geoclue --- -py3-xdg-0.28p2 --- Error deleting directory /usr/local/lib/qt5/examples: Directory not empty Error deleting directory /usr/local/lib/qt5: Directory not empty ~ $ as you see, it left /usr/local/lib/qt5: ~ $ find /usr/local/lib/qt5 /usr/local/lib/qt5 /usr/local/lib/qt5/examples /usr/local/lib/qt5/examples/bluetooth /usr/local/lib/qt5/examples/bluetooth/btscanner /usr/local/lib/qt5/examples/bluetooth/heartrate-game /usr/local/lib/qt5/examples/bluetooth/heartrate-server /usr/local/lib/qt5/examples/bluetooth/lowenergyscanner /usr/local/lib/qt5/examples/remoteobjects /usr/local/lib/qt5/examples/remoteobjects/ssl /usr/local/lib/qt5/examples/remoteobjects/ssl/sslserver /usr/local/lib/qt5/examples/remoteobjects/ssl/sslserver/cert /usr/local/lib/qt5/examples/remoteobjects/websockets /usr/local/lib/qt5/examples/remoteobjects/websockets/common /usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert ~ $ -- wbr, Kirill
Re: -current Haskell ports aborting with SIGILL
James Cook writes: > Here are some results of debugging with lldb. > > > With cabal-bundler and pandoc, it seems to be the xgetbv instruction > itself: > > > $ lldb /usr/local/bin/cabal-bundler > (lldb) target create "/usr/local/bin/cabal-bundler" > Current executable set to '/usr/local/bin/cabal-bundler' (x86_64). > (lldb) run > Process 90738 launched: '/usr/local/bin/cabal-bundler' (x86_64) > Process 90738 stopped > * thread #1, stop reason = signal SIGILL > frame #0: 0x004c12ba cabal-bundler`___lldb_unnamed_symbol522 + 90 > cabal-bundler`___lldb_unnamed_symbol522: > -> 0x4c12ba <+90>: xgetbv Unless I'm missing something, xgetvb is not available in your CPU. cpu0: AMD Phenom(tm) II X3 710 Processor, 2611.95 MHz, 10-04-02, patch 01db cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,HWPSTATE,ITSC XGETBV1 is missing in the above and my cursory reading of https://en.wikipedia.org/wiki/X86-64#AMD64 supports this conclusion. Somebody will have to adapt the checking code to be conditional on this instruction presence if it's deemed important enough to support this CPU. Thanks Greg
UPDATE: spdlog 1.13.0
Here is an update to spdlog 1.13.0.
Version 1.13.0
Release Notes
Enhancements
- Qt Sink: Allow for darker colors for light backgrounds (#2817). Thanks to
@krawq.
- Set CMAKE_BUILD_TYPE only for single-config generators (#2839). Thanks to
@moritz-h.
- Provide spdlog_header_only in build directory export (#2846). Thanks to
@robertmaynard.
- Add SPDLOG_TO_VERSION to compare spdlog version (#2853). Thanks to @kegechen.
- Support async_overflow_policy::discard_new (#2876). Thanks to @walkerlala.
- Make syslog_sink.h's syslog_prio_from_level protected (#2918). Thanks to
@shannonbooth.
- Fix OS availability check of pthread_threadid_np for iOS (#2897). Thanks to
@lowdesertpunk.
- Add .git-blame-ignore-revs to ignore clang-format related commits (#2899).
Thanks to @lowdesertpunk.
- Match SPDLOG_CONSTEXPR_FUNC to FMT_CONSTEXPR (#2901). Thanks to @kkraus14.
Bug Fixes
- Check fd_ is not nullptr in file_helper to prevent possible crash if disk is
full (#2972).
- Fix encoding issue in qt_sinks (#2862). Thanks to @neothenil and @tt4g .
- Fix wrong thread_id (TID) in systemd_sink.h (#2919). Thanks to @M010.
- Update example.cpp to fix the vector issue in bin_example (#2963). Thanks to
@zhuzhzh.
- Fix MSVC compile flag for no exceptions (#2974). Thanks to @Programicus.
- Fix bug in circular_q::size() (#2820).
- Fix link to fmt license file (#2967).
Maintenance
- Added and updated various tests for circular_q.
- Removed obsolete part from CMake configuration files (#2871). Thanks to
@albert-github.
- Removed policy_max from cmake_minimum_required(..).
- Updated clang-format to google style and updated various formatting scripts.
- Bumped catch2
Index: devel/spdlog/Makefile
===
RCS file: /cvs/ports/devel/spdlog/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- devel/spdlog/Makefile 2 Sep 2023 19:03:37 - 1.3
+++ devel/spdlog/Makefile 20 Apr 2024 01:46:44 -
@@ -2,23 +2,26 @@ COMMENT = fast C++ logging library
GH_ACCOUNT = gabime
GH_PROJECT = spdlog
-GH_TAGNAME = v1.12.0
+GH_TAGNAME = v1.13.0
CATEGORIES = devel
-SHARED_LIBS = spdlog 1.0
+SHARED_LIBS = spdlog 1.1
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB = ${COMPILER_LIBCXX} m
+WANTLIB = ${COMPILER_LIBCXX} fmt m
MODULES = devel/cmake
+LIB_DEPENDS += devel/fmt>=10.2.1
+
# C++11
COMPILER = base-clang ports-gcc
CONFIGURE_ARGS+=-DSPDLOG_BUILD_BENCH=OFF \
- -DSPDLOG_BUILD_SHARED=ON
+ -DSPDLOG_BUILD_SHARED=ON \
+ -DSPDLOG_FMT_EXTERNAL=ON
NO_TEST = Yes
Index: devel/spdlog/distinfo
===
RCS file: /cvs/ports/devel/spdlog/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- devel/spdlog/distinfo 2 Sep 2023 19:03:37 - 1.2
+++ devel/spdlog/distinfo 20 Apr 2024 01:46:44 -
@@ -1,2 +1,2 @@
-SHA256 (spdlog-1.12.0.tar.gz) = Tczy0Q9BDB4v6v+Jlmv8SaGrsp728IJGM1sRDgAeCak=
-SIZE (spdlog-1.12.0.tar.gz) = 251037
+SHA256 (spdlog-1.13.0.tar.gz) = U08u4aTcvrIiSYVu37K+dqHPT3CKILCsLtCQ7iTP28k=
+SIZE (spdlog-1.13.0.tar.gz) = 264003
Index: devel/spdlog/pkg/PLIST
===
RCS file: /cvs/ports/devel/spdlog/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- devel/spdlog/pkg/PLIST 2 Sep 2023 19:03:37 - 1.3
+++ devel/spdlog/pkg/PLIST 20 Apr 2024 01:46:44 -
@@ -39,22 +39,6 @@ include/spdlog/details/udp_client.h
include/spdlog/details/windows_include.h
include/spdlog/fmt/
include/spdlog/fmt/bin_to_hex.h
-include/spdlog/fmt/bundled/
-include/spdlog/fmt/bundled/args.h
-include/spdlog/fmt/bundled/chrono.h
-include/spdlog/fmt/bundled/color.h
-include/spdlog/fmt/bundled/compile.h
-include/spdlog/fmt/bundled/core.h
-include/spdlog/fmt/bundled/fmt.license.rst
-include/spdlog/fmt/bundled/format-inl.h
-include/spdlog/fmt/bundled/format.h
-include/spdlog/fmt/bundled/locale.h
-include/spdlog/fmt/bundled/os.h
-include/spdlog/fmt/bundled/ostream.h
-include/spdlog/fmt/bundled/printf.h
-include/spdlog/fmt/bundled/ranges.h
-include/spdlog/fmt/bundled/std.h
-include/spdlog/fmt/bundled/xchar.h
include/spdlog/fmt/chrono.h
include/spdlog/fmt/compile.h
include/spdlog/fmt/fmt.h
And adjustments for some of the downstream ports that use
spdlog as a dependency.
Index: devel/coeurl/Makefile
===
RCS file: /cvs/ports/devel/coeurl/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- devel/coeurl/Makefile 21 Sep 2023 09:49:50 - 1.7
+++ devel/coeurl/Makefile 20 Apr 2024 02:07:11 -
@@ -4,6 +4,7 @@ CATEGORIES =devel
V =v0.3.0
DISTNAME = coeurl-${V}
PKGNAME = ${DISTNAME:S/v//}
+REVISION = 0
SHARED_LIBS += coeurl0.1 # 0.2.0
@@ -12,15 +
Re: UPDATE: audio/gonic to v0.16.4
On Sun, 7 Apr 2024 00:41:22 -0400, Russ Sharek wrote: > Minor update to audio/gonic from 0.16.2 to 0.16.4 > > Tested on amd64, appears to be working as expected. > > OK, please? Please send a diff, it's easier to review and apply.
Re: UPDATE: net/tailscale-1.64.1
On Mon, 15 Apr 2024 20:02:18 -0400, Adriano Barbosa
wrote:
> Hi.
> Update for net/tailscale v1.64.1
> Changelog:
> https://github.com/tailscale/tailscale/releases/tag/v1.64.0
> https://github.com/tailscale/tailscale/releases/tag/v1.64.1
Committed, thanks!
> Obrigado!
> --
> Adriano
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/tailscale/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- Makefile 12 Apr 2024 15:33:24 - 1.31
> +++ Makefile 16 Apr 2024 00:00:06 -
> @@ -2,7 +2,7 @@ BROKEN-i386 = unix.EPROTO not defined
>
> COMMENT =modern overlay-like VPN built on top of WireGuard
>
> -V = 1.62.1
> +V = 1.64.1
> MODGO_MODNAME = tailscale.com
> MODGO_VERSION = v${V}
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/tailscale/distinfo,v
> retrieving revision 1.29
> diff -u -p -r1.29 distinfo
> --- distinfo 12 Apr 2024 15:33:24 - 1.29
> +++ distinfo 16 Apr 2024 00:00:08 -
> @@ -226,6 +226,8 @@ SHA256 (go_modules/github.com/beorn7/per
> SHA256 (go_modules/github.com/beorn7/perks/@v/v1.0.0.mod) =
> wNxuW3KlzSPG92OQoe/KJ+VoublPPKvl3zWk+mGGJIQ= SHA256
> (go_modules/github.com/beorn7/perks/@v/v1.0.1.mod) =
> yHCz/lC2lE+rCVsGII2ciJh2PpFzyx7tMljD1YMJumY= SHA256
> (go_modules/github.com/beorn7/perks/@v/v1.0.1.zip) =
> Jb2eLZSsp3Dm28H1NyX4T2r0Qy9jHTXdLEb5bvBRLxo= +SHA256
> (go_modules/github.com/bits-and-blooms/bitset/@v/v1.13.0.mod) =
> 4ddvUctSrXejZsFOOR8p/xrboZITWppMvspeh61+Qf0= +SHA256
> (go_modules/github.com/bits-and-blooms/bitset/@v/v1.13.0.zip) =
> 6E8CwFuIDqnyiQMvieL8tRB8qfd/pFLx/VzDAw9hidI= SHA256
> (go_modules/github.com/bkielbasa/cyclop/@v/v1.2.0.mod) =
> agJkli28hOTqGIrRI/1mHDLVJcF3gfUeWv9IYlVD+2U= SHA256
> (go_modules/github.com/bkielbasa/cyclop/@v/v1.2.0.zip) =
> srwK0yNMgdEpFaxperEj4MhfgyVN1XYPhnK09WhckiY= SHA256
> (go_modules/github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod)
> = tDJMdJk7y9pqEkEtEDup7TGjTjTGgPOOcOE4c55UfTA= @@ -375,8 +377,8 @@
> SHA256 (go_modules/github.com/docker/doc SHA256
> (go_modules/github.com/docker/docker-credential-helpers/@v/v0.8.1.zip)
> = 2vg70wDu11ymb9LivieGHnIU7FRL3BDnGiHXPS7nf5M= SHA256
> (go_modules/github.com/docker/docker/@v/v24.0.0+incompatible.mod) =
> kf0O0nQ9pHohFX0Pa3aFky9UqMNjIX5sW8Z88iP/2CI= SHA256
> (go_modules/github.com/docker/docker/@v/v24.0.7+incompatible.mod) =
> kf0O0nQ9pHohFX0Pa3aFky9UqMNjIX5sW8Z88iP/2CI= -SHA256
> (go_modules/github.com/docker/docker/@v/v25.0.0+incompatible.mod) =
> kf0O0nQ9pHohFX0Pa3aFky9UqMNjIX5sW8Z88iP/2CI= -SHA256
> (go_modules/github.com/docker/docker/@v/v25.0.0+incompatible.zip) =
> lDOCQyvlxFtk93m+y00sdqZ3J0UrOKF6GXo8XZOfnNw= +SHA256
> (go_modules/github.com/docker/docker/@v/v25.0.5+incompatible.mod) =
> kf0O0nQ9pHohFX0Pa3aFky9UqMNjIX5sW8Z88iP/2CI= +SHA256
> (go_modules/github.com/docker/docker/@v/v25.0.5+incompatible.zip) =
> 20etPfmlBvisJjh0pPSmpkPO6CrDSclS7Ji6sfBEFSA= SHA256
> (go_modules/github.com/docker/go-connections/@v/v0.4.0.mod) =
> PaVqKXDHlKCzgbUAg3cJRJ+urCcUglMbDCIo6zpxFEg= SHA256
> (go_modules/github.com/docker/go-connections/@v/v0.4.0.zip) =
> Vw687n5v2ETgDInuqysZIggdaWnfdgeN/k/6zT21ato= SHA256
> (go_modules/github.com/docker/go-units/@v/v0.4.0.mod) =
> 7UVXffs1YrxpPc7ZGxcvcQ8akInECAhSn0RzSHVODFg= @@ -440,6 +442,8 @@
> SHA256 (go_modules/github.com/fxamacker/ SHA256
> (go_modules/github.com/fxamacker/cbor/v2/@v/v2.5.0.zip) =
> muECKXxJXOcXTb3u2ss05LPF13PdgXFoS2VcKM5lKGM= SHA256
> (go_modules/github.com/fzipp/gocyclo/@v/v0.6.0.mod) =
> aeViKYd5ycYD7KmvDNjeKrTt87qUImJUMytvUtA3cVA= SHA256
> (go_modules/github.com/fzipp/gocyclo/@v/v0.6.0.zip) =
> kdYOuR86MJcR5G1ER4KTpVj+uWV8agQ/C0BEkcivqME= +SHA256
> (go_modules/github.com/gaissmai/bart/@v/v0.4.1.mod) =
> 4cpG4BLgccqwRR6Ss3KDa1qFwSYuODgwjlZ69TgWjVc= +SHA256
> (go_modules/github.com/gaissmai/bart/@v/v0.4.1.zip) =
> 1Dldl9SJJg84plUaXvLmbmLcInYo07htRqyXZ78l4bI= SHA256
> (go_modules/github.com/github/fakeca/@v/v0.1.0.mod) =
> AmXV4uexgSV0hgiK7I4jJmZhJETPM2I2otby0xJJgVs= SHA256
> (go_modules/github.com/github/fakeca/@v/v0.1.0.zip) =
> zHLm6J6AdU6JvQNMor9cglcT5VJae4rugjtO8BKRl5Y= SHA256
> (go_modules/github.com/gliderlabs/ssh/@v/v0.1.2-0.20181113160402-cbabf5414432.mod)
> = WyHgkzw6Mwgn1BFsjy2ib16sZ78cpT2otDM/pzaOTNQ= @@ -2200,7 +2204,7 @@
> SHA256 (go_modules/software.sslmate.com/ SHA256
> (go_modules/software.sslmate.com/src/go-pkcs12/@v/v0.4.0.zip) =
> VQGaOR5TAqUbpi6YkJ4AYiS4EgeGbakL6vWC7A3uA28= SHA256
> (go_modules/src.elv.sh/@v/v0.16.0-rc1.0.20220116211855-fda62502ad7f.mod)
> = ImJNCVe1tA5jNq8JoM2bIJGqRqDtuksdWKAwpOaNWiI= SHA256
> (go_modules/src.elv.sh/@v/v0.16.0-rc1.0.20220116211855-fda62502ad7f.zip)
> = edEgOGTOmXKXLEt1tIEy1odFM3S8Y8hyYUcl8moi1Ts= -SHA256
> (tailscale.com-v1.62.1.zip) =
> cq7nCbjiG493VzcBV1JkVKlhBgs7JWGpIlWHngb/2PM= +SHA256
> (tailscale.com-v1.64.1.zip) =
> f2w8iFwLWzqlNhh+ZXIMa9nft7erzKPtu0hW7VIhT
Re: UPDATE: spdlog 1.13.0
Le Fri, Apr 19, 2024 at 10:11:47PM -0400, Brad Smith a écrit : > Here is an update to spdlog 1.13.0. > > And adjustments for some of the downstream ports that use > spdlog as a dependency. so from my understanding: - spdlog shipped its own bundled fmt, which gets removed in this update as newer spdlog now links with the system fmt (or the dep could be enabled since fmt was updated) - and the downstream ports coeurl & nheko get new patches (from upstream) to build against the system fmt too ? right ? iirc in the past i tried to update coeurl & nheko and there were issues with the fmt version we had, but now that it's updated it might be another occasion to update those. I'll eventually look at that too. Landry
