diff options
| -rw-r--r-- | libre/icecat/PKGBUILD | 11 | ||||
| -rw-r--r-- | libre/icecat/freetype261.patch | 30 |
2 files changed, 3 insertions, 38 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 629e8b300..a1f545a7a 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,9 +13,9 @@ _pgo=true pkgname=icecat -_pkgver=38.3.0-gnu1 +_pkgver=38.4.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=6 +pkgrel=1 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64) @@ -40,12 +40,11 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{ $pkgname.desktop $pkgname-install-dir.patch freetype26.patch - freetype261.patch vendor.js $pkgname-fixed-loading-icon.png remove-google-play-services-support.patch disable-general-crypto-hardening-settings.patch) -sha256sums=('08fe9724a84aef2182265b230c68fa37a36a5d93ffd5118ec0739718dc71a66e' +sha256sums=('d7358b4fdf52691f6d2bafab6954fe529e52513ae8b38d45e3943d9753508a65' 'SKIP' '33a8cf07373c63a0bea70ec2c3983d2cca990752c0f946cb5dbd91f1e2b6410f' 'dd173c9283babb8a04bf55274de05e823161f7d13adb8c5e21dd5a9c0dc549a2' @@ -53,7 +52,6 @@ sha256sums=('08fe9724a84aef2182265b230c68fa37a36a5d93ffd5118ec0739718dc71a66e' '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745' '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47' 'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85' - 'd3796311f93328fc8494d75a2123d29e51d52c3f01ffea0977efbfbe12171809' '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' '9e651b0f7e7d9d663e8b24077d52bad15f011871747743aff60d6e2d7a45ae5b' @@ -76,9 +74,6 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411 patch -Np1 -i "$srcdir/freetype26.patch" - # https://bugzilla.mozilla.org/show_bug.cgi?id=1194520 - patch -Np1 -i "$srcdir/freetype261.patch" - # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" patch -Np1 -i "$srcdir/remove-google-play-services-support.patch" diff --git a/libre/icecat/freetype261.patch b/libre/icecat/freetype261.patch deleted file mode 100644 index 0d5bbb1d2..000000000 --- a/libre/icecat/freetype261.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# HG changeset patch -# User Mike Hommey <mh+mozilla@glandium.org> -# Date 1439509838 -32400 -# Node ID ffb931f910498504782f4df88206b9cb911b33a4 -# Parent 467ce7a8340d008a5999e57198035d492b7bc79f -Bug 1194520 - Add a system header wrapper for <freetype/ftfntfmt.h>. r=mshal a=ritu - -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -453,16 +453,17 @@ foundation/base64.h - foundation/hexdump.h - #endif - fp.h - fpieee.h - frame/log.h - frame/req.h - freetype/freetype.h - freetype/ftcache.h -+freetype/ftfntfmt.h - freetype/ftglyph.h - freetype/ftsynth.h - freetype/ftoutln.h - freetype/ttnameid.h - freetype/tttables.h - freetype/t1tables.h - freetype/ftlcdfil.h - freetype/ftsizes.h - |