[142168] trunk/dports/graphics/ufraw

[devans at macports.org]

Revision: 142168
          https://trac.macports.org/changeset/142168
Author:   devans at macports.org
Date:     2015-11-05 04:29:58 -0800 (Thu, 05 Nov 2015)
Log Message:
-----------
ufraw: add +x11 +quartz variants requiring the appropriate variant of gtk2, patch to fix +quartz build on 10.11+ (#49584).

Modified Paths:
--------------
    trunk/dports/graphics/ufraw/Portfile

Added Paths:
-----------
    trunk/dports/graphics/ufraw/files/patch-uf_gtk.cc.diff

Modified: trunk/dports/graphics/ufraw/Portfile
===================================================================
--- trunk/dports/graphics/ufraw/Portfile	2015-11-05 09:27:01 UTC (rev 142167)
+++ trunk/dports/graphics/ufraw/Portfile	2015-11-05 12:29:58 UTC (rev 142168)
@@ -1,10 +1,12 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
-                    
+
 PortSystem          1.0
+PortGroup           active_variants 1.1
 
 name                ufraw
 version             0.22
+revision            1
 license             GPL-2+
 categories          graphics
 maintainers         devans openmaintainer
@@ -39,7 +41,8 @@
                     port:lensfun \
                     port:tiff
 
-patchfiles          patch-ufraw-gimp.c.diff
+patchfiles          patch-ufraw-gimp.c.diff \
+                    patch-uf_gtk.cc.diff
 
 platform darwin {
     if {${os.major} < 11} {
@@ -49,6 +52,22 @@
 
 configure.args      --enable-contrast
 
+#
+# the following dummy variants are used
+# to identify this port's binary dependencies
+# based on which variant of gtk2 is used for the build
+#
+
+variant x11 conflicts quartz {}
+variant quartz conflicts x11 {}
+
+if {[variant_isset quartz]} {
+    require_active_variants port:gtk2 quartz
+} else {
+    default_variants +x11
+    require_active_variants port:gtk2 x11
+}
+
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}
     xinstall -d ${docdir}

Added: trunk/dports/graphics/ufraw/files/patch-uf_gtk.cc.diff
===================================================================
--- trunk/dports/graphics/ufraw/files/patch-uf_gtk.cc.diff	                        (rev 0)
+++ trunk/dports/graphics/ufraw/files/patch-uf_gtk.cc.diff	2015-11-05 12:29:58 UTC (rev 142168)
@@ -0,0 +1,35 @@
+--- uf_gtk.cc.orig	2015-06-15 20:58:38.000000000 -0700
++++ uf_gtk.cc	2015-11-05 01:49:48.000000000 -0800
+@@ -19,6 +19,7 @@
+ #include <Carbon/Carbon.h>
+ #include <ApplicationServices/ApplicationServices.h>
+ #include <CoreServices/CoreServices.h>
++#include <Availability.h>
+ #endif
+ 
+ #ifdef G_OS_WIN32
+@@ -163,6 +164,15 @@
+         g_free(atom_name);
+ 
+ #elif defined GDK_WINDOWING_QUARTZ
++#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
++//
++// ColorSync Manager API, deprecated in Mac OS X 10.6,
++// was finally removed in Mac OS X 10.11 (El Capitan).
++//
++// If 10.11 or later just return with no profile.
++//
++        return;
++#else
+         GdkScreen *screen = gtk_widget_get_screen(widget);
+         if (screen == NULL)
+             screen = gdk_screen_get_default();
+@@ -184,7 +194,7 @@
+         *buffer_size = CFDataGetLength(data);
+ 
+         CFRelease(data);
+-
++#endif
+ #elif defined G_OS_WIN32
+         (void)widget;
+         HDC hdc = GetDC(NULL);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/2a95fb2f/attachment.html>