diff options
Diffstat (limited to 'libre/icecat')
| -rw-r--r-- | libre/icecat/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/icecat/cairo.patch | 33 |
2 files changed, 7 insertions, 38 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 0721a71f2..c249e740f 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false pkgname=icecat pkgver=24.0 -pkgrel=3 +pkgrel=4 pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.' arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) @@ -43,7 +43,6 @@ source=( $pkgname-install-dir.patch vendor.js icecat-20.0.1-fixed-loading-icon.png - #cairo.patch ) md5sums=( @@ -56,7 +55,6 @@ md5sums=( 64826fcf48816b13090042eefddbaa58 1dfa11e781950a969205e83840e9741e 6e335a517c68488941340ee1c23f97b0 - #c8552d030494443218d88792f4dbbd0f ) prepare() { @@ -70,8 +68,12 @@ prepare() { fi patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname - patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff - #patch -Np1 -i $srcdir/cairo.patch # fix cairo + + # Patch and remove anything that's left + 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 # Fix for use nspr, sqlite and nss external sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \ 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(); |