[36132] trunk/dports/graphics/cairomm

[gui_dos at macports.org]

Revision: 36132
          http://trac.macosforge.org/projects/macports/changeset/36132
Author:   gui_dos at macports.org
Date:     2008-04-18 22:29:12 -0700 (Fri, 18 Apr 2008)

Log Message:
-----------
cairomm: avoid the redefinition of 'Status' on Intel Machines
(fixes http://lists.macosforge.org/pipermail/macports-users/2008-April/009963.html) 

Modified Paths:
--------------
    trunk/dports/graphics/cairomm/Portfile
    trunk/dports/graphics/cairomm/files/patch-cairomm-context.cc.diff

Modified: trunk/dports/graphics/cairomm/Portfile
===================================================================
--- trunk/dports/graphics/cairomm/Portfile	2008-04-19 04:01:41 UTC (rev 36131)
+++ trunk/dports/graphics/cairomm/Portfile	2008-04-19 05:29:12 UTC (rev 36132)
@@ -4,6 +4,7 @@
 
 name		cairomm
 version		1.6.0
+revision 	1
 categories	graphics
 maintainers	nomaintainer
 description	Cairo is a vector graphics library with cross-device output support.

Modified: trunk/dports/graphics/cairomm/files/patch-cairomm-context.cc.diff
===================================================================
--- trunk/dports/graphics/cairomm/files/patch-cairomm-context.cc.diff	2008-04-19 04:01:41 UTC (rev 36131)
+++ trunk/dports/graphics/cairomm/files/patch-cairomm-context.cc.diff	2008-04-19 05:29:12 UTC (rev 36132)
@@ -1,14 +1,21 @@
 --- cairomm/context.cc.orig	2008-03-11 04:36:32.000000000 +0100
-+++ cairomm/context.cc	2008-04-17 06:36:51.000000000 +0200
-@@ -21,7 +21,11 @@
++++ cairomm/context.cc	2008-04-19 07:20:31.000000000 +0200
+@@ -21,8 +21,17 @@
  #include <cairomm/private.h>
  #include <cairomm/surface.h>
  #include <cairomm/win32_surface.h>
-+#define Cursor X11_Cursor
-+#define Picture X11_Picture
- #include <cairomm/xlib_surface.h>
+-#include <cairomm/xlib_surface.h>
++
++#define Cursor Quartz_Cursor
++#define Picture Quartz_Picture
++#define Status Quartz_Status 
+ #include <cairomm/quartz_surface.h>
 +#undef Cursor
 +#undef Picture
- #include <cairomm/quartz_surface.h>
++#undef Status
++
++#include <cairomm/xlib_surface.h>
++
  
  /* M_PI is defined in math.h in the case of Microsoft Visual C++ */
+ #if defined(_MSC_VER)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080418/ae495e48/attachment.html