diff options
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff b/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff deleted file mode 100644 index 13ae61ef88..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff +++ /dev/null | |||
@@ -1,97 +0,0 @@ | |||
1 | Index: gtk+-2.21.2/configure.in | ||
2 | =================================================================== | ||
3 | --- gtk+-2.21.2.orig/configure.in 2010-06-22 18:14:40.000000000 +0800 | ||
4 | +++ gtk+-2.21.2/configure.in 2010-06-22 18:14:58.000000000 +0800 | ||
5 | @@ -1072,48 +1072,50 @@ | ||
6 | # check one of the variables here | ||
7 | AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes]) | ||
8 | |||
9 | -if test x$gio_can_sniff = x; then | ||
10 | - AC_MSG_CHECKING([if gio can sniff png]) | ||
11 | - gtk_save_LIBS="$LIBS" | ||
12 | - gtk_save_CFLAGS="$CFLAGS" | ||
13 | - LIBS="`$PKG_CONFIG --libs gio-2.0`" | ||
14 | - CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" | ||
15 | - AC_RUN_IFELSE([AC_LANG_SOURCE([[ | ||
16 | - #include <gio/gio.h> | ||
17 | - static const gsize data_size = 159; | ||
18 | - static const guint8 data[] = | ||
19 | - { | ||
20 | - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, | ||
21 | - 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, | ||
22 | - 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, | ||
23 | - 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, | ||
24 | - 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, | ||
25 | - 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, | ||
26 | - 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, | ||
27 | - 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, | ||
28 | - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, | ||
29 | - 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, | ||
30 | - 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, | ||
31 | - 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, | ||
32 | - 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, | ||
33 | - 0x42, 0x60, 0x82 | ||
34 | - }; | ||
35 | - int | ||
36 | - main (int argc, char **argv) | ||
37 | - { | ||
38 | - char *content_type; | ||
39 | - char *image_png; | ||
40 | - content_type = g_content_type_guess (NULL, data, data_size, NULL); | ||
41 | - image_png = g_content_type_from_mime_type ("image/png"); | ||
42 | - return !!strcmp (content_type, image_png); | ||
43 | - }]])], | ||
44 | - [gio_can_sniff=yes | ||
45 | - AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])], | ||
46 | - [gio_can_sniff=no]) | ||
47 | - AC_MSG_RESULT($gio_can_sniff) | ||
48 | - LIBS="$gtk_save_LIBS" | ||
49 | - CFLAGS="$gtk_save_CFLAGS" | ||
50 | -fi | ||
51 | +# Disabled due to cross-compile | ||
52 | +#if test x$gio_can_sniff = x; then | ||
53 | +# AC_MSG_CHECKING([if gio can sniff png]) | ||
54 | +# gtk_save_LIBS="$LIBS" | ||
55 | +# gtk_save_CFLAGS="$CFLAGS" | ||
56 | +# LIBS="`$PKG_CONFIG --libs gio-2.0`" | ||
57 | +# CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" | ||
58 | +# AC_RUN_IFELSE([AC_LANG_SOURCE([[ | ||
59 | +# #include <gio/gio.h> | ||
60 | +# static const gsize data_size = 159; | ||
61 | +# static const guint8 data[] = | ||
62 | +# { | ||
63 | +# 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, | ||
64 | +# 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, | ||
65 | +# 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, | ||
66 | +# 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, | ||
67 | +# 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, | ||
68 | +# 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, | ||
69 | +# 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, | ||
70 | +# 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, | ||
71 | +# 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, | ||
72 | +# 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, | ||
73 | +# 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, | ||
74 | +# 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, | ||
75 | +# 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, | ||
76 | +# 0x42, 0x60, 0x82 | ||
77 | +# }; | ||
78 | +# int | ||
79 | +# main (int argc, char **argv) | ||
80 | +# { | ||
81 | +# char *content_type; | ||
82 | +# char *image_png; | ||
83 | +# content_type = g_content_type_guess (NULL, data, data_size, NULL); | ||
84 | +# image_png = g_content_type_from_mime_type ("image/png"); | ||
85 | +# return !!strcmp (content_type, image_png); | ||
86 | +# }]])], | ||
87 | +# [gio_can_sniff=yes | ||
88 | +# [gio_can_sniff=no]) | ||
89 | +# AC_MSG_RESULT($gio_can_sniff) | ||
90 | +# LIBS="$gtk_save_LIBS" | ||
91 | +# CFLAGS="$gtk_save_CFLAGS" | ||
92 | +#fi | ||
93 | + | ||
94 | +AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])], | ||
95 | |||
96 | # | ||
97 | # Allow building some or all immodules included | ||