[45971] trunk/dports/graphics/cairo-devel

[ryandesign at macports.org]

Revision: 45971
          http://trac.macports.org/changeset/45971
Author:   ryandesign at macports.org
Date:     2009-01-25 23:16:52 -0800 (Sun, 25 Jan 2009)
Log Message:
-----------
cairo-devel: merge from cairo:

 * r45305 / #16007: disable unavailable Quartz functions on 64-bit
 * r45970 / #15570: use muniversal portgroup for universal build

Modified Paths:
--------------
    trunk/dports/graphics/cairo-devel/Portfile

Added Paths:
-----------
    trunk/dports/graphics/cairo-devel/files/
    trunk/dports/graphics/cairo-devel/files/patch-quartz-lp64.diff

Property Changed:
----------------
    trunk/dports/graphics/cairo-devel/


Property changes on: trunk/dports/graphics/cairo-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/dports/graphics/cairo:45305,45970

Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile	2009-01-26 07:09:26 UTC (rev 45970)
+++ trunk/dports/graphics/cairo-devel/Portfile	2009-01-26 07:16:52 UTC (rev 45971)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               muniversal 1.0
 
 name                    cairo-devel
 set my_name             cairo
@@ -40,6 +41,9 @@
     port:zlib \
     port:expat
 
+patchfiles \
+    patch-quartz-lp64.diff
+
 pre-configure {
     set pixman_minimum_version 0.12.0
     set pixman_installed_version [exec pkg-config pixman-1 --modversion]
@@ -48,8 +52,6 @@
     }
 }
 
-# The +universal variant is written in such a way that the port's global
-# configure.args must not be empty!
 configure.args \
     --disable-glitz \
     --disable-quartz \
@@ -118,59 +120,6 @@
     }
 }
 
-if {![info exists universal_archs]} {
-    set universal_archs {i386 ppc}
-}
-set first_arch [lindex ${universal_archs} 0]
-
-set my_worksrcpaths ${worksrcpath}
-
-variant universal {
-    set my_worksrcpaths {}
-    foreach arch ${universal_archs} {
-        lappend my_worksrcpaths ${workpath}/${arch}
-    }
-
-    post-patch {
-        foreach arch ${universal_archs} {
-            if {[string equal ${arch} ${first_arch}]} {
-                move ${worksrcpath} ${workpath}/${first_arch}
-            } else {
-                copy ${workpath}/${first_arch} ${workpath}/${arch}
-            }
-        }
-    }
-    
-    configure {
-        foreach arch ${universal_archs} {
-            set my_arch_flag "-arch ${arch}"
-            set my_cflags "${configure.cflags} -isysroot ${sysroot} ${my_arch_flag}"
-            set my_ldflags "${configure.ldflags} ${my_arch_flag}"
-            system "cd ${workpath}/${arch} && CFLAGS=\"${my_cflags}\" CXXFLAGS=\"${my_cflags}\" LDFLAGS=\"${my_ldflags}\" ${configure.cmd} ${configure.pre_args} ${configure.args}"
-        }
-    }
-    
-    build {
-        foreach arch ${universal_archs} {
-            system "cd ${workpath}/${arch} && ${build.cmd} ${build.pre_args}"
-        }
-    }
-    
-    destroot {
-        system "cd ${workpath}/${first_arch} && ${destroot.cmd} ${destroot.pre_args} ${destroot.post_args}"
-        foreach lib [list [file readlink ${workpath}/${first_arch}/src/.libs/libcairo.dylib] libcairo.a] {
-            set output_lib ${destroot}${prefix}/lib/${lib}
-            set lipo_args {}
-            foreach arch ${universal_archs} {
-                lappend lipo_args -arch ${arch} ${workpath}/${arch}/src/.libs/${lib}
-            }
-            lappend lipo_args -create -output ${output_lib}
-            delete ${output_lib}
-            system "lipo ${lipo_args}"
-        }
-    }
-}
-
 livecheck.check         regex
 livecheck.url           ${homepage}news/
 livecheck.regex         ${my_name}-(\[0-9\]+\\.\[0-9\]*\[13579\]\\.\[0-9\]+)

Copied: trunk/dports/graphics/cairo-devel/files/patch-quartz-lp64.diff (from rev 45305, trunk/dports/graphics/cairo/files/patch-quartz-lp64.diff)
===================================================================
--- trunk/dports/graphics/cairo-devel/files/patch-quartz-lp64.diff	                        (rev 0)
+++ trunk/dports/graphics/cairo-devel/files/patch-quartz-lp64.diff	2009-01-26 07:16:52 UTC (rev 45971)
@@ -0,0 +1,29 @@
+--- src/cairo-quartz-font.c	2008-10-30 09:34:25.000000000 -0500
++++ src/cairo-quartz-font.c	2008-11-13 21:19:32.000000000 -0600
+@@ -816,6 +816,8 @@
+  *
+  * Since: 1.6
+  **/
++
++#if !__LP64__
+ cairo_font_face_t *
+ cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id)
+ {
+@@ -838,3 +840,4 @@
+ {
+     return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
+ }
++#endif
+--- src/cairo-quartz.h	2008-10-30 09:34:25.000000000 -0500
++++ src/cairo-quartz.h	2008-11-13 21:19:32.000000000 -0600
+@@ -66,8 +66,10 @@
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
+ 
++#if !__LP64__
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
++#endif
+ 
+ #endif /* CAIRO_HAS_QUARTZ_FONT */
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090125/f4f661da/attachment.html>