From e676e2910f592704af67424758ebd4cfdff9ebcd Mon Sep 17 00:00:00 2001 From: Florian Smeets Date: Thu, 10 Jan 2013 22:29:23 +0000 Subject: - update www/firefox to 18.0 - update www/firefox-esr to 17.0.2 - update www/seamonkey to 2.15 (enigmail to 1.5.0) - remove QT4 option to avoid confusion (it turned out to be too experimental) In collaboration with: Jan Beich Security: http://www.vuxml.org/freebsd/a4ed6632-5aa9-11e2-8fcb-c8600054b392.html --- www/firefox/files/patch-bug722975 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'www/firefox/files/patch-bug722975') diff --git a/www/firefox/files/patch-bug722975 b/www/firefox/files/patch-bug722975 index 46a3381b9375..21c28b19540b 100644 --- a/www/firefox/files/patch-bug722975 +++ b/www/firefox/files/patch-bug722975 @@ -7,13 +7,13 @@ Bug 722975 - --enable-system-cairo build is broken after Bug 715658 fixed diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp --- gfx/thebes/gfxPlatform.cpp +++ gfx/thebes/gfxPlatform.cpp -@@ -484,21 +484,19 @@ gfxPlatform::CreateDrawTargetForSurface( +@@ -502,21 +502,19 @@ struct SourceSurfaceUserData + BackendType mBackendType; + }; - cairo_user_data_key_t kSourceSurface; - - void SourceBufferDestroy(void *srcBuffer) + void SourceBufferDestroy(void *srcSurfUD) { - static_cast(srcBuffer)->Release(); + delete static_cast(srcSurfUD); } -void SourceSnapshotDetached(cairo_surface_t *nullSurf) @@ -31,7 +31,7 @@ diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp { void *userData = aSurface->GetData(&kSourceSurface); -@@ -588,24 +586,19 @@ gfxPlatform::GetSourceSurfaceForSurface( +@@ -621,24 +619,19 @@ gfxPlatform::GetSourceSurfaceForSurface( } srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(), @@ -53,9 +53,9 @@ diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp + SourceSnapshotDetached, imgSurface.get()); } - srcBuffer->AddRef(); - aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy); + SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData; + srcSurfUD->mBackendType = aTarget->GetType(); + srcSurfUD->mSrcSurface = srcBuffer; + aSurface->SetData(&kSourceSurface, srcSurfUD, SourceBufferDestroy); return srcBuffer; - } - -- cgit v1.2.3