diff options
Diffstat (limited to 'media-libs/fontconfig/files')
5 files changed, 221 insertions, 0 deletions
diff --git a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch new file mode 100644 index 000000000000..33d6549c8147 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch @@ -0,0 +1,16 @@ +diff --unified -uNrp fontconfig-2.10.2-orig/configure.ac fontconfig-2.10.2/configure.ac +--- fontconfig-2.10.2-orig/configure.ac 2012-11-26 09:21:13.000000000 +0100 ++++ fontconfig-2.10.2/configure.ac 2013-01-05 15:40:54.541682239 +0100 +@@ -570,7 +570,11 @@ AC_SUBST(XMLDIR) + # Let people not build/install docs if they don't have docbook + # + +-AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no) ++AC_ARG_ENABLE(docbook, [ --disable-docbook Don't build documentation],,) ++ ++if test x$enable_docbook != xno; then ++ AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no) ++fi + + AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes) + diff --git a/media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch b/media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch new file mode 100644 index 000000000000..48f67f12974d --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch @@ -0,0 +1,26 @@ +From f44157c809d280e2a0ce87fb078fc4b278d24a67 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <akira@tagoh.org> +Date: Thu, 10 Apr 2014 19:27:55 +0900 +Subject: Fix fc-cache fail with -r + +Do not unlink the cache even if --really-force is given. +because re-scanning process expects the cache exists. + +https://bugs.freedesktop.org/show_bug.cgi?id=77252 + +diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c +index 99e0e9f..90ebad3 100644 +--- a/fc-cache/fc-cache.c ++++ b/fc-cache/fc-cache.c +@@ -388,7 +388,7 @@ main (int argc, char **argv) + list = FcStrListCreate (updateDirs); + if (list) + { +- ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed, NULL); ++ ret += scanDirs (list, config, FcTrue, FcFalse, verbose, FcFalse, &changed, NULL); + FcStrListDone (list); + } + FcStrSetDestroy (updateDirs); +-- +cgit v0.10.2 + diff --git a/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch b/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch new file mode 100644 index 000000000000..ce90c450b360 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch @@ -0,0 +1,61 @@ +From 9878b306f6c673d3d6cd9db487f67eb426cc03df Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <akira@tagoh.org> +Date: Thu, 23 Feb 2017 21:39:10 +0900 +Subject: Fix the build issue with gperf 3.1 + +To support the one of changes in gperf 3.1: +* The 'len' parameter of the hash function and of the lookup function is now + of type 'size_t' instead of 'unsigned int'. This makes it safe to call these + functions with strings of length > 4 GB, on 64-bit machines. + +diff --git a/configure.ac b/configure.ac +index 4948816..8fbf3d3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -193,6 +193,26 @@ fi + AC_CHECK_MEMBERS([struct dirent.d_type],,, + [#include <dirent.h>]) + ++# Check the argument type of the gperf hash/lookup function ++AC_MSG_CHECKING([The type of len parameter of gperf hash/lookup function]) ++fc_gperf_test="$(echo 'foo' | gperf -L ANSI-C)" ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ #include <string.h> ++ ++ const char *in_word_set(register const char *, register size_t); ++ $fc_gperf_test ++ ]])], [FC_GPERF_SIZE_T=size_t], ++ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ #include <string.h> ++ ++ const char *in_word_set(register const char *, register unsigned int); ++ $fc_gperf_test ++ ]])], [FC_GPERF_SIZE_T="unsigned int"], ++ [AC_MSG_ERROR([Unable to determine the type of the len parameter of the gperf hash/lookup function])] ++)]) ++AC_DEFINE_UNQUOTED(FC_GPERF_SIZE_T, $FC_GPERF_SIZE_T, [The type of len parameter of the gperf hash/lookup function]) ++AC_MSG_RESULT($FC_GPERF_SIZE_T) ++ + # + # Checks for iconv + # +diff --git a/src/fcobjs.c b/src/fcobjs.c +index 16ff31c..33bba8d 100644 +--- a/src/fcobjs.c ++++ b/src/fcobjs.c +@@ -25,10 +25,10 @@ + #include "fcint.h" + + static unsigned int +-FcObjectTypeHash (register const char *str, register unsigned int len); ++FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len); + + static const struct FcObjectTypeInfo * +-FcObjectTypeLookup (register const char *str, register unsigned int len); ++FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len); + + #include "fcobjshash.h" + +-- +cgit v0.10.2 + diff --git a/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch new file mode 100644 index 000000000000..397781e87acd --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch @@ -0,0 +1,68 @@ +--- fontconfig-2.12.3/conf.d/60-latin.conf ++++ fontconfig-2.12.3/conf.d/60-latin.conf +@@ -4,47 +4,50 @@ + <alias> + <family>serif</family> + <prefer> +- <family>Bitstream Vera Serif</family> ++ <family>Liberation Serif</family> + <family>DejaVu Serif</family> + <family>Times New Roman</family> +- <family>Thorndale AMT</family> + <family>Luxi Serif</family> + <family>Nimbus Roman No9 L</family> + <family>Nimbus Roman</family> + <family>Times</family> ++ <family>Thorndale AMT</family> ++ <family>Bitstream Vera Serif</family> + </prefer> + </alias> + <alias> + <family>sans-serif</family> + <prefer> +- <family>Bitstream Vera Sans</family> ++ <family>Liberation Sans</family> + <family>DejaVu Sans</family> +- <family>Verdana</family> + <family>Arial</family> +- <family>Albany AMT</family> + <family>Luxi Sans</family> + <family>Nimbus Sans L</family> + <family>Nimbus Sans</family> + <family>Helvetica</family> + <family>Lucida Sans Unicode</family> + <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor --> ++ <family>Verdana</family> + <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai --> ++ <family>Albany AMT</family> ++ <family>Bitstream Vera Sans</family> + </prefer> + </alias> + <alias> + <family>monospace</family> + <prefer> +- <family>Bitstream Vera Sans Mono</family> ++ <family>Liberation Mono</family> + <family>DejaVu Sans Mono</family> + <family>Inconsolata</family> + <family>Andale Mono</family> + <family>Courier New</family> +- <family>Cumberland AMT</family> + <family>Luxi Mono</family> + <family>Nimbus Mono L</family> + <family>Nimbus Mono</family> + <family>Nimbus Mono PS</family> + <family>Courier</family> ++ <family>Cumberland AMT</family> ++ <family>Bitstream Vera Sans Mono</family> + </prefer> + </alias> + <!-- +@@ -65,6 +68,7 @@ + <alias> + <family>cursive</family> + <prefer> ++ <family>Comic Neue</family> + <family>ITC Zapf Chancery Std</family> + <family>Zapfino</family> + <family>Comic Sans MS</family> diff --git a/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch b/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch new file mode 100644 index 000000000000..6ecf6cb9df6e --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch @@ -0,0 +1,50 @@ +diff -Naurp fontconfig-2.7.1-orig/conf.d/60-latin.conf fontconfig-2.7.1/conf.d/60-latin.conf +--- fontconfig-2.7.1-orig/conf.d/60-latin.conf 2009-07-10 11:09:33.000000000 -0600 ++++ fontconfig-2.7.1/conf.d/60-latin.conf 2009-08-16 15:25:38.347701112 -0600 +@@ -4,8 +4,8 @@ + <alias> + <family>serif</family> + <prefer> +- <family>Bitstream Vera Serif</family> + <family>DejaVu Serif</family> ++ <family>Bitstream Vera Serif</family> + <family>Times New Roman</family> + <family>Thorndale AMT</family> + <family>Luxi Serif</family> +@@ -16,14 +16,14 @@ + <alias> + <family>sans-serif</family> + <prefer> +- <family>Bitstream Vera Sans</family> + <family>DejaVu Sans</family> +- <family>Verdana</family> +- <family>Arial</family> +- <family>Albany AMT</family> ++ <family>Bitstream Vera Sans</family> + <family>Luxi Sans</family> + <family>Nimbus Sans L</family> ++ <family>Arial</family> ++ <family>Albany AMT</family> + <family>Helvetica</family> ++ <family>Verdana</family> + <family>Lucida Sans Unicode</family> + <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor --> + <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai --> +@@ -32,14 +32,14 @@ + <alias> + <family>monospace</family> + <prefer> +- <family>Bitstream Vera Sans Mono</family> + <family>DejaVu Sans Mono</family> ++ <family>Bitstream Vera Sans Mono</family> + <family>Inconsolata</family> ++ <family>Luxi Mono</family> ++ <family>Nimbus Mono L</family> + <family>Andale Mono</family> + <family>Courier New</family> + <family>Cumberland AMT</family> +- <family>Luxi Mono</family> +- <family>Nimbus Mono L</family> + <family>Courier</family> + </prefer> + </alias> |