fontconfig: Updte from 2.11.1 to 2.12.0
This commit is contained in:
parent
9fe53ded8d
commit
8b5e9dd00e
@ -1,7 +1,6 @@
|
|||||||
TERMUX_PKG_HOMEPAGE=http://www.freedesktop.org/wiki/Software/fontconfig/
|
TERMUX_PKG_HOMEPAGE=http://www.freedesktop.org/wiki/Software/fontconfig/
|
||||||
TERMUX_PKG_DESCRIPTION="Library for configuring and customizing font access"
|
TERMUX_PKG_DESCRIPTION="Library for configuring and customizing font access"
|
||||||
TERMUX_PKG_VERSION=2.11.1
|
TERMUX_PKG_VERSION=2.12.0
|
||||||
TERMUX_PKG_BUILD_REVISION=2
|
|
||||||
TERMUX_PKG_SRCURL=http://www.freedesktop.org/software/fontconfig/release/fontconfig-${TERMUX_PKG_VERSION}.tar.bz2
|
TERMUX_PKG_SRCURL=http://www.freedesktop.org/software/fontconfig/release/fontconfig-${TERMUX_PKG_VERSION}.tar.bz2
|
||||||
TERMUX_PKG_DEPENDS="freetype, libxml2"
|
TERMUX_PKG_DEPENDS="freetype, libxml2"
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-libxml2 --enable-iconv=no --disable-docs --with-default-fonts=/system/fonts --with-add-fonts=$TERMUX_PREFIX/share/fonts"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-libxml2 --enable-iconv=no --disable-docs --with-default-fonts=/system/fonts --with-add-fonts=$TERMUX_PREFIX/share/fonts"
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
diff -u -r ../fontconfig-2.11.1/src/fcxml.c ./src/fcxml.c
|
|
||||||
--- ../fontconfig-2.11.1/src/fcxml.c 2014-03-13 08:00:47.000000000 +0100
|
|
||||||
+++ ./src/fcxml.c 2014-06-26 08:36:09.000000000 +0200
|
|
||||||
@@ -1314,10 +1314,13 @@
|
|
||||||
static double
|
|
||||||
FcStrtod (char *s, char **end)
|
|
||||||
{
|
|
||||||
+#ifndef __ANDROID__
|
|
||||||
struct lconv *locale_data;
|
|
||||||
char *dot;
|
|
||||||
+#endif
|
|
||||||
double v;
|
|
||||||
|
|
||||||
+#ifndef __ANDROID__
|
|
||||||
/*
|
|
||||||
* Have to swap the decimal point to match the current locale
|
|
||||||
* if that locale doesn't use 0x2e
|
|
||||||
@@ -1358,6 +1361,7 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
+#endif
|
|
||||||
v = strtod (s, end);
|
|
||||||
return v;
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user