CVS commit: pkgsrc/graphics/librsvg

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

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Jul 23 08:56:07 UTC 2023

Modified Files:
        pkgsrc/graphics/librsvg: distinfo
Added Files:
        pkgsrc/graphics/librsvg/patches:
            patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_mod.rs
            patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_riscv64.rs

Log Message:
librsvg: add riscv64 support, copied from rust's libc patches.

Needed as long as upstream rust libc hasn't picked up our change.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/graphics/librsvg/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/librsvg/patches/patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_mod.rs \
    pkgsrc/graphics/librsvg/patches/patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_riscv64.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/librsvg/distinfo
diff -u pkgsrc/graphics/librsvg/distinfo:1.61 pkgsrc/graphics/librsvg/distinfo:1.62
--- pkgsrc/graphics/librsvg/distinfo:1.61       Tue Apr 11 05:45:44 2023
+++ pkgsrc/graphics/librsvg/distinfo    Sun Jul 23 08:56:07 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2023/04/11 05:45:44 adam Exp $
+$NetBSD: distinfo,v 1.62 2023/07/23 08:56:07 he Exp $
 
 BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa
 SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
@@ -886,4 +886,6 @@ BLAKE2s (yeslogic-fontconfig-sys-4.0.1.c
 SHA512 (yeslogic-fontconfig-sys-4.0.1.crate) = b1626e259d8535c0189535eb240b92c798330c01866f33231ca9baba07b3da792cc5390221c826c67df9c6e6c0ae64568f1dbd70b9841750e233dab2bd27f506
 Size (yeslogic-fontconfig-sys-4.0.1.crate) = 6694 bytes
 SHA1 (patch-.._vendor_cfg-expr-0.11.0_src_targets_builtins.rs) = fed9efb96fa7b284957b76a78e17c8220cb19876
+SHA1 (patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 3fae0585df210643681ba55518fdcf0cd68691b9
+SHA1 (patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 2dcfd78b71f2eb6569ff9d71a294aca0bfdef8b1
 SHA1 (patch-Makefile.in) = af90858d2771644f5b094839f64fb7538fb6428d

Added files:

Index: pkgsrc/graphics/librsvg/patches/patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_mod.rs
diff -u /dev/null pkgsrc/graphics/librsvg/patches/patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_mod.rs:1.1
--- /dev/null   Sun Jul 23 08:56:07 2023
+++ pkgsrc/graphics/librsvg/patches/patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_mod.rs  Sun Jul 23 08:56:07 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2023/07/23 08:56:07 he Exp $
+
+Replicate from main rust package to get riscv64 support.
+
+--- ../vendor/libc-0.2.140/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig  2006-07-24 01:21:28.000000000 +0000
++++ ../vendor/libc-0.2.140/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -3130,6 +3130,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
+     }
Index: pkgsrc/graphics/librsvg/patches/patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
diff -u /dev/null pkgsrc/graphics/librsvg/patches/patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_riscv64.rs:1.1
--- /dev/null   Sun Jul 23 08:56:07 2023
+++ pkgsrc/graphics/librsvg/patches/patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_riscv64.rs      Sun Jul 23 08:56:07 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-.._vendor_libc-0.2.140_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2023/07/23 08:56:07 he Exp $
+
+Add support for NetBSD/riscv64.
+
+--- ../vendor/libc-0.2.140/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig      2023-07-14 09:12:33.579150305 +0000
++++ ../vendor/libc-0.2.140/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -0,0 +1,22 @@
++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 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;