CVS commit: pkgsrc/graphics/librsvg

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Jul 27 19:31:00 UTC 2019

Modified Files:
        pkgsrc/graphics/librsvg: Makefile distinfo
Added Files:
        pkgsrc/graphics/librsvg/patches: patch-Cargo.lock

Log Message:
librsvg: update vendored libc create to latest version. Fixes aarch build.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/graphics/librsvg/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/graphics/librsvg/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/librsvg/patches/patch-Cargo.lock

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/Makefile
diff -u pkgsrc/graphics/librsvg/Makefile:1.108 pkgsrc/graphics/librsvg/Makefile:1.109
--- pkgsrc/graphics/librsvg/Makefile:1.108      Sun Jul 21 22:24:06 2019
+++ pkgsrc/graphics/librsvg/Makefile    Sat Jul 27 19:31:00 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2019/07/21 22:24:06 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2019/07/27 19:31:00 tnn Exp $
 
 DISTNAME=      librsvg-2.44.14
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/librsvg/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -83,7 +83,7 @@ CARGO_CRATE_DEPENDS+= kernel32-sys-0.2.2
 CARGO_CRATE_DEPENDS+=  language-tags-0.2.2
 CARGO_CRATE_DEPENDS+=  lazy_static-0.2.11
 CARGO_CRATE_DEPENDS+=  lazy_static-1.1.0
-CARGO_CRATE_DEPENDS+=  libc-0.2.43
+CARGO_CRATE_DEPENDS+=  libc-0.2.60
 CARGO_CRATE_DEPENDS+=  libm-0.1.2
 CARGO_CRATE_DEPENDS+=  locale_config-0.2.2
 CARGO_CRATE_DEPENDS+=  log-0.4.5

Index: pkgsrc/graphics/librsvg/distinfo
diff -u pkgsrc/graphics/librsvg/distinfo:1.38 pkgsrc/graphics/librsvg/distinfo:1.39
--- pkgsrc/graphics/librsvg/distinfo:1.38       Wed May 29 12:38:23 2019
+++ pkgsrc/graphics/librsvg/distinfo    Sat Jul 27 19:31:00 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2019/05/29 12:38:23 wiz Exp $
+$NetBSD: distinfo,v 1.39 2019/07/27 19:31:00 tnn Exp $
 
 SHA1 (aho-corasick-0.6.8.crate) = e39bb67748289a94512db5c32c599c37e6bb0317
 RMD160 (aho-corasick-0.6.8.crate) = adc1808fb3ec73db2643b6ad3754029e2e495e5f
@@ -220,10 +220,10 @@ SHA1 (lazy_static-1.1.0.crate) = 4b95eab
 RMD160 (lazy_static-1.1.0.crate) = 3cd4086bfce143b673d7589f8b05539871405aee
 SHA512 (lazy_static-1.1.0.crate) = 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
 Size (lazy_static-1.1.0.crate) = 12317 bytes
-SHA1 (libc-0.2.43.crate) = 794bcf9b456cc3fcfd7428634d1f1f4ce1936a42
-RMD160 (libc-0.2.43.crate) = b401dc3bd4dfe6bdc8f24d2857e3aa2c735304fe
-SHA512 (libc-0.2.43.crate) = d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
-Size (libc-0.2.43.crate) = 353810 bytes
+SHA1 (libc-0.2.60.crate) = 19b399fa96e8fde936a8ec1dd15515f36d473876
+RMD160 (libc-0.2.60.crate) = 15e5de92d6750eb53e7f69c50809e03a9ae6f7ad
+SHA512 (libc-0.2.60.crate) = 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
+Size (libc-0.2.60.crate) = 409744 bytes
 SHA1 (libm-0.1.2.crate) = dc16f409be8a4621125c5b5ead07691ef0fe2317
 RMD160 (libm-0.1.2.crate) = df0295c7f10403f97696a4b4671f15b50bb79821
 SHA512 (libm-0.1.2.crate) = 707a42632a5d92cccf8eb32fc507061e5b3b724c4fccb21f998bed5e187772a2015dee40a0225fb860a38ce2caa2ec3d9060ddd32b86a927308b253b41d73c95
@@ -560,5 +560,6 @@ SHA1 (winapi-x86_64-pc-windows-gnu-0.4.0
 RMD160 (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 300417853d251d91cadb9650992a6aa98248619f
 SHA512 (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 Size (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 bytes
+SHA1 (patch-Cargo.lock) = 6767f39a384c89d5ee449bde02ae79d321c229d2
 SHA1 (patch-Makefile.am) = fd57625bed8e908a6b56f78cb75283d1d566cdd6
 SHA1 (patch-configure.ac) = bdad8c486f552dbd301abb49cef3f73aaeb81165

Added files:

Index: pkgsrc/graphics/librsvg/patches/patch-Cargo.lock
diff -u /dev/null pkgsrc/graphics/librsvg/patches/patch-Cargo.lock:1.1
--- /dev/null   Sat Jul 27 19:31:00 2019
+++ pkgsrc/graphics/librsvg/patches/patch-Cargo.lock    Sat Jul 27 19:31:00 2019
@@ -0,0 +1,254 @@
+$NetBSD: patch-Cargo.lock,v 1.1 2019/07/27 19:31:00 tnn Exp $
+
+Update libc create to latest version.
+The vendored libc crate is outdated and doesn't work on aarch64.
+
+To regen this patch:
+make build-env
+mv .cargo/config .cargo/config.bak
+cp Cargo.lock Cargo.lock.orig
+cargo update -p libc --precise 0.2.60
+pkgdiff Cargo.lock.orig Cargo.lock > /usr/pkgsrc/graphics/librsvg/patches/patch-Cargo.lock
+
+--- Cargo.lock.orig    2019-07-27 14:58:13.921161346 +0000
++++ Cargo.lock
+@@ -1,3 +1,5 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
+ [[package]]
+ name = "aho-corasick"
+ version = "0.6.8"
+@@ -46,7 +48,7 @@ name = "atty"
+ version = "0.2.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -58,7 +60,7 @@ source = "registry+https://github.com/ru
+ dependencies = [
+  "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -69,7 +71,7 @@ version = "0.1.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+  "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -101,7 +103,7 @@ dependencies = [
+  "cairo-sys-rs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -109,7 +111,7 @@ name = "cairo-sys-rs"
+ version = "0.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -359,7 +361,7 @@ dependencies = [
+  "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -371,7 +373,7 @@ dependencies = [
+  "gio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -394,7 +396,7 @@ dependencies = [
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -405,7 +407,7 @@ dependencies = [
+  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -418,7 +420,7 @@ dependencies = [
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -427,7 +429,7 @@ version = "0.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -438,7 +440,7 @@ source = "registry+https://github.com/ru
+ dependencies = [
+  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -507,7 +509,7 @@ dependencies = [
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.43"
++version = "0.2.60"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ 
+ [[package]]
+@@ -553,7 +555,7 @@ version = "2.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+  "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -608,7 +610,7 @@ name = "num_cpus"
+ version = "1.8.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -628,7 +630,7 @@ dependencies = [
+  "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pango-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -640,7 +642,7 @@ dependencies = [
+  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -655,7 +657,7 @@ dependencies = [
+  "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "gobject-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pango 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pango-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pangocairo-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -669,7 +671,7 @@ dependencies = [
+  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cairo-sys-rs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pango-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -765,7 +767,7 @@ version = "0.4.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+  "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -776,7 +778,7 @@ source = "registry+https://github.com/ru
+ dependencies = [
+  "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -816,7 +818,7 @@ source = "registry+https://github.com/ru
+ dependencies = [
+  "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -890,7 +892,7 @@ dependencies = [
+  "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "nalgebra 0.16.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1049,7 +1051,7 @@ name = "termion"
+ version = "1.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -1080,7 +1082,7 @@ name = "time"
+ version = "0.1.40"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+ dependencies = [
+- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -1241,7 +1243,7 @@ source = "registry+https://github.com/ru
+ "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
+ "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
+ "checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7"
+-"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
++"checksum libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb"
+ "checksum libm 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "03c0bb6d5ce1b5cc6fd0578ec1cbc18c9d88b5b591a5c7c1d6c6175e266a0819"
+ "checksum locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14fbee0e39bc2dd6a2427c4fdea66e9826cc1fd09b0a0b7550359f5f6efe1dab"
+ "checksum log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fcce5fa49cc693c312001daf1d13411c4a5283796bac1084299ea3e567113f"