<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2a3a115803a1642d48517b47628ce1241cac8efd">https://github.com/macports/macports-ports/commit/2a3a115803a1642d48517b47628ce1241cac8efd</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 2a3a115 dvisvgm: remove integrated patch
</span>2a3a115 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2a3a115803a1642d48517b47628ce1241cac8efd
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue May 21 10:22:36 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> dvisvgm: remove integrated patch
</span>---
graphics/dvisvgm/Portfile | 5 -
graphics/dvisvgm/files/patch-fix-make_array.diff | 122 -----------------------
2 files changed, 127 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dvisvgm/Portfile b/graphics/dvisvgm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e1b671..c3ed6cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/dvisvgm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/dvisvgm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,11 +35,6 @@ if {${subport} eq ${name}} {
</span> updated every 6 months. If for some reason this port does not build or \
function as desired, try the ${name}-devel port.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to move some c++14 features back to c++11 or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # earlier. This patch comes from upstream.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patchfiles-append patch-fix-make_array.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> } else {
# devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dvisvgm/files/patch-fix-make_array.diff b/graphics/dvisvgm/files/patch-fix-make_array.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6b6d83b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/dvisvgm/files/patch-fix-make_array.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,122 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HG changeset patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# User Martin Gieseking <martin.gieseking@uos.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date 1555578878 -7200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Thu Apr 18 11:14:38 2019 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID 4fa1e45d2e2a5b50e385244813b3b8a34629a1f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent 736ab658460f07a5019a7cf049465ac1e14a3a2c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-removed util::make_array() due to compatibility issues
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/optimizer/AttributeExtractor.cpp b/src/optimizer/AttributeExtractor.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/optimizer/AttributeExtractor.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/optimizer/AttributeExtractor.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -113,14 +113,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @return true if the element is groupable */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool AttributeExtractor::groupable (const XMLElement &elem) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // https://www.w3.org/TR/SVG/struct.html#GElement
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static constexpr auto names = util::make_array(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const char *names[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "a", "altGlyphDef", "animate", "animateColor", "animateMotion", "animateTransform",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "circle", "clipPath", "color-profile", "cursor", "defs", "desc", "ellipse", "filter",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "font", "font-face", "foreignObject", "g", "image", "line", "linearGradient", "marker",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "mask", "path", "pattern", "polygon", "polyline", "radialGradient", "rect", "set",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "style", "switch", "symbol", "text", "title", "use", "view"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return binary_search(names.begin(), names.end(), elem.name(), [](const string &name1, const string &name2) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return binary_search(begin(names), end(names), elem.name(), [](const string &name1, const string &name2) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return name1 < name2;
</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;'>-@@ -136,15 +136,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // clip-path is not inheritable but can be moved to the parent element as long as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // no child gets an different clip-path attribute
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // https://www.w3.org/TR/SVG11/styling.html#Inheritance
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static constexpr auto names = util::make_array(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const char *names[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "clip-path", "clip-rule", "color", "color-interpolation", "color-interpolation-filters", "color-profile",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "color-rendering", "direction", "fill", "fill-opacity", "fill-rule", "font", "font-family", "font-size",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "font-size-adjust", "font-stretch", "font-style", "font-variant", "font-weight", "glyph-orientation-horizontal",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "glyph-orientation-vertical", "letter-spacing", "paint-order", "stroke", "stroke-dasharray", "stroke-dashoffset",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "transform",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "visibility", "word-spacing", "writing-mode"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return binary_search(names.begin(), names.end(), attrib.name, [](const string &name1, const string &name2) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return binary_search(begin(names), end(names), attrib.name, [](const string &name1, const string &name2) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return name1 < name2;
</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;'>-@@ -159,13 +159,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // the 'fill' attribute of animation elements has different semantics than
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // that of graphics elements => don't extract it from animation nodes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // https://www.w3.org/TR/SVG11/animate.html#TimingAttributes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static constexpr auto names = util::make_array(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const char *names[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "animate", "animateColor", "animateMotion", "animateTransform", "set"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto it = find_if(names.begin(), names.end(), [&](const string &name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto it = find_if(begin(names), end(names), [&](const string &name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return element.name() == name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- });
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return it == names.end();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return it == end(names);
</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;'>-diff --git a/src/optimizer/GroupCollapser.cpp b/src/optimizer/GroupCollapser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/optimizer/GroupCollapser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/optimizer/GroupCollapser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,13 +132,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool GroupCollapser::collapsible (const XMLElement &element) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // the 'fill' attribute of animation elements has different semantics than
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // that of graphics elements => don't collapse them
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static constexpr auto names = util::make_array(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const char *names[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "animate", "animateColor", "animateMotion", "animateTransform", "set"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto it = find_if(names.begin(), names.end(), [&](const string &name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto it = find_if(begin(names), end(names), [&](const string &name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return element.name() == name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- });
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return it == names.end();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return it == end(names);
</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;'>-@@ -155,11 +155,11 @@
</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;'>- // these attributes prevent a group from being unwrapped
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static constexpr auto attribs = util::make_array(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const char *attribs[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "class", "id", "filter", "mask", "style"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto it = find_if(attribs.begin(), attribs.end(), [&](const string &name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto it = find_if(begin(attribs), end(attribs), [&](const string &name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return source.hasAttribute(name) || dest.hasAttribute(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- });
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return it == attribs.end();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return it == end(attribs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/utility.hpp b/src/utility.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/utility.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/utility.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,15 +103,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return std::unique_ptr<T>{static_cast<T*>(old.release())};
</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;'>--template <typename... T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--constexpr auto make_array (T&&... values) ->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::array<typename std::decay<typename std::common_type<T...>::type>::type, sizeof...(T)> {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return std::array<typename std::decay<typename std::common_type<T...>::type>::type, sizeof...(T)>{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::forward<T>(values)...
</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;'>- } // namespace util
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>
</pre>