Updated to 38.4.0-gnu1

3 files changed, 9 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7fa793561ea..7314a12add5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = icecat
 	pkgdesc = GNU version of the Firefox browser.
-	pkgver = 38.3.0
+	pkgver = 38.4.0
 	pkgrel = 1
 	url = http://www.gnu.org/software/gnuzilla/
 	install = icecat.install
@@ -42,22 +42,20 @@ pkgbase = icecat
 	optdepends = gst-plugins-good: h.264 video
 	optdepends = gst-libav: h.264 video
 	optdepends = upower: Battery API
-	source = https://ftp.gnu.org/gnu/gnuzilla/38.3.0/icecat-38.3.0-gnu1.tar.bz2
-	source = https://ftp.gnu.org/gnu/gnuzilla/38.3.0/icecat-38.3.0-gnu1.tar.bz2.sig
+	source = https://ftp.gnu.org/gnu/gnuzilla/38.4.0/icecat-38.4.0-gnu1.tar.bz2
+	source = https://ftp.gnu.org/gnu/gnuzilla/38.4.0/icecat-38.4.0-gnu1.tar.bz2.sig
 	source = mozconfig
 	source = icecat.desktop
 	source = icecat-safe.desktop
 	source = vendor.js
 	source = freetype26.patch
-	source = 0001-Bug-1194520-Add-a-system-header-wrapper-for-freetype.patch
-	sha256sums = 08fe9724a84aef2182265b230c68fa37a36a5d93ffd5118ec0739718dc71a66e
+	sha256sums = d7358b4fdf52691f6d2bafab6954fe529e52513ae8b38d45e3943d9753508a65
 	sha256sums = SKIP
 	sha256sums = 4602066304f0bb10bdaea75405570d500dae3199b77b04a45167d423fdf9bf6f
 	sha256sums = c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3
 	sha256sums = 190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303
 	sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
 	sha256sums = b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85
-	sha256sums = 5371c4e73ef9620c2cf3e922cbf7e6ebecfe5b0d80df03ba0744ad61de7c1a25
 
 pkgname = icecat
 
diff --git a/0001-Bug-1194520-Add-a-system-header-wrapper-for-freetype.patch b/0001-Bug-1194520-Add-a-system-header-wrapper-for-freetype.patch
deleted file mode 100644
index 176360f8a53b..000000000000
--- a/0001-Bug-1194520-Add-a-system-header-wrapper-for-freetype.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh+mozilla@glandium.org>
-Date: Fri, 14 Aug 2015 08:50:38 +0900
-Subject: [PATCH] Bug 1194520 - Add a system header wrapper for
- <freetype/ftfntfmt.h>
-
----
- config/system-headers | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/system-headers b/config/system-headers
-index bee35da..ad1f88d 100644
---- a/config/system-headers
-+++ b/config/system-headers
-@@ -450,16 +450,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
--- 
-2.5.0.3.ge81d485
-
diff --git a/PKGBUILD b/PKGBUILD
index c4c577a96075..1583150cd501 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 pkgname=icecat
-pkgver=38.3.0
-_pkgver=38.3.0-gnu1
+pkgver=38.4.0
+_pkgver=38.4.0-gnu1
 _pkgverbase=${pkgver%%.*}
 pkgrel=1
 pkgdesc="GNU version of the Firefox browser."
@@ -33,17 +33,15 @@ source=(https://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2
         icecat.desktop
         icecat-safe.desktop
         vendor.js
-        freetype26.patch
-	0001-Bug-1194520-Add-a-system-header-wrapper-for-freetype.patch)
+        freetype26.patch)
 
-sha256sums=('08fe9724a84aef2182265b230c68fa37a36a5d93ffd5118ec0739718dc71a66e'
+sha256sums=('d7358b4fdf52691f6d2bafab6954fe529e52513ae8b38d45e3943d9753508a65'
             'SKIP'
             '4602066304f0bb10bdaea75405570d500dae3199b77b04a45167d423fdf9bf6f'
             'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
             '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
-            'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85'
-            '5371c4e73ef9620c2cf3e922cbf7e6ebecfe5b0d80df03ba0744ad61de7c1a25')
+            'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85')
 
 validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
 
@@ -56,9 +54,7 @@ prepare() {
   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
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1194520
   patch -Np1 -i ../freetype26.patch
-  patch -Np1 -i ../0001-Bug-1194520-Add-a-system-header-wrapper-for-freetype.patch
 
   msg2 "Starting build..."