<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/845979657c59db2805735bf87e14f01ab62823e2">https://github.com/macports/macports-ports/commit/845979657c59db2805735bf87e14f01ab62823e2</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 845979657c5 darktable: allow x11 variant
</span>845979657c5 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 845979657c59db2805735bf87e14f01ab62823e2
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Sat Dec 19 11:21:54 2020 -0800

<span style='display:block; white-space:pre;color:#404040;'>    darktable: allow x11 variant
</span>---
 graphics/darktable/Portfile                            | 18 +++++++++++++++---
 .../darktable/files/patch-darktable-no-quartz.diff     | 14 ++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable/Portfile b/graphics/darktable/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e602fee022d..891cb26a08a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/darktable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/darktable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,6 @@ depends_lib-append      port:atk \
</span>                         port:gettext \
                         path:lib/pkgconfig/glib-2.0.pc:glib2 \
                         port:gmic \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gtk-osx-application-gtk3 \
</span>                         port:gtk3 \
                         port:ilmbase \
                         port:iso-codes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,8 +85,6 @@ depends_lib-append      port:atk \
</span> depends_run             port:adwaita-icon-theme \
                         port:desktop-file-utils
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants gtk3 quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # sets march optimization to generic
 configure.args-append   -DBINARY_PACKAGE_BUILD=ON
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,6 +126,21 @@ compiler.cxx_standard   2014
</span> # compiling src/osx/osx.mm with GCC results in a cascade of errors
 compiler.blacklist      *gcc*
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append       patch-darktable-no-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants gtk3 x11 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   -DUSE_MAC_INTEGRATION=OFF
</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;'>+variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants gtk3 quartz x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:gtk-osx-application-gtk3
</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 quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants-append +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant openmp description {enable support for OpenMP} {
     configure.args-replace  -DUSE_OPENMP=OFF -DUSE_OPENMP=ON
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable/files/patch-darktable-no-quartz.diff b/graphics/darktable/files/patch-darktable-no-quartz.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..28fb75fd24d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/darktable/files/patch-darktable-no-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/osx/osx.mm src/osx/osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index afd89ef..c8249c0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/osx/osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/osx/osx.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AppKit/AppKit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gtk/gtk.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MAC_INTEGRATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gdk/gdkquartz.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MAC_INTEGRATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gtkosxapplication.h>
</span></pre><pre style='margin:0'>

</pre>