files/instantbird-1.3-system-cairo-1.10.patch to compile application with system cairo

instantbird-1.3-system-cairo-1.10.patch (text/plain), 1.16 KB, created by Sergey S. Starikoff on 2013-04-09 07:22:06 UTC

# Solves "cairo_null_surface_create" error when building with --enable-system-cairo
# Works with cairo 1.10

--- mozilla/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000
+++ mozilla/gfx/thebes/gfxPlatform.cpp  2012-02-07 13:06:01.084668445 +0000
@@ -446,6 +446,7 @@
   static_cast<SourceSurface*>(srcBuffer)->Release();
 }

+#ifdef MOZ_TREE_CAIRO
 void SourceSnapshotDetached(cairo_surface_t *nullSurf)
 {
   gfxImageSurface* origSurf =
@@ -453,6 +454,7 @@

   origSurf->SetData(&kSourceSurface, NULL, NULL);
 }
+#endif

 RefPtr<SourceSurface>
 gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
@@ -522,6 +524,7 @@
                                                      imgSurface->Stride(),
                                                      format);

+    #ifdef MOZ_TREE_CAIRO
     cairo_surface_t *nullSurf =
    cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
     cairo_surface_set_user_data(nullSurf,
@@ -530,6 +533,7 @@
                NULL);
     cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
     cairo_surface_destroy(nullSurf);
+    #endif
   }

   srcBuffer->AddRef();