[SM-Commit] GIT changes to master grimoire by Robin Cook (fdae397b05a38bb1d91f9891b122edff631781ab)

Robin Cook scm at sourcemage.org
Sat Jul 18 22:27:52 EDT 2009


GIT changes to master grimoire by Robin Cook <rcook at wyrms.net>:

 http/xulrunner/HISTORY                         |    4 +
 http/xulrunner/PRE_BUILD                       |    2 
 http/xulrunner/gfxdirectfbsurface-header.patch |   66 +++++++++++++++++++++++++
 3 files changed, 72 insertions(+)

New commits:
commit fdae397b05a38bb1d91f9891b122edff631781ab
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    xulrunner: added patch to fix compile with cairo and cairo compiled with directfb

diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 4cb568e..40cd316 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,7 @@
+2009-07-18 Robin Cook <rcook at wyrms.net>
+	* PRE_BUILD: added patch to fix compile with cairo and directfb
+	  https://bugzilla.mozilla.org/show_bug.cgi?id=466250
+
 2009-07-16 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 1.9.1.1. SECURITY_PATCH++
 
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 4e74769..99b4935 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -8,6 +8,8 @@ patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&
 
 patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&
 
+patch -p1 < $SCRIPT_DIRECTORY/gfxdirectfbsurface-header.patch &&
+
 # Needed to make things using XUL find NSPR.
 echo "Requires: nspr" >> xulrunner/installer/libxul-embedding.pc.in &&
 
diff --git a/http/xulrunner/gfxdirectfbsurface-header.patch b/http/xulrunner/gfxdirectfbsurface-header.patch
new file mode 100644
index 0000000..819446f
--- /dev/null
+++ b/http/xulrunner/gfxdirectfbsurface-header.patch
@@ -0,0 +1,66 @@
+diff -r 2d9d7822862a gfx/thebes/src/gfxASurface.cpp
+--- a/gfx/thebes/src/gfxASurface.cpp	Tue Apr 14 15:12:38 2009 -0700
++++ b/gfx/thebes/src/gfxASurface.cpp	Wed Apr 15 10:07:50 2009 +0900
+@@ -41,26 +41,26 @@
+ #include "gfxImageSurface.h"
+ 
+ #include "cairo.h"
+ 
+ #ifdef CAIRO_HAS_WIN32_SURFACE
+ #include "gfxWindowsSurface.h"
+ #endif
+ 
+-#ifdef CAIRO_HAS_XLIB_SURFACE
++#ifdef MOZ_X11
+ #include "gfxXlibSurface.h"
+ #endif
+ 
+ #ifdef CAIRO_HAS_QUARTZ_SURFACE
+ #include "gfxQuartzSurface.h"
+ #include "gfxQuartzImageSurface.h"
+ #endif
+ 
+-#ifdef CAIRO_HAS_DIRECTFB_SURFACE
++#ifdef MOZ_DFB
+ #include "gfxDirectFBSurface.h"
+ #endif
+ 
+ #ifdef CAIRO_HAS_QPAINTER_SURFACE
+ #include "gfxQPainterSurface.h"
+ #endif
+ 
+ #include <stdio.h>
+@@ -153,30 +153,30 @@ gfxASurface::Wrap (cairo_surface_t *csur
+         result = new gfxImageSurface(csurf);
+     }
+ #ifdef CAIRO_HAS_WIN32_SURFACE
+     else if (stype == CAIRO_SURFACE_TYPE_WIN32 ||
+              stype == CAIRO_SURFACE_TYPE_WIN32_PRINTING) {
+         result = new gfxWindowsSurface(csurf);
+     }
+ #endif
+-#ifdef CAIRO_HAS_XLIB_SURFACE
++#ifdef MOZ_X11
+     else if (stype == CAIRO_SURFACE_TYPE_XLIB) {
+         result = new gfxXlibSurface(csurf);
+     }
+ #endif
+ #ifdef CAIRO_HAS_QUARTZ_SURFACE
+     else if (stype == CAIRO_SURFACE_TYPE_QUARTZ) {
+         result = new gfxQuartzSurface(csurf);
+     }
+     else if (stype == CAIRO_SURFACE_TYPE_QUARTZ_IMAGE) {
+         result = new gfxQuartzImageSurface(csurf);
+     }
+ #endif
+-#ifdef CAIRO_HAS_DIRECTFB_SURFACE
++#ifdef MOZ_DFB
+     else if (stype == CAIRO_SURFACE_TYPE_DIRECTFB) {
+         result = new gfxDirectFBSurface(csurf);
+     }
+ #endif
+ #ifdef CAIRO_HAS_QPAINTER_SURFACE
+     else if (stype == CAIRO_SURFACE_TYPE_QPAINTER) {
+         result = new gfxQPainterSurface(csurf);
+     }
+



More information about the SM-Commit mailing list