From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../files/fontconfig-2.10.2-docbook.patch | 16 +++++ .../files/fontconfig-2.11.1-fc-cache-r.patch | 26 +++++++++ .../files/fontconfig-2.12.2-gperf31.patch | 61 +++++++++++++++++++ .../files/fontconfig-2.12.3-latin-update.patch | 68 ++++++++++++++++++++++ .../files/fontconfig-2.7.1-latin-reorder.patch | 50 ++++++++++++++++ 5 files changed, 221 insertions(+) create mode 100644 media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch create mode 100644 media-libs/fontconfig/files/fontconfig-2.11.1-fc-cache-r.patch create mode 100644 media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch create mode 100644 media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch create mode 100644 media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch (limited to 'media-libs/fontconfig/files') 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 +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 +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 ]) + ++# 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 ++ ++ 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 ++ ++ 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 @@ + + serif + +- Bitstream Vera Serif ++ Liberation Serif + DejaVu Serif + Times New Roman +- Thorndale AMT + Luxi Serif + Nimbus Roman No9 L + Nimbus Roman + Times ++ Thorndale AMT ++ Bitstream Vera Serif + + + + sans-serif + +- Bitstream Vera Sans ++ Liberation Sans + DejaVu Sans +- Verdana + Arial +- Albany AMT + Luxi Sans + Nimbus Sans L + Nimbus Sans + Helvetica + Lucida Sans Unicode + BPG Glaho International ++ Verdana + Tahoma ++ Albany AMT ++ Bitstream Vera Sans + + + + monospace + +- Bitstream Vera Sans Mono ++ Liberation Mono + DejaVu Sans Mono + Inconsolata + Andale Mono + Courier New +- Cumberland AMT + Luxi Mono + Nimbus Mono L + Nimbus Mono + Nimbus Mono PS + Courier ++ Cumberland AMT ++ Bitstream Vera Sans Mono + + + + Tahoma +@@ -32,14 +32,14 @@ + + monospace + +- Bitstream Vera Sans Mono + DejaVu Sans Mono ++ Bitstream Vera Sans Mono + Inconsolata ++ Luxi Mono ++ Nimbus Mono L + Andale Mono + Courier New + Cumberland AMT +- Luxi Mono +- Nimbus Mono L + Courier + + -- cgit v1.2.3