CVS commit: pkgsrc/graphics/librsvg

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan 12 12:57:59 UTC 2021

Modified Files:
        pkgsrc/graphics/librsvg: distinfo
Added Files:
        pkgsrc/graphics/librsvg/patches: patch-.._vendor_time-0.1.42_src_sys.rs

Log Message:
librsvg: Fix illumos target.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/graphics/librsvg/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/librsvg/patches/patch-.._vendor_time-0.1.42_src_sys.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.49 pkgsrc/graphics/librsvg/distinfo:1.50
--- pkgsrc/graphics/librsvg/distinfo:1.49       Sun Apr 12 21:00:37 2020
+++ pkgsrc/graphics/librsvg/distinfo    Tue Jan 12 12:57:59 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2020/04/12 21:00:37 wiz Exp $
+$NetBSD: distinfo,v 1.50 2021/01/12 12:57:59 jperkin Exp $
 
 SHA1 (aho-corasick-0.7.10.crate) = 46a5f4bc5d99c97eca60043752a0fd47d01fca7d
 RMD160 (aho-corasick-0.7.10.crate) = 925013ea0bce7c4a0ca5e1b017af0a1e553061fd
@@ -656,5 +656,6 @@ SHA1 (xml5ever-0.16.1.crate) = a78a90722
 RMD160 (xml5ever-0.16.1.crate) = 3a2290ea232fa6facb871c867b91e72fb625a41b
 SHA512 (xml5ever-0.16.1.crate) = 20ad09f202336950c13867d69582a12e5daba671d5ffc79d3f8a69a13f7911b04e135cf5791a24744d6bb909b10e6eef5d5f0b52b5d1124ead2b1017e4d4c4ee
 Size (xml5ever-0.16.1.crate) = 41282 bytes
+SHA1 (patch-.._vendor_time-0.1.42_src_sys.rs) = 83cf6e59436781d4ffada105892e7b83e2b16c68
 SHA1 (patch-Cargo.toml) = f50c18dd330c6b52d7106373619c461239229c42
 SHA1 (patch-Makefile.in) = f926c7f645e1f3eb40a187ea019c0be26f849541

Added files:

Index: pkgsrc/graphics/librsvg/patches/patch-.._vendor_time-0.1.42_src_sys.rs
diff -u /dev/null pkgsrc/graphics/librsvg/patches/patch-.._vendor_time-0.1.42_src_sys.rs:1.1
--- /dev/null   Tue Jan 12 12:57:59 2021
+++ pkgsrc/graphics/librsvg/patches/patch-.._vendor_time-0.1.42_src_sys.rs      Tue Jan 12 12:57:59 2021
@@ -0,0 +1,51 @@
+$NetBSD: patch-.._vendor_time-0.1.42_src_sys.rs,v 1.1 2021/01/12 12:57:59 jperkin Exp $
+
+Pull in upstream fixes for illumos target.
+
+--- ../vendor/time-0.1.42/src/sys.rs.orig      2018-12-13 18:36:22.000000000 +0000
++++ ../vendor/time-0.1.42/src/sys.rs
+@@ -359,7 +359,7 @@ mod inner {
+     #[cfg(all(not(target_os = "macos"), not(target_os = "ios")))]
+     pub use self::unix::*;
+ 
+-    #[cfg(target_os = "solaris")]
++    #[cfg(any(target_os = "solaris", target_os = "illumos"))]
+     extern {
+         static timezone: time_t;
+         static altzone: time_t;
+@@ -390,7 +390,7 @@ mod inner {
+         rust_tm.tm_utcoff = utcoff;
+     }
+ 
+-    #[cfg(any(target_os = "nacl", target_os = "solaris"))]
++    #[cfg(any(target_os = "nacl", target_os = "solaris", target_os = "illumos"))]
+     unsafe fn timegm(tm: *mut libc::tm) -> time_t {
+         use std::env::{set_var, var_os, remove_var};
+         extern {
+@@ -433,7 +433,7 @@ mod inner {
+             if libc::localtime_r(&sec, &mut out).is_null() {
+                 panic!("localtime_r failed: {}", io::Error::last_os_error());
+             }
+-            #[cfg(target_os = "solaris")]
++            #[cfg(any(target_os = "solaris", target_os = "illumos"))]
+             let gmtoff = {
+                 ::tzset();
+                 // < 0 means we don't know; assume we're not in DST.
+@@ -446,7 +446,7 @@ mod inner {
+                     -timezone
+                 }
+             };
+-            #[cfg(not(target_os = "solaris"))]
++            #[cfg(not(any(target_os = "solaris", target_os = "illumos")))]
+             let gmtoff = out.tm_gmtoff;
+             tm_to_rust_tm(&out, gmtoff as i32, tm);
+         }
+@@ -455,7 +455,7 @@ mod inner {
+     pub fn utc_tm_to_time(rust_tm: &Tm) -> i64 {
+         #[cfg(all(target_os = "android", target_pointer_width = "32"))]
+         use libc::timegm64 as timegm;
+-        #[cfg(not(any(all(target_os = "android", target_pointer_width = "32"), target_os = "nacl", target_os = "solaris")))]
++        #[cfg(not(any(all(target_os = "android", target_pointer_width = "32"), target_os = "nacl", target_os = "solaris", target_os = "illumos")))]
+         use libc::timegm;
+ 
+         let mut tm = unsafe { mem::zeroed() };