diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2017-08-22 12:23:56 +0200 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2017-08-22 12:23:56 +0200 |
| commit | 62a83455a0bce537a3e2e44f5439d2c9dbee8d80 (patch) | |
| tree | e29f34fc8ab1fc1d7d7d7da9ffefa4e286a30fcb /tools/depends/target/fontconfig | |
| parent | d88e3a587d0ce2fc290fd593da3153cf7dc9a8a1 (diff) | |
[depends] bump fontconfig to 2.12.4
Diffstat (limited to 'tools/depends/target/fontconfig')
| -rw-r--r-- | tools/depends/target/fontconfig/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/target/fontconfig/lconv.patch | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tools/depends/target/fontconfig/Makefile b/tools/depends/target/fontconfig/Makefile index dba0ee536a..e46ac57153 100644 --- a/tools/depends/target/fontconfig/Makefile +++ b/tools/depends/target/fontconfig/Makefile @@ -3,7 +3,7 @@ DEPS= ../../Makefile.include lconv.patch fix-aarch64_atomics.patch Makefile # lib name, version LIBNAME=fontconfig -VERSION=2.11.1 +VERSION=2.12.4 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.bz2 diff --git a/tools/depends/target/fontconfig/lconv.patch b/tools/depends/target/fontconfig/lconv.patch index c760d7f7a4..4635b1b17c 100644 --- a/tools/depends/target/fontconfig/lconv.patch +++ b/tools/depends/target/fontconfig/lconv.patch @@ -1,18 +1,18 @@ ---- fontconfig-2.6.0.old/src/fcxml.c 2011-10-15 16:16:43.809967115 -0400 -+++ fontconfig-2.6.0/src/fcxml.c 2011-10-15 16:18:39.059967042 -0400 -@@ -1139,6 +1139,7 @@ +--- a/src/fcxml.c ++++ b/src/fcxml.c +@@ -1352,6 +1352,7 @@ static double FcStrtod (char *s, char **end) { +#if 0 + #ifndef __BIONIC__ struct lconv *locale_data; - char *dot; - double v; -@@ -1185,6 +1186,7 @@ + #endif +@@ -1409,6 +1410,7 @@ else - v = strtod (s, end); + v = strtod (s, end); return v; +#endif } - - static void
\ No newline at end of file + + static void |