<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/a961dd51482bf26699be9118714ca5bbaed22adf">https://github.com/macports/macports-ports/commit/a961dd51482bf26699be9118714ca5bbaed22adf</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 a961dd5 mypaint-brushes: Update to 2.0.2
</span>a961dd5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a961dd51482bf26699be9118714ca5bbaed22adf
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 3 14:31:39 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> mypaint-brushes: Update to 2.0.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add mypaint-brushes1 subport at version 1.3.1 for GIMP to use.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patch to fix pkgconfig.pc.in files so that MYPAINT_BRUSHES_DIR is
</span><span style='display:block; white-space:pre;color:#404040;'> not quoted, because that makes more sense. GIMP will need to be patched
</span><span style='display:block; white-space:pre;color:#404040;'> to accommodate this.
</span>---
graphics/mypaint-brushes/Portfile | 45 ++++++++++++----------
.../mypaint-brushes/files/patch-autogen.sh.diff | 24 ------------
.../mypaint-brushes/files/pkgconfig.pc.in.patch | 15 ++++++++
3 files changed, 39 insertions(+), 45 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mypaint-brushes/Portfile b/graphics/mypaint-brushes/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b6ac3cf..6aca358 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mypaint-brushes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mypaint-brushes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,32 +3,35 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mypaint mypaint-brushes 2.0.2 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 cbb8f1423d5a2f2ae350a0d44b161c04b6ae9265 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7984a74edef94571d872d0629b224abaa956a36f632f5c5516b33d22e49eb566 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1522216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description libmypaint brush data version 2 (used by MyPaint)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For GIMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://gitlab.gnome.org/GNOME/gimp/-/issues/3205
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}1 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup mypaint mypaint-brushes 1.3.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 a1ec139be511c59a4f28c230b534fb652641328f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fef66ffc241b7c5cd29e9c518e933c739618cb51c4ed4d745bf648a1afc3fe70 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1360028
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description libmypaint brush data version 1 (used by GIMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.livecheck.regex {(1\.[0-9.]+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories graphics
maintainers {devans @dbevans} {ryandesign @ryandesign} openmaintainer
platforms darwin
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# license CC0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license public-domain
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Jehan mypaint-brushes 1.3.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description libmypaint brush data for GIMP 2.10+
</span> long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# no release tarballs to be had at the moment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4f57d9a46a4177906ed779034c77ee3b9a6f1a76 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 53269363448a705936ba8cfa2ad126f71ac2470c42160d93aee547f4189ec331 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2446910
</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:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh && ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append pkgconfig.pc.in.patch
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mypaint-brushes/files/patch-autogen.sh.diff b/graphics/mypaint-brushes/files/patch-autogen.sh.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7d7e8ec..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mypaint-brushes/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- autogen.sh.orig 2018-04-16 14:57:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autogen.sh 2018-04-16 15:01:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,9 +7,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # tools and you shouldn't use this script. Just call ./configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # directly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ACLOCAL=${ACLOCAL-aclocal-1.13}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ACLOCAL=${ACLOCAL-aclocal-1.16}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOCONF=${AUTOCONF-autoconf}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AUTOMAKE=${AUTOMAKE-automake-1.13}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AUTOMAKE=${AUTOMAKE-automake-1.16}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOCONF_REQUIRED_VERSION=2.62
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE_REQUIRED_VERSION=1.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,6 +90,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE=$AUTOMAKE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elif (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AUTOMAKE=automake-1.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ACLOCAL=aclocal-1.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE=automake-1.15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL=aclocal-1.15
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mypaint-brushes/files/pkgconfig.pc.in.patch b/graphics/mypaint-brushes/files/pkgconfig.pc.in.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ba7df0f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mypaint-brushes/files/pkgconfig.pc.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't surround MYPAINT_BRUSHES_DIR with escaped quotation marks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes this warning when building MyPaint:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<command line>:5:30: warning: missing terminating '"' character [-Winvalid-pp-token]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://github.com/mypaint/mypaint-brushes/issues/5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pkgconfig.pc.in.orig 2018-12-08 13:03:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pkgconfig.pc.in 2020-06-02 21:00:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,4 +7,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Description: Brushes used by MyPaint and other software using libmypaint.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Version: @VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Cflags: -DMYPAINT_BRUSHES_DIR="\"${brushesdir}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Cflags: -DMYPAINT_BRUSHES_DIR="${brushesdir}"
</span></pre><pre style='margin:0'>
</pre>