Ticket #27685: quartz-device.diff

File quartz-device.diff, 1.6 KB (added by adfernandes (Andrew Fernandes), 13 years ago)

  • files/patch-QuartzDevice_h.diff

     
     1--- src/include/R_ext/QuartzDevice.h    2010-09-16 18:02:11.000000000 -0400
     2+++ src/include/R_ext/QuartzDevice.h    2010-12-15 11:12:40.000000000 -0500
     3@@ -98,7 +98,9 @@
     4 #endif   
     5 
     6 #if HAVE_AQUA
     7+#define __INTEL_COMPILER
     8 #include <ApplicationServices/ApplicationServices.h>
     9+#undef __INTEL_COMPILER
     10 #else
     11     typedef void* CGContextRef;
     12 #endif

  • Portfile

     
    6969    depends_lib-append port:gcc45
    7070}
    7171
     72platform darwin 10 {
     73    variant aqua description {Build with the Quartz graphics driver} {
     74        # This variant uses a hack in "CFString.h" that does not define the problematic CF_FORMAT_FUNCTION
     75        # and CF_FORMAT_ARGUMENT macros if __INTEL_COMPILER is defined. Currently, that is the ONLY place
     76        # in the 10.6 SDK where the __INTEL_COMPILER macro is checked, but that may change in the future.
     77        # We also need to use Apple's ObjC compiler for the single "qdCocoa.m" file.
     78        configure.args-delete   --without-aqua
     79        configure.args-append   --with-aqua
     80        patchfiles-append       patch-QuartzDevice_h.diff
     81        configure.objc          /usr/bin/gcc-4.2
     82    }
     83}
     84
    7285default_variants +recommended
    7386
    7487if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45]} {