01/01: gnu: icecat: Add patch to adapt to freetype 2.6.

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit 2fdc68274282a0e6243c706ea6d97785be4ead3b
Author: Mark H Weaver <address@hidden>
Date:   Thu Jul 16 23:32:51 2015 -0400

    gnu: icecat: Add patch to adapt to freetype 2.6.
    
    * gnu/packages/patches/icecat-freetype-2.6.patch: New file.
    * gnu-system.am (dist_patch_DATA): Add it.
    * gnu/packages/gnuzilla.scm (icecat)[source]: Add patch.
---
 gnu-system.am                                  |    1 +
 gnu/packages/gnuzilla.scm                      |    1 +
 gnu/packages/patches/icecat-freetype-2.6.patch |   14 ++++++++++++++
 3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index d99a4e2..f584703 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -469,6 +469,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/hydra-automake-1.15.patch               \
   gnu/packages/patches/hydra-disable-darcs-test.patch          \
   gnu/packages/patches/icecat-enable-acceleration-and-webgl.patch \
+  gnu/packages/patches/icecat-freetype-2.6.patch               \
   gnu/packages/patches/icecat-libvpx-1.4.patch                 \
   gnu/packages/patches/irrlicht-mesa-10.patch                  \
   gnu/packages/patches/jbig2dec-ignore-testtest.patch          \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 8be3d48..dfa1d5d 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -279,6 +279,7 @@ standards.")
                       "db/sqlite3"))
           #t))
       (patches (map search-patch '("icecat-enable-acceleration-and-webgl.patch"
+                                   "icecat-freetype-2.6.patch"
                                    "icecat-libvpx-1.4.patch")))))
     (build-system gnu-build-system)
     (inputs
diff --git a/gnu/packages/patches/icecat-freetype-2.6.patch 
b/gnu/packages/patches/icecat-freetype-2.6.patch
new file mode 100644
index 0000000..ef69f2f
--- /dev/null
+++ b/gnu/packages/patches/icecat-freetype-2.6.patch
@@ -0,0 +1,14 @@
+Adapt to freetype 2.6.  This patch copied from upstream, see:
+https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
+https://hg.mozilla.org/mozilla-central/rev/afd840d66e6a
+
+--- a/config/system-headers
++++ b/config/system-headers
+@@ -415,6 +415,7 @@ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h