shells/fish4: update to fish 4.2.1
# pkgsrc changes
Documentation is now included in the source tarball, hence we don't need
sphynx any more.
# upstream changes
fish 4.2.1 (released November 13, 2025)
=======================================
This release fixes the following problems identified in 4.2.0:
- When building from a tarball without Sphinx (that is, with
``-DBUILD_DOCS=OFF`` or when ``sphinx-build`` is not found), builtin
man pages and help files were missing, which has been fixed
(:issue:`12052`).
- ``fish_config``'s theme selector (the "colors" tab) was broken, which
[50 lines not shown]
Pull up following revision(s) (requested by riastradh in ticket #105):
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c: revision 1.18
nouveau(4): Fix return value of fence wait.
kpause(9) returns EAGAIN/EWOULDBLOCK when it times out, which is
perfectly normal and expected here with an internal one-tick timeout
which should just go through another loop iteration. This function
is expected to return the number of ticks left to wait when done, so
it reports timeout by returning zero, and is forbidden to fail with
EAGAIN/EWOULDBLOCK.
This is also forbidden to fail with EINTR -- on interruption it must
fail with the Linux ERESTARTSYS instead. So map EINTR to that too
while here.
PR kern/59773: i386 11.0_BETA system crash (Xorg nouveau ?)
Pull up following revision(s) (requested by macallan in ticket #1199):
sys/dev/tc/sfb.c: revision 1.90
mmap the actual framebuffer at offset 0, not the raw slot space
now X works again
tested by Dave McGuire
Pull up following revision(s) (requested by macallan in ticket #104):
sys/dev/tc/sfb.c: revision 1.90
mmap the actual framebuffer at offset 0, not the raw slot space
now X works again
tested by Dave McGuire
Pull up following revision(s) (requested by thorpej in ticket #103):
sys/arch/m68k/m68k/vectors.c: revision 1.5
Fix a typo (affecting 68060-only configs) and a 1-line omission (affecting
GENERIC configs) that resulted in the F-Line Emulator trap not being routed
to the 060SP for handling.
Fix confirmed by Denis Ahrens on an MVME177.
PR port-m68k/59786
Since we're batting 1.000 on "platforms that adopt new-pmap_68k that also
use machine_bootmap[]", just remove the option (it looks like it would
be opted into on every platform).
Pull up following revision(s) (requested by nia in ticket #101):
sys/dev/wscons/wsmux.c: revision 1.69
wsmux(4): Fix sense of assertion in kqfilter.
This was recently changed in rev. 1.68 to tighten bogus run-time
conditionals into assertions -- with a small snag in this particular
hunk:
@@ -613,12 +589,7 @@ wsmuxkqfilter(dev_t dev, struct knote *kn)
return (1);
}
- if (sc->sc_base.me_evp == NULL) {
-#ifdef DIAGNOSTIC
- printf("wsmuxkqfilter: not open\n");
-#endif
- return (1);
- }
+ KASSERTMSG(sc->sc_base.me_evp == NULL, "wsmuxkqfilter: not open\n");
[12 lines not shown]
Pull up following revision(s) (requested by nia in ticket #1196):
external/mit/xorg/share/examples/xorg.conf: revision 1.1
external/mit/xorg/share/examples/xorg.conf: revision 1.2
distrib/sets/lists/xbase/mi: revision 1.178
etc/mtree/NetBSD.dist.Xorg: revision 1.32
external/mit/xorg/share/Makefile: revision 1.3
external/mit/xorg/share/examples/Makefile: revision 1.1
Add a sample xorg.conf that shows how to set the video driver.
This is mainly so that I don't have to look up how to configure
xorg to use wsfb every time I try out a new machine.
small corrections
Pull up following revision(s) (requested by nia in ticket #100):
external/mit/xorg/share/examples/xorg.conf: revision 1.1
external/mit/xorg/share/examples/xorg.conf: revision 1.2
distrib/sets/lists/xbase/mi: revision 1.178
etc/mtree/NetBSD.dist.Xorg: revision 1.32
external/mit/xorg/share/Makefile: revision 1.3
external/mit/xorg/share/examples/Makefile: revision 1.1
Add a sample xorg.conf that shows how to set the video driver.
This is mainly so that I don't have to look up how to configure
xorg to use wsfb every time I try out a new machine.
small corrections
Simplify dealing with 1 vs 2 VA ranges (non-SYSMAP_VA vs SYSMAP_VA cases),
and start laying the groundwork for supporting platforms that do not have
a VM_MIN_KERNEL_ADDRESS of 0 (potentially more work to be done here).