From 3dd4b6420f686b0147d5b8136268cc63196e253b Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 9 Mar 2014 21:32:55 +0100 Subject: fontconfig mesa xserver git update 9 Mar 2014 xserver commit 1c61d38528a573caadee2468ee59ea558c822e09 fontconfig commit f8ccf379eb1092592ae0b65deb563c5491f69de9 mesa commit 897f40f25d21af678b1b67c1a68c4a6722d19983 --- fontconfig/doc/fccache.fncs | 2 ++ fontconfig/doc/fccharset.fncs | 1 + fontconfig/doc/fcconfig.fncs | 2 ++ fontconfig/doc/fcdircache.fncs | 1 + fontconfig/doc/fcformat.fncs | 1 + fontconfig/doc/fclangset.fncs | 6 ++++++ fontconfig/doc/fcstrset.fncs | 1 + fontconfig/doc/func.sgml | 9 +++++---- fontconfig/src/fcstat.c | 12 +++++------- 9 files changed, 24 insertions(+), 11 deletions(-) (limited to 'fontconfig') diff --git a/fontconfig/doc/fccache.fncs b/fontconfig/doc/fccache.fncs index ca8ffa03c..34ce63f27 100644 --- a/fontconfig/doc/fccache.fncs +++ b/fontconfig/doc/fccache.fncs @@ -74,6 +74,7 @@ FcCacheCopySet. @PURPOSE@ This tries to clean up the cache directory of cache_dir. This returns FcTrue if the operation is successfully complete. otherwise FcFalse. +@SINCE@ 2.9.91 @@ @RET@ void @@ -83,4 +84,5 @@ This returns FcTrue if the operation is successfully complete. otherwise FcFalse @DESC@ This tries to create CACHEDIR.TAG file at the cache directory registered to config. +@SINCE@ 2.9.91 @@ diff --git a/fontconfig/doc/fccharset.fncs b/fontconfig/doc/fccharset.fncs index efcd0ccf1..7245a2a0e 100644 --- a/fontconfig/doc/fccharset.fncs +++ b/fontconfig/doc/fccharset.fncs @@ -60,6 +60,7 @@ running out of memory. FcCharSetDelChar deletes a single Unicode char from the set, returning FcFalse on failure, either as a result of a constant set or from running out of memory. +@SINCE@ 2.9.0 @@ @RET@ FcCharSet * diff --git a/fontconfig/doc/fcconfig.fncs b/fontconfig/doc/fcconfig.fncs index 0491a566f..24d7121e4 100644 --- a/fontconfig/doc/fcconfig.fncs +++ b/fontconfig/doc/fcconfig.fncs @@ -378,6 +378,7 @@ parse error, semantic error or allocation failure. Otherwise returns FcTrue. @PURPOSE@ Obtain the system root directory @DESC@ Obtrains the system root directory in 'config' if available. +@SINCE@ 2.10.92 @@ @RET@ void @@ -390,5 +391,6 @@ Set 'sysroot' as the system root directory. fontconfig prepend 'sysroot' to the cache directories in order to allow people to generate caches at the build time. Note that this causes changing current config. i.e. this function calls FcConfigSetCurrent() internally. +@SINCE@ 2.10.92 @@ diff --git a/fontconfig/doc/fcdircache.fncs b/fontconfig/doc/fcdircache.fncs index ab5e3d9a0..faeba2928 100644 --- a/fontconfig/doc/fcdircache.fncs +++ b/fontconfig/doc/fcdircache.fncs @@ -62,6 +62,7 @@ FcDirCacheRead. @DESC@ Re-scan directories only at dir and update the cache. returns NULL if failed. +@SINCE@ 2.11.1 @@ @RET@ FcCache * diff --git a/fontconfig/doc/fcformat.fncs b/fontconfig/doc/fcformat.fncs index c136e8cf2..71b866b88 100644 --- a/fontconfig/doc/fcformat.fncs +++ b/fontconfig/doc/fcformat.fncs @@ -305,4 +305,5 @@ For example, the format "%{family|downcase|delete( )}\n" will expand to the values of the family element in pattern, lower-cased and with spaces removed. +@SINCE@ 2.9.0 @@ diff --git a/fontconfig/doc/fclangset.fncs b/fontconfig/doc/fclangset.fncs index c08d60c70..c7ed83b34 100644 --- a/fontconfig/doc/fclangset.fncs +++ b/fontconfig/doc/fclangset.fncs @@ -68,6 +68,7 @@ two or three letter language from ISO 639 and Tt is a territory from ISO lang should be of the form Ll-Tt where Ll is a two or three letter language from ISO 639 and Tt is a territory from ISO 3166. +@SINCE@ 2.9.0 @@ @RET@ FcLangSet * @@ -77,6 +78,7 @@ two or three letter language from ISO 639 and Tt is a territory from ISO @PURPOSE@ Add langsets @DESC@ Returns a set including only those languages found in either ls_a or ls_b. +@SINCE@ 2.9.0 @@ @RET@ FcLangSet * @@ -86,6 +88,7 @@ Returns a set including only those languages found in either ls_als_a but not in ls_b. +@SINCE@ 2.9.0 @@ @RET@ FcLangResult @@ -161,6 +164,8 @@ has no matching language, this function returns FcLangDifferentLang. Returns a string set of the default languages according to the environment variables on the system. This function looks for them in order of FC_LANG, LC_ALL, LC_CTYPE and LANG then. If there are no valid values in those environment variables, "en" will be set as fallback. +@SINCE@ 2.9.91 +@@ @RET@ FcStrSet * @FUNC@ FcLangSetGetLangs @@ -184,6 +189,7 @@ Returns a string set of all known languages. @PURPOSE@ Normalize the language string @DESC@ Returns a string to make lang suitable on fontconfig. +@SINCE@ 2.10.91 @@ @RET@ const FcCharSet * diff --git a/fontconfig/doc/fcstrset.fncs b/fontconfig/doc/fcstrset.fncs index b96489a43..67aa61ac0 100644 --- a/fontconfig/doc/fcstrset.fncs +++ b/fontconfig/doc/fcstrset.fncs @@ -104,6 +104,7 @@ Creates an iterator to list the strings in set. @PURPOSE@ get first string in iteration @DESC@ Returns the first string in list. +@SINCE@ 2.11.0 @@ @RET@ FcChar8 * diff --git a/fontconfig/doc/func.sgml b/fontconfig/doc/func.sgml index 73e7761ce..f076baff2 100644 --- a/fontconfig/doc/func.sgml +++ b/fontconfig/doc/func.sgml @@ -33,6 +33,7 @@ @FUNC@ @;@ 3 + Fontconfig &version; @{PROTOTYPE@ @@ -82,9 +83,9 @@ @DESC@ - Version - -Fontconfig version &version; - +@?SINCE@ + Since + version @SINCE@ +@;@ diff --git a/fontconfig/src/fcstat.c b/fontconfig/src/fcstat.c index f384767cc..0a880975a 100644 --- a/fontconfig/src/fcstat.c +++ b/fontconfig/src/fcstat.c @@ -186,10 +186,8 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum) struct Adler32 ctx; struct dirent **files; int n; -#ifndef HAVE_STRUCT_DIRENT_D_TYPE int ret = 0; size_t len = strlen ((const char *)dir); -#endif Adler32Init (&ctx); @@ -210,7 +208,9 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum) #ifdef HAVE_STRUCT_DIRENT_D_TYPE dtype = files[n]->d_type; -#else + if (dtype == DT_UNKNOWN) + { +#endif struct stat statb; char f[PATH_MAX + 1]; @@ -227,20 +227,18 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum) goto bail; dtype = statb.st_mode; +#ifdef HAVE_STRUCT_DIRENT_D_TYPE + } #endif Adler32Update (&ctx, files[n]->d_name, dlen + 1); Adler32Update (&ctx, (char *)&dtype, sizeof (int)); -#ifndef HAVE_STRUCT_DIRENT_D_TYPE bail: -#endif free (files[n]); } free (files); -#ifndef HAVE_STRUCT_DIRENT_D_TYPE if (ret == -1) return -1; -#endif *checksum = Adler32Finish (&ctx); -- cgit v1.2.3