<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0c03fc0153a64fbdfc4ad161b99e26304c24c6b0">https://github.com/macports/macports-ports/commit/0c03fc0153a64fbdfc4ad161b99e26304c24c6b0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0c03fc0153a64fbdfc4ad161b99e26304c24c6b0
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Jan 13 15:15:54 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> librsvg: fix patch for pre-cargo fallback version, rebuild
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57782.
</span>---
graphics/librsvg/Portfile | 13 +++++++++----
.../files/patch-disable-viewer-pre-cargo.diff | 20 ++++++++++++++++++++
2 files changed, 29 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/Portfile b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd32a89..74d9313 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,11 +58,16 @@ depends_run port:python[join [split ${pyversion} "."] ""]
</span> if {${os.platform} eq "darwin" && ${os.major} < 15} {
# revert to latest pre-cargo version
version 2.40.20
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> epoch 1
checksums rmd160 e697e1220779f77e81a890718ef5cda5b5e6b740 \
sha256 cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b \
size 1796376
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset viewer]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-disable-viewer-pre-cargo.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
PortGroup cargo_fetch 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +78,10 @@ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span> # when CARGO_BUILD_TARGET is set, directory structure changes
patchfiles-append \
patch-configure-rust_target_subdir.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset viewer]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-disable-viewer.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
gobject_introspection yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,10 +105,6 @@ variant viewer description "Build the rsvg-view-3 viewer utility." {
</span> depends_run-append port:adwaita-icon-theme
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset viewer]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-disable-viewer.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/files/patch-disable-viewer-pre-cargo.diff b/graphics/librsvg/files/patch-disable-viewer-pre-cargo.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..be9696a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/files/patch-disable-viewer-pre-cargo.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2017-12-15 14:47:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2019-01-13 16:18:44.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,8 +153,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POST_UNINSTALL = :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_triplet = @build@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ host_triplet = @host@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bin_PROGRAMS = rsvg-convert$(EXEEXT) $(am__EXEEXT_1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@HAVE_GTK_3_TRUE@am__append_1 = rsvg-view-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bin_PROGRAMS = rsvg-convert$(EXEEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @OS_WIN32_TRUE@am__append_2 = -mwindows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HAVE_INTROSPECTION_TRUE@am__append_3 = $(nodist_gir_DATA) $(nodist_typelibs_DATA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_4 = $(VAPIGEN_VAPIS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -255,7 +254,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CCLD) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_CFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CFLAGS) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_LDFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LDFLAGS) -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@HAVE_GTK_3_TRUE@am__EXEEXT_1 = rsvg-view-3$(EXEEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROGRAMS = $(bin_PROGRAMS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am_rsvg_convert_OBJECTS = rsvg_convert-rsvg-convert.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsvg_convert-rsvg-size-callback.$(OBJEXT) $(am__objects_1)
</span></pre><pre style='margin:0'>
</pre>