librsvg: fix linking on NetBSD.

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Fri May 24 16:16:07 2019 +0200
Changeset:	8962f8c0140f218af8445e872dfe5a9a01facacf

Modified Files:
	librsvg/PLIST
	librsvg/distinfo
Added Files:
	librsvg/patches/patch-Makefile.am
Removed Files:
	librsvg/TODO
	librsvg/patches/patch-rsvg__internals_Cargo.toml

Log Message:
librsvg: fix linking on NetBSD.

Fix PLIST.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8962f8c0140f218af8445e872dfe5a9a01facacf

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

diffstat:
 librsvg/PLIST                                    | 22 ++++++++-----------
 librsvg/TODO                                     |  1 -
 librsvg/distinfo                                 |  2 +-
 librsvg/patches/patch-Makefile.am                | 28 ++++++++++++++++++++++++
 librsvg/patches/patch-rsvg__internals_Cargo.toml | 13 -----------
 5 files changed, 38 insertions(+), 28 deletions(-)

diffs:
diff --git a/librsvg/PLIST b/librsvg/PLIST
index 1810ff89f3..5e2244bd4f 100644
--- a/librsvg/PLIST
+++ b/librsvg/PLIST
@@ -1,26 +1,21 @@
-@comment $NetBSD: PLIST,v 1.18 2018/01/01 22:29:37 rillig Exp $
+@comment $NetBSD$
 bin/rsvg-convert
-include/librsvg-2.0/librsvg/librsvg-enum-types.h
 include/librsvg-2.0/librsvg/librsvg-features.h
 include/librsvg-2.0/librsvg/rsvg-cairo.h
 include/librsvg-2.0/librsvg/rsvg.h
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la
-${PLIST.introspection}lib/girepository-1.0/Rsvg-2.0.typelib
+lib/girepository-1.0/Rsvg-2.0.typelib
 lib/librsvg-2.la
 lib/pkgconfig/librsvg-2.0.pc
 man/man1/rsvg-convert.1
-${PLIST.introspection}share/gir-1.0/Rsvg-2.0.gir
-share/gtk-doc/html/rsvg-2.0/RsvgHandle.html
+share/doc/librsvg/COMPILING.md
+share/doc/librsvg/CONTRIBUTING.md
+share/doc/librsvg/README.md
+share/doc/librsvg/code-of-conduct.md
+share/gir-1.0/Rsvg-2.0.gir
 share/gtk-doc/html/rsvg-2.0/annotation-glossary.html
-share/gtk-doc/html/rsvg-2.0/api-index-2-14.html
-share/gtk-doc/html/rsvg-2.0/api-index-2-22.html
-share/gtk-doc/html/rsvg-2.0/api-index-2-32.html
-share/gtk-doc/html/rsvg-2.0/api-index-2-36.html
-share/gtk-doc/html/rsvg-2.0/api-index-2-4.html
-share/gtk-doc/html/rsvg-2.0/api-index-2-8.html
-share/gtk-doc/html/rsvg-2.0/api-index-2-9.html
-share/gtk-doc/html/rsvg-2.0/api-index-deprecated.html
 share/gtk-doc/html/rsvg-2.0/api-index-full.html
+share/gtk-doc/html/rsvg-2.0/ch01.html
 share/gtk-doc/html/rsvg-2.0/home.png
 share/gtk-doc/html/rsvg-2.0/index.html
 share/gtk-doc/html/rsvg-2.0/left-insensitive.png
@@ -30,6 +25,7 @@ share/gtk-doc/html/rsvg-2.0/object-tree.html
 share/gtk-doc/html/rsvg-2.0/right-insensitive.png
 share/gtk-doc/html/rsvg-2.0/right.png
 share/gtk-doc/html/rsvg-2.0/rsvg-2.0.devhelp2
+share/gtk-doc/html/rsvg-2.0/rsvg-RsvgHandle.html
 share/gtk-doc/html/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html
 share/gtk-doc/html/rsvg-2.0/rsvg-Using-RSVG-with-GdkPixbuf.html
 share/gtk-doc/html/rsvg-2.0/rsvg-Using-RSVG-with-cairo.html
diff --git a/librsvg/TODO b/librsvg/TODO
deleted file mode 100644
index df5ee0bb49..0000000000
--- a/librsvg/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- Make this build
diff --git a/librsvg/distinfo b/librsvg/distinfo
index ce073c3301..17c71af5c0 100644
--- a/librsvg/distinfo
+++ b/librsvg/distinfo
@@ -560,5 +560,5 @@ SHA1 (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = eadfdb146024d37b6887b5b9cb6a69
 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-Makefile.am) = df79814a592d7fd59fe53dde977c56206c6bca5a
 SHA1 (patch-configure.ac) = bdad8c486f552dbd301abb49cef3f73aaeb81165
-SHA1 (patch-rsvg__internals_Cargo.toml) = e75641a5278b0420cf336f7d4b2a88186f7bb896
diff --git a/librsvg/patches/patch-Makefile.am b/librsvg/patches/patch-Makefile.am
new file mode 100644
index 0000000000..f95653cf51
--- /dev/null
+++ b/librsvg/patches/patch-Makefile.am
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Rename rust-produced shared library.
+When it ends on "_pic.a", libtool accepts that its code is good
+enough to be included in the shared library.
+
+--- Makefile.am.orig	2019-02-15 18:20:24.000000000 +0000
++++ Makefile.am
+@@ -136,7 +136,8 @@ cargo_verbose_ = $(cargo_verbose_$(AM_DE
+ cargo_verbose_0 =
+ cargo_verbose_1 = --verbose
+ 
+-RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
++RUST_LIB_NONPIC=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
++RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals_pic.a
+ CARGO_TARGET_DIR=@abs_top_builddir@/target
+ 
+ check-local:
+@@ -165,7 +166,8 @@ $(RUST_LIB): $(RUST_SRC)
+ 	PKG_CONFIG_ALLOW_CROSS=1						\
+ 	PKG_CONFIG='$(PKG_CONFIG)'						\
+ 	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)					\
+-	$(CARGO) build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS)
++	$(CARGO) build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) && \
++	cp $(RUST_LIB_NONPIC) $(RUST_LIB) 
+ 
+ librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
+ 	-I$(top_srcdir) 			\
diff --git a/librsvg/patches/patch-rsvg__internals_Cargo.toml b/librsvg/patches/patch-rsvg__internals_Cargo.toml
deleted file mode 100644
index 0d19c0ebc8..0000000000
--- a/librsvg/patches/patch-rsvg__internals_Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- rsvg_internals/Cargo.toml.orig	2018-10-09 13:52:22.000000000 +0000
-+++ rsvg_internals/Cargo.toml
-@@ -73,7 +73,7 @@ criterion = "0.2"
- 
- [lib]
- name = "rsvg_internals"
--crate-type = ["staticlib", "lib"]
-+crate-type = ["staticlib", "lib", "dylib"]
- 
- [[bench]]
- name = "box_blur"