blob: c54d46ebc3dc2163a1f96b0f6d75c8759a25802c (
plain)
1 reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652290
2
3 diff -ru vte-0.26.2.orig/configure.in vte-0.26.2/configure.in
4 --- vte-0.26.2.orig/configure.in 2011-08-17 08:30:55 +0200
5 +++ vte-0.26.2/configure.in 2011-08-17 08:35:42 +0200
6 @@ -362,7 +362,11 @@
7 AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
8 fi
9 AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
10 -AC_CHECK_FUNCS([ceil floor])
11 +dnl if the first check didn't find floor, it caches the "no" value,
12 +dnl and doesn't recheck. this makes the below check fail always on
13 +dnl systems with floor in -lm. thus we unset the chached result.
14 +unset ac_cv_func_floor
15 +AC_CHECK_FUNCS([ceil floor round])
16
17 # Look for tgetent
18
19 --- vte-0.26.2.orig/configure 2012-04-30 20:02:55.000000000 +0200
20 +++ vte-0.26.2/configure 2012-04-30 20:03:16.000000000 +0200
21 @@ -13277,7 +13277,7 @@
22
23 fi
24
25 -for ac_func in ceil floor
26 +for ac_func in ceil floor round
27 do :
28 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
29 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
30 diff -ru vte-0.26.2.orig/src/vte.c vte-0.26.2/src/vte.c
31 --- vte-0.26.2.orig/src/vte.c 2011-08-17 08:30:58 +0200
32 +++ vte-0.26.2/src/vte.c 2011-08-17 08:38:09 +0200
33 @@ -63,6 +63,18 @@
34 #include <locale.h>
35 #endif
36
37 +#ifndef HAVE_ROUND
38 +# if defined(HAVE_CEIL) && defined(HAVE_FLOOR)
39 +static inline double round(double x) {
40 + if(x - floor(x) < 0.5) {
41 + return floor(x);
42 + } else {
43 + return ceil(x);
44 + }
45 +}
46 +# endif
47 +#endif
48 +
49 #if GTK_CHECK_VERSION (2, 90, 7)
50 #define GDK_KEY(symbol) GDK_KEY_##symbol
51 #else
|