diff options
Diffstat (limited to 'fonts')
-rw-r--r-- | fonts/fontconfig/distinfo | 6 | ||||
-rw-r--r-- | fonts/fontconfig/patches/patch-ba | 23 | ||||
-rw-r--r-- | fonts/fontconfig/patches/patch-test_test-migration.c | 32 |
3 files changed, 53 insertions, 8 deletions
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index 274a453f690..339f0266366 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2013/10/21 08:21:04 wiz Exp $ +$NetBSD: distinfo,v 1.48 2013/10/30 23:53:10 wiz Exp $ SHA1 (fontconfig-2.11.0.tar.bz2) = 969818b0326ac08241b11cbeaa4f203699f9b550 RMD160 (fontconfig-2.11.0.tar.bz2) = a77063d43caecc6090e6b942ae4fca08a2f1f62c @@ -7,6 +7,6 @@ SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12 SHA1 (patch-ab) = 5aabb4bd60319c83cbb22f784efe11bdc7308f92 SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803 SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7 -SHA1 (patch-ba) = 025148291320df10e4976ab1380b525f1ab0ee60 +SHA1 (patch-ba) = e0ad71bfb333872fcef21d76db06312e7a325202 SHA1 (patch-src_fcstat.c) = 9cb2d9b656bcb79d33be84a053e928ecf957dfd7 -SHA1 (patch-test_test-migration.c) = 3e174b43b45a131b7bbdce7e417a768b7ff210c5 +SHA1 (patch-test_test-migration.c) = 16435e36de501523dd487005dec68c31c229112e diff --git a/fonts/fontconfig/patches/patch-ba b/fonts/fontconfig/patches/patch-ba index 3d241c3cf80..5a07a7e3e71 100644 --- a/fonts/fontconfig/patches/patch-ba +++ b/fonts/fontconfig/patches/patch-ba @@ -1,7 +1,27 @@ -$NetBSD: patch-ba,v 1.2 2013/10/19 09:29:37 wiz Exp $ +$NetBSD: patch-ba,v 1.3 2013/10/30 23:53:10 wiz Exp $ + +First chunk: part of the Solaris fix for test-migration.c, from +Akira TAGOH (upstream) + +Second chunk: On NetBSD, it is not supported to load a library linked against +libpthread into a program that wasn't (since the C library provides +stubs for some pthread-functions, which might have already been called +before libpthread is loaded, leading to problems). + +Since xdm (not linked against libpthread) might load fontconfig, +fontconfig shouldn't be linked against libpthread. --- configure.orig 2013-01-10 08:59:05.000000000 +0000 +++ configure +@@ -13908,7 +13908,7 @@ $as_echo "#define HAVE_MMAP 1" >>confdef + fi + rm -f conftest.mmap conftest.txt + +-for ac_func in link mkstemp mkostemp _mktemp_s getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat ++for ac_func in link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -15017,6 +15017,11 @@ case ${host_os} in darwin*) ax_pthread_flags="-pthread $ax_pthread_flags" @@ -14,3 +34,4 @@ $NetBSD: patch-ba,v 1.2 2013/10/19 09:29:37 wiz Exp $ esac if test x"$ax_pthread_ok" = xno; then + diff --git a/fonts/fontconfig/patches/patch-test_test-migration.c b/fonts/fontconfig/patches/patch-test_test-migration.c index 2f783d6d9fc..d306492f9ad 100644 --- a/fonts/fontconfig/patches/patch-test_test-migration.c +++ b/fonts/fontconfig/patches/patch-test_test-migration.c @@ -1,11 +1,11 @@ -$NetBSD: patch-test_test-migration.c,v 1.1 2013/10/21 08:21:04 wiz Exp $ +$NetBSD: patch-test_test-migration.c,v 1.2 2013/10/30 23:53:10 wiz Exp $ Fix build on Solaris. From Akira TAGOH (upstream). --- test/test-migration.c.orig 2013-10-11 03:10:18.000000000 +0000 +++ test/test-migration.c -@@ -4,6 +4,11 @@ +@@ -4,8 +4,26 @@ #include <unistd.h> #include <sys/types.h> #include <dirent.h> @@ -16,8 +16,23 @@ From Akira TAGOH (upstream). +#endif #include <fontconfig/fontconfig.h> ++#ifdef HAVE_MKDTEMP ++#define fc_mkdtemp mkdtemp ++#else ++char * ++fc_mkdtemp (char *template) ++{ ++ if (!mktemp (template) || mkdir (template, 0700)) ++ return NULL; ++ ++ return template; ++} ++#endif ++ FcBool -@@ -36,6 +41,9 @@ unlink_dirs(const char *dir) + mkdir_p(const char *dir) + { +@@ -36,6 +54,9 @@ unlink_dirs(const char *dir) size_t len = strlen (dir); char *n = NULL; FcBool ret = FcTrue; @@ -27,7 +42,7 @@ From Akira TAGOH (upstream). if (!d) return FcFalse; -@@ -53,7 +61,17 @@ unlink_dirs(const char *dir) +@@ -53,7 +74,17 @@ unlink_dirs(const char *dir) strcpy (n, dir); n[len] = '/'; strcpy (&n[len + 1], e->d_name); @@ -45,3 +60,12 @@ From Akira TAGOH (upstream). { if (!unlink_dirs (n)) { +@@ -89,7 +120,7 @@ int + main(void) + { + char template[32] = "fontconfig-XXXXXXXX"; +- char *tmp = mkdtemp (template); ++ char *tmp = fc_mkdtemp (template); + size_t len = strlen (tmp), xlen, dlen; + char xdg[256], confd[256], fn[256], nfn[256], ud[256], nud[256]; + int ret = -1; |