Petr Gajdos
8e12a55195
+ Fix syntax errors in fonts.dtd. + Bug 57114 - regression on FcFontMatch with namelang + Update CaseFolding.txt to Unicode 6.2 + Bug 57286 - Remove UnBatang and Baekmuk Batang from monospace in 65-nonlatin.conf + Fix N'ko orthography + Install config files first OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=92
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
Index: configure.ac
|
|
===================================================================
|
|
--- configure.ac.orig
|
|
+++ configure.ac
|
|
@@ -59,7 +59,9 @@ dnl ====================================
|
|
AC_CONFIG_HEADERS(config.h)
|
|
AC_CONFIG_MACRO_DIR([m4])
|
|
|
|
-AC_PROG_CC
|
|
+AC_PROG_CC_STDC
|
|
+AC_USE_SYSTEM_EXTENSIONS
|
|
+AC_SYS_LARGEFILE
|
|
AC_PROG_INSTALL
|
|
AC_PROG_LN_S
|
|
AC_LIBTOOL_WIN32_DLL
|
|
@@ -136,7 +138,7 @@ AC_TYPE_PID_T
|
|
# Checks for library functions.
|
|
AC_FUNC_VPRINTF
|
|
AC_FUNC_MMAP
|
|
-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs])
|
|
+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs])
|
|
|
|
dnl AC_CHECK_FUNCS doesn't check for header files.
|
|
dnl posix_fadvise() may be not available in older libc.
|
|
Index: src/fcatomic.c
|
|
===================================================================
|
|
--- src/fcatomic.c.orig
|
|
+++ src/fcatomic.c
|
|
@@ -109,10 +109,14 @@ FcAtomicLock (FcAtomic *atomic)
|
|
|
|
strcpy ((char *) atomic->tmp, (char *) atomic->file);
|
|
strcat ((char *) atomic->tmp, TMP_NAME);
|
|
+#ifdef HAVE_MKOSTEMP
|
|
+ fd = mkostemp ((char *) atomic->tmp, O_CLOEXEC);
|
|
+#else
|
|
fd = mkstemp ((char *) atomic->tmp);
|
|
+#endif
|
|
if (fd < 0)
|
|
return FcFalse;
|
|
- f = fdopen (fd, "w");
|
|
+ f = fdopen (fd, "we");
|
|
if (!f)
|
|
{
|
|
close (fd);
|
|
Index: src/fccache.c
|
|
===================================================================
|
|
--- src/fccache.c.orig
|
|
+++ src/fccache.c
|
|
@@ -150,7 +150,7 @@ FcDirCacheOpenFile (const FcChar8 *cache
|
|
if (FcStat (cache_file, file_stat) < 0)
|
|
return -1;
|
|
#endif
|
|
- fd = open((char *) cache_file, O_RDONLY | O_BINARY);
|
|
+ fd = open((char *) cache_file, O_RDONLY | O_BINARY | O_CLOEXEC);
|
|
if (fd < 0)
|
|
return fd;
|
|
#ifndef _WIN32
|
|
@@ -904,7 +904,7 @@ FcDirCacheWrite (FcCache *cache, FcConfi
|
|
if (!FcAtomicLock (atomic))
|
|
goto bail3;
|
|
|
|
- fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY, 0666);
|
|
+ fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY | O_CLOEXEC, 0666);
|
|
if (fd == -1)
|
|
goto bail4;
|
|
|