<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0521da5dcd4b4593ae06d920869af556d7bc2bd0">https://github.com/macports/macports-ports/commit/0521da5dcd4b4593ae06d920869af556d7bc2bd0</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 0521da5 synfig: Update to 1.2.2
</span>0521da5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0521da5dcd4b4593ae06d920869af556d7bc2bd0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Nov 8 00:30:30 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> synfig: Update to 1.2.2
</span>---
graphics/synfig/Portfile | 47 ++++++++++++++------------------
graphics/synfig/files/WorkAreaTile.patch | 13 ---------
graphics/synfig/files/algorithm.patch | 13 ---------
graphics/synfig/files/no-extern-C.patch | 19 +++++++++++++
graphics/synfig/files/template.patch | 32 ----------------------
5 files changed, 40 insertions(+), 84 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/synfig/Portfile b/graphics/synfig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d42039c..096d589 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/synfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/synfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,18 +3,21 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup synfig synfig 1.2.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup synfig synfig 1.2.2 v
</span> categories graphics
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.synfig.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.synfig.org
</span> master_sites sourceforge:project/synfig/releases/${version}/source/
dist_subdir ${subport}
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ddc2de6a6243519cbc146ed72619a8d58f6a145f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5f5f7b33483041165f9a63fe4d95eb815971c7444569e574206f6964e83cc2ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5005298
</span>
description vector-based 2-D animation package
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +29,8 @@ if {${subport} eq ${name}} {
</span> at any resolution or framerate), high dynamic range \
images, and a flexible plugin system.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 51f687541f7ea74b65caa3fee1cad694f8534745 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 611ea9f156188c9ecbb99a21116b5330e5070c51a0ffa721c7791c46ec231dbf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:intltool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib port:boost \
path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,14 +52,14 @@ if {${subport} eq ${name}} {
</span> port:openexr \
path:lib/pkgconfig/pango.pc:pango
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles template.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles no-extern-C.patch
</span>
configure.args --with-boost=${prefix}
post-destroot {
set docdir ${destroot}${prefix}/share/doc/${subport}
xinstall -d ${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span> ABOUT-NLS \
AUTHORS \
COPYING \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,16 +71,17 @@ if {${subport} eq ${name}} {
</span> ${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.name synfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type sourceforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.livecheck.regex {(\d+\.\d*[02468]\.*(?:.\d+)*)}
</span> } else {
livecheck.type none
}
subport ETL {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 0.04.22
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 0cf881584ac7ef57066c0e4f651c9561af552063 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0dc19c5a6c9e964054ca3af6dacd6ab0c198d78071cfab2aebac178afe454d8b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 377133
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> supported_archs noarch
description multi-platform class and template library
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,18 +91,13 @@ subport ETL {
</span> types and functions from the C++ Standard Template \
Library (STL).
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c9dcf4a0f3ef1cc33b4453416b3ca7c4f0f0f9a6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ac5aeb9b8ec2c69dd455c6c72e104ff20c43e1e5dde6c0cd87f3f7d1b41d2746
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # ETL-config is a wrapper around pkg-config
depends_run port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles algorithm.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
set docdir ${destroot}${prefix}/share/doc/${subport}
xinstall -d ${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span> AUTHORS \
ChangeLog \
COPYING \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,6 +109,9 @@ subport ETL {
</span>
subport synfigstudio {
revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 0eee777a88c74d85048c215eb592cfa2a5dbe0d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 76fa37998af634cf694f9b5bdfcb90220bc88f8527df117d9282a39fe01489e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5801316
</span>
description synfig animation studio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,9 +119,6 @@ subport synfigstudio {
</span> provides a GUI to create Synfig animations which are \
saved in Synfig .sif or .sifz format.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c0cbbd19c0430ccd18f21c89c9d552776cee34be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 159b6bef1f5a819602f82014f787c22d4c9108af749fcd4505ee37c4979b6c39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:intltool \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,8 +126,6 @@ subport synfigstudio {
</span> port:gtkmm3 \
port:synfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles WorkAreaTile.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
foreach f [glob ${destroot}${prefix}/share/mime/*] {
if {[file isfile ${f}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +135,7 @@ subport synfigstudio {
</span>
set docdir ${destroot}${prefix}/share/doc/${subport}
xinstall -d ${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span> ABOUT-NLS \
AUTHORS \
COPYING \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/synfig/files/WorkAreaTile.patch b/graphics/synfig/files/WorkAreaTile.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e4539c5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/synfig/files/WorkAreaTile.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/synfig/synfig/issues/300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/synfig/synfig/commit/4fcc3f490cc02498491b76e18e80d1be954d04be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/workarea.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/workarea.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,7 +130,7 @@ class WorkAreaTile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- top + (surface ? cairo_image_surface_get_height(surface) : 0) ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- surface() { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool operator< (const WorkAreaTile &other) { return refresh_id < other.refresh_id; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool operator< (const WorkAreaTile &other) const { return refresh_id < other.refresh_id; }
</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;'>- class WorkAreaTileBook
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/synfig/files/algorithm.patch b/graphics/synfig/files/algorithm.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 962820c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/synfig/files/algorithm.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/synfig/synfig/issues/297
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/synfig/synfig/commit/a1232fa5834a109b470322061d1a4d7346c04f83
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ETL/_boxblur.h.orig 2016-11-30 04:59:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ETL/_boxblur.h 2017-01-13 00:38:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,6 +29,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* === H E A D E R S ======================================================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* === M A C R O S ========================================================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* === T Y P E D E F S ===================================================== */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/synfig/files/no-extern-C.patch b/graphics/synfig/files/no-extern-C.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9802a23
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/synfig/files/no-extern-C.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure by removing unneeded include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/synfig/synfig/commit/dedb2f7f82a04c0cb3aad462bbe055412f3f5e18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The build failure is because extern "C" is being used to enclose a header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+which later includes a C++ file (from icu).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/synfig/savecanvas.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/synfig/savecanvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,9 +66,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ETL/stringf>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gradient.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libxml/tree.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/synfig/files/template.patch b/graphics/synfig/files/template.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 26299d5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/synfig/files/template.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/synfig/synfig/issues/298
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/synfig/synfig/commit/8406fe911df74868cfcc449ae94fbe364a8290e1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/synfig/rendering/software/function/array.h.orig 2016-11-30 05:00:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/synfig/rendering/software/function/array.h 2017-01-13 01:00:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -432,23 +432,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void assign(const Array<TT, Rank> &x) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typename Array<TT, Rank>::Iterator j(x);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for(Iterator i(*this); i && j; ++i, ++j) i.get_array().assign<TT>(j.get_array());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for(Iterator i(*this); i && j; ++i, ++j) i.get_array().template assign<TT>(j.get_array());
</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 function>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void process(const Type &x) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { for(Iterator i(*this); i; ++i) i.get_array().process<function>(x); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { for(Iterator i(*this); i; ++i) i.get_array().template process<function>(x); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template<typename function, typename TT>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void process(const Array<TT, Rank> &x) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typename Array<TT, Rank>::Iterator j(x);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for(Iterator i(*this); i && j; ++i, ++j) i.get_array().process<function, TT>(j.get_array());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for(Iterator i(*this); i && j; ++i, ++j) i.get_array().template process<function, TT>(j.get_array());
</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 function>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void process() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { for(Iterator i(*this); i; ++i) i.get_array().process<function>(); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { for(Iterator i(*this); i; ++i) i.get_array().template process<function>(); }
</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></pre><pre style='margin:0'>
</pre>