<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/52ad08fb0b60fdd4e476c9d4fdb44ec38e1d2829">https://github.com/macports/macports-ports/commit/52ad08fb0b60fdd4e476c9d4fdb44ec38e1d2829</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 52ad08f gimp3-devel: update to version 2.99.1 git master as of 20200223
</span>52ad08f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 52ad08fb0b60fdd4e476c9d4fdb44ec38e1d2829
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Feb 23 16:57:17 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> gimp3-devel: update to version 2.99.1 git master as of 20200223
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * add variant +python38, default +python37
</span><span style='display:block; white-space:pre;color:#404040;'> * use perl5 PortGroup for perl configuration, remove unnecessary patch
</span><span style='display:block; white-space:pre;color:#404040;'> * disable flaky lua/javascript plugin support for now
</span>---
graphics/gimp3-devel/Portfile | 42 +++++++++++++---------
graphics/gimp3-devel/files/patch-configure.ac.diff | 20 -----------
2 files changed, 26 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/Portfile b/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3138c1b..ef6d1a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,13 +2,13 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup perl5 1.0
</span>
name gimp3-devel
conflicts gimp2 gimp2-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit ed86de48d290405cd2f2bd48ff68dc0b62694339
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20190801
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit 9046c758e7b82ffe39b1acb93160a0c9c15743ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20200223
</span> version 2.99.1-${git_date}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span> license GPL-3+
categories graphics
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +29,6 @@ fetch.type git
</span> git.url --depth 2000 https://gitlab.gnome.org/GNOME/gimp.git
git.branch ${git_commit}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set perl_version 5.28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig \
port:appstream-glib \
port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +36,7 @@ depends_build port:pkgconfig \
</span> port:libtool \
port:intltool \
port:gtk-doc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl${perl_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl${perl5.major}
</span>
depends_lib port:desktop-file-utils \
port:iso-codes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,8 +91,7 @@ use_parallel_build no
</span> compiler.cxx_standard 2014
compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-etc-gimprc.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-etc-gimprc.in.diff \
</span> patch-quartz-32bit.diff
if {${os.platform} eq "darwin" && ${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +108,7 @@ post-patch {
</span> ${worksrcpath}/plug-ins/python/python-console/python-console.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.perl ${prefix}/bin/perl${perl_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${perl5.bin}
</span>
configure.env CC_FOR_BUILD=${configure.cc}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,12 +130,15 @@ configure.args --build=${configure.build_arch}-apple-${os.platform}${os.ver
</span> --with-x \
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-javascript=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-lua=no \
</span> --disable-silent-rules \
--disable-python \
--without-alsa \
--without-gudev \
--without-webkit \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_INTLTOOL_PERL=${configure.perl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_INTLTOOL_PERL=${configure.perl} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_PERL=${configure.perl}
</span>
# keep empty GIMP font directory
# silences warning message on startup:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,6 +168,22 @@ variant python37 description {Build with python plugin support using python 3.7}
</span> configure.env-append PATH=${python_framework}/bin:$env(PATH)
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 description {Build with python plugin support using python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py38-cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py38-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PATH=${python_framework}/bin:$env(PATH)
</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 {![variant_isset python36] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant remote description {Enable building of obsolete gimp-remote helper app} {
configure.args-append --enable-gimp-remote
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,12 +205,6 @@ variant quartz {
</span> configure.args-append --without-x
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# set default variants
</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;'>-default_variants +python36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # create unversioned symbolic link to versioned executable for compatibility with gimp-app
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/files/patch-configure.ac.diff b/graphics/gimp3-devel/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 000511e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp3-devel/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2019-07-31 10:19:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2019-07-31 22:25:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2222,7 +2222,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for perl
</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;'>--AC_PATH_PROGS(PERL,perl5 perl,perl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_PATH_PROGS(PERL,perl5.28)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AX_PROG_PERL_VERSION([perl_required_version],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [add_deps_error([perl >= perl_required_version])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2296,7 +2296,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # XXX Check here for something related to Python gobject-introspection & GTK3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(PYCAIRO, pycairo >= pycairo_required_version,,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(PYCAIRO, py3cairo >= pycairo_required_version,,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [pycheck_error([PyCairo pycairo_required_version or newer], [it])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GIMP_DETECT_CFLAGS(PYGIMP_EXTRA_CFLAGS, '-fno-strict-aliasing')
</span></pre><pre style='margin:0'>
</pre>