[145029] users/devans/GNOME-3/stable/dports/devel/glade

[devans at macports.org]

Revision: 145029
          https://trac.macports.org/changeset/145029
Author:   devans at macports.org
Date:     2016-01-23 16:34:04 -0800 (Sat, 23 Jan 2016)
Log Message:
-----------
GNOME-3/stable: glade, allow build if gtk3 was built with +quartz variant.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/devel/glade/Portfile

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/devel/glade/


Property changes on: users/devans/GNOME-3/stable/dports/devel/glade
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/devel/glade:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/glade:118251-127453
/users/cal/ports/devel/glade:96570-97031
/users/devans/GNOME-3/unstable/dports/devel/glade:137534-140634
   + /trunk/dports/devel/glade:118251-145028
/users/devans/GNOME-3/unstable/dports/devel/glade:137534-140634

Modified: users/devans/GNOME-3/stable/dports/devel/glade/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glade/Portfile	2016-01-24 00:26:17 UTC (rev 145028)
+++ users/devans/GNOME-3/stable/dports/devel/glade/Portfile	2016-01-24 00:34:04 UTC (rev 145029)
@@ -3,6 +3,7 @@
 
 PortSystem          1.0
 PortGroup           gobject_introspection 1.0
+PortGroup           active_variants 1.1
 
 name                glade
 version             3.19.0
@@ -77,4 +78,25 @@
     system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
 }
 
+variant x11 conflicts quartz {
+    require_active_variants gtk3 x11 quartz
+}
+
+variant quartz conflicts x11 {
+    require_active_variants gtk3 quartz x11
+    depends_lib-append port:gtk-osx-application-gtk3
+
+    # compile glade-registration.c as Objective-C file since it includes
+    #    /System/Library/Frameworks/AppKit.framework/Headers/AppKit.h
+    post-configure {
+        reinplace \
+            "s|-o glade-glade-registration.o|-xobjective-c -o glade-glade-registration.o|g" \
+            ${worksrcpath}/src/Makefile
+    }
+}
+
+if {![variant_isset quartz]} {
+    default_variants +x11
+}
+
 livecheck.type      gnome-with-unstable
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160123/a704d4fa/attachment.html>