CVS commit: pkgsrc/graphics/simp

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Wed Oct 11 11:39:56 UTC 2023

Modified Files:
        pkgsrc/graphics/simp: Makefile distinfo
Added Files:
        pkgsrc/graphics/simp/patches:
            patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs
            patch-.._vendor_trash-3.0.6_src_freedesktop.rs

Log Message:
graphics/simp: enable move to trash


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/simp/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/simp/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/simp/patches/patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs \
    pkgsrc/graphics/simp/patches/patch-.._vendor_trash-3.0.6_src_freedesktop.rs

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

Modified files:

Index: pkgsrc/graphics/simp/Makefile
diff -u pkgsrc/graphics/simp/Makefile:1.10 pkgsrc/graphics/simp/Makefile:1.11
--- pkgsrc/graphics/simp/Makefile:1.10  Sun Sep  3 07:08:19 2023
+++ pkgsrc/graphics/simp/Makefile       Wed Oct 11 11:39:56 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2023/09/03 07:08:19 pin Exp $
+# $NetBSD: Makefile,v 1.11 2023/10/11 11:39:56 pin Exp $
 
 DISTNAME=      simp-3.4.1
+PKGREVISION=    1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Kl4rry/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -20,11 +21,6 @@ RUSTFLAGS+=  -C link-arg=${COMPILER_RPATH
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
 RUSTFLAGS+=    -C link-arg=-L${BUILDLINK_PREFIX.libxcb}/lib
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Linux"
-CARGO_NO_DEFAULT_FEATURES=     YES
-.endif
-
 .include "../../lang/rust/cargo.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/graphics/simp/distinfo
diff -u pkgsrc/graphics/simp/distinfo:1.5 pkgsrc/graphics/simp/distinfo:1.6
--- pkgsrc/graphics/simp/distinfo:1.5   Sun Sep  3 07:08:19 2023
+++ pkgsrc/graphics/simp/distinfo       Wed Oct 11 11:39:56 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2023/09/03 07:08:19 pin Exp $
+$NetBSD: distinfo,v 1.6 2023/10/11 11:39:56 pin Exp $
 
 BLAKE2s (ab_glyph-0.2.21.crate) = 344769fee6be378bf37182a61c129bfba96f4f7debb038a5e2af881b6ecb5e6d
 SHA512 (ab_glyph-0.2.21.crate) = 3766c240f8acce486de23c661da7c708c56a5dff04e17fd9dc37f7fcab22d4db6905080ce7a6707c2b8f85cfcf224e068af2c51e53440818b8d021ac8d3b8457
@@ -1272,3 +1272,5 @@ Size (yaml-rust-0.4.5.crate) = 47783 byt
 BLAKE2s (zune-inflate-0.2.54.crate) = c10d8be1628f8a0b68a2d35a2cc3ab5ca45461685e4d61623f4ef14b872fcb04
 SHA512 (zune-inflate-0.2.54.crate) = 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
 Size (zune-inflate-0.2.54.crate) = 37973 bytes
+SHA1 (patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 4d9bd38b3a8458805bac7e86878d5ee7aa8c64e9
+SHA1 (patch-.._vendor_trash-3.0.6_src_freedesktop.rs) = be103555ff292d8303caa7f2fc1d1a198ed416f3

Added files:

Index: pkgsrc/graphics/simp/patches/patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs
diff -u /dev/null pkgsrc/graphics/simp/patches/patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs:1.1
--- /dev/null   Wed Oct 11 11:39:56 2023
+++ pkgsrc/graphics/simp/patches/patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs     Wed Oct 11 11:39:56 2023
@@ -0,0 +1,55 @@
+$NetBSD: patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2023/10/11 11:39:56 pin Exp $
+
+https://github.com/rust-lang/libc/pull/3368
+
+--- ../vendor/libc-0.2.147/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig  2006-07-24 01:21:28.000000000 +0000
++++ ../vendor/libc-0.2.147/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -1852,6 +1852,9 @@ pub const MNT_NODEVMTIME: ::c_int = 0x40
+ pub const MNT_SOFTDEP: ::c_int = 0x80000000;
+ pub const MNT_POSIX1EACLS: ::c_int = 0x00000800;
+ pub const MNT_ACLS: ::c_int = MNT_POSIX1EACLS;
++pub const MNT_WAIT: ::c_int = 1;
++pub const MNT_NOWAIT: ::c_int = 2;
++pub const MNT_LAZY: ::c_int = 3;
+ 
+ //<sys/timex.h>
+ pub const NTP_API: ::c_int = 4;
+@@ -3153,6 +3156,38 @@ extern "C" {
+     pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
+ }
+ 
++#[link(name = "execinfo")]
++extern "C" {
++    pub fn backtrace(addrlist: *mut *mut ::c_void, len: ::size_t) -> ::size_t;
++    pub fn backtrace_symbols(addrlist: *const *mut ::c_void, len: ::size_t) -> *mut *mut ::c_char;
++    pub fn backtrace_symbols_fd(
++        addrlist: *const *mut ::c_void,
++        len: ::size_t,
++        fd: ::c_int,
++    ) -> ::c_int;
++    pub fn backtrace_symbols_fmt(
++        addrlist: *const *mut ::c_void,
++        len: ::size_t,
++        fmt: *const ::c_char,
++    ) -> *mut *mut ::c_char;
++    pub fn backtrace_symbols_fd_fmt(
++        addrlist: *const *mut ::c_void,
++        len: ::size_t,
++        fd: ::c_int,
++        fmt: *const ::c_char,
++    ) -> ::c_int;
++}
++
++cfg_if! {
++    if #[cfg(libc_union)] {
++        extern {
++            // these functions use statvfs:
++            pub fn getmntinfo(mntbufp: *mut *mut ::statvfs, flags: ::c_int) -> ::c_int;
++            pub fn getvfsstat(buf: *mut statvfs, bufsize: ::size_t, flags: ::c_int) -> ::c_int;
++        }
++    }
++}
++
+ cfg_if! {
+     if #[cfg(target_arch = "aarch64")] {
+         mod aarch64;
Index: pkgsrc/graphics/simp/patches/patch-.._vendor_trash-3.0.6_src_freedesktop.rs
diff -u /dev/null pkgsrc/graphics/simp/patches/patch-.._vendor_trash-3.0.6_src_freedesktop.rs:1.1
--- /dev/null   Wed Oct 11 11:39:56 2023
+++ pkgsrc/graphics/simp/patches/patch-.._vendor_trash-3.0.6_src_freedesktop.rs Wed Oct 11 11:39:56 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-.._vendor_trash-3.0.6_src_freedesktop.rs,v 1.1 2023/10/11 11:39:56 pin Exp $
+
+https://github.com/Byron/trash-rs/pull/84
+
+--- ../vendor/trash-3.0.6/src/freedesktop.rs.orig      2006-07-24 01:21:28.000000000 +0000
++++ ../vendor/trash-3.0.6/src/freedesktop.rs
+@@ -700,12 +700,12 @@ fn get_mount_points() -> Result<Vec<Moun
+             std::str::from_utf8(buf).ok()
+         }
+     }
+-    let mut fs_infos: *mut libc::statfs = std::ptr::null_mut();
++    let mut fs_infos: *mut libc::statvfs = std::ptr::null_mut();
+     let count = unsafe { libc::getmntinfo(&mut fs_infos, libc::MNT_WAIT) };
+     if count < 1 {
+         return Ok(Vec::new());
+     }
+-    let fs_infos: &[libc::statfs] = unsafe { std::slice::from_raw_parts(fs_infos as _, count as _) };
++    let fs_infos: &[libc::statvfs] = unsafe { std::slice::from_raw_parts(fs_infos as _, count as _) };
+ 
+     let mut result = Vec::new();
+     for fs_info in fs_infos {