pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Update x11/rio to v.0.5.28. NetBSD-specific patches removed from this version
Module Name: pkgsrc-wip
Committed By: ci4ic4 <ci4ic4%gmail.com@localhost>
Pushed By: ci4ic4
Date: Wed Sep 23 17:06:44 2026 +0100
Changeset: 861cd0a1ecb2383061c953cf9be4a4127dea99a6
Modified Files:
rio/Makefile
rio/PLIST
rio/distinfo
Removed Files:
rio/patches/patch-corcovado_src_sys_unix_kqueue.rs
rio/patches/patch-misc_rio.desktop
rio/patches/patch-misc_rio.terminfo
rio/patches/patch-rio-backend_src_config_defaults.rs
rio/patches/patch-teletypewriter_src_unix_mod.rs
Log Message:
Update x11/rio to v.0.5.28.
NetBSD-specific patches removed from this version
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=861cd0a1ecb2383061c953cf9be4a4127dea99a6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rio/Makefile | 2 +-
rio/PLIST | 9 +--
rio/distinfo | 6 +-
rio/patches/patch-corcovado_src_sys_unix_kqueue.rs | 17 ------
rio/patches/patch-misc_rio.desktop | 24 --------
rio/patches/patch-misc_rio.terminfo | 30 ----------
.../patch-rio-backend_src_config_defaults.rs | 24 --------
rio/patches/patch-teletypewriter_src_unix_mod.rs | 68 ----------------------
8 files changed, 9 insertions(+), 171 deletions(-)
diffs:
diff --git a/rio/Makefile b/rio/Makefile
index 6d14a93f9b..1f2b7cfb45 100644
--- a/rio/Makefile
+++ b/rio/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= rio-0.5.27
+DISTNAME= rio-0.5.28
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=raphamorim/}
GITHUB_TAG= refs/tags/v${PKGVERSION_NOREV}
diff --git a/rio/PLIST b/rio/PLIST
index 5ee4d56e74..2f1b716281 100644
--- a/rio/PLIST
+++ b/rio/PLIST
@@ -1,10 +1,11 @@
@comment $NetBSD$
bin/rio
+man/man1/rio.1
+man/man5/rio-bindings.5
+man/man5/rio.5
share/applications/rio.desktop
+share/doc/rio/README.NetBSD
share/icons/hicolor/scalable/apps/rio.svg
+share/terminfo/r/rio
share/terminfo/r/rio+base
share/terminfo/x/xterm-rio
-share/doc/rio/README.NetBSD
-${PLIST.man}man/man1/rio.1
-${PLIST.man}man/man5/rio-bindings.5
-${PLIST.man}man/man5/rio.5
diff --git a/rio/distinfo b/rio/distinfo
index 2dc1e609f5..3e0bd74dff 100644
--- a/rio/distinfo
+++ b/rio/distinfo
@@ -1170,9 +1170,9 @@ Size (regex-syntax-0.8.11.crate) = 359055 bytes
BLAKE2s (renderdoc-sys-1.1.0.crate) = 49b1ff8373ceffa1c69bd645b656f619aca7cd1da9b8da18d8947eee7df5dae2
SHA512 (renderdoc-sys-1.1.0.crate) = a9535ffe9fb0a7c38133a834419f5b1f9b866e116569e0f31f2238145a63e1392d4f24186504cbf40bc67521842c1a977c0dcc53f5a12f45366b6c44484a64c9
Size (renderdoc-sys-1.1.0.crate) = 10366 bytes
-BLAKE2s (rio-0.5.27.tar.gz) = 4ba03ffd45ebf56ac24eb90093ec7122bbe4ec82364a13cba688304adc5bf488
-SHA512 (rio-0.5.27.tar.gz) = 74bce1e2bab71caaf327b1dc6387ab941d08fb51a4cfa4a57ca53ba95c71dd396bfae17379f89f1a343b84cb707ad99f36029af867806844c6dc6bb4bd5e071c
-Size (rio-0.5.27.tar.gz) = 10928347 bytes
+BLAKE2s (rio-0.5.28.tar.gz) = c0a8909dfb18fb919df826c002cadf0995bb83872486420654deb1f7b323771c
+SHA512 (rio-0.5.28.tar.gz) = cbf9bf2567e35a42cc8ccfb99dff54b471b9fdf02a471624db762c9d6304def7f35821de5e37e2268360eb35fc2b1665bcd9381763397d33a338e3b7405d0016
+Size (rio-0.5.28.tar.gz) = 10969223 bytes
BLAKE2s (roxmltree-0.20.0.crate) = a74e1d845d741408dbb31693bd676db21c43c1660c3f44ee5afee12ae03cdf9d
SHA512 (roxmltree-0.20.0.crate) = f8a934d3809e417c43bca53478cef0a7a18d908620175c84cfa2cdb8c85775b52cc641fb7eb12c80c483e0c17eb500dd3358ace858aceaa810d3ddbdef902d91
Size (roxmltree-0.20.0.crate) = 54594 bytes
diff --git a/rio/patches/patch-corcovado_src_sys_unix_kqueue.rs b/rio/patches/patch-corcovado_src_sys_unix_kqueue.rs
deleted file mode 100644
index 6e554d8145..0000000000
--- a/rio/patches/patch-corcovado_src_sys_unix_kqueue.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-NetBSD kevent.udata is *mut c_void in libc 0.2.185 (not intptr_t as the
-original code assumed). The non-FreeBSD kevent! macro already covers NetBSD
-correctly as long as UData has the right type.
-
---- corcovado/src/sys/unix/kqueue.rs.orig
-+++ corcovado/src/sys/unix/kqueue.rs
-@@ -32,7 +32,7 @@
- #[cfg(target_os = "netbsd")]
- type Filter = u32;
- #[cfg(target_os = "netbsd")]
--type UData = ::libc::intptr_t;
-+type UData = *mut ::libc::c_void;
- #[cfg(target_os = "netbsd")]
- type Count = usize;
-
diff --git a/rio/patches/patch-misc_rio.desktop b/rio/patches/patch-misc_rio.desktop
deleted file mode 100644
index 016bc008ad..0000000000
--- a/rio/patches/patch-misc_rio.desktop
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Wrap Exec with env to:
-- suppress the harmless Mesa DRI2 authentication warning on software EGL
-- set TERMINFO_DIRS so rio and programs running inside it find the rio
- terminfo entry installed by this package under @PREFIX@/share/terminfo
-
---- misc/rio.desktop.orig
-+++ misc/rio.desktop
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Type=Application
- TryExec=rio
--Exec=rio
-+Exec=env EGL_LOG_LEVEL=fatal TERMINFO_DIRS=@PREFIX@/share/terminfo rio
- Icon=rio
- Terminal=false
- Categories=System;TerminalEmulator;
-@@ -14,4 +14,4 @@
-
- [Desktop Action New]
- Name=New Terminal
--Exec=rio
-+Exec=env EGL_LOG_LEVEL=fatal TERMINFO_DIRS=@PREFIX@/share/terminfo rio
diff --git a/rio/patches/patch-misc_rio.terminfo b/rio/patches/patch-misc_rio.terminfo
deleted file mode 100644
index 338e2a6f2d..0000000000
--- a/rio/patches/patch-misc_rio.terminfo
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-Remove the "rio" terminfo entry from the source. pkgsrc ncurses already
-ships share/terminfo/r/rio (and rio-direct); compiling it here would cause
-a PLIST conflict at pkg_add time. The rio+base and xterm-rio entries are
-unique to this package and are compiled normally.
-
---- misc/rio.terminfo.orig
-+++ misc/rio.terminfo
-@@ -1,20 +1,6 @@
- xterm-rio,
- use=rio+base,
-
--rio,
-- use=xterm-rio,
-- rs1=\Ec\E]104\007,
-- ccc,
-- colors#0x100, pairs#0x7FFF,
-- initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*
-- %{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
-- oc=\E]104\007,
-- setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
-- 5;%p1%d%;m,
-- setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5
-- ;%p1%d%;m,
-- setb@, setf@,
--
- rio+base,
- OTbs, am, bce, km, mir, msgr, xenl, AX, XT,
- colors#8, cols#80, it#8, lines#24, pairs#64,
diff --git a/rio/patches/patch-rio-backend_src_config_defaults.rs b/rio/patches/patch-rio-backend_src_config_defaults.rs
deleted file mode 100644
index 18d5d3179e..0000000000
--- a/rio/patches/patch-rio-backend_src_config_defaults.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Use spawn (not fork) on NetBSD to ensure configured shell args (e.g.
---login) are actually passed when launching the PTY shell. The fork path
-(create_pty_with_fork) never forwards args to execvp; the spawn path
-(create_pty_with_spawn) does. macOS already uses spawn for the same reason.
-
---- rio-backend/src/config/defaults.rs.orig
-+++ rio-backend/src/config/defaults.rs
-@@ -60,11 +60,11 @@
-
- #[inline]
- pub fn default_use_fork() -> bool {
-- #[cfg(target_os = "macos")]
-+ #[cfg(any(target_os = "macos", target_os = "netbsd"))]
- {
- false
- }
-
-- #[cfg(not(target_os = "macos"))]
-+ #[cfg(not(any(target_os = "macos", target_os = "netbsd")))]
- {
- true
- }
diff --git a/rio/patches/patch-teletypewriter_src_unix_mod.rs b/rio/patches/patch-teletypewriter_src_unix_mod.rs
deleted file mode 100644
index 67bd7a9cc5..0000000000
--- a/rio/patches/patch-teletypewriter_src_unix_mod.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD$
-
-Add NetBSD support to teletypewriter: TIOCSWINSZ constant (same value as
-FreeBSD), BSD termios branch, and exclude NetBSD from the Linux/macOS-only
-IUTF8 flag (not defined in NetBSD libc). Also set B38400 baud rate in the
-PTY termios to prevent NetBSD tty.c B0 hangup semantics (c_ospeed=0 triggers
-ttysig(SIGHUP) to the session leader via the kernel PTY path).
-
-On NetBSD, $SHELL in graphical sessions is often inherited from the display
-manager (/bin/ksh) rather than reflecting the user's configured login shell.
-Override with pw_shell from getpwuid_r so rio always starts the shell from
-/etc/passwd, matching the documented "user's login shell" behaviour.
-
---- teletypewriter/src/unix/mod.rs.orig
-+++ teletypewriter/src/unix/mod.rs
-@@ -34,6 +34,8 @@
- const TIOCSWINSZ: libc::c_ulong = 0x80087467;
- #[cfg(target_os = "macos")]
- const TIOCSWINSZ: libc::c_ulong = 2148037735;
-+#[cfg(target_os = "netbsd")]
-+const TIOCSWINSZ: libc::c_ulong = 0x80087467;
-
- #[link(name = "util")]
- extern "C" {
-@@ -289,25 +291,25 @@
- c_line: 0,
- };
-
-- #[cfg(any(target_os = "macos", target_os = "freebsd"))]
-+ #[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "netbsd"))]
- let mut term = libc::termios {
- c_iflag: libc::ICRNL | libc::IXON | libc::IXANY | libc::IMAXBEL | libc::BRKINT,
- c_oflag: libc::OPOST | libc::ONLCR,
- c_cflag: libc::CREAD | libc::CS8 | libc::HUPCL,
- c_lflag: libc::ICANON
- | libc::ISIG
- | libc::IEXTEN
- | libc::ECHO
- | libc::ECHOE
- | libc::ECHOK
- | libc::ECHOKE
- | libc::ECHOCTL,
- c_cc: Default::default(),
-- c_ispeed: Default::default(),
-- c_ospeed: Default::default(),
-+ c_ispeed: libc::B38400 as libc::c_int,
-+ c_ospeed: libc::B38400 as libc::c_int,
- };
-
-- #[cfg(not(target_os = "freebsd"))]
-+ #[cfg(not(any(target_os = "freebsd", target_os = "netbsd")))]
- {
- // Enable utf8 support if requested
- if utf8 {
-@@ -381,6 +381,13 @@
- },
- };
-
-+ #[cfg(target_os = "netbsd")]
-+ if let Ok(ref pw) = pw {
-+ if !pw.shell.is_empty() {
-+ shell = pw.shell.to_owned();
-+ }
-+ }
-+
- Ok(Self { user, home, shell })
- }
- }
Home |
Main Index |
Thread Index |
Old Index