<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/f2d7473e7ee2aad162df588ff35ae28e6fcfa6a1">https://github.com/macports/macports-ports/commit/f2d7473e7ee2aad162df588ff35ae28e6fcfa6a1</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 f2d7473 gimp3-devel: update to version 2.99.1 git master as of 20180701
</span>f2d7473 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f2d7473e7ee2aad162df588ff35ae28e6fcfa6a1
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Jul 26 08:52:02 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp3-devel: update to version 2.99.1 git master as of 20180701
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * fetch from new GNOME Gitlab repository
</span><span style='display:block; white-space:pre;color:#404040;'> * apply 32-bit quartz patch from gimp2
</span>---
graphics/gimp3-devel/Portfile | 18 ++++++------
.../patch-app-widgets-gimpcriticaldialog.c.diff | 6 ++--
graphics/gimp3-devel/files/patch-configure.ac.diff | 10 +++----
graphics/gimp3-devel/files/patch-quartz-32bit.diff | 32 ++++++++++++++++++++++
4 files changed, 50 insertions(+), 16 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 b524879..266bff5 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,10 +7,9 @@ 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 15ec52eab4381f2dd0b786366e1bdffd8ced56c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20180521
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit 38e5a021ad04663c43279f0301fb1490d06eec3e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20180701
</span> version 2.99.1-${git_date}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> license GPL-3+
categories graphics
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,13 +25,15 @@ long_description The GNU Image Manipulation Program (GIMP) is a powerful \
</span> git master.
homepage http://www.gimp.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://git.gnome.org/browse/${git_name}/snapshot/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://gitlab.gnome.org/GNOME/${git_name}/-/archive/${git_commit}/
</span>
distname ${git_name}-${git_commit}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b327dd066ef97212c23458f4476a1d680cc23351 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0860fe2cb3b22163bd28d340877853b99b9c428deb3dc8730638eddeb23a236d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 36790626
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b07ad3282d2809d813977504b33fb1a5deafd604 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2a2d01e497292466b3ab2ad76d83140c1e71fb4ea75b45cc4de391e73387cfc0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 28666993
</span>
set perl_version 5.26
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +98,8 @@ compiler.blacklist *gcc-3.* *gcc-4.* {clang < 700}
</span>
patchfiles patch-configure.ac.diff \
patch-etc-gimprc.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-app-widgets-gimpcriticaldialog.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-app-widgets-gimpcriticaldialog.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-quartz-32bit.diff
</span>
pre-configure {
if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/files/patch-app-widgets-gimpcriticaldialog.c.diff b/graphics/gimp3-devel/files/patch-app-widgets-gimpcriticaldialog.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c50ba6f..d8feb88 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp3-devel/files/patch-app-widgets-gimpcriticaldialog.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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- app/widgets/gimpcriticaldialog.c.orig 2018-05-17 03:56:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ app/widgets/gimpcriticaldialog.c 2018-05-18 05:10:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -274,26 +274,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/widgets/gimpcriticaldialog.c.orig 2018-07-25 08:01:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/widgets/gimpcriticaldialog.c 2018-07-25 14:39:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -276,26 +276,25 @@
</span>
return TRUE;
<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 c5b9207..c769cdb 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,15 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2018-05-21 10:59:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2018-05-21 12:24:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -757,7 +757,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-07-02 11:06:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-07-25 19:59:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -763,7 +763,7 @@
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT($have_glib_2_43)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT($have_glib_2_57)
</span>
-AC_PATH_PROG(GEGL, gegl, no)
+AC_PATH_PROG(GEGL, gegl-0.4, no)
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;'>-@@ -2009,7 +2009,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2033,7 +2033,7 @@
</span> # Check for perl
################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/files/patch-quartz-32bit.diff b/graphics/gimp3-devel/files/patch-quartz-32bit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fc42149
</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-quartz-32bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgimpwidgets/gimppickbutton-quartz.c.orig 2018-07-25 08:01:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgimpwidgets/gimppickbutton-quartz.c 2018-07-25 14:45:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GimpPickButton *button;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSMutableArray *windows;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOL firstBecameKey;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSCursor *cursor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ @property (nonatomic, assign) BOOL firstBecameKey;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,6 +56,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GimpPickButton *button;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GimpPickWindowController *controller;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSTrackingArea *area;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ @property (readonly,assign) NSTrackingArea *area;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,7 +183,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rect = [self.window convertRectToScreen:rect];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rect.origin.y = [[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.origin.y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- root_image_ref = CGWindowListCreateImage (rect,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ root_image_ref = CGWindowListCreateImage (NSRectToCGRect(rect),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kCGWindowListOptionOnScreenOnly,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kCGNullWindowID,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kCGWindowImageDefault);
</span></pre><pre style='margin:0'>
</pre>