[arch-commits] Commit in firefox/trunk (PKGBUILD freetype26.patch)

[Evangelos Foutras]

    Date: Sunday, June 21, 2015 @ 13:54:42
  Author: foutrelis
Revision: 241155

Fix build with FreeType 2.6

Added:
  firefox/trunk/freetype26.patch
Modified:
  firefox/trunk/PKGBUILD

------------------+
 PKGBUILD         |   10 +++++++++-
 freetype26.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-21 09:37:02 UTC (rev 241154)
+++ PKGBUILD	2015-06-21 11:54:42 UTC (rev 241155)
@@ -22,12 +22,17 @@
 install=firefox.install
 options=('!emptydirs' '!makeflags')
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
-        mozconfig firefox.desktop firefox-install-dir.patch vendor.js
+        mozconfig
+        firefox.desktop
+        firefox-install-dir.patch
+        freetype26.patch
+        vendor.js
         firefox-fixed-loading-icon.png)
 sha256sums=('4f53506d1e8a724a165ee509d9448fa7c9b7203183f53ae313063eb144a403b6'
             'ffcb2a0ba2ed08f74931a11043717391ef380234cadccc6f0c13f1186ad80e8b'
             'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
+            'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
@@ -53,6 +58,9 @@
   cp ../mozconfig .mozconfig
   patch -Np1 -i ../firefox-install-dir.patch
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
+  patch -Np1 -i ../freetype26.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
 

Added: freetype26.patch
===================================================================
--- freetype26.patch	                        (rev 0)
+++ freetype26.patch	2015-06-21 11:54:42 UTC (rev 241155)
@@ -0,0 +1,30 @@
+
+# HG changeset patch
+# User NiLuJe <ninuje at 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
+