[142846] trunk/dports/gnome/gtk3

[devans at macports.org]

Revision: 142846
          https://trac.macports.org/changeset/142846
Author:   devans at macports.org
Date:     2015-11-24 12:04:09 -0800 (Tue, 24 Nov 2015)
Log Message:
-----------
gtk3: when building +quartz blacklist compilers that don't support instancetype, when selecting cursors check that cursor type exists, fixes +quartz builds where Xcode < 4.6 (possibly some 10.7, 10.6 and earlier) (#49391).

Modified Paths:
--------------
    trunk/dports/gnome/gtk3/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gtk3/files/patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff

Property Changed:
----------------
    trunk/dports/gnome/gtk3/


Property changes on: trunk/dports/gnome/gtk3
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-142842
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375
/users/rmstonecipher/gnome/gtk3:102363-103172
   + /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-142845
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375
/users/rmstonecipher/gnome/gtk3:102363-103172

Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile	2015-11-24 19:53:04 UTC (rev 142845)
+++ trunk/dports/gnome/gtk3/Portfile	2015-11-24 20:04:09 UTC (rev 142846)
@@ -6,6 +6,7 @@
 PortGroup           muniversal 1.0
 PortGroup           xcodeversion 1.0
 PortGroup           active_variants 1.1
+PortGroup           compiler_blacklist_versions 1.0
 
 name                gtk3
 set real_name       gtk+
@@ -55,7 +56,13 @@
 
 patchfiles          nawk.patch
 
+# gtk3 +quartz uses instancetype which is not available
+# before approximately Xcode 4.6 (#49391)
 
+if {[variant_isset quartz]} {
+    compiler.blacklist  *gcc* {clang < 425}
+}
+
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
 
 if {[variant_isset universal]} {
@@ -123,18 +130,25 @@
     reinplace "s|${destroot}||" ${destroot}${prefix}/etc/gtk-3.0/gtk.immodules
 }
 
-platform darwin 8 {
-    # The rules enabled by gobject-introspection require GNU make 3.81+
-    depends_build-append    port:gmake
-    build.cmd               ${prefix}/bin/gmake
+platform darwin {
+    if {${os.major} <= 8} {
+        # The rules enabled by gobject-introspection require GNU make 3.81+
+        depends_build-append    port:gmake
+        build.cmd               ${prefix}/bin/gmake
 
-    if {[variant_isset quartz] || ![variant_isset x11]} {
-        configure.ldflags-append  -framework Cocoa -framework Carbon
+        if {[variant_isset quartz] || ![variant_isset x11]} {
+            configure.ldflags-append  -framework Cocoa -framework Carbon
+        }
+    
+        configure.args-append --disable-cups
     }
-}
 
-if {${os.major} <= 8} {
-    configure.args-append --disable-cups
+    if {${os.major} <= 10} {
+        # OS X 10.6 and earlier do not supply all cursors specified by gtk3 +quartz (#49391)
+        if {[variant_isset quartz]} {
+            patchfiles-append   patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff
+        }
+    }
 }
 
 if {[variant_isset universal]} {

Copied: trunk/dports/gnome/gtk3/files/patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff (from rev 142845, users/devans/GNOME-3/stable/dports/gnome/gtk3/files/patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff)
===================================================================
--- trunk/dports/gnome/gtk3/files/patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff	                        (rev 0)
+++ trunk/dports/gnome/gtk3/files/patch-gdk_quartz_gdkcursor-quartz-10_6_compat.diff	2015-11-24 20:04:09 UTC (rev 142846)
@@ -0,0 +1,15 @@
+--- gdk/quartz/gdkcursor-quartz.c.old	2015-11-23 21:43:17.000000000 +0100
++++ gdk/quartz/gdkcursor-quartz.c	2015-11-23 21:43:52.000000000 +0100
+@@ -402,6 +402,12 @@
+         selector = NSSelectorFromString(test->selector);
+         break;
+       }
++
++  if (! [[gdkCoreCursor class] respondsToSelector:selector])
++  {
++  	  selector = @selector(arrowCursor);
++  }
++
+   nscursor = [[gdkCoreCursor class] performSelector:selector];
+ 
+   [nscursor retain];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/73c9a964/attachment.html>