<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/f92062771b07f2f187a2086be8e0aa06ede31573">https://github.com/macports/macports-ports/commit/f92062771b07f2f187a2086be8e0aa06ede31573</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 f920627 gimp3-devel: update to version 2.99.0 git branch gtk3-port as of 20180507
</span>f920627 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f92062771b07f2f187a2086be8e0aa06ede31573
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri May 4 16:26:29 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp3-devel: update to version 2.99.0 git branch gtk3-port as of 20180507
</span>---
graphics/gimp3-devel/Portfile | 57 +++++++++++++---------
...=> patch-app-widgets-gimpcriticaldialog.c.diff} | 25 +++++++---
graphics/gimp3-devel/files/patch-autogen.sh.diff | 12 -----
graphics/gimp3-devel/files/patch-configure.ac.diff | 20 ++++++++
...ch-etc-gimprc.diff => patch-etc-gimprc.in.diff} | 10 ++--
5 files changed, 79 insertions(+), 45 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 8450adb..0cf0b49 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,14 +2,14 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+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 fc73b3249d8b223bfa0a0434ea18d2c5b3bc57b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20160330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit 3df796fbbf1b8010d6c3564ffad0f84d12741425
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20180507
</span> version 2.99.0-${git_date}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span> license GPL-3+
categories graphics
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,15 +29,20 @@ master_sites https://git.gnome.org/browse/${git_name}/snapshot/
</span>
distname ${git_name}-${git_commit}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 daf2b0319f58753bc7e3e10d520d941d076755b4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4a94d30de01e46177ea66bb79a36f860e0d8f9220431df082f25464459a8e8a0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8704930dd7e4e30a30be32dfc2a121bf32683505 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bf3d0ba2e340418e19b24fe1da48f9b1ef716d2a9d9823bf16a16cc1f82545b9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 36646736
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set perl_version 5.26
</span>
depends_build port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:appstream-glib \
</span> port:intltool \
port:gtk-doc \
port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl${perl_version}
</span>
depends_lib port:desktop-file-utils \
port:iso-codes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +50,9 @@ depends_lib port:desktop-file-utils \
</span> port:gegl-devel \
port:atk \
port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glib-networking \
</span> port:gtk3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gvfs \
</span> port:fontconfig \
port:freetype \
port:tiff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,24 +71,33 @@ depends_lib port:desktop-file-utils \
</span> port:curl \
port:libwmf \
port:jasper \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/libmypaint.pc:MyPaint-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/libmypaint.pc:libmypaint \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mypaint-brushes \
</span> port:lcms2 \
port:dbus-glib \
port:libxml2 \
port:libxslt \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xdg-utils \
</span> port:xorg-libXcursor \
port:xorg-libXmu \
port:xorg-libXext \
port:xorg-libXfixes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libgimpwidgets/gimpwidgetsmarshal.h can be referenced by a parallel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build before it is created
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
# redefinition of typedef is invalid in C [-Wtypedef-redefinition] (#50329)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# as of version 2.10.0 requires a C++14 compatible compiler to configure
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *gcc* {clang < 300}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist *gcc-3.* *gcc-4.* {clang < 700}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-autogen.sh.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-etc-gimprc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-plug-ins-common-web-browser.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-etc-gimprc.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-app-widgets-gimpcriticaldialog.c.diff
</span>
pre-configure {
if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,10 +113,13 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl${perl_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cmd ./autogen.sh
configure.args --build=${configure.build_arch}-apple-${os.platform}${os.version} \
--enable-mp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-bundled-mypaint-brushes \
</span> --with-pdbgen \
--with-x \
--x-includes=${prefix}/include \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,15 +128,9 @@ configure.args --build=${configure.build_arch}-apple-${os.platform}${os.ver
</span> --disable-python \
--without-alsa \
--without-gudev \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-webkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# --without-mac-twain:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Leopard's 64bit Carbon is missing QuitApplicationEventLoop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# It doesn't build any more anyway:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/35168
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mac-twain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-webkit \
</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;'>+configure.env CC_FOR_BUILD=${configure.cc}
</span>
variant python27 description {Build with python plugin support using python 2.7} {
configure.args-delete --disable-python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +138,7 @@ variant python27 description {Build with python plugin support using python 2.7}
</span> depends_lib-append port:py27-pygtk
set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
configure.pkg_config_path ${python_framework}/lib/pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=${python_framework}/bin:$env(PATH)
</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:#e0e0e0;'>@@ -163,7 +176,7 @@ post-destroot {
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/files/patch-plug-ins-common-web-browser.c.diff b/graphics/gimp3-devel/files/patch-app-widgets-gimpcriticaldialog.c.diff
</span>similarity index 53%
rename from graphics/gimp3-devel/files/patch-plug-ins-common-web-browser.c.diff
rename to graphics/gimp3-devel/files/patch-app-widgets-gimpcriticaldialog.c.diff
<span style='display:block; white-space:pre;color:#808080;'>index a316a7b..5559992 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp3-devel/files/patch-plug-ins-common-web-browser.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp3-devel/files/patch-app-widgets-gimpcriticaldialog.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plug-ins/common/web-browser.c.orig 2015-08-15 00:52:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plug-ins/common/web-browser.c 2016-10-09 03:07:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -181,11 +181,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/widgets/gimpcriticaldialog.c.orig 2018-05-01 13:13:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/widgets/gimpcriticaldialog.c 2018-05-01 13:18:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,26 +272,25 @@
</span>
return TRUE;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(PLATFORM_OSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSURL *ns_url;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gboolean retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @autoreleasepool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ns_url = [NSURL URLWithString: [NSString stringWithUTF8String: url]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- retval = [[NSWorkspace sharedWorkspace] openURL: ns_url];
</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;'>+- return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> #else
+ gboolean rstatus;
+ gchar *command_line;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gimp_ui_init (PLUG_IN_BINARY, FALSE);
</span>
- return gtk_show_uri (gdk_screen_get_default (),
+ rstatus = gtk_show_uri (gdk_screen_get_default (),
url,
gtk_get_current_event_time(),
error);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> + if (!rstatus) {
+ command_line = g_strdup_printf ("open %s", url);
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,3 +39,4 @@
</span> + return rstatus;
#endif
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/files/patch-autogen.sh.diff b/graphics/gimp3-devel/files/patch-autogen.sh.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6ad2d6e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp3-devel/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,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- autogen.sh.orig 2018-03-25 21:02:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autogen.sh 2018-03-25 21:02:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,6 +157,9 @@
</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;'>- ACLOCAL=$ACLOCAL
</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/gimp3-devel/files/patch-configure.ac.diff b/graphics/gimp3-devel/files/patch-configure.ac.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7cffecb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-05-07 12:10:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-05-07 13:10:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -749,7 +749,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT($have_glib_2_43)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_PATH_PROG(GEGL, gegl, no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_PATH_PROG(GEGL, gegl-0.4, no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$GEGL" = xno; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_deps_error([gegl], [Could not find native gegl executable in your PATH.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2001,7 +2001,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for perl
</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;'>+-AC_PATH_PROGS(PERL,perl5 perl,perl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_PATH_PROGS(PERL,perl5.26 perl5 perl,perl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AX_PROG_PERL_VERSION([perl_required_version],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [add_deps_error([perl >= perl_required_version])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/files/patch-etc-gimprc.diff b/graphics/gimp3-devel/files/patch-etc-gimprc.in.diff
</span>similarity index 80%
rename from graphics/gimp3-devel/files/patch-etc-gimprc.diff
rename to graphics/gimp3-devel/files/patch-etc-gimprc.in.diff
<span style='display:block; white-space:pre;color:#808080;'>index d595304..5744ef3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp3-devel/files/patch-etc-gimprc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp3-devel/files/patch-etc-gimprc.in.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;'>---- etc/gimprc.orig 2016-05-17 11:07:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc/gimprc 2016-10-07 18:24:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -695,11 +695,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- etc/gimprc.in.orig 2018-03-26 16:15:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ etc/gimprc.in 2018-04-16 14:10:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -747,11 +747,13 @@
</span> # string value.
#
# (help-locales "")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span>
# When enabled, a search of actions will also return inactive actions.
# Possible values are yes and no.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -715,6 +717,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -767,6 +769,7 @@
</span> # no.
#
# (user-manual-online no)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@
</span>
# The location of the online user manual. This is used if
# 'user-manual-online' is enabled. This is a string value.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -726,6 +729,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -778,6 +781,7 @@
</span> # windows. Possible values are normal, utility and keep-above.
#
# (dock-window-hint utility)
</pre><pre style='margin:0'>
</pre>