diff --git a/build/patches/fontconfig/0002-disable-pthreads.patch b/build/patches/fontconfig/0001-disable-pthreads.patch similarity index 90% rename from build/patches/fontconfig/0002-disable-pthreads.patch rename to build/patches/fontconfig/0001-disable-pthreads.patch index 7e529378..455eb4e7 100644 --- a/build/patches/fontconfig/0002-disable-pthreads.patch +++ b/build/patches/fontconfig/0001-disable-pthreads.patch @@ -1,8 +1,8 @@ diff --git a/configure.ac b/configure.ac -index 394c281..1cb2f74 100644 +index 26b974a..b73d132 100644 --- a/configure.ac +++ b/configure.ac -@@ -681,22 +681,8 @@ if $fc_cv_have_solaris_atomic_ops; then +@@ -712,22 +712,8 @@ if $fc_cv_have_solaris_atomic_ops; then AC_DEFINE(HAVE_SOLARIS_ATOMIC_OPS, 1, [Have Solaris __machine_*_barrier and atomic_* operations]) fi diff --git a/build/patches/fontconfig/0003-fix-fcstats-emscripten.patch b/build/patches/fontconfig/0003-fix-fcstats-emscripten.patch deleted file mode 100644 index c55e4f27..00000000 --- a/build/patches/fontconfig/0003-fix-fcstats-emscripten.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/fcstat.c b/src/fcstat.c -index 5aa1643..2a5ae3b 100644 ---- a/src/fcstat.c -+++ b/src/fcstat.c -@@ -398,6 +398,8 @@ FcFStatFs (int fd, FcStatFS *statb) - } - - return ret; -+# elif EMSCRIPTEN -+ return ret; - # else - # error "BUG: No way to figure out with fstatfs()" - # endif -@@ -418,17 +420,24 @@ FcFStatFs (int fd, FcStatFS *statb) - FcBool - FcIsFsMmapSafe (int fd) - { -+#ifdef EMSCRIPTEN -+ return FcFalse; -+#else - FcStatFS statb; - - if (FcFStatFs (fd, &statb) < 0) - return FcTrue; - - return !statb.is_remote_fs; -+#endif - } - - FcBool - FcIsFsMtimeBroken (const FcChar8 *dir) - { -+#ifdef EMSCRIPTEN -+ return FcFalse; -+#else - int fd = FcOpen ((const char *) dir, O_RDONLY); - - if (fd != -1) -@@ -444,6 +453,7 @@ FcIsFsMtimeBroken (const FcChar8 *dir) - } - - return FcFalse; -+#endif - } - - #define __fcstat__ diff --git a/lib/fontconfig b/lib/fontconfig index e291fda7..d37f9722 160000 --- a/lib/fontconfig +++ b/lib/fontconfig @@ -1 +1 @@ -Subproject commit e291fda7d42e5d64379555097a066d9c2c4efce3 +Subproject commit d37f97223a4715176c0889e91685dc796457e25f