<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/7c4a6b375b78615ffda878a82084c4ba2192ac0d">https://github.com/macports/macports-ports/commit/7c4a6b375b78615ffda878a82084c4ba2192ac0d</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 7c4a6b3 libmypaint: Update to 1.6.1
</span>7c4a6b3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7c4a6b375b78615ffda878a82084c4ba2192ac0d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 3 14:29:19 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> libmypaint: Update to 1.6.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update autogen.sh in files to match upstream.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The library install_name changes again in this version, but from now on
</span><span style='display:block; white-space:pre;color:#404040;'> it should only change when necessary.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add pre-activate hack to deactivate any MyPaint or MyPaint-devel that's
</span><span style='display:block; white-space:pre;color:#404040;'> installed and active since they used to provide libmypaint files but
</span><span style='display:block; white-space:pre;color:#404040;'> won't anymore after they're updated.
</span>---
graphics/libmypaint/Portfile | 44 ++++++++++++++++++++++++++----------
graphics/libmypaint/files/autogen.sh | 30 +++++++++++++++++++++---
2 files changed, 59 insertions(+), 15 deletions(-)
<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 ccfe30f..7463149 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;'>@@ -3,19 +3,18 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name libmypaint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mypaint libmypaint 1.6.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1c09037ab87cadddb57345e5fc2057ba4fadfe23 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 741754f293f6b7668f941506da07cd7725629a793108bb31633fb6c3eae5315f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 519464
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories graphics
maintainers {ryandesign @ryandesign} {devans @dbevans} openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts MyPaint MyPaint-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup mypaint libmypaint 1.6.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 370609d3f831fbd8105e8bb66d62283a4b2a3e68 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a5ec3624ba469b7b35fd66b6fbee7f07285b7a7813d02291ac9b10e46618140e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 519412
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# license ISC
</span> license Permissive
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description The MyPaint Brush Library
long_description libmypaint, a.k.a. \"brushlib\", is a library for making brushstrokes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,8 +23,11 @@ long_description libmypaint, a.k.a. \"brushlib\", is a library for making bru
</span> github.tarball_from releases
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Using the same python as MyPaint for consistency.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python37
</span>
depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:json-c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +42,8 @@ autoreconf.env ACLOCAL=${prefix}/bin/aclocal \
</span> AUTOCONF=${prefix}/bin/autoconf \
AUTOHEADER=${prefix}/bin/autoheader \
AUTOMAKE=${prefix}/bin/automake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOLIZE=${prefix}/bin/glibtoolize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBTOOLIZE=${prefix}/bin/glibtoolize \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=${prefix}/bin/python3.7
</span>
depends_build-append \
port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,4 +52,21 @@ depends_build-append \
</span>
configure.args --with-glib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MyPaint and MyPaint-devel < 2.0.0 installed libmypaint files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This deactivate hack can be removed after June 2021.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active MyPaint] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_version 2.0.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite MyPaint "" [list ports_nodepcheck 1]
</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;'>+ if {![catch {set installed [lindex [registry_active MyPaint-devel] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_version 2.0.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite MyPaint-devel "" [list ports_nodepcheck 1]
</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;'>+
</span> github.livecheck.regex {(\d+(?:\.\d+)+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libmypaint/files/autogen.sh b/graphics/libmypaint/files/autogen.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index 8140e5e..625f137 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libmypaint/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libmypaint/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,11 +9,12 @@
</span> # tools and you shouldn't use this script. Just call ./configure
# directly.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ACLOCAL=${ACLOCAL-aclocal-1.13}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ACLOCAL=${ACLOCAL-aclocal-1.16}
</span> AUTOCONF=${AUTOCONF-autoconf}
AUTOHEADER=${AUTOHEADER-autoheader}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOMAKE=${AUTOMAKE-automake-1.13}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+AUTOMAKE=${AUTOMAKE-automake-1.16}
</span> LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PYTHON=${PYTHON-python}
</span>
AUTOCONF_REQUIRED_VERSION=2.62
AUTOMAKE_REQUIRED_VERSION=1.13
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,6 +170,29 @@ else
</span> DIE=1
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+printf "checking for python ... "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if ($PYTHON --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=$PYTHON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+elif (python3 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+elif (python3.8 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+elif (python3.7 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=python3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+elif (python2 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=python2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+elif (python2.7 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " You must have python (any version) installed to compile $PROJECT."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " or get the source tarball at https://www.python.org/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIE=1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "yes ($PYTHON)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if test "$DIE" -eq 1; then
echo
echo "Please install/upgrade the missing tools and call me again."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -235,7 +259,7 @@ $LIBTOOLIZE --force || exit $?
</span> # configure script. The internal-only brushsettings-gen.h is also used
# as the source of strings for gettext.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python generate.py mypaint-brush-settings-gen.h brushsettings-gen.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$PYTHON generate.py mypaint-brush-settings-gen.h brushsettings-gen.h || exit $?
</span>
# The MyPaint code no longer needs the .json file at runtime, and it is
# not installed as data.
</pre><pre style='margin:0'>
</pre>