<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/0dc07b632e4b4b1ba2c6e09abc3f18e08ae2e04d">https://github.com/macports/macports-ports/commit/0dc07b632e4b4b1ba2c6e09abc3f18e08ae2e04d</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 0dc07b6 gimp3-devel: update to version 2.99.1 git master as of 20190801
</span>0dc07b6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0dc07b632e4b4b1ba2c6e09abc3f18e08ae2e04d
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Aug 1 14:14:31 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp3-devel: update to version 2.99.1 git master as of 20190801
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * python plugins now require python3 >= 3.6.0 and gobject-introspection
</span><span style='display:block; white-space:pre;color:#404040;'> * add python variants +python36, +python37, drop +python27
</span>---
graphics/gimp3-devel/Portfile | 38 ++++++++++++++++------
graphics/gimp3-devel/files/patch-configure.ac.diff | 17 +++++++---
2 files changed, 41 insertions(+), 14 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 9b581fc..39a7fb4 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;'>@@ -7,8 +7,8 @@ PortGroup cxx11 1.1
</span> name gimp3-devel
conflicts gimp2 gimp2-devel
set git_name gimp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit 6c033317ac06103932f83f376a9a5d75148d5e67
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20190629
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit ed86de48d290405cd2f2bd48ff68dc0b62694339
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20190801
</span> version 2.99.1-${git_date}
license GPL-3+
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@ distname ${git_name}-${git_commit}
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 88e26992d24ee2e135a894004be4b7f2d9191133 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ce86f595a55412096fe875b02c0dcf41ebff9eaf952ad0f6452173cdd41f43f2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 29549517
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8c1ee20623524b4b484d07067ee6ef52a72de500 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2520c69aee8625849893d6538b31e3b4cd6fd18992fc2b11b1f1a145bbf33880 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29594898
</span>
set perl_version 5.28
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,7 @@ depends_lib port:desktop-file-utils \
</span> port:atk \
port:gdk-pixbuf2 \
port:glib-networking \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gobject-introspection \
</span> port:gtk3 \
port:fontconfig \
port:freetype \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,6 +109,12 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> patch-x11-widgets-fix.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix pytrhon-console.py shebag to use our python3's installation path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#!/usr/bin/python3|#!${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/plug-ins/python/python-console/python-console.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,16 +165,27 @@ configure.args --build=${configure.build_arch}-apple-${os.platform}${os.ver
</span> # - /opt/local/share/gimp/2.99/fonts/
destroot.keepdirs ${destroot}${prefix}/share/gimp/2.99/fonts
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# requires python >= 3.6.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Build with python plugin support using python 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 description {Build with python plugin support using python 3.6} {
</span> configure.args-delete --disable-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-pygtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py36-cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.6
</span> configure.pkg_config_path ${python_framework}/lib/pkgconfig
configure.env-append PATH=${python_framework}/bin:$env(PATH)
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 description {Build with python plugin support using python 3.7} {
</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.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append poer:py37-cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.7
</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>
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;'>@@ -194,7 +212,7 @@ variant quartz {
</span> # set default variants
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +python36
</span>
# create unversioned symbolic link to versioned executable for compatibility with gimp-app
<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><span style='display:block; white-space:pre;color:#808080;'>index 42c67cf..9a45f2e 100644
</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;'>+++ b/graphics/gimp3-devel/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2019-03-03 13:42:43.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2019-03-03 16:22:33.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -796,7 +796,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2019-07-31 10:19:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2019-07-31 22:25:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -804,7 +804,7 @@
</span> fi
AC_MSG_RESULT($have_glib_2_57)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> if test "x$GEGL" = xno; then
add_deps_error([gegl], [Could not find native gegl executable in your PATH.])
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2214,7 +2214,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2222,7 +2222,7 @@
</span> # Check for perl
################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,3 +18,12 @@
</span> AX_PROG_PERL_VERSION([perl_required_version],,
[add_deps_error([perl >= perl_required_version])])
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2296,7 +2296,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX Check here for something related to Python gobject-introspection & GTK3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_MODULES(PYCAIRO, pycairo >= pycairo_required_version,,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_MODULES(PYCAIRO, py3cairo >= pycairo_required_version,,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [pycheck_error([PyCairo pycairo_required_version or newer], [it])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIMP_DETECT_CFLAGS(PYGIMP_EXTRA_CFLAGS, '-fno-strict-aliasing')
</span></pre><pre style='margin:0'>
</pre>