<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/6d7046bbf718e627c4af3b0faeb3f144a2752710">https://github.com/macports/macports-ports/commit/6d7046bbf718e627c4af3b0faeb3f144a2752710</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6d7046bbf718e627c4af3b0faeb3f144a2752710
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Aug 14 17:38:09 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp2: unpatch native code in gimpcriticaldialog.c, rebuild
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream changes to makefiles now allow this Objective C code
</span><span style='display:block; white-space:pre;color:#404040;'> to build and link correctly.
</span>---
graphics/gimp2/Portfile | 3 +-
.../patch-app-widgets-gimpcriticaldialog.c.diff | 42 ----------------------
2 files changed, 1 insertion(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/Portfile b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e64ee7..25baa62 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name gimp2
</span> conflicts gimp2-devel gimp3-devel
# please remember to update the gimp metapackage to match
version 2.10.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> license GPL-3+
categories graphics
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,6 @@ compiler.blacklist-append *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> patch-quartz-32bit.diff
use_autoreconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-app-widgets-gimpcriticaldialog.c.diff b/graphics/gimp2/files/patch-app-widgets-gimpcriticaldialog.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b23dfe5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/patch-app-widgets-gimpcriticaldialog.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- app/widgets/gimpcriticaldialog.c.orig 2018-05-01 13:13:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ app/widgets/gimpcriticaldialog.c 2018-05-01 13:18:07.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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(PLATFORM_OSX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSURL *ns_url;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gboolean retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @autoreleasepool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ns_url = [NSURL URLWithString: [NSString stringWithUTF8String: url]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- retval = [[NSWorkspace sharedWorkspace] openURL: ns_url];
</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;'>-- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gboolean rstatus;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gchar *command_line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return gtk_show_uri (gdk_screen_get_default (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rstatus = gtk_show_uri (gdk_screen_get_default (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- url,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_get_current_event_time(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!rstatus) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ command_line = g_strdup_printf ("open %s", url);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rstatus = g_spawn_command_line_async (command_line,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_free (command_line);
</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;'>-+ return rstatus;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>