From f8e01ff1cc19d58774bc112976fe2489fe14cf1a Mon Sep 17 00:00:00 2001
From: Joan Figueras <ffigue@gmail.com>
Date: Wed, 23 Dec 2015 13:56:56 +0000
Subject: [PATCH] Update to 38.5.0

---
 .SRCINFO         | 12 ++++++------
 PKGBUILD         | 15 +++++----------
 freetype26.patch | 30 ------------------------------
 3 files changed, 11 insertions(+), 46 deletions(-)
 delete mode 100644 freetype26.patch

diff --git a/.SRCINFO b/.SRCINFO
index 68123c03434a6..3c19ae352b4d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Dec 23 13:55:50 UTC 2015
 pkgbase = icecat
 	pkgdesc = GNU version of the Firefox browser.
-	pkgver = 38.4.0
+	pkgver = 38.5.0
 	pkgrel = 1
 	url = http://www.gnu.org/software/gnuzilla/
 	install = icecat.install
@@ -42,20 +44,18 @@ pkgbase = icecat
 	optdepends = gst-plugins-good: h.264 video
 	optdepends = gst-libav: h.264 video
 	optdepends = upower: Battery API
-	source = http://ftpmirror.gnu.org/gnuzilla/38.4.0/icecat-38.4.0-gnu1.tar.bz2
-	source = http://ftpmirror.gnu.org/gnuzilla/38.4.0/icecat-38.4.0-gnu1.tar.bz2.sig
+	source = http://ftpmirror.gnu.org/gnuzilla/38.5.0/icecat-38.5.0-gnu1.tar.bz2
+	source = http://ftpmirror.gnu.org/gnuzilla/38.5.0/icecat-38.5.0-gnu1.tar.bz2.sig
 	source = mozconfig
 	source = icecat.desktop
 	source = icecat-safe.desktop
 	source = vendor.js
-	source = freetype26.patch
-	sha256sums = d7358b4fdf52691f6d2bafab6954fe529e52513ae8b38d45e3943d9753508a65
+	sha256sums = 462a27cce5153d36a03e7b46ad38d860b84498835058d580d292a0be6f05c2ad
 	sha256sums = SKIP
 	sha256sums = 4602066304f0bb10bdaea75405570d500dae3199b77b04a45167d423fdf9bf6f
 	sha256sums = c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3
 	sha256sums = 190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303
 	sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
-	sha256sums = b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85
 
 pkgname = icecat
 
diff --git a/PKGBUILD b/PKGBUILD
index c6745c236edab..a84f91abf842e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 pkgname=icecat
-pkgver=38.4.0
-_pkgver=38.4.0-gnu1
+pkgver=38.5.0
+_pkgver=38.5.0-gnu1
 _pkgverbase=${pkgver%%.*}
 pkgrel=1
 pkgdesc="GNU version of the Firefox browser."
@@ -33,16 +33,14 @@ source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz
 	mozconfig
         icecat.desktop
         icecat-safe.desktop
-        vendor.js
-        freetype26.patch)
+        vendor.js)
 
-sha256sums=('d7358b4fdf52691f6d2bafab6954fe529e52513ae8b38d45e3943d9753508a65'
+sha256sums=('462a27cce5153d36a03e7b46ad38d860b84498835058d580d292a0be6f05c2ad'
             'SKIP'
             '4602066304f0bb10bdaea75405570d500dae3199b77b04a45167d423fdf9bf6f'
             'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
             '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
-            '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
-            'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85')
+            '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4')
 
 validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
 
@@ -54,9 +52,6 @@ prepare() {
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
-  patch -Np1 -i ../freetype26.patch
-
   msg2 "Starting build..."
 
   cp -v ${srcdir}/mozconfig .mozconfig
diff --git a/freetype26.patch b/freetype26.patch
deleted file mode 100644
index c1eb494972df9..0000000000000
--- a/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
-