From a689f0916e5101b035685d173eb8786663717a35 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 3 Nov 2015 19:13:22 +0000
Subject: [PATCH] community/xulrunner to 41.0.2-1

---
 community/xulrunner/PKGBUILD               | 12 ++--
 community/xulrunner/freetype-headers.patch | 66 ----------------------
 community/xulrunner/freetype261.patch      | 31 ++++++++++
 3 files changed, 39 insertions(+), 70 deletions(-)
 delete mode 100644 community/xulrunner/freetype-headers.patch
 create mode 100644 community/xulrunner/freetype261.patch

diff --git a/community/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD
index 077d3fd2c..330902e31 100644
--- a/community/xulrunner/PKGBUILD
+++ b/community/xulrunner/PKGBUILD
@@ -8,21 +8,22 @@
 #  - set extra CFLAG for v5
 
 pkgname=xulrunner
-pkgver=40.0.3
+pkgver=41.0.2
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 depends=('gtk2' 'mozilla-common' 'nss>3.18' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'libpulse' 'libevent' 'libvpx' 'icu' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gst-plugins-base-libs')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'gconf' 'autoconf2.13' 'gst-plugins-base-libs')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(https://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2
+source=(https://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.xz
         mozconfig
+        freetype261.patch
         mozilla-pkgconfig.patch
         shared-libs.patch)
 options=('!emptydirs' 'staticlibs')
 replaces=('xulrunner-oss')
-sha256sums=('500af8a84c48e31fe368cd89aa17118e4f18ef76ce7b7154a9d676222ce3ced5'
+sha256sums=('f7abb2e2989779305ab1f80d30caf9fc55d96c7e66d1394e2cc9639442e2b864'
             '08e7c8e40ca3ab68f91b18b84a4fbbba00767c88d84c0cfcdd52fe5e36083207'
             '1aa9ebe67542a2b8c28905d070829ada5b29438c6a7961f2b0cdd6b92d8b9f5c'
             '59d9fc421bc10a5515b73e159f44a72365bf7b7e8b3fc8a8c46043ef40bd3a40')
@@ -31,6 +32,9 @@ prepare() {
   cd "$srcdir/mozilla-release"
   cp "$srcdir/mozconfig" .mozconfig
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1194520
+  patch -Np1 -i ../freetype261.patch
+
   # fix libdir/sdkdir - fedora
   patch -Np1 -i ../mozilla-pkgconfig.patch
   patch -Np1 -i ../shared-libs.patch
diff --git a/community/xulrunner/freetype-headers.patch b/community/xulrunner/freetype-headers.patch
deleted file mode 100644
index 20a5b19ca..000000000
--- a/community/xulrunner/freetype-headers.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Nur mozilla-release.orig/config/system-headers mozilla-release/config/system-headers
---- mozilla-release.orig/config/system-headers
-+++ mozilla-release/config/system-headers
-@@ -408,16 +408,29 @@ freetype/ftoutln.h
- freetype/ttnameid.h
- 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
-+ftglyph.h
-+ftsynth.h
-+ftoutln.h
-+ttnameid.h
-+tttables.h
-+t1tables.h
-+ftlcdfil.h
-+ftsizes.h
-+ftadvanc.h
-+ftbitmap.h
-+ftxf86.h
- fribidi/fribidi.h
- FSp_fopen.h
- fstream
- fstream.h
- ft2build.h
- fts.h
- gconf/gconf-client.h
- Gdiplus.h
-diff -Nur mozilla-release.orig/js/src/config/system-headers mozilla-release/js/src/config/system-headers
---- mozilla-release.orig/js/src/config/system-headers
-+++ mozilla-release/js/src/config/system-headers
-@@ -408,16 +408,29 @@ freetype/ftoutln.h
- freetype/ttnameid.h
- 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
-+ftglyph.h
-+ftsynth.h
-+ftoutln.h
-+ttnameid.h
-+tttables.h
-+t1tables.h
-+ftlcdfil.h
-+ftsizes.h
-+ftadvanc.h
-+ftbitmap.h
-+ftxf86.h
- fribidi/fribidi.h
- FSp_fopen.h
- fstream
- fstream.h
- ft2build.h
- fts.h
- gconf/gconf-client.h
- Gdiplus.h
diff --git a/community/xulrunner/freetype261.patch b/community/xulrunner/freetype261.patch
new file mode 100644
index 000000000..318ea644e
--- /dev/null
+++ b/community/xulrunner/freetype261.patch
@@ -0,0 +1,31 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1439509838 -32400
+# Node ID af40750720b59cb7af58c32f4f3325d6e03bbbc4
+# Parent  e578cc44a96a2a953e75e295b0d8954f467d5cff
+Bug 1194520 - Add a system header wrapper for <freetype/ftfntfmt.h>. r=mshal
+
+
+diff --git a/config/system-headers b/config/system-headers
+--- 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
+