<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/8df96881241b0d4bcb1f73339c0914f2420a5e3d">https://github.com/macports/macports-ports/commit/8df96881241b0d4bcb1f73339c0914f2420a5e3d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8df9688 librsvg: update to 2.46.3
</span>8df9688 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8df96881241b0d4bcb1f73339c0914f2420a5e3d
</span>Author: Gregorio Litenstein <g.litenstein@gmail.com>
AuthorDate: Tue Oct 29 11:39:38 2019 -0300
<span style='display:block; white-space:pre;color:#404040;'> librsvg: update to 2.46.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes PR https://github.com/macports/macports-ports/pull/5657.
</span>---
graphics/librsvg/Portfile | 42 +++++++------
.../files/patch-configure-rust_target_subdir.diff | 6 +-
graphics/librsvg/files/patch-disable-viewer.diff | 18 ------
graphics/librsvg/files/patch-rust-1.38.0.diff | 68 ----------------------
4 files changed, 23 insertions(+), 111 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 a4abc34..939ec66 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup gobject_introspection 1.0
name librsvg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.44.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.46.3
</span> license {GPL-2+ LGPL-2+}
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ homepage https://wiki.gnome.org/Projects/LibRsvg
</span> master_sites gnome:sources/${name}/${branch}/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 96c3f77b61004966d532244472772babda1d632d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6a85a7868639cdd4aa064245cc8e9d864dad8b8e9a4a8031bb09a4796bc4e303 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12616040
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 920dc5bd6e7ef6442aeadd37a9072a9fcaee23c7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 768e46467d874161a277bd696551f4f364b3c8d51eeedeb9b4fe1277a2496ae8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12664520
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,16 @@ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span> checksums rmd160 e697e1220779f77e81a890718ef5cda5b5e6b740 \
sha256 cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b \
size 1796376
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# variant viewer disabled by default in an attempt to avoid loading
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gtk3 by those who are using it strictly as a library outside of GTK+/GNOME.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/43328
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/47443
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/47596
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant viewer description "Build the rsvg-view-3 viewer utility." {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> if {![variant_isset viewer]} {
patchfiles-append patch-disable-viewer-pre-cargo.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,12 +86,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span>
# when CARGO_BUILD_TARGET is set, directory structure changes
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-rust_target_subdir.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-rust-1.38.0.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#e0ffe0;'>+ patch-configure-rust_target_subdir.diff
</span> }
gobject_introspection yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,23 +99,17 @@ test.run yes
</span> test.dir ${worksrcpath}/tests
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# variant viewer disabled by default in an attempt to avoid loading
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gtk3 by those who are using it strictly as a library outside of GTK+/GNOME.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/43328
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/47443
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/47596
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant viewer description "Build the rsvg-view-3 viewer utility." {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:adwaita-icon-theme
</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;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING COPYING.LIB NEWS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING.LIB NEWS \
</span> ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} COPYING \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xinstall -m 755 -W ${filespath} svg2pdf \
${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/files/patch-configure-rust_target_subdir.diff b/graphics/librsvg/files/patch-configure-rust_target_subdir.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0faeac0..be927a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg/files/patch-configure-rust_target_subdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/files/patch-configure-rust_target_subdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-11-13 10:52:29.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2018-12-02 13:45:39.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15574,9 +15574,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-01-24 09:14:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-03-21 09:01:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17881,9 +17881,9 @@
</span> CROSS_COMPILING_FALSE=
fi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/files/patch-disable-viewer.diff b/graphics/librsvg/files/patch-disable-viewer.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ada2087..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg/files/patch-disable-viewer.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2019-02-15 14:37:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2019-02-17 15:52:02.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -161,7 +161,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_triplet = @build@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- host_triplet = @host@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin_PROGRAMS = rsvg-convert$(EXEEXT) $(am__EXEEXT_1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@HAVE_GTK_3_TRUE@am__append_1 = rsvg-view-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @OS_WIN32_TRUE@am__append_2 = -mwindows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_3 = $(VAPIGEN_VAPIS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_INTROSPECTION_TRUE@am__append_4 = $(INTROSPECTION_INTERMEDIATE_ITEMS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,7 +186,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.h.win32 librsvg-${RSVG_API_VERSION}.pc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- librsvg-${RSVG_API_VERSION}-uninstalled.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG_CLEAN_VPATH_FILES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@HAVE_GTK_3_TRUE@am__EXEEXT_1 = rsvg-view-3$(EXEEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibsdir)" \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/files/patch-rust-1.38.0.diff b/graphics/librsvg/files/patch-rust-1.38.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0dced25..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg/files/patch-rust-1.38.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,68 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Backport from upstream commit https://github.com/servo/rust-cssparser/commit/3c98d22c5de3b696bf1fde2b6c90069812312aa6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Not necessary once librsvg is updated to 2.46.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vendor/cssparser/src/parser.rs 2017-12-11 12:41:06.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vendor/cssparser/src/parser.rs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -555,28 +555,34 @@ impl<'i: 't, 't> Parser<'i, 't> {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let token_start_position = self.input.tokenizer.position();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- let token;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- match self.input.cached_token {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Some(ref cached_token)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if cached_token.start_position == token_start_position => {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.input.tokenizer.reset(&cached_token.end_state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- match cached_token.token {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Token::Function(ref name) => self.input.tokenizer.see_function(name),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _ => {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- token = &cached_token.token
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _ => {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- let new_token = self.input.tokenizer.next()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.input.cached_token = Some(CachedToken {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- token: new_token,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- start_position: token_start_position,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- end_state: self.input.tokenizer.state(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- });
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- token = self.input.cached_token_ref()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ let using_cached_token = self
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .input
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .cached_token
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .as_ref()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .map_or(false, |cached_token| {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cached_token.start_position == token_start_position
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ });
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ let token = if using_cached_token {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ let cached_token = self.input.cached_token.as_ref().unwrap();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.input.tokenizer.reset(&cached_token.end_state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ match cached_token.token {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Token::Function(ref name) => self.input.tokenizer.see_function(name),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _ => {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &cached_token.token
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ let new_token = self
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .input
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .tokenizer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .next()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.input.cached_token = Some(CachedToken {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ token: new_token,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ start_position: token_start_position,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end_state: self.input.tokenizer.state(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ });
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.input.cached_token_ref()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if let Some(block_type) = BlockType::opening(token) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.at_start_of = Some(block_type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vendor/cssparser/.cargo-checksum.json.orig 2019-10-11 15:36:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vendor/cssparser/.cargo-checksum.json 2019-10-11 15:37:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{"files":{".travis.yml":"e8f586288c39dbaebefdd391f68376e58f3a4c568a8dc3cd97c4a362194716dd","Cargo.toml":"99d0445140451d806afb253209d7fb144fe0879f52b2ba69da621237f8dd546b","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"ce686e87cccb6aa85a8cd34688d809398c5a624f179fd9a172d1049892da3f4c","build/match_byte.rs":"31905ae3dba69fa82c1f13069df4cd056bb340d59ee5d177679425f105f203c [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"files":{".travis.yml":"e8f586288c39dbaebefdd391f68376e58f3a4c568a8dc3cd97c4a362194716dd","Cargo.toml":"99d0445140451d806afb253209d7fb144fe0879f52b2ba69da621237f8dd546b","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"ce686e87cccb6aa85a8cd34688d809398c5a624f179fd9a172d1049892da3f4c","build/match_byte.rs":"31905ae3dba69fa82c1f13069df4cd056bb340d59ee5d177679425f105f203c [...]
</span></pre><pre style='margin:0'>
</pre>