summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/icecat/PKGBUILD2
-rw-r--r--libre/icecat/cairo.patch33
2 files changed, 1 insertions, 34 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index f8ac556ba..c25e3b4e5 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -70,7 +70,7 @@ prepare() {
patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname
# Patch and remove anything that's left
- patch -Np1 -i "$srcdir/libre.patch"
+ patch -Np1 -i $srcdir/libre.patch
sed -i 's|Adobe Flash|SWF Player|g;
' browser/base/content/pageinfo/permissions.js \
browser/base/content/browser-plugins.js
diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch
deleted file mode 100644
index a1fabee90..000000000
--- a/libre/icecat/cairo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/gfx/thebes/gfxPlatform.cpp
-+++ b/gfx/thebes/gfxPlatform.cpp
-@@ -459,11 +459,9 @@ 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);
- }
-
-@@ -535,14 +533,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
- imgSurface->Stride(),
- 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();