CVS commit: xsrc/external/mit/fontconfig/dist/fc-cache
Module Name:xsrc
Committed By: mrg
Date: Fri Mar 8 10:51:55 UTC 2019
Modified Files:
xsrc/external/mit/fontconfig/dist/fc-cache: fc-cache.c
Log Message:
fix merge botch in previous.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
diff -u xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.8 xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.9
--- xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.8 Fri Mar 8 09:49:07 2019
+++ xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c Fri Mar 8 10:51:55 2019
@@ -96,6 +96,7 @@ static void
usage (char *program, int error)
{
FILE *file = error ? stderr : stdout;
+#if HAVE_GETOPT_LONG
fprintf (file, _("usage: %s [-EfqrsvVh] [--quick] [-y SYSROOT] [--error-on-no-fonts] [--force|--really-force] [--sysroot=SYSROOT] [--system-only] [--verbose] [--version] [--help] [dirs]\n"),
program);
#else
CVS commit: xsrc/external/mit/fontconfig/include
Module Name:xsrc Committed By: mrg Date: Fri Mar 8 09:49:46 UTC 2019 Modified Files: xsrc/external/mit/fontconfig/include: config.h fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h Added Files: xsrc/external/mit/fontconfig/include: fcobjshash.h Removed Files: xsrc/external/mit/fontconfig/include: fcstdint.h Log Message: regen for fontconfig 2.13.1. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/fontconfig/include/config.h cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/fontconfig/include/fcalias.h \ xsrc/external/mit/fontconfig/include/fcaliastail.h cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fontconfig/include/fcftalias.h cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/include/fcftaliastail.h cvs rdiff -u -r0 -r1.1 xsrc/external/mit/fontconfig/include/fcobjshash.h cvs rdiff -u -r1.1 -r0 xsrc/external/mit/fontconfig/include/fcstdint.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/fontconfig/include/config.h diff -u xsrc/external/mit/fontconfig/include/config.h:1.8 xsrc/external/mit/fontconfig/include/config.h:1.9 --- xsrc/external/mit/fontconfig/include/config.h:1.8 Tue Aug 29 08:46:05 2017 +++ xsrc/external/mit/fontconfig/include/config.h Fri Mar 8 09:49:46 2019 @@ -5,23 +5,31 @@ /* #undef AC_APPLE_UNIVERSAL_BUILD */ /* The normal alignment of `double', in bytes. */ -#define ALIGNOF_DOUBLE 4 +#define ALIGNOF_DOUBLE 8 /* The normal alignment of `void *', in bytes. */ -#define ALIGNOF_VOID_P 4 +#define ALIGNOF_VOID_P 8 /* Use libxml2 instead of Expat */ /* #undef ENABLE_LIBXML2 */ +#if 0 +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#define ENABLE_NLS 1 +#endif + +#if 0 /* Additional font directories */ -#define FC_ADD_FONTS "yes" +#define FC_ADD_FONTS "/usr/X11R7/lib/X11/fonts,/usr/pkg/share/fonts/urw,/usr/pkg/share/ghostscript/fonts,/usr/pkg/share/fonts/X11" +#endif /* Architecture prefix to use for cache file names */ /* #undef FC_ARCHITECTURE */ #if 0 /* System font directory */ -#define FC_DEFAULT_FONTS "/usr/share/fonts" +#define FC_DEFAULT_FONTS "/usr/pkg/share/fonts/X11" #endif /* The type of len parameter of the gperf hash/lookup function */ @@ -36,6 +44,23 @@ MSVC and with C++ compilers. */ #define FLEXIBLE_ARRAY_MEMBER /**/ +/* Gettext package */ +#define GETTEXT_PACKAGE "fontconfig" + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +#if 0 +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#define HAVE_DCGETTEXT 1 +#endif + /* Define to 1 if you have the header file, and it defines `DIR'. */ #define HAVE_DIRENT_H 1 @@ -55,15 +80,12 @@ /* Define to 1 if you have the `fstatvfs' function. */ #define HAVE_FSTATVFS 1 -/* FT_Bitmap_Size structure includes y_ppem field */ -#define HAVE_FT_BITMAP_SIZE_Y_PPEM 1 +/* Define to 1 if you have the `FT_Done_MM_Var' function. */ +#define HAVE_FT_DONE_MM_VAR 1 /* Define to 1 if you have the `FT_Get_BDF_Property' function. */ #define HAVE_FT_GET_BDF_PROPERTY 1 -/* Define to 1 if you have the `FT_Get_Next_Char' function. */ -#define HAVE_FT_GET_NEXT_CHAR 1 - /* Define to 1 if you have the `FT_Get_PS_Font_Info' function. */ #define HAVE_FT_GET_PS_FONT_INFO 1 @@ -73,9 +95,6 @@ /* Define to 1 if you have the `FT_Has_PS_Glyph_Names' function. */ #define HAVE_FT_HAS_PS_GLYPH_NAMES 1 -/* Define to 1 if you have the `FT_Select_Size' function. */ -#define HAVE_FT_SELECT_SIZE 1 - /* Define to 1 if you have the `getexecname' function. */ /* #undef HAVE_GETEXECNAME */ @@ -91,6 +110,14 @@ /* Define to 1 if you have the `getprogname' function. */ #define HAVE_GETPROGNAME 1 +#if 0 +/* Define if the GNU gettext() function is already present or preinstalled. */ +#define HAVE_GETTEXT 1 +#endif + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + /* Have Intel __sync_* atomic primitives */ #define HAVE_INTEL_ATOMIC_PRIMITIVES 1 @@ -163,6 +190,12 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + /* Define to 1 if you have the header file. */ #define HAVE_STRINGS_H 1 @@ -216,12 +249,6 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_VFS_H */ -/* Define to 1 if `usLowerOpticalPointSize' is a member of `TT_OS2'. */ -#define HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE 1 - -/* Define to 1 if `usUpperOpticalPointSize'
CVS commit: xsrc/external/mit/fontconfig/dist
Module Name:xsrc Committed By: mrg Date: Fri Mar 8 09:49:08 UTC 2019 Modified Files: xsrc/external/mit/fontconfig/dist/doc: FcLangSetGetLangs.3 xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel: fclangsetgetlangs.html xsrc/external/mit/fontconfig/dist/fc-cache: fc-cache.c xsrc/external/mit/fontconfig/dist/src: fccache.c fccfg.c fcformat.c fcfreetype.c fcinit.c fcint.h fcmatch.c fcname.c fcstat.c Added Files: xsrc/external/mit/fontconfig/dist/src: fchash.c Removed Files: xsrc/external/mit/fontconfig/dist/conf.d: 30-urw-aliases.conf xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel: x102.html xsrc/external/mit/fontconfig/dist/fc-blanks: Makefile.am Makefile.in fc-blanks.py fcblanks.h fcblanks.tmpl.h xsrc/external/mit/fontconfig/dist/fc-glyphname: Makefile.am Makefile.in fc-glyphname.c fcglyphname.h fcglyphname.tmpl.h zapfdingbats.txt xsrc/external/mit/fontconfig/dist/src: fcblanks.c fcobjshash.gperf fcobjshash.h xsrc/external/mit/fontconfig/dist/test: out.expected out271.expected run-test271.sh Log Message: merge fontconfig 2.13.1. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r0 \ xsrc/external/mit/fontconfig/dist/conf.d/30-urw-aliases.conf cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3 cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html cvs rdiff -u -r1.1.1.7 -r0 \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/x102.html cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/fontconfig/dist/fc-blanks/Makefile.am \ xsrc/external/mit/fontconfig/dist/fc-blanks/Makefile.in \ xsrc/external/mit/fontconfig/dist/fc-blanks/fc-blanks.py \ xsrc/external/mit/fontconfig/dist/fc-blanks/fcblanks.h \ xsrc/external/mit/fontconfig/dist/fc-blanks/fcblanks.tmpl.h cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c cvs rdiff -u -r1.1.1.4 -r0 \ xsrc/external/mit/fontconfig/dist/fc-glyphname/Makefile.am cvs rdiff -u -r1.1.1.7 -r0 \ xsrc/external/mit/fontconfig/dist/fc-glyphname/Makefile.in cvs rdiff -u -r1.1.1.5 -r0 \ xsrc/external/mit/fontconfig/dist/fc-glyphname/fc-glyphname.c cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/fontconfig/dist/fc-glyphname/fcglyphname.h \ xsrc/external/mit/fontconfig/dist/fc-glyphname/zapfdingbats.txt cvs rdiff -u -r1.1.1.3 -r0 \ xsrc/external/mit/fontconfig/dist/fc-glyphname/fcglyphname.tmpl.h cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/fontconfig/dist/src/fcblanks.c cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/fontconfig/dist/src/fccache.c cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fontconfig/dist/src/fccfg.c \ xsrc/external/mit/fontconfig/dist/src/fcinit.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/dist/src/fcformat.c \ xsrc/external/mit/fontconfig/dist/src/fcfreetype.c cvs rdiff -u -r0 -r1.5 xsrc/external/mit/fontconfig/dist/src/fchash.c cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/fontconfig/dist/src/fcint.h \ xsrc/external/mit/fontconfig/dist/src/fcname.c \ xsrc/external/mit/fontconfig/dist/src/fcstat.c cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/fontconfig/dist/src/fcmatch.c cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/fontconfig/dist/src/fcobjshash.gperf cvs rdiff -u -r1.2 -r0 xsrc/external/mit/fontconfig/dist/src/fcobjshash.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/fontconfig/dist/test/out.expected \ xsrc/external/mit/fontconfig/dist/test/out271.expected \ xsrc/external/mit/fontconfig/dist/test/run-test271.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3 diff -u xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.4 xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.5 --- xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.4 Tue Aug 29 08:38:50 2017 +++ xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3 Fri Mar 8 09:49:07 2019 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetGetLangs" "3" "05 7月 2017" "Fontconfig 2.12.4" "" +.TH "FcLangSetGetLangs" "3" "30 8月 2018" "Fontconfig 2.13.1" "" .SH NAME FcLangSetGetLangs \- get the list of languages in the langset .SH SYNOPSIS Index: xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html diff -u xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.4 xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.5 --- xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.4 Tue Aug 29 08:38:50 2017 +++ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html Fri Mar 8 09:49:
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: christos
Date: Sun Jan 28 16:44:15 UTC 2018
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcmatch.c
Log Message:
CID-1428671: Unchecked malloc/strdup
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/fontconfig/dist/src/fcmatch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcmatch.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.9 xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.10
--- xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.9 Wed Aug 30 16:11:59 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcmatch.c Sun Jan 28 11:44:15 2018
@@ -703,6 +703,12 @@ FcFontSetMatchInternal (FcFontSet **se
FcBool f = FcTrue;
ss = s = strdup (env);
+ if (ss == NULL)
+ {
+ fprintf (stderr, "Fontconfig Error: %s\n",
+ strerror (errno));
+ exit (1);
+ }
os = FcObjectSetCreate ();
while (f)
{
@@ -719,6 +725,12 @@ FcFontSetMatchInternal (FcFontSet **se
len = (p - s) + 1;
}
x = malloc (sizeof (char) * len);
+ if (x == NULL)
+ {
+ fprintf (stderr, "Fontconfig Error: %s\n",
+ strerror (errno));
+ exit (1);
+ }
strncpy (x, s, len - 1);
x[len - 1] = 0;
if (FcObjectFromName (x) > 0)
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: christos
Date: Sun Jan 28 16:43:32 UTC 2018
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcstat.c
Log Message:
CID-1428670: Uncheck malloc
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/fontconfig/dist/src/fcstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcstat.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.7 xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.8
--- xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.7 Tue Aug 29 04:38:50 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcstat.c Sun Jan 28 11:43:32 2018
@@ -202,7 +202,7 @@ FcScandir (const char *dirp,
if (!d)
return -1;
-dlist = (struct dirent **) malloc (sizeof (struct dirent *) * lsize);
+dlist = malloc (sizeof (struct dirent *) * lsize);
if (!dlist)
{
closedir (d);
@@ -217,14 +217,17 @@ FcScandir (const char *dirp,
{
size_t dentlen = FcPtrToOffset (dent, dent->d_name) + strlen (dent->d_name) + 1;
dentlen = ((dentlen + ALIGNOF_VOID_P - 1) & ~(ALIGNOF_VOID_P - 1));
- p = (struct dirent *) malloc (dentlen);
+ p = malloc (dentlen);
+ if (!p)
+ goto out;
memcpy (p, dent, dentlen);
if ((n + 1) >= lsize)
{
lsize += 128;
- dlp = (struct dirent **) realloc (dlist, sizeof (struct dirent *) * lsize);
+ dlp = realloc (dlist, sizeof (struct dirent *) * lsize);
if (!dlp)
{
+out:
free_dirent (dlist);
closedir (d);
errno = ENOMEM;
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: christos
Date: Thu Aug 31 19:44:02 UTC 2017
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcobjshash.h
Log Message:
use static inline
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/fontconfig/dist/src/fcobjshash.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcobjshash.h
diff -u xsrc/external/mit/fontconfig/dist/src/fcobjshash.h:1.1.1.2 xsrc/external/mit/fontconfig/dist/src/fcobjshash.h:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcobjshash.h:1.1.1.2 Tue Aug 29 04:32:28 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcobjshash.h Thu Aug 31 15:44:01 2017
@@ -190,7 +190,7 @@ __inline
__attribute__ ((__gnu_inline__))
#endif
#endif
-const struct FcObjectTypeInfo *
+static const struct FcObjectTypeInfo *
FcObjectTypeLookup (register const char *str, register unsigned int len)
{
enum
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: mrg
Date: Wed Aug 30 20:11:59 UTC 2017
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcmatch.c
Log Message:
reapply the missing part this patch:
>Deal with the limited range of VAX floating point numbers when compiling
>for VAX.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/fontconfig/dist/src/fcmatch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcmatch.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.8 xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.9
--- xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.8 Tue Aug 29 08:38:50 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcmatch.c Wed Aug 30 20:11:59 2017
@@ -376,17 +376,10 @@ FcCompareValueList (FcObject object
return FcTrue;
}
-#if 0
best = DBL_MAX;
bestStrong = DBL_MAX;
bestWeak = DBL_MAX;
j = 1;
-#else
-best = 1e99;
-bestStrong = 1e99;
-bestWeak = 1e99;
-j = 0;
-#endif
for (v1 = v1orig; v1; v1 = FcValueListNext(v1))
{
for (v2 = v2orig, k = 0; v2; v2 = FcValueListNext(v2), k++)
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: mrg
Date: Wed Aug 30 20:09:45 UTC 2017
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcfreetype.c
Log Message:
achVendID is an array not a pointer so it is always "true".
avoid clang warnings by not testing it.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/fontconfig/dist/src/fcfreetype.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcfreetype.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcfreetype.c:1.1.1.7 xsrc/external/mit/fontconfig/dist/src/fcfreetype.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcfreetype.c:1.1.1.7 Tue Aug 29 08:32:28 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcfreetype.c Wed Aug 30 20:09:45 2017
@@ -1286,7 +1286,7 @@ FcFreeTypeQueryFace (const FT_Face face
if (os2 && os2->version >= 0x0001 && os2->version != 0x)
{
- if (os2->achVendID && os2->achVendID[0] != 0)
+ if (os2->achVendID[0] != 0)
{
foundry_ = (FcChar8 *) malloc (sizeof (os2->achVendID) + 1);
memcpy ((void *)foundry_, os2->achVendID, sizeof (os2->achVendID));
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc Committed By: maya Date: Tue Aug 29 16:47:07 UTC 2017 Modified Files: xsrc/external/mit/fontconfig/dist/src: fcobjs.c Log Message: Build fix. don't provide a conflicting declaration of FcObjectTypeHash and FcObjectTypeLookup. they're defined in fcobjshash.h included just after. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/fontconfig/dist/src/fcobjs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/fontconfig/dist/src/fcobjs.c diff -u xsrc/external/mit/fontconfig/dist/src/fcobjs.c:1.1.1.3 xsrc/external/mit/fontconfig/dist/src/fcobjs.c:1.2 --- xsrc/external/mit/fontconfig/dist/src/fcobjs.c:1.1.1.3 Tue Aug 29 08:32:28 2017 +++ xsrc/external/mit/fontconfig/dist/src/fcobjs.c Tue Aug 29 16:47:07 2017 @@ -24,12 +24,6 @@ #include "fcint.h" -static unsigned int -FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len); - -static const struct FcObjectTypeInfo * -FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len); - #include "fcobjshash.h" #include
CVS commit: xsrc/external/mit/fontconfig/include
Module Name:xsrc
Committed By: mrg
Date: Tue Aug 29 08:46:05 UTC 2017
Modified Files:
xsrc/external/mit/fontconfig/include: config.h
Added Files:
xsrc/external/mit/fontconfig/include: fcalias.h fcaliastail.h
fcftalias.h fcftaliastail.h fcstdint.h
Log Message:
oops, update these, not delete them. also add new fcstdint.h
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/fontconfig/include/config.h
cvs rdiff -u -r0 -r1.7 xsrc/external/mit/fontconfig/include/fcalias.h \
xsrc/external/mit/fontconfig/include/fcaliastail.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/fontconfig/include/fcftalias.h
cvs rdiff -u -r0 -r1.4 xsrc/external/mit/fontconfig/include/fcftaliastail.h
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/fontconfig/include/fcstdint.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/include/config.h
diff -u xsrc/external/mit/fontconfig/include/config.h:1.7 xsrc/external/mit/fontconfig/include/config.h:1.8
--- xsrc/external/mit/fontconfig/include/config.h:1.7 Tue Aug 29 08:38:50 2017
+++ xsrc/external/mit/fontconfig/include/config.h Tue Aug 29 08:46:05 2017
@@ -19,8 +19,10 @@
/* Architecture prefix to use for cache file names */
/* #undef FC_ARCHITECTURE */
+#if 0
/* System font directory */
#define FC_DEFAULT_FONTS "/usr/share/fonts"
+#endif
/* The type of len parameter of the gperf hash/lookup function */
#define FC_GPERF_SIZE_T size_t
Added files:
Index: xsrc/external/mit/fontconfig/include/fcalias.h
diff -u /dev/null xsrc/external/mit/fontconfig/include/fcalias.h:1.7
--- /dev/null Tue Aug 29 08:46:05 2017
+++ xsrc/external/mit/fontconfig/include/fcalias.h Tue Aug 29 08:46:05 2017
@@ -0,0 +1,410 @@
+extern __typeof (FcBlanksCreate) IA__FcBlanksCreate __attribute((visibility("hidden")));
+#define FcBlanksCreate IA__FcBlanksCreate
+extern __typeof (FcBlanksDestroy) IA__FcBlanksDestroy __attribute((visibility("hidden")));
+#define FcBlanksDestroy IA__FcBlanksDestroy
+extern __typeof (FcBlanksAdd) IA__FcBlanksAdd __attribute((visibility("hidden")));
+#define FcBlanksAdd IA__FcBlanksAdd
+extern __typeof (FcBlanksIsMember) IA__FcBlanksIsMember __attribute((visibility("hidden")));
+#define FcBlanksIsMember IA__FcBlanksIsMember
+extern __typeof (FcCacheCopySet) IA__FcCacheCopySet __attribute((visibility("hidden")));
+#define FcCacheCopySet IA__FcCacheCopySet
+extern __typeof (FcCacheNumSubdir) IA__FcCacheNumSubdir __attribute((visibility("hidden")));
+#define FcCacheNumSubdir IA__FcCacheNumSubdir
+extern __typeof (FcCacheNumFont) IA__FcCacheNumFont __attribute((visibility("hidden")));
+#define FcCacheNumFont IA__FcCacheNumFont
+extern __typeof (FcDirCacheUnlink) IA__FcDirCacheUnlink __attribute((visibility("hidden")));
+#define FcDirCacheUnlink IA__FcDirCacheUnlink
+extern __typeof (FcDirCacheValid) IA__FcDirCacheValid __attribute((visibility("hidden")));
+#define FcDirCacheValid IA__FcDirCacheValid
+extern __typeof (FcDirCacheClean) IA__FcDirCacheClean __attribute((visibility("hidden")));
+#define FcDirCacheClean IA__FcDirCacheClean
+extern __typeof (FcCacheCreateTagFile) IA__FcCacheCreateTagFile __attribute((visibility("hidden")));
+#define FcCacheCreateTagFile IA__FcCacheCreateTagFile
+extern __typeof (FcConfigHome) IA__FcConfigHome __attribute((visibility("hidden")));
+#define FcConfigHome IA__FcConfigHome
+extern __typeof (FcConfigEnableHome) IA__FcConfigEnableHome __attribute((visibility("hidden")));
+#define FcConfigEnableHome IA__FcConfigEnableHome
+extern __typeof (FcConfigFilename) IA__FcConfigFilename __attribute((visibility("hidden")));
+#define FcConfigFilename IA__FcConfigFilename
+extern __typeof (FcConfigCreate) IA__FcConfigCreate __attribute((visibility("hidden")));
+#define FcConfigCreate IA__FcConfigCreate
+extern __typeof (FcConfigReference) IA__FcConfigReference __attribute((visibility("hidden")));
+#define FcConfigReference IA__FcConfigReference
+extern __typeof (FcConfigDestroy) IA__FcConfigDestroy __attribute((visibility("hidden")));
+#define FcConfigDestroy IA__FcConfigDestroy
+extern __typeof (FcConfigSetCurrent) IA__FcConfigSetCurrent __attribute((visibility("hidden")));
+#define FcConfigSetCurrent IA__FcConfigSetCurrent
+extern __typeof (FcConfigGetCurrent) IA__FcConfigGetCurrent __attribute((visibility("hidden")));
+#define FcConfigGetCurrent IA__FcConfigGetCurrent
+extern __typeof (FcConfigUptoDate) IA__FcConfigUptoDate __attribute((visibility("hidden")));
+#define FcConfigUptoDate IA__FcConfigUptoDate
+extern __typeof (FcConfigBuildFonts) IA__FcConfigBuildFonts __attribute((visibility("hidden")));
+#define FcConfigBuildFonts IA__FcConfigBuildFonts
+extern __typeof (FcConfigGetFontDirs) IA__FcConfigGetFontDirs __attribute((visibility("hidden")));
+#define FcConfigGetFontDirs IA__FcConfigGetFontDirs
+extern __typeof (FcConfigGetConfigDirs) IA__FcConfigGetConfigDirs __attribute((vis
CVS commit: xsrc/external/mit/fontconfig
Module Name:xsrc
Committed By: mrg
Date: Tue Aug 29 08:38:50 UTC 2017
Modified Files:
xsrc/external/mit/fontconfig/dist/doc: FcLangSetGetLangs.3
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel:
fclangsetgetlangs.html
xsrc/external/mit/fontconfig/dist/fc-cache: fc-cache.c
xsrc/external/mit/fontconfig/dist/src: fccache.c fccfg.c fcinit.c
fcint.h fcmatch.c fcname.c fcstat.c
xsrc/external/mit/fontconfig/include: config.h
Removed Files:
xsrc/external/mit/fontconfig/dist/src: fchash.c
xsrc/external/mit/fontconfig/include: fcalias.h fcaliastail.h
fcftalias.h fcftaliastail.h
Log Message:
merge fontconfig 2.12.4.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/fontconfig/dist/src/fccache.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/dist/src/fccfg.c \
xsrc/external/mit/fontconfig/dist/src/fcinit.c
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/fontconfig/dist/src/fchash.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/fontconfig/dist/src/fcint.h \
xsrc/external/mit/fontconfig/dist/src/fcmatch.c \
xsrc/external/mit/fontconfig/dist/src/fcname.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/dist/src/fcstat.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/include/config.h
cvs rdiff -u -r1.5 -r0 xsrc/external/mit/fontconfig/include/fcalias.h \
xsrc/external/mit/fontconfig/include/fcaliastail.h
cvs rdiff -u -r1.1 -r0 xsrc/external/mit/fontconfig/include/fcftalias.h
cvs rdiff -u -r1.2 -r0 xsrc/external/mit/fontconfig/include/fcftaliastail.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
diff -u xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.3 xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.4
--- xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.3 Sat Jul 12 04:11:34 2014
+++ xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3 Tue Aug 29 08:38:50 2017
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetGetLangs" "3" "24 3月 2014" "Fontconfig 2.11.1" ""
+.TH "FcLangSetGetLangs" "3" "05 7月 2017" "Fontconfig 2.12.4" ""
.SH NAME
FcLangSetGetLangs \- get the list of languages in the langset
.SH SYNOPSIS
Index: xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
diff -u xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.3 xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.4
--- xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.3 Sat Jul 12 04:11:34 2014
+++ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html Tue Aug 29 08:38:50 2017
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html">NameSynopsisDescriptionUp
const struct option longopts[] = {
+{"error-on-no-fonts", 0, 0, 'E'},
{"force", 0, 0, 'f'},
{"quick", 0, 0, 'q'},
{"really-force", 0, 0, 'r'},
@@ -87,16 +88,17 @@ usage (char *program, int error)
{
FILE *file = error ? stderr : stdout;
#if HAVE_GETOPT_LONG
-fprintf (file, "usage: %s [-fqrsvVh] [--quick] [-y SYSROOT] [--force|--really-force] [--sysroot=SYSROOT] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
+fprintf (file, "usage: %s [-EfqrsvVh] [--quick] [-y SYSROOT] [--error-on-no-fonts] [--force|--really-force] [--sysroot=SYSROOT] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
program);
#else
-fprintf (file, "usage: %s [-fqrsvVh] [-y SYSROOT] [dirs]\n",
+fprintf (file, "usage: %s [-EfqrsvVh] [-y SYSROOT] [dirs]\n",
program);
#endif
fprintf (file, "Build font information caches in [dirs]\n"
"(all directories in font configuration by default).\n");
fprintf (file, "\n");
#if HAVE_GETOPT_LONG
+fprintf (file, " -E, --error-on-no-fonts raise an error if no fonts in a directory\n");
fprintf (file, " -f, --force scan directories with apparently valid caches\n");
fprintf (file, " -q, --quick don't sleep before exiting\n");
fprintf (file, " -r, --really-force erase all existing caches, then rescan\n");
@@ -106,6 +108,8 @@ usage (char *program, int error)
fprintf (file, " -V, --versiondisplay font config version and exit\n");
fprintf (file, " -h, --help display this help and exit\n");
#else
+fprintf (file, " -E (error-on-no-fonts)\n");
+fprintf (file, " raise an error if no fonts i
CVS commit: xsrc/external/mit/fontconfig/include
Module Name:xsrc Committed By: martin Date: Fri Dec 16 16:00:22 UTC 2016 Modified Files: xsrc/external/mit/fontconfig/include: config.h Log Message: HAVE_SCANDIR_VOID_P -> HAVE_SCANDIR To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/fontconfig/include/config.h diff -u xsrc/external/mit/fontconfig/include/config.h:1.5 xsrc/external/mit/fontconfig/include/config.h:1.6 --- xsrc/external/mit/fontconfig/include/config.h:1.5 Sat Jul 12 04:20:22 2014 +++ xsrc/external/mit/fontconfig/include/config.h Fri Dec 16 16:00:22 2016 @@ -160,11 +160,11 @@ #define HAVE_REGFREE 1 /* Define to 1 if you have the 'scandir' function. */ -/* #undef HAVE_SCANDIR */ +#define HAVE_SCANDIR 1 /* Define to 1 if you have the 'scandir' function with int (* compar)(const void *, const void *) */ -#define HAVE_SCANDIR_VOID_P 1 +/* #undef HAVE_SCANDIR_VOID_P */ /* Define to 1 if you have the header file. */ /* #undef HAVE_SCHED_H */
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: martin
Date: Fri Dec 16 15:10:08 UTC 2016
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcstat.c
Log Message:
Undo a local change now that our scandir() signature has been fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/dist/src/fcstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcstat.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.5 xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.6
--- xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.5 Sat Jul 12 04:11:34 2014
+++ xsrc/external/mit/fontconfig/dist/src/fcstat.c Fri Dec 16 15:10:08 2016
@@ -166,11 +166,8 @@ FcDirChecksumScandirFilter(const struct
#ifdef HAVE_SCANDIR
static int
-FcDirChecksumScandirSorter(const void *arg1, const void *arg2)
+FcDirChecksumScandirSorter(const struct dirent **lhs, const struct dirent **rhs)
{
-const struct dirent * const *lhs = arg1;
-const struct dirent * const *rhs = arg2;
-
return strcmp((*lhs)->d_name, (*rhs)->d_name);
}
#elif HAVE_SCANDIR_VOID_P
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: riastradh
Date: Wed Apr 29 21:04:52 UTC 2015
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcinit.c
Log Message:
Switch #pragma message(...) to #warning so it actually does anything.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/fontconfig/dist/src/fcinit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcinit.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcinit.c:1.1.1.4 xsrc/external/mit/fontconfig/dist/src/fcinit.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcinit.c:1.1.1.4 Mon Jun 3 19:44:51 2013
+++ xsrc/external/mit/fontconfig/dist/src/fcinit.c Wed Apr 29 21:04:52 2015
@@ -26,13 +26,13 @@
#include
#if defined(FC_ATOMIC_INT_NIL)
-#pragma message("Could not find any system to define atomic_int macros, library may NOT be thread-safe.")
+#warning Could not find any system to define atomic_int macros, library may NOT be thread-safe.
#endif
#if defined(FC_MUTEX_IMPL_NIL)
-#pragma message("Could not find any system to define mutex macros, library may NOT be thread-safe.")
+#warning Could not find any system to define mutex macros, library may NOT be thread-safe.
#endif
#if defined(FC_ATOMIC_INT_NIL) || defined(FC_MUTEX_IMPL_NIL)
-#pragma message("To suppress these warnings, define FC_NO_MT.")
+#warning To suppress these warnings, define FC_NO_MT.
#endif
static FcConfig *
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: joerg
Date: Sun Jan 4 18:08:34 UTC 2015
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fccache.c
Log Message:
Avoid __UNVOLATILE here, just inline the cast. We don't have
src/tools/compat's header here.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/fontconfig/dist/src/fccache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.7 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.8
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.7 Fri Dec 19 18:10:18 2014
+++ xsrc/external/mit/fontconfig/dist/src/fccache.c Sun Jan 4 18:08:34 2015
@@ -297,7 +297,7 @@ free_lock (void)
lock = fc_atomic_ptr_get (&cache_lock);
if (lock && fc_atomic_ptr_cmpexch (&cache_lock, lock, NULL)) {
FcMutexFinish (lock);
-free (__UNVOLATILE(lock));
+free (((void *)(uintptr_t)lock));
}
}
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: christos
Date: Fri Dec 19 18:10:18 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fccache.c
Log Message:
on vax mutexes are volatile.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/dist/src/fccache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.6 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.7
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.6 Sat Jul 12 00:11:34 2014
+++ xsrc/external/mit/fontconfig/dist/src/fccache.c Fri Dec 19 13:10:18 2014
@@ -297,7 +297,7 @@ free_lock (void)
lock = fc_atomic_ptr_get (&cache_lock);
if (lock && fc_atomic_ptr_cmpexch (&cache_lock, lock, NULL)) {
FcMutexFinish (lock);
-free (lock);
+free (__UNVOLATILE(lock));
}
}
CVS commit: xsrc/external/mit/fontconfig/include
Module Name:xsrc
Committed By: mrg
Date: Sat Jul 12 04:20:22 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/include: config.h fcalias.h fcaliastail.h
Log Message:
regen for fontconfig 2.11.1
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/include/config.h \
xsrc/external/mit/fontconfig/include/fcalias.h \
xsrc/external/mit/fontconfig/include/fcaliastail.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/include/config.h
diff -u xsrc/external/mit/fontconfig/include/config.h:1.4 xsrc/external/mit/fontconfig/include/config.h:1.5
--- xsrc/external/mit/fontconfig/include/config.h:1.4 Thu Mar 20 07:57:19 2014
+++ xsrc/external/mit/fontconfig/include/config.h Sat Jul 12 04:20:22 2014
@@ -105,6 +105,9 @@
/* Define to 1 if you have the header file. */
#define HAVE_MEMORY_H 1
+/* Define to 1 if you have the `mkdtemp' function. */
+#define HAVE_MKDTEMP 1
+
/* Define to 1 if you have the `mkostemp' function. */
/* #undef HAVE_MKOSTEMP */
@@ -117,7 +120,7 @@
/* Define to 1 if you have the header file, and it defines `DIR'. */
/* #undef HAVE_NDIR_H */
-/* Define to 1 if you have the 'posix_fadvise' function. */
+/* Define to 1 if you have the 'posix_fadivse' function. */
#define HAVE_POSIX_FADVISE 1
/* Have POSIX threads */
@@ -138,6 +141,9 @@
/* Define to 1 if you have the `rand_r' function. */
#define HAVE_RAND_R 1
+/* Define to 1 if you have the `readlink' function. */
+#define HAVE_READLINK 1
+
/* Define to 1 if you have the `regcomp' function. */
#define HAVE_REGCOMP 1
@@ -213,6 +219,9 @@
/* Define to 1 if you have the header file. */
/* #undef HAVE_SYS_STATFS_H */
+/* Define to 1 if you have the header file. */
+#define HAVE_SYS_STATVFS_H 1
+
/* Define to 1 if you have the header file. */
#define HAVE_SYS_STAT_H 1
Index: xsrc/external/mit/fontconfig/include/fcalias.h
diff -u xsrc/external/mit/fontconfig/include/fcalias.h:1.4 xsrc/external/mit/fontconfig/include/fcalias.h:1.5
--- xsrc/external/mit/fontconfig/include/fcalias.h:1.4 Thu Mar 20 07:57:19 2014
+++ xsrc/external/mit/fontconfig/include/fcalias.h Sat Jul 12 04:20:22 2014
@@ -130,6 +130,8 @@ extern __typeof (FcDirSave) IA__FcDirSav
#define FcDirSave IA__FcDirSave
extern __typeof (FcDirCacheLoad) IA__FcDirCacheLoad __attribute((visibility("hidden")));
#define FcDirCacheLoad IA__FcDirCacheLoad
+extern __typeof (FcDirCacheRescan) IA__FcDirCacheRescan __attribute((visibility("hidden")));
+#define FcDirCacheRescan IA__FcDirCacheRescan
extern __typeof (FcDirCacheRead) IA__FcDirCacheRead __attribute((visibility("hidden")));
#define FcDirCacheRead IA__FcDirCacheRead
extern __typeof (FcDirCacheLoadFile) IA__FcDirCacheLoadFile __attribute((visibility("hidden")));
Index: xsrc/external/mit/fontconfig/include/fcaliastail.h
diff -u xsrc/external/mit/fontconfig/include/fcaliastail.h:1.4 xsrc/external/mit/fontconfig/include/fcaliastail.h:1.5
--- xsrc/external/mit/fontconfig/include/fcaliastail.h:1.4 Thu Mar 20 07:57:19 2014
+++ xsrc/external/mit/fontconfig/include/fcaliastail.h Sat Jul 12 04:20:22 2014
@@ -148,6 +148,8 @@ extern __typeof (FcDirSave) FcDirSave __
extern __typeof (FcDirCacheLoad) FcDirCacheLoad __attribute((alias("IA__FcDirCacheLoad"), visibility("default")));
#endif /* __fccache__ */
#ifdef __fcdir__
+# undef FcDirCacheRescan
+extern __typeof (FcDirCacheRescan) FcDirCacheRescan __attribute((alias("IA__FcDirCacheRescan"), visibility("default")));
# undef FcDirCacheRead
extern __typeof (FcDirCacheRead) FcDirCacheRead __attribute((alias("IA__FcDirCacheRead"), visibility("default")));
#endif /* __fcdir__ */
CVS commit: xsrc/external/mit/fontconfig/dist
Module Name:xsrc
Committed By: mrg
Date: Sat Jul 12 04:11:34 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/dist/fc-cache: fc-cache.c
xsrc/external/mit/fontconfig/dist/src: fccache.c fcint.h fcmatch.c
fcname.c fcstat.c
Added Files:
xsrc/external/mit/fontconfig/dist/doc: FcLangSetGetLangs.3
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel:
fclangsetgetlangs.html
Log Message:
merge fontconfig-2.11.1
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/dist/src/fccache.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/dist/src/fcint.h \
xsrc/external/mit/fontconfig/dist/src/fcmatch.c \
xsrc/external/mit/fontconfig/dist/src/fcname.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/dist/src/fcstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
diff -u xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.5 xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.6
--- xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.5 Thu Mar 20 07:49:26 2014
+++ xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c Sat Jul 12 04:11:34 2014
@@ -68,7 +68,7 @@ const struct option longopts[] = {
{"force", 0, 0, 'f'},
{"quick", 0, 0, 'q'},
{"really-force", 0, 0, 'r'},
-{"sysroot", 0, 0, 'y'},
+{"sysroot", required_argument, 0, 'y'},
{"system-only", 0, 0, 's'},
{"version", 0, 0, 'V'},
{"verbose", 0, 0, 'v'},
@@ -121,7 +121,7 @@ usage (char *program, int error)
static FcStrSet *processed_dirs;
static int
-scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, FcBool recursive, int *changed)
+scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, FcBool recursive, int *changed, FcStrSet *updateDirs)
{
int ret = 0;
const FcChar8 *dir;
@@ -140,7 +140,10 @@ scanDirs (FcStrList *list, FcConfig *con
{
if (verbose)
{
- printf ("%s: ", dir);
+ if (!recursive)
+ printf ("Re-scanning %s: ", dir);
+ else
+ printf ("%s: ", dir);
fflush (stdout);
}
@@ -187,8 +190,13 @@ scanDirs (FcStrList *list, FcConfig *con
if (!cache)
{
- (*changed)++;
- cache = FcDirCacheRead (dir, FcTrue, config);
+ if (!recursive)
+ cache = FcDirCacheRescan (dir, config);
+ else
+ {
+ (*changed)++;
+ cache = FcDirCacheRead (dir, FcTrue, config);
+ }
if (!cache)
{
fprintf (stderr, "%s: error scanning\n", dir);
@@ -229,6 +237,8 @@ scanDirs (FcStrList *list, FcConfig *con
}
for (i = 0; i < FcCacheNumSubdir (cache); i++)
FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
+ if (updateDirs && FcCacheNumSubdir (cache) > 0)
+ FcStrSetAdd (updateDirs, dir);
FcDirCacheUnload (cache);
@@ -241,7 +251,7 @@ scanDirs (FcStrList *list, FcConfig *con
continue;
}
FcStrSetAdd (processed_dirs, dir);
- ret += scanDirs (sublist, config, force, really_force, verbose, recursive, changed);
+ ret += scanDirs (sublist, config, force, really_force, verbose, recursive, changed, updateDirs);
FcStrListDone (sublist);
}
else
@@ -274,7 +284,7 @@ cleanCacheDirectories (FcConfig *config,
int
main (int argc, char **argv)
{
-FcStrSet *dirs;
+FcStrSet *dirs, *updateDirs;
FcStrList *list;
FcBool verbose = FcFalse;
FcBool quick = FcFalse;
@@ -376,13 +386,19 @@ main (int argc, char **argv)
fprintf(stderr, "Cannot malloc\n");
return 1;
}
-
+
+updateDirs = FcStrSetCreate ();
changed = 0;
-ret = scanDirs (list, config, force, really_force, verbose, FcTrue, &changed);
+ret = scanDirs (list, config, force, really_force, verbose, FcTrue, &changed, updateDirs);
/* Update the directory cache again to avoid the race condition as much as possible */
-FcStrListFirst (list);
-ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed);
FcStrListDone (list);
+list = FcStrListCreate (updateDirs);
+if (list)
+{
+ ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed, NULL);
+ FcStrListDone (list);
+}
+FcStrSetDestroy (updateDirs);
/*
* Try to create CACHEDIR.TAG anyway.
Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.5 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.6
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.5 Thu Mar 20 07:49:26 2014
+++ xsrc
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: mrg
Date: Thu Mar 20 08:04:41 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fccfg.c
Log Message:
avoid CPP when the C compiler can do it more sanely.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/fontconfig/dist/src/fccfg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fccfg.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.1.1.5 xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.1.1.5 Thu Mar 20 07:41:43 2014
+++ xsrc/external/mit/fontconfig/dist/src/fccfg.c Thu Mar 20 08:04:41 2014
@@ -1546,19 +1546,19 @@ FcConfigSubstituteWithPat (FcConfig*
}
nobjs = FC_MAX_BASE_OBJECT + config->maxObjects + 2;
-value = (FcValueList **) malloc (SIZEOF_VOID_P * nobjs);
+value = (FcValueList **) malloc (sizeof(void *) * nobjs);
if (!value)
{
retval = FcFalse;
goto bail1;
}
-elt = (FcPatternElt **) malloc (SIZEOF_VOID_P * nobjs);
+elt = (FcPatternElt **) malloc (sizeof(void *) * nobjs);
if (!elt)
{
retval = FcFalse;
goto bail1;
}
-tst = (FcTest **) malloc (SIZEOF_VOID_P * nobjs);
+tst = (FcTest **) malloc (sizeof(void *) * nobjs);
if (!tst)
{
retval = FcFalse;
CVS commit: xsrc/external/mit/fontconfig/include
Module Name:xsrc
Committed By: mrg
Date: Thu Mar 20 07:57:19 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/include: config.h fcalias.h fcaliastail.h
Log Message:
merge fontconfig 2.11.0.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fontconfig/include/config.h \
xsrc/external/mit/fontconfig/include/fcalias.h \
xsrc/external/mit/fontconfig/include/fcaliastail.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/include/config.h
diff -u xsrc/external/mit/fontconfig/include/config.h:1.3 xsrc/external/mit/fontconfig/include/config.h:1.4
--- xsrc/external/mit/fontconfig/include/config.h:1.3 Mon Jun 3 20:43:29 2013
+++ xsrc/external/mit/fontconfig/include/config.h Thu Mar 20 07:57:19 2014
@@ -85,10 +85,10 @@
/* Define to 1 if you have the `getprogname' function. */
#define HAVE_GETPROGNAME 1
-#if 0
+//#if 0 // fontconfig 2.10, but we should have this in -current now
/* Have Intel __sync_* atomic primitives */
#define HAVE_INTEL_ATOMIC_PRIMITIVES 1
-#endif
+//#endif
/* Define to 1 if you have the header file. */
#define HAVE_INTTYPES_H 1
@@ -153,6 +153,13 @@
/* Define to 1 if you have the `regfree' function. */
#define HAVE_REGFREE 1
+/* Define to 1 if you have the 'scandir' function. */
+/* #undef HAVE_SCANDIR */
+
+/* Define to 1 if you have the 'scandir' function with int (* compar)(const
+ void *, const void *) */
+#define HAVE_SCANDIR_VOID_P 1
+
/* Define to 1 if you have the header file. */
/* #undef HAVE_SCHED_H */
@@ -241,13 +248,13 @@
#define PACKAGE "fontconfig"
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enger_bug.cgi?product=fontconfig";
+#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig";
/* Define to the full name of this package. */
#define PACKAGE_NAME "fontconfig"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fontconfig 2.10.93"
+#define PACKAGE_STRING "fontconfig 2.11.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "fontconfig"
@@ -256,7 +263,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.10.93"
+#define PACKAGE_VERSION "2.11.0"
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -312,7 +319,7 @@
/* Version number of package */
-#define VERSION "2.10.93"
+#define VERSION "2.11.0"
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
Index: xsrc/external/mit/fontconfig/include/fcalias.h
diff -u xsrc/external/mit/fontconfig/include/fcalias.h:1.3 xsrc/external/mit/fontconfig/include/fcalias.h:1.4
--- xsrc/external/mit/fontconfig/include/fcalias.h:1.3 Mon Jun 3 20:22:55 2013
+++ xsrc/external/mit/fontconfig/include/fcalias.h Thu Mar 20 07:57:19 2014
@@ -376,6 +376,8 @@ extern __typeof (FcStrSetDestroy) IA__Fc
#define FcStrSetDestroy IA__FcStrSetDestroy
extern __typeof (FcStrListCreate) IA__FcStrListCreate __attribute((visibility("hidden")));
#define FcStrListCreate IA__FcStrListCreate
+extern __typeof (FcStrListFirst) IA__FcStrListFirst __attribute((visibility("hidden")));
+#define FcStrListFirst IA__FcStrListFirst
extern __typeof (FcStrListNext) IA__FcStrListNext __attribute((visibility("hidden")));
#define FcStrListNext IA__FcStrListNext
extern __typeof (FcStrListDone) IA__FcStrListDone __attribute((visibility("hidden")));
Index: xsrc/external/mit/fontconfig/include/fcaliastail.h
diff -u xsrc/external/mit/fontconfig/include/fcaliastail.h:1.3 xsrc/external/mit/fontconfig/include/fcaliastail.h:1.4
--- xsrc/external/mit/fontconfig/include/fcaliastail.h:1.3 Mon Jun 3 20:22:55 2013
+++ xsrc/external/mit/fontconfig/include/fcaliastail.h Thu Mar 20 07:57:19 2014
@@ -420,6 +420,8 @@ extern __typeof (FcStrSetDel) FcStrSetDe
extern __typeof (FcStrSetDestroy) FcStrSetDestroy __attribute((alias("IA__FcStrSetDestroy"), visibility("default")));
# undef FcStrListCreate
extern __typeof (FcStrListCreate) FcStrListCreate __attribute((alias("IA__FcStrListCreate"), visibility("default")));
+# undef FcStrListFirst
+extern __typeof (FcStrListFirst) FcStrListFirst __attribute((alias("IA__FcStrListFirst"), visibility("default")));
# undef FcStrListNext
extern __typeof (FcStrListNext) FcStrListNext __attribute((alias("IA__FcStrListNext"), visibility("default")));
# undef FcStrListDone
CVS commit: xsrc/external/mit/fontconfig/dist
Module Name:xsrc
Committed By: mrg
Date: Thu Mar 20 07:49:26 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/dist/fc-cache: fc-cache.c
xsrc/external/mit/fontconfig/dist/src: fccache.c fchash.c fcint.h
fcmatch.c fcname.c fcstat.c
Log Message:
merge fontconfig 2.11.0.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/dist/src/fccache.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/dist/src/fchash.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/dist/src/fcint.h \
xsrc/external/mit/fontconfig/dist/src/fcmatch.c \
xsrc/external/mit/fontconfig/dist/src/fcname.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fontconfig/dist/src/fcstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
diff -u xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.4 xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.5
--- xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.4 Mon Jun 3 19:49:01 2013
+++ xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c Thu Mar 20 07:49:26 2014
@@ -121,7 +121,7 @@ usage (char *program, int error)
static FcStrSet *processed_dirs;
static int
-scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, int *changed)
+scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, FcBool recursive, int *changed)
{
int ret = 0;
const FcChar8 *dir;
@@ -144,7 +144,7 @@ scanDirs (FcStrList *list, FcConfig *con
fflush (stdout);
}
- if (FcStrSetMember (processed_dirs, dir))
+ if (recursive && FcStrSetMember (processed_dirs, dir))
{
if (verbose)
printf ("skipping, looped directory detected\n");
@@ -216,32 +216,37 @@ scanDirs (FcStrList *list, FcConfig *con
ret++;
}
}
-
- subdirs = FcStrSetCreate ();
- if (!subdirs)
+
+ if (recursive)
{
- fprintf (stderr, "%s: Can't create subdir set\n", dir);
- ret++;
- FcDirCacheUnload (cache);
- continue;
- }
- for (i = 0; i < FcCacheNumSubdir (cache); i++)
- FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
+ subdirs = FcStrSetCreate ();
+ if (!subdirs)
+ {
+ fprintf (stderr, "%s: Can't create subdir set\n", dir);
+ ret++;
+ FcDirCacheUnload (cache);
+ continue;
+ }
+ for (i = 0; i < FcCacheNumSubdir (cache); i++)
+ FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
- FcDirCacheUnload (cache);
+ FcDirCacheUnload (cache);
- sublist = FcStrListCreate (subdirs);
- FcStrSetDestroy (subdirs);
- if (!sublist)
- {
- fprintf (stderr, "%s: Can't create subdir list\n", dir);
- ret++;
- continue;
+ sublist = FcStrListCreate (subdirs);
+ FcStrSetDestroy (subdirs);
+ if (!sublist)
+ {
+ fprintf (stderr, "%s: Can't create subdir list\n", dir);
+ ret++;
+ continue;
+ }
+ FcStrSetAdd (processed_dirs, dir);
+ ret += scanDirs (sublist, config, force, really_force, verbose, recursive, changed);
+ FcStrListDone (sublist);
}
- FcStrSetAdd (processed_dirs, dir);
- ret += scanDirs (sublist, config, force, really_force, verbose, changed);
+ else
+ FcDirCacheUnload (cache);
}
-FcStrListDone (list);
return ret;
}
@@ -373,7 +378,11 @@ main (int argc, char **argv)
}
changed = 0;
-ret = scanDirs (list, config, force, really_force, verbose, &changed);
+ret = scanDirs (list, config, force, really_force, verbose, FcTrue, &changed);
+/* Update the directory cache again to avoid the race condition as much as possible */
+FcStrListFirst (list);
+ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed);
+FcStrListDone (list);
/*
* Try to create CACHEDIR.TAG anyway.
@@ -386,6 +395,8 @@ main (int argc, char **argv)
cleanCacheDirectories (config, verbose);
+FcConfigDestroy (config);
+FcFini ();
/*
* Now we need to sleep a second (or two, to be extra sure), to make
* sure that timestamps for changes after this run of fc-cache are later
@@ -393,8 +404,7 @@ main (int argc, char **argv)
* sleep(3) can't be interrupted by a signal here -- this isn't in the
* library, and there aren't any signals flying around here.
*/
-FcConfigDestroy (config);
-FcFini ();
+/* the resolution of mtime on FAT is 2 seconds */
if (!quick && changed)
sleep (2);
if (verbose)
Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.4 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.5
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.4 Mon Jun 3 19:49:01 2013
+++ xsrc/external/mit/fontconfig/dist/src/fccache.c Thu Mar 20 07:49:26 2014
@@ -
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc Committed By: wiz Date: Thu Jun 27 12:44:11 UTC 2013 Modified Files: xsrc/external/mit/fontconfig/dist/src: fcname.c Log Message: Fix a comparison of constant warning with clang >From upstream: commit 9acc14c34a372b54f9075ec3611588298fb2a501 Author: Akira TAGOH Date: Wed Jun 26 12:03:38 2013 +0900 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/dist/src/fcname.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/fontconfig/dist/src/fcname.c diff -u xsrc/external/mit/fontconfig/dist/src/fcname.c:1.4 xsrc/external/mit/fontconfig/dist/src/fcname.c:1.5 --- xsrc/external/mit/fontconfig/dist/src/fcname.c:1.4 Mon Jun 3 19:49:01 2013 +++ xsrc/external/mit/fontconfig/dist/src/fcname.c Thu Jun 27 12:44:11 2013 @@ -86,7 +86,7 @@ FcObjectValidType (FcObject object, FcTy return FcTrue; break; default: - if (t->type == (unsigned int) -1 || type == t->type) + if ((unsigned int) t->type == (unsigned int) -1 || type == t->type) return FcTrue; break; }
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc Committed By: mrg Date: Mon Jun 3 21:07:44 UTC 2013 Modified Files: xsrc/external/mit/fontconfig/dist/src: fchash.c Log Message: don't try to shift size_t by 32 or more bits on !lp64. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/fontconfig/dist/src/fchash.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/fontconfig/dist/src/fchash.c diff -u xsrc/external/mit/fontconfig/dist/src/fchash.c:1.1.1.1 xsrc/external/mit/fontconfig/dist/src/fchash.c:1.2 --- xsrc/external/mit/fontconfig/dist/src/fchash.c:1.1.1.1 Mon Jun 3 19:44:51 2013 +++ xsrc/external/mit/fontconfig/dist/src/fchash.c Mon Jun 3 21:07:44 2013 @@ -194,10 +194,12 @@ FcHashGetSHA256Digest (const FcChar8 *in block[63 - 1] = (len >> 8) & 0xff; block[63 - 2] = (len >> 16) & 0xff; block[63 - 3] = (len >> 24) & 0xff; +#ifdef _LP64 block[63 - 4] = (len >> 32) & 0xff; block[63 - 5] = (len >> 40) & 0xff; block[63 - 6] = (len >> 48) & 0xff; block[63 - 7] = (len >> 56) & 0xff; +#endif FcHashComputeSHA256Digest (ret, block); return FcHashSHA256ToString (ret); @@ -243,10 +245,12 @@ FcHashGetSHA256DigestFromFile (const FcC ibuf[63 - 1] = (v >> 8) & 0xff; ibuf[63 - 2] = (v >> 16) & 0xff; ibuf[63 - 3] = (v >> 24) & 0xff; +#ifdef _LP64 ibuf[63 - 4] = (v >> 32) & 0xff; ibuf[63 - 5] = (v >> 40) & 0xff; ibuf[63 - 6] = (v >> 48) & 0xff; ibuf[63 - 7] = (v >> 56) & 0xff; +#endif FcHashComputeSHA256Digest (ret, ibuf); break; } @@ -302,10 +306,12 @@ FcHashGetSHA256DigestFromMemory (const c ibuf[63 - 1] = (v >> 8) & 0xff; ibuf[63 - 2] = (v >> 16) & 0xff; ibuf[63 - 3] = (v >> 24) & 0xff; +#ifdef _LP64 ibuf[63 - 4] = (v >> 32) & 0xff; ibuf[63 - 5] = (v >> 40) & 0xff; ibuf[63 - 6] = (v >> 48) & 0xff; ibuf[63 - 7] = (v >> 56) & 0xff; +#endif FcHashComputeSHA256Digest (ret, ibuf); break; }
CVS commit: xsrc/external/mit/fontconfig/include
Module Name:xsrc Committed By: mrg Date: Mon Jun 3 20:43:29 UTC 2013 Modified Files: xsrc/external/mit/fontconfig/include: config.h Log Message: don't define HAVE_INTEL_ATOMIC_PRIMITIVES. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/fontconfig/include/config.h diff -u xsrc/external/mit/fontconfig/include/config.h:1.2 xsrc/external/mit/fontconfig/include/config.h:1.3 --- xsrc/external/mit/fontconfig/include/config.h:1.2 Mon Jun 3 20:22:55 2013 +++ xsrc/external/mit/fontconfig/include/config.h Mon Jun 3 20:43:29 2013 @@ -85,8 +85,10 @@ /* Define to 1 if you have the `getprogname' function. */ #define HAVE_GETPROGNAME 1 +#if 0 /* Have Intel __sync_* atomic primitives */ #define HAVE_INTEL_ATOMIC_PRIMITIVES 1 +#endif /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc Committed By: joerg Date: Thu Aug 11 21:59:46 UTC 2011 Modified Files: xsrc/external/mit/fontconfig/dist/src: fccache.c Log Message: Fix memset usage To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/fontconfig/dist/src/fccache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/fontconfig/dist/src/fccache.c diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.1.1.2 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.2 --- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.1.1.2 Sun Nov 21 06:35:32 2010 +++ xsrc/external/mit/fontconfig/dist/src/fccache.c Thu Aug 11 21:59:46 2011 @@ -1157,7 +1157,7 @@ MD5Transform(ctx->buf, (FcChar32 *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); memcpy(digest, ctx->buf, 16); -memset(ctx, 0, sizeof(ctx));/* In case it's sensitive */ +memset(ctx, 0, sizeof(*ctx));/* In case it's sensitive */ }
CVS commit: xsrc/external/mit/fontconfig/dist/fc-cache
Module Name:xsrc
Committed By: jmcneill
Date: Fri Feb 18 00:26:24 UTC 2011
Modified Files:
xsrc/external/mit/fontconfig/dist/fc-cache: fc-cache.c
Log Message:
add a -q (quick) flag to skip the 2s sleep at the end of cache updates
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
diff -u xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.1.1.2 xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.2
--- xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.1.1.2 Sun Nov 21 06:35:29 2010
+++ xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c Fri Feb 18 00:26:24 2011
@@ -68,6 +68,7 @@
#include
const struct option longopts[] = {
{"force", 0, 0, 'f'},
+{"quick", 0, 0, 'q'},
{"really-force", 0, 0, 'r'},
{"system-only", 0, 0, 's'},
{"version", 0, 0, 'V'},
@@ -87,10 +88,10 @@
{
FILE *file = error ? stderr : stdout;
#if HAVE_GETOPT_LONG
-fprintf (file, "usage: %s [-frsvVh] [--force|--really-force] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
+fprintf (file, "usage: %s [-fqrsvVh] [--quick] [--force|--really-force] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
program);
#else
-fprintf (file, "usage: %s [-frsvVh] [dirs]\n",
+fprintf (file, "usage: %s [-fqrsvVh] [dirs]\n",
program);
#endif
fprintf (file, "Build font information caches in [dirs]\n"
@@ -98,6 +99,7 @@
fprintf (file, "\n");
#if HAVE_GETOPT_LONG
fprintf (file, " -f, --force scan directories with apparently valid caches\n");
+fprintf (file, " -q, --quick don't sleep before exiting\n");
fprintf (file, " -r, --really-force erase all existing caches, then rescan\n");
fprintf (file, " -s, --system-onlyscan system-wide directories only\n");
fprintf (file, " -v, --verbosedisplay status information while busy\n");
@@ -105,6 +107,7 @@
fprintf (file, " -h, --help display this help and exit\n");
#else
fprintf (file, " -f (force) scan directories with apparently valid caches\n");
+fprintf (file, " -q (quick) don't sleep before exiting\n");
fprintf (file, " -r, (really force) erase all existing caches, then rescan\n");
fprintf (file, " -s (system) scan system-wide directories only\n");
fprintf (file, " -v (verbose) display status information while busy\n");
@@ -364,6 +367,7 @@
FcStrSet *dirs;
FcStrList *list;
FcBool verbose = FcFalse;
+FcBool quick = FcFalse;
FcBool force = FcFalse;
FcBool really_force = FcFalse;
FcBool systemOnly = FcFalse;
@@ -374,9 +378,9 @@
int c;
#if HAVE_GETOPT_LONG
-while ((c = getopt_long (argc, argv, "frsVvh", longopts, NULL)) != -1)
+while ((c = getopt_long (argc, argv, "fqrsVvh", longopts, NULL)) != -1)
#else
-while ((c = getopt (argc, argv, "frsVvh")) != -1)
+while ((c = getopt (argc, argv, "fqrsVvh")) != -1)
#endif
{
switch (c) {
@@ -386,6 +390,9 @@
case 'f':
force = FcTrue;
break;
+ case 'q':
+ quick = FcTrue;
+ break;
case 's':
systemOnly = FcTrue;
break;
@@ -461,7 +468,8 @@
*/
FcConfigDestroy (config);
FcFini ();
-sleep (2);
+if (!quick)
+sleep (2);
if (verbose)
printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded");
return ret;
CVS commit: xsrc/external/mit/fontconfig/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 21 06:50:47 UTC 2010 Modified Files: xsrc/external/mit/fontconfig/dist/src: fcint.h ftglue.c Removed Files: xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel: index.html r1034.html r1056.html r108.html r1099.html r1127.html r1148.html r1171.html r1192.html r1237.html r1260.html r1283.html r129.html r1309.html r1336.html r1367.html r1389.html r1412.html r1434.html r1460.html r1482.html r150.html r1505.html r1529.html r1552.html r1577.html r1602.html r1627.html r1652.html r1677.html r1699.html r171.html r1724.html r1749.html r1774.html r1801.html r1829.html r1858.html r1883.html r1905.html r192.html r1927.html r1950.html r1976.html r2002.html r2032.html r2057.html r2081.html r2110.html r213.html r2131.html r2155.html r2178.html r2201.html r2227.html r2256.html r2286.html r2316.html r234.html r2349.html r2370.html r2391.html r2413.html r2434.html r2456.html r2478.html r2501.html r2522.html r2544.html r2566.html r258.html r2588.html r2609.html r2631.html r2655.html r2676.html r2698.html r2721.html r2744.html r2767.html r2788.html r279.html r2817.html r2842.html r2873.html r2911.html r2942.html r2969.html r2993.html r301.html r3021.html r3045.html r3069.html r3094.html r3118.html r3142.html r3164.html r3192.html r3213.html r323.html r3234.html r3257.html r3283.html r3305.html r3327.html r3349.html r3371.html r3393.html r3414.html r3435.html r344.html r3460.html r3496.html r3518.html r3553.html r3581.html r3607.html r3629.html r3656.html r3683.html r369.html r3708.html r3733.html r3755.html r3778.html r3805.html r3827.html r3852.html r3873.html r3898.html r3923.html r3948.html r397.html r3973.html r3999.html r4021.html r4043.html r4065.html r4090.html r4119.html r4144.html r4176.html r418.html r4209.html r4245.html r4267.html r4289.html r4311.html r4334.html r4356.html r4380.html r4405.html r4430.html r4457.html r446.html r4484.html r4509.html r4530.html r4552.html r475.html r570.html r600.html r707.html r759.html r782.html r807.html r828.html r856.html r878.html r902.html r923.html r944.html r967.html r999.html xsrc/external/mit/fontconfig/dist/fc-lang: ava.orth az.orth bam.orth ful.orth ibo.orth ku.orth mn.orth ven.orth Log Message: merge fontconfig 2.8.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/index.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1034.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1056.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r108.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1099.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1127.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1148.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1171.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1192.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1237.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1260.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1283.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r129.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1309.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1336.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1367.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1389.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1412.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1434.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1460.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1482.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r150.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1505.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1529.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1552.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1577.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1602.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1627.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1652.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1677.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1699.html \ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel
CVS commit: xsrc/external/mit/fontconfig/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 21 06:37:21 UTC 2010 Update of /cvsroot/xsrc/external/mit/fontconfig/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22769 Log Message: initial import of fontconfig-2.8.0 Status: Vendor Tag: xorg Release Tags: fontconfig-2-8-0 U xsrc/external/mit/fontconfig/dist/fonts.conf.in U xsrc/external/mit/fontconfig/dist/config.guess U xsrc/external/mit/fontconfig/dist/config.sub U xsrc/external/mit/fontconfig/dist/depcomp U xsrc/external/mit/fontconfig/dist/aclocal.m4 U xsrc/external/mit/fontconfig/dist/Makefile.in U xsrc/external/mit/fontconfig/dist/AUTHORS U xsrc/external/mit/fontconfig/dist/configure U xsrc/external/mit/fontconfig/dist/fontconfig-zip.in U xsrc/external/mit/fontconfig/dist/fonts.dtd U xsrc/external/mit/fontconfig/dist/fontconfig.pc.in U xsrc/external/mit/fontconfig/dist/fontconfig.spec U xsrc/external/mit/fontconfig/dist/COPYING U xsrc/external/mit/fontconfig/dist/missing U xsrc/external/mit/fontconfig/dist/configure.in U xsrc/external/mit/fontconfig/dist/install-sh U xsrc/external/mit/fontconfig/dist/fontconfig.spec.in U xsrc/external/mit/fontconfig/dist/NEWS U xsrc/external/mit/fontconfig/dist/acinclude.m4 U xsrc/external/mit/fontconfig/dist/INSTALL U xsrc/external/mit/fontconfig/dist/config.h.in U xsrc/external/mit/fontconfig/dist/ChangeLog U xsrc/external/mit/fontconfig/dist/README U xsrc/external/mit/fontconfig/dist/Makefile.am U xsrc/external/mit/fontconfig/dist/ltmain.sh U xsrc/external/mit/fontconfig/dist/test/fonts.conf.in U xsrc/external/mit/fontconfig/dist/test/4x6.pcf U xsrc/external/mit/fontconfig/dist/test/run-test.sh U xsrc/external/mit/fontconfig/dist/test/8x16.pcf U xsrc/external/mit/fontconfig/dist/test/Makefile.in U xsrc/external/mit/fontconfig/dist/test/out.expected U xsrc/external/mit/fontconfig/dist/test/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-list/fc-list.c U xsrc/external/mit/fontconfig/dist/fc-list/fc-list.sgml U xsrc/external/mit/fontconfig/dist/fc-list/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-list/fc-list.1 U xsrc/external/mit/fontconfig/dist/fc-list/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.sgml U xsrc/external/mit/fontconfig/dist/fc-cache/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c U xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.1 U xsrc/external/mit/fontconfig/dist/fc-cache/Makefile.am U xsrc/external/mit/fontconfig/dist/fontconfig/Makefile.in U xsrc/external/mit/fontconfig/dist/fontconfig/fontconfig.h U xsrc/external/mit/fontconfig/dist/fontconfig/fcprivate.h U xsrc/external/mit/fontconfig/dist/fontconfig/fcfreetype.h U xsrc/external/mit/fontconfig/dist/fontconfig/Makefile.am U xsrc/external/mit/fontconfig/dist/conf.d/30-metric-aliases.conf U xsrc/external/mit/fontconfig/dist/conf.d/70-no-bitmaps.conf U xsrc/external/mit/fontconfig/dist/conf.d/20-fix-globaladvance.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-vrgb.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-bgr.conf U xsrc/external/mit/fontconfig/dist/conf.d/49-sansserif.conf U xsrc/external/mit/fontconfig/dist/conf.d/45-latin.conf U xsrc/external/mit/fontconfig/dist/conf.d/69-unifont.conf U xsrc/external/mit/fontconfig/dist/conf.d/40-nonlatin.conf U xsrc/external/mit/fontconfig/dist/conf.d/Makefile.in U xsrc/external/mit/fontconfig/dist/conf.d/65-nonlatin.conf U xsrc/external/mit/fontconfig/dist/conf.d/50-user.conf U xsrc/external/mit/fontconfig/dist/conf.d/25-unhint-nonlatin.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-no-sub-pixel.conf U xsrc/external/mit/fontconfig/dist/conf.d/65-khmer.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-rgb.conf U xsrc/external/mit/fontconfig/dist/conf.d/README U xsrc/external/mit/fontconfig/dist/conf.d/30-urw-aliases.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-vbgr.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-autohint.conf U xsrc/external/mit/fontconfig/dist/conf.d/60-latin.conf U xsrc/external/mit/fontconfig/dist/conf.d/70-yes-bitmaps.conf U xsrc/external/mit/fontconfig/dist/conf.d/51-local.conf U xsrc/external/mit/fontconfig/dist/conf.d/20-unhint-small-vera.conf U xsrc/external/mit/fontconfig/dist/conf.d/90-synthetic.conf U xsrc/external/mit/fontconfig/dist/conf.d/Makefile.am U xsrc/external/mit/fontconfig/dist/conf.d/65-fonts-persian.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-unhinted.conf U xsrc/external/mit/fontconfig/dist/conf.d/80-delicious.conf N xsrc/external/mit/fontconfig/dist/fc-scan/Makefile.in N xsrc/external/mit/fontconfig/dist/fc-scan/fc-scan.sgml N xsrc/external/mit/fontconfig/dist/fc-scan/fc-scan.c N xsrc/external/mit/fontconfig/dist/fc-scan/Makefile.am N xsrc/external/mit/fontconfig/dist/fc-scan/fc-scan.1 U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.sgml U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.1 U xsrc/external/mit/fontconfig/dist/fc-match/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-matc
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: christos
Date: Fri Jun 12 18:47:01 UTC 2009
Modified Files:
xsrc/external/mit/fontconfig/dist/src: ftglue.c
Log Message:
work around ssp lossage
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/fontconfig/dist/src/ftglue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/ftglue.c
diff -u xsrc/external/mit/fontconfig/dist/src/ftglue.c:1.1.1.1 xsrc/external/mit/fontconfig/dist/src/ftglue.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/ftglue.c:1.1.1.1 Tue Jul 29 21:24:25 2008
+++ xsrc/external/mit/fontconfig/dist/src/ftglue.c Fri Jun 12 14:47:01 2009
@@ -28,6 +28,8 @@
#define LOG(x) do {} while (0)
#endif
+#undef read /* XXX: SSP/FORTIFY */
+
/* only used internally */
static FT_Pointer
ftglue_qalloc( FT_Memory memory,
