summaryrefslogtreecommitdiff
path: root/www/firefox-esr/files/patch-bug722975
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-10-30 20:37:55 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-10-30 20:37:55 +0000
commit2cd503bcdb5f9bb9fadb663412a68fb84e801524 (patch)
treea87ddf1d023ec31d88d818886f89a42f8183ebd2 /www/firefox-esr/files/patch-bug722975
parentx11/lxpanel: pass maintainership (diff)
- update firefox to 25.0
- update firefox-esr to 24.1.0 - update thunderbird to 24.1.0 - update seamonkey to 22.0 - update libxul to 24.1.0 - don't remove/add share/applications directory - remove checks for older gecko releases from bsd.gecko.mk - drop support for FreeBSD 9.0 Not staged yet. I started working on it, but didn't finish it in time for this release. I'll try to make the next one in 6 weeks. In collaboration with: Jan Beich
Diffstat (limited to 'www/firefox-esr/files/patch-bug722975')
-rw-r--r--www/firefox-esr/files/patch-bug72297561
1 files changed, 0 insertions, 61 deletions
diff --git a/www/firefox-esr/files/patch-bug722975 b/www/firefox-esr/files/patch-bug722975
deleted file mode 100644
index 46a3381b9375..000000000000
--- a/www/firefox-esr/files/patch-bug722975
+++ /dev/null
@@ -1,61 +0,0 @@
-# HG changeset patch
-# Parent 9d3c9b863c697634e434b687d456bb82fa794ecf
-# User Uli Schlachter <psychon@znc.in>
-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(
-
- cairo_user_data_key_t kSourceSurface;
-
- void SourceBufferDestroy(void *srcBuffer)
- {
- static_cast<SourceSurface*>(srcBuffer)->Release();
- }
-
--void SourceSnapshotDetached(cairo_surface_t *nullSurf)
-+void SourceSnapshotDetached(void *nullSurf)
- {
-- gfxImageSurface* origSurf =
-- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
--
-+ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
- origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
- {
- void *userData = aSurface->GetData(&kSourceSurface);
-
-@@ -588,24 +586,19 @@ gfxPlatform::GetSourceSurfaceForSurface(
- }
-
- srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(),
- imgSurface->Stride(),
- size, format);
-
- }
-
-- cairo_surface_t *nullSurf =
-- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
-- cairo_surface_set_user_data(nullSurf,
-- &kSourceSurface,
-- imgSurface,
-- NULL);
-- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
-- cairo_surface_destroy(nullSurf);
-+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
-+ (const unsigned char *) "data", 4,
-+ SourceSnapshotDetached, imgSurface.get());
- }
-
- srcBuffer->AddRef();
- aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy);
-
- return srcBuffer;
- }
-