<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/76a14cf9f6751c0f085a639cd616c5a51b150bee">https://github.com/macports/macports-ports/commit/76a14cf9f6751c0f085a639cd616c5a51b150bee</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 76a14cf libmypaint: Add patch from intltool port
</span>76a14cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 76a14cf9f6751c0f085a639cd616c5a51b150bee
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Mar 2 06:22:33 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> libmypaint: Add patch from intltool port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes build failure when the installed variant of the perl5 port does
</span><span style='display:block; white-space:pre;color:#404040;'> not match what the intltool port uses.
</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/60130
</span>---
graphics/libmypaint/Portfile | 2 ++
.../files/patch-remove-intltool-perl-hack.diff | 30 ++++++++++++++++++++++
2 files changed, 32 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libmypaint/Portfile b/graphics/libmypaint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1358b82..3bb0435 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libmypaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libmypaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +30,8 @@ depends_build port:pkgconfig \
</span> depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:json-c
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-remove-intltool-perl-hack.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # reconfigure with our intltool.m4 using upstream autogen.sh
post-extract {
xinstall ${filespath}/autogen.sh ${worksrcpath}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libmypaint/files/patch-remove-intltool-perl-hack.diff b/graphics/libmypaint/files/patch-remove-intltool-perl-hack.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4dbef8b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libmypaint/files/patch-remove-intltool-perl-hack.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4macros/intltool.m4.orig 2013-07-02 11:22:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4macros/intltool.m4 2013-07-02 11:22:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,27 +131,6 @@ if test -z "$xgversion" -o -z "$mmversio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_PATH_PROG(INTLTOOL_PERL, perl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -z "$INTLTOOL_PERL"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([perl not found])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_MSG_CHECKING([for perl >= 5.8.1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test $? -ne 0; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([$IT_PERL_VERSION])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x$2" != "xno-xml"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING([for XML::Parser])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([ok])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(ALL_LINGUAS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>