diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-07-16 23:32:51 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-07-17 01:42:35 -0400 |
| commit | 2fdc68274282a0e6243c706ea6d97785be4ead3b (patch) | |
| tree | d7dc192a23b5afeb284c6cba415caccb9faec45c | |
| parent | 355e53c4ca95b309b74a815559a960e0624b034f (diff) | |
| download | guix-2fdc68274282a0e6243c706ea6d97785be4ead3b.tar guix-2fdc68274282a0e6243c706ea6d97785be4ead3b.tar.gz | |
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.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 1 | ||||
| -rw-r--r-- | 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 d99a4e2cd4..f5847031b2 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 8be3d48871..dfa1d5d8a4 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 0000000000..ef69f2f715 --- /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 |