CVS commit: pkgsrc/x11/rterm

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sat Jan 20 23:27:51 UTC 2024

Modified Files:
        pkgsrc/x11/rterm: cargo-depends.mk distinfo
        pkgsrc/x11/rterm/patches: patch-src_x11__wrapper.rs
Added Files:
        pkgsrc/x11/rterm/patches:
            patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
            patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netsbd_mod.rs

Log Message:
x11/rterm: silence warning, port to riscv64.

 * silence warning by commenting out un-used import
 * use a less specific cast instead of explicitly sized type

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/rterm/cargo-depends.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/rterm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/rterm/patches/patch-src_x11__wrapper.rs
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/rterm/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs \
    pkgsrc/x11/rterm/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netsbd_mod.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/rterm/cargo-depends.mk
diff -u pkgsrc/x11/rterm/cargo-depends.mk:1.5 pkgsrc/x11/rterm/cargo-depends.mk:1.6
--- pkgsrc/x11/rterm/cargo-depends.mk:1.5       Tue Jan  3 15:34:37 2023
+++ pkgsrc/x11/rterm/cargo-depends.mk   Sat Jan 20 23:27:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: cargo-depends.mk,v 1.5 2023/01/03 15:34:37 pin Exp $
+# $NetBSD: cargo-depends.mk,v 1.6 2024/01/20 23:27:51 he Exp $
 
 CARGO_CRATE_DEPENDS+=  anyhow-1.0.68
 CARGO_CRATE_DEPENDS+=  arrayvec-0.7.2

Index: pkgsrc/x11/rterm/distinfo
diff -u pkgsrc/x11/rterm/distinfo:1.10 pkgsrc/x11/rterm/distinfo:1.11
--- pkgsrc/x11/rterm/distinfo:1.10      Sat Sep 23 18:25:57 2023
+++ pkgsrc/x11/rterm/distinfo   Sat Jan 20 23:27:51 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2023/09/23 18:25:57 vins Exp $
+$NetBSD: distinfo,v 1.11 2024/01/20 23:27:51 he Exp $
 
 BLAKE2s (anyhow-1.0.68.crate) = 79593a6a8f5559833825e9341680bb8b1dafe01e70c99d0f014175fbe2828e71
 SHA512 (anyhow-1.0.68.crate) = b8cfc132ebeac823edf18cba7e335d1939fcbb095ed4ea859f4dc4cde5b1ff35fd68f0743577c69085f74f019768a3359936bf6dc1b2aceb7e2b28ace7f74a0f
@@ -173,4 +173,6 @@ SHA512 (x11-2.20.1.crate) = abb62057138b
 Size (x11-2.20.1.crate) = 67811 bytes
 SHA1 (patch-src_glyph.rs) = 256a0df3c63250bfc3da0eefdab99c2e4ea83204
 SHA1 (patch-src_win.rs) = b361b2a2bb50ddf188dc391178a43aed72b070a9
-SHA1 (patch-src_x11__wrapper.rs) = 7f91cd4eb8ae5c606520751e087802a9033bcc3c
+SHA1 (patch-src_x11__wrapper.rs) = bbc97e448fcccb08eaf3716bd9abb8a4ccc90f8c
+SHA1 (patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = d78f99131b1a8176208d70d3668be52417f9edd3
+SHA1 (patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netsbd_mod.rs) = 908a8166e80814d6f13e88d78592e2cde7c92792

Index: pkgsrc/x11/rterm/patches/patch-src_x11__wrapper.rs
diff -u pkgsrc/x11/rterm/patches/patch-src_x11__wrapper.rs:1.1 pkgsrc/x11/rterm/patches/patch-src_x11__wrapper.rs:1.2
--- pkgsrc/x11/rterm/patches/patch-src_x11__wrapper.rs:1.1      Thu May 25 13:50:05 2023
+++ pkgsrc/x11/rterm/patches/patch-src_x11__wrapper.rs  Sat Jan 20 23:27:51 2024
@@ -1,10 +1,20 @@
-$NetBSD: patch-src_x11__wrapper.rs,v 1.1 2023/05/25 13:50:05 he Exp $
+$NetBSD: patch-src_x11__wrapper.rs,v 1.2 2024/01/20 23:27:51 he Exp $
 
 Fix type mismatch:  The third arg to XChangeWindowAttributes() is
 a c_ulong, not an u64.
+Comment out unused import.
 
 --- src/x11_wrapper.rs.orig    2023-01-02 12:45:40.000000000 +0000
 +++ src/x11_wrapper.rs
+@@ -32,7 +32,7 @@ pub use xlib::True;
+ pub use xlib::Window;
+ pub use xlib::XEvent;
+ pub use xlib::XGCValues;
+-pub use xlib::XICCEncodingStyle;
++// pub use xlib::XICCEncodingStyle; (unused)
+ pub use xlib::XSetWindowAttributes;
+ pub use xlib::XTextProperty;
+ pub use xlib::XUTF8StringStyle;
 @@ -434,7 +434,7 @@ pub fn XConvertSelection(
  pub fn XChangeWindowAttributes(
      dpy: Display,

Added files:

Index: pkgsrc/x11/rterm/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
diff -u /dev/null pkgsrc/x11/rterm/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs:1.1
--- /dev/null   Sat Jan 20 23:27:51 2024
+++ pkgsrc/x11/rterm/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs        Sat Jan 20 23:27:51 2024
@@ -0,0 +1,31 @@
+$NetBSD: patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2024/01/20 23:27:51 he Exp $
+
+Add NetBSD/riscv64 spec.
+
+--- ../vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig      2023-11-23 18:31:50.155183333 +0000
++++ ../vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/riscv64.rs   2023-11-23 18:37:17.175383536 +0000
+@@ -0,0 +1,24 @@
++use PT_FIRSTMACH;
++
++pub type c_long = i64;
++pub type c_ulong = u64;
++pub type c_char = u8;
++pub type __cpu_simple_lock_nv_t = ::c_int;
++
++// should be pub(crate), but that requires Rust 1.18.0
++cfg_if! {
++    if #[cfg(libc_const_size_of)] {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
++    } else {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = 8 - 1;
++    }
++}
++
++// pub const _MAX_PAGE_SHIFT: u32 = 12;
++
++pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0;
++pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1;
++pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 2;
++pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 3;
Index: pkgsrc/x11/rterm/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netsbd_mod.rs
diff -u /dev/null pkgsrc/x11/rterm/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netsbd_mod.rs:1.1
--- /dev/null   Sat Jan 20 23:27:51 2024
+++ pkgsrc/x11/rterm/patches/patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netsbd_mod.rs    Sat Jan 20 23:27:51 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-vendor_libc-0.2.139_src_unix_bsd_netbsdlike_netsbd_mod.rs,v 1.1 2024/01/20 23:27:51 he Exp $
+
+Add use of spec for NetBSD/riscv64.
+
+--- ../vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig  2006-07-24 01:21:28.000000000 +0000
++++ ../vendor/libc-0.2.139/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -3068,6 +3068,9 @@ cfg_if! {
+     } else if #[cfg(target_arch = "x86")] {
+         mod x86;
+         pub use self::x86::*;
++    } else if #[cfg(target_arch = "riscv64")] {
++        mod riscv64;
++        pub use self::riscv64::*;
+     } else {
+         // Unknown target_arch
+     }