Patch for freetype2-2.6.1

3 files changed, 20 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 91f8ad8eb68d..f6019584cac3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,7 +21,6 @@ pkgbase = firefox-beta
 	makedepends = libpulse
 	makedepends = gst-plugins-base-libs
 	makedepends = inetutils
-	makedepends = freetype2<2.6.1
 	depends = gtk2
 	depends = mozilla-common
 	depends = libxt
@@ -49,12 +48,14 @@ pkgbase = firefox-beta
 	source = mozconfig
 	source = firefox-beta.desktop
 	source = firefox-install-dir.patch
+	source = freetype2-261.patch
 	source = vendor.js
 	source = firefox-fixed-loading-icon.png
 	sha256sums = bf019ccaf7faea8f70e59252d773fa786d6d6a614557ad0060f5f4402a722b50
 	sha256sums = c89abe5ee54637743ee1f54c9e760dc9c35f18a175b46e5dcbb914e06f1b1f2f
 	sha256sums = cf19552d5bbd14c2747aad9b92a2897b88701e9b42990cf28cf40c2d50a41909
 	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
+	sha256sums = c65d7c784d382d24f47b49a86e8ca02158de04b8bfd14b097cf4839bd641fdd5
 	sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
 	sha256sums = 68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f8cbe88d074..eab608f9df1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
          'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite')
 makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
              'xorg-server-xvfb' 'libpulse' 'gst-plugins-base-libs'
-             'inetutils' 'freetype2<2.6.1')
+             'inetutils')
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'gst-plugins-good: h.264 video'
             'gst-libav: h.264 video'
@@ -25,12 +25,14 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/
         mozconfig
         firefox-beta.desktop
         firefox-install-dir.patch
+        freetype2-261.patch
         vendor.js
         firefox-fixed-loading-icon.png)
 sha256sums=('bf019ccaf7faea8f70e59252d773fa786d6d6a614557ad0060f5f4402a722b50'
             'c89abe5ee54637743ee1f54c9e760dc9c35f18a175b46e5dcbb914e06f1b1f2f'
             'cf19552d5bbd14c2747aad9b92a2897b88701e9b42990cf28cf40c2d50a41909'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
+            'c65d7c784d382d24f47b49a86e8ca02158de04b8bfd14b097cf4839bd641fdd5'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
@@ -55,7 +57,8 @@ prepare() {
 
   cp ../mozconfig .mozconfig
   patch -Np1 -i ../firefox-install-dir.patch
-
+  patch -Np0 --no-backup-if-mismatch -i ../freetype2-261.patch
+  
   echo -n "$_google_api_key" >google-api-key
   echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
 
diff --git a/freetype2-261.patch b/freetype2-261.patch
new file mode 100644
index 000000000000..62dadf0c6939
--- /dev/null
+++ b/freetype2-261.patch
@@ -0,0 +1,13 @@
+diff -c config/system-headers.FIX_SYSTEM_HEADERS config/system-headers
+*** config/system-headers.FIX_SYSTEM_HEADERS	Thu Oct  8 18:29:42 2015
+--- config/system-headers	Thu Oct  8 18:29:42 2015
+***************
+*** 455,460 ****
+--- 455,461 ----
+  frame/req.h
+  freetype/freetype.h
+  freetype/ftcache.h
++ freetype/ftfntfmt.h
+  freetype/ftglyph.h
+  freetype/ftsynth.h
+  freetype/ftoutln.h