summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/icecat/PKGBUILD5
-rw-r--r--libre/icecat/freetype26.patch30
2 files changed, 0 insertions, 35 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index bcc1a95f8..1811c254c 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -39,7 +39,6 @@ source=(http://jenkins.trisquel.info/$pkgname/$pkgname-$_pkgver.tar.bz2
gnu_headshadow.png
$pkgname.desktop
$pkgname-install-dir.patch
- freetype26.patch
vendor.js
$pkgname-fixed-loading-icon.png
remove-google-play-services-support.patch
@@ -50,7 +49,6 @@ sha256sums=('c266acbc54c364f32a5e56f997f21a2cbbf95fd76ea53452e8026629a9bb5f1f'
'93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
'52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745'
'5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47'
- 'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85'
'977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33'
'68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
'9e651b0f7e7d9d663e8b24077d52bad15f011871747743aff60d6e2d7a45ae5b'
@@ -70,9 +68,6 @@ prepare() {
# Install to /usr/lib/$pkgname
patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
- patch -Np1 -i "$srcdir/freetype26.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/freetype26.patch b/libre/icecat/freetype26.patch
deleted file mode 100644
index c1eb49497..000000000
--- a/libre/icecat/freetype26.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# HG changeset patch
-# User NiLuJe <ninuje@gmail.com>
-# Date 1426721573 14400
-# Node ID afd840d66e6a775dc2ed35dd3add01ff07f950fe
-# Parent 35515400af363bfc141353acd474814567c43c54
-Bug 1143411 - Fix build against latest freetype code. r=glandium
-
-diff --git a/config/system-headers b/config/system-headers
---- a/config/system-headers
-+++ b/config/system-headers
-@@ -465,16 +465,17 @@ freetype/tttables.h
- freetype/t1tables.h
- freetype/ftlcdfil.h
- freetype/ftsizes.h
- freetype/ftadvanc.h
- freetype/ftbitmap.h
- freetype/ftxf86.h
- freetype.h
- ftcache.h
-+ftfntfmt.h
- ftglyph.h
- ftsynth.h
- ftoutln.h
- ttnameid.h
- tttables.h
- t1tables.h
- ftlcdfil.h
- ftsizes.h
-