diff options
Diffstat (limited to 'libre/icecat')
| -rw-r--r-- | libre/icecat/PKGBUILD | 24 | ||||
| -rw-r--r-- | libre/icecat/cairo.patch | 33 | ||||
| -rw-r--r-- | libre/icecat/libre.patch | 24 |
3 files changed, 15 insertions, 66 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 0721a71f2..17a9da2b9 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor (Parabola): André Silva <emulatorman@parabola.nu> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> # Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> @@ -14,7 +14,7 @@ _pgo=false pkgname=icecat pkgver=24.0 -pkgrel=3 +pkgrel=5 pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.' arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) @@ -27,9 +27,10 @@ if $_pgo; then fi optdepends=('networkmanager: Location detection via available WiFi networks' 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' - 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' 'gstreamer0.10-good-plugins: webm and mp4 demuxing' - 'gstreamer0.10-ugly-plugins: h.264 decoding' + 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' + 'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding' + 'gstreamer0.10-ffmpeg: more decoders' 'libpulse: PulseAudio audio driver') url=http://www.gnu.org/software/gnuzilla/ install=$pkgname.install @@ -43,20 +44,18 @@ source=( $pkgname-install-dir.patch vendor.js icecat-20.0.1-fixed-loading-icon.png - #cairo.patch ) md5sums=( 0d3fdcec3f5fde494dedb595387e8f21 71dce16848bc51503a154841ce99427b df08eaa1ac3bc6c2356be4fbf8ec8932 - b5198ac730fc09e3d0297523b28289c4 + 21b5014c55aa97983f833886e047f55c b41f82994fa056ffa5f8e6d99570e27a b30ba2b5562558d510fdd09d626d0faa 64826fcf48816b13090042eefddbaa58 1dfa11e781950a969205e83840e9741e 6e335a517c68488941340ee1c23f97b0 - #c8552d030494443218d88792f4dbbd0f ) prepare() { @@ -70,8 +69,15 @@ 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 + sed -i '\|URL of the GeoLocation backend|d; + \|geo[.]wifi[.]uri|d; + ' browser/app/profile/firefox.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(); diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 244592db8..c8a0a5f0d 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -80,27 +80,3 @@ index e925c1e..5101035 100644 + <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> -diff --git a/dom/ipc/test.xul b/dom/ipc/test.xul -index 25efdb6..8162c73 100644 ---- a/dom/ipc/test.xul -+++ b/dom/ipc/test.xul -@@ -299,6 +299,6 @@ - oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> - <label id="messageLog" value="" crop="center"/> - </window> -diff --git a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul -index 237ba61..7603d7d 100644 ---- a/layout/ipc/test-ipcbrowser.xul -+++ b/layout/ipc/test-ipcbrowser.xul -@@ -73,6 +73,6 @@ - label="setViewportScale"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="content" -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" - remote="true"/> - </window> |