Skip to content

Commit 26bc296

Browse files
committed
patch to solve other lconv decimal_point problem in cairo utils/cairo-trace/trace.c
1 parent 2e5b99b commit 26bc296

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

modulesets/clutter-android.modules

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<autotools id="cairo" autogenargs="--cache-file=config.cache --enable-test-surfaces --disable-xlib">
5353
<branch module="releases/cairo-1.12.2.tar.xz" repo="cairo.org" version="1.12.2">
5454
<patch file="cairo/0001-don-t-use-lconv.patch" strip="1" />
55+
<patch file="cairo/0002-trace-don-t-use-lconv.patch" strip="1" />
5556
</branch>
5657
<dependencies>
5758
<dep package="fontconfig"/>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
From: Roberto Huelga <[email protected]>
2+
Date: 29 Aug 2013 12:05:06 +0100
3+
Subject: [PATCH] trace don't use lconv
4+
---
5+
6+
diff --git a/util/cairo-trace/trace.c b/util/cairo-trace/trace.c
7+
index da7d2f0..ae82bac 100644
8+
--- a/util/cairo-trace/trace.c
9+
+++ b/util/cairo-trace/trace.c
10+
@@ -532,8 +532,12 @@ _trace_dtostr (char *buffer, size_t size, double d)
11+
if (d == 0.0)
12+
d = 0.0;
13+
14+
+#ifndef __ANDROID__
15+
locale_data = localeconv ();
16+
decimal_point = locale_data->decimal_point;
17+
+#else
18+
+ decimal_point = ".";
19+
+#endif
20+
decimal_point_len = strlen (decimal_point);
21+
22+
/* Using "%f" to print numbers less than 0.1 will result in
23+
--

0 commit comments

Comments
 (0)