[41312] trunk/dports/graphics/cairomm-devel

devans at macports.org devans at macports.org
Thu Oct 30 11:33:43 PDT 2008


Revision: 41312
          http://trac.macports.org/changeset/41312
Author:   devans at macports.org
Date:     2008-10-30 11:33:42 -0700 (Thu, 30 Oct 2008)
Log Message:
-----------
cairomm-devel:  add patches to fix OS X specific build problem caused by conflicting definitions of nil.

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

Added Paths:
-----------
    trunk/dports/graphics/cairomm-devel/files/
    trunk/dports/graphics/cairomm-devel/files/patch-cairomm-fontface.h.diff
    trunk/dports/graphics/cairomm-devel/files/patch-cairomm-surface.h.diff

Modified: trunk/dports/graphics/cairomm-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairomm-devel/Portfile	2008-10-30 16:07:34 UTC (rev 41311)
+++ trunk/dports/graphics/cairomm-devel/Portfile	2008-10-30 18:33:42 UTC (rev 41312)
@@ -25,6 +25,9 @@
                 sha1 6d19e71717abf559ffb868423669ba23860fc94b \
                 rmd160 32976a31a7922f241a7700aef48b9d136555f32c
 
+patchfiles      patch-cairomm-fontface.h.diff \
+                patch-cairomm-surface.h.diff
+
 depends_lib     port:cairo
 
 livecheck.check regex

Added: trunk/dports/graphics/cairomm-devel/files/patch-cairomm-fontface.h.diff
===================================================================
--- trunk/dports/graphics/cairomm-devel/files/patch-cairomm-fontface.h.diff	                        (rev 0)
+++ trunk/dports/graphics/cairomm-devel/files/patch-cairomm-fontface.h.diff	2008-10-30 18:33:42 UTC (rev 41312)
@@ -0,0 +1,18 @@
+--- cairomm/fontface.h.orig	2008-10-30 10:54:59.000000000 -0700
++++ cairomm/fontface.h	2008-10-30 11:00:36.000000000 -0700
+@@ -24,6 +24,15 @@
+ #include <cairomm/enums.h>
+ #include <cairomm/types.h>
+ #include <cairomm/refptr.h>
++
++/* following is required for OS X */
++
++#ifdef nil
++#undef nil
++#endif
++
++/* end OS X */
++
+ #include <sigc++/slot.h>
+ #include <cairo.h>
+ #ifdef CAIRO_HAS_FT_FONT

Added: trunk/dports/graphics/cairomm-devel/files/patch-cairomm-surface.h.diff
===================================================================
--- trunk/dports/graphics/cairomm-devel/files/patch-cairomm-surface.h.diff	                        (rev 0)
+++ trunk/dports/graphics/cairomm-devel/files/patch-cairomm-surface.h.diff	2008-10-30 18:33:42 UTC (rev 41312)
@@ -0,0 +1,18 @@
+--- cairomm/surface.h.orig	2008-10-30 10:55:19.000000000 -0700
++++ cairomm/surface.h	2008-10-30 11:01:37.000000000 -0700
+@@ -21,6 +21,15 @@
+ 
+ #include <string>
+ #include <vector>
++
++/* following is required for OS X */
++
++#ifdef nil
++#undef nil
++#endif
++
++/* end OS X */
++
+ #include <sigc++/slot.h>
+ #include <cairomm/enums.h>
+ #include <cairomm/exception.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081030/f3ea4927/attachment.html>


More information about the macports-changes mailing list