summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch42
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch79
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch33
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest3
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/tests-check.patch465
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb105
-rw-r--r--meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch19
-rw-r--r--meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch95
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.6.bb60
-rw-r--r--meta/recipes-gnome/gnome/gnome-common_3.7.4.bb22
-rw-r--r--meta/recipes-gnome/gnome/gnome-desktop.inc23
-rw-r--r--meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb7
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils.inc31
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch35
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch30
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch95
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb13
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch49
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb24
-rw-r--r--meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch14
-rw-r--r--meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb18
-rw-r--r--meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb16
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch17
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/aarch64/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/mips/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/mips64/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/mips64el/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/mipsel/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/powerpc/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/x86_64/art_config.h10
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb28
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch48
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch30
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch31
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch21
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch87
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch22
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch105
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch1814
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/run-iconcache.patch23
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/toggle-font.diff102
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.22/xsettings.patch20
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc90
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc106
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch43
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch33
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch35
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb19
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.22.bb50
-rw-r--r--meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb47
-rw-r--r--meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb20
-rw-r--r--meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch23
-rw-r--r--meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch37
-rw-r--r--meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb46
-rw-r--r--meta/recipes-gnome/gtk-theme-torturer/gtk-theme-torturer_git.bb21
-rw-r--r--meta/recipes-gnome/hicolor-icon-theme/files/index.theme1731
-rw-r--r--meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb23
-rw-r--r--meta/recipes-gnome/json-glib/json-glib_0.16.2.bb20
-rw-r--r--meta/recipes-gnome/libffi/libffi/fix-libffi.la-location.patch18
-rw-r--r--meta/recipes-gnome/libffi/libffi_3.0.13.bb24
-rw-r--r--meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch102
-rw-r--r--meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch501
-rw-r--r--meta/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch14
-rw-r--r--meta/recipes-gnome/libglade/libglade_2.6.4.bb29
-rw-r--r--meta/recipes-gnome/libnotify/libnotify_0.6.0.bb17
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/gtk-option.patch59
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/vapigen.m496
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.40.1.bb55
-rw-r--r--meta/recipes-gnome/libunique/libunique/build.patch421
-rw-r--r--meta/recipes-gnome/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch36
-rw-r--r--meta/recipes-gnome/libunique/libunique/noconst.patch130
-rw-r--r--meta/recipes-gnome/libunique/libunique_1.1.6.bb25
77 files changed, 7617 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
new file mode 100644
index 0000000..edbdced
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
@@ -0,0 +1,42 @@
1Upstream-Status: Pending
2
3This patch fixes parallel install issue that lib libpixbufloader-png.la
4depends on libgdk_pixbuf-2.0.la which will be regenerated during insta-
5llation, if libgdk_pixbuf-2.0.la is regenerating and at the same time
6libpixbufloader-png.la links it, the error will happen.
7
8Error message is:
9* usr/bin/ld: cannot find -lgdk_pixbuf-2.0
10* collect2: ld returned 1 exit status
11
12Make an explicit dependency to the libs install targets would fix this
13issue.
14
15Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
16---
17 gdk-pixbuf/Makefile.am | 1 +
18 libdeps.mk | 3 +++
19 2 files changed, 4 insertions(+), 0 deletions(-)
20 create mode 100644 libdeps.mk
21
22diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
23index 95a93a8..db44cae 100644
24--- a/gdk-pixbuf/Makefile.am
25+++ b/gdk-pixbuf/Makefile.am
26@@ -783,3 +783,4 @@ loaders.cache:
27 endif
28
29 -include $(top_srcdir)/git.mk
30+-include $(top_srcdir)/libdeps.mk
31diff --git a/libdeps.mk b/libdeps.mk
32new file mode 100644
33index 0000000..d7a10a8
34--- /dev/null
35+++ b/libdeps.mk
36@@ -0,0 +1,3 @@
37+# Extending dependencies of install-loaderLTLIBRARIES:
38+# The $(lib-LTLIBRARIES) is needed by relinking $(loader_LTLIBRARIES)
39+install-loaderLTLIBRARIES: install-libLTLIBRARIES
40--
411.7.6.1
42
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
new file mode 100644
index 0000000..70146c6
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
@@ -0,0 +1,79 @@
1If an environment variable is specified set the return value from main() to
2non-zero if the loader had errors (missing libraries, generally).
3
4Upstream-Status: Pending
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
8index a9ca015..395674a 100644
9--- a/gdk-pixbuf/queryloaders.c
10+++ b/gdk-pixbuf/queryloaders.c
11@@ -146,7 +146,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info)
12 g_string_append_c (contents, '\n');
13 }
14
15-static void
16+static gboolean
17 query_module (GString *contents, const char *dir, const char *file)
18 {
19 char *path;
20@@ -155,6 +155,7 @@ query_module (GString *contents, const char *dir, const char *file)
21 void (*fill_vtable) (GdkPixbufModule *module);
22 gpointer fill_info_ptr;
23 gpointer fill_vtable_ptr;
24+ gboolean ret = TRUE;
25
26 if (g_path_is_absolute (file))
27 path = g_strdup (file);
28@@ -204,10 +205,13 @@ query_module (GString *contents, const char *dir, const char *file)
29 g_module_error());
30 else
31 g_fprintf (stderr, "Cannot load loader %s\n", path);
32+ ret = FALSE;
33 }
34 if (module)
35 g_module_close (module);
36 g_free (path);
37+
38+ return ret;
39 }
40
41 #ifdef G_OS_WIN32
42@@ -257,6 +261,7 @@ int main (int argc, char **argv)
43 GString *contents;
44 gchar *cache_file = NULL;
45 gint first_file = 1;
46+ gboolean success = TRUE;
47
48 #ifdef G_OS_WIN32
49 gchar *libdir;
50@@ -360,7 +365,8 @@ int main (int argc, char **argv)
51 gint len = strlen (dent);
52 if (len > SOEXT_LEN &&
53 strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) {
54- query_module (contents, path, dent);
55+ if (!query_module (contents, path, dent))
56+ success = FALSE;
57 }
58 }
59 g_dir_close (dir);
60@@ -378,7 +384,8 @@ int main (int argc, char **argv)
61 infilename = g_locale_to_utf8 (infilename,
62 -1, NULL, NULL, NULL);
63 #endif
64- query_module (contents, cwd, infilename);
65+ if (!query_module (contents, cwd, infilename))
66+ success = FALSE;
67 }
68 g_free (cwd);
69 }
70@@ -394,5 +401,8 @@ int main (int argc, char **argv)
71 else
72 g_print ("%s\n", contents->str);
73
74- return 0;
75+ if (g_getenv ("GDK_PIXBUF_FATAL_LOADER"))
76+ return success ? 0 : 1;
77+ else
78+ return 0;
79 }
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
new file mode 100644
index 0000000..ecca62a
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
@@ -0,0 +1,33 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: gdk-pixbuf-2.22.1/configure.ac
4===================================================================
5--- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-26 09:06:34.000000000 +0800
6+++ gdk-pixbuf-2.22.1/configure.ac 2010-11-26 09:07:33.000000000 +0800
7@@ -287,7 +287,7 @@
8 case $enable_explicit_deps in
9 auto)
10 export SED
11- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
12+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
13 if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
14 enable_explicit_deps=yes
15 else
16@@ -484,7 +484,7 @@
17 dnl Now we check to see if our libtool supports shared lib deps
18 dnl (in a rather ugly way even)
19 if $dynworks; then
20- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
21+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config"
22 pixbuf_deplibs_check=`$pixbuf_libtool_config | \
23 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
24 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
25@@ -957,7 +957,7 @@
26 # We are using gmodule-no-export now, but I'm leaving the stripping
27 # code in place for now, since pango and atk still require gmodule.
28 export SED
29-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
30+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
31 if test -n "$export_dynamic"; then
32 GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
33 fi
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest
new file mode 100644
index 0000000..8f90723
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest
@@ -0,0 +1,3 @@
1#! /bin/sh
2
3gnome-desktop-testing-runner gdk-pixbuf
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/tests-check.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/tests-check.patch
new file mode 100644
index 0000000..31f3368
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/tests-check.patch
@@ -0,0 +1,465 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 9fa240c1ad5a815d63d8aa9126954152c2607f2e Mon Sep 17 00:00:00 2001
5From: Matthias Clasen <mclasen@redhat.com>
6Date: Sat, 25 Jan 2014 21:29:34 +0000
7Subject: Make testsuite robust against disabled formats
8
9Skip tests if their file format is not supported by the
10available loaders.
11
12https://bugzilla.gnome.org/show_bug.cgi?id=722651
13---
14diff --git a/tests/Makefile.am b/tests/Makefile.am
15index de3442e..80840c2 100644
16--- a/tests/Makefile.am
17+++ b/tests/Makefile.am
18@@ -42,17 +42,57 @@ dist_installed_test_data = \
19 icc-profile.png \
20 $(wildcard $(srcdir)/test-images/*)
21
22+pixbuf_icc_SOURCES = \
23+ pixbuf-icc.c \
24+ test-common.c \
25+ test-common.h \
26+ $(NULL)
27+
28+pixbuf_scale_SOURCES = \
29+ pixbuf-scale.c \
30+ test-common.c \
31+ test-common.h \
32+ $(NULL)
33+
34+pixbuf_stream_SOURCES = \
35+ pixbuf-stream.c \
36+ test-common.c \
37+ test-common.h \
38+ $(NULL)
39+
40+pixbuf_threads_SOURCES = \
41+ pixbuf-threads.c \
42+ test-common.c \
43+ test-common.h \
44+ $(NULL)
45+
46+pixbuf_icon_serialize_SOURCES = \
47+ pixbuf-icon-serialize.c \
48+ test-common.c \
49+ test-common.h \
50+ $(NULL)
51+
52+pixbuf_save_SOURCES = \
53+ pixbuf-save.c \
54+ test-common.c \
55+ test-common.h \
56+ $(NULL)
57+
58 pixbuf_resource_SOURCES = \
59 pixbuf-resource.c \
60+ test-common.c \
61+ test-common.h \
62 resources.h \
63- resources.c
64+ resources.c \
65+ $(NULL)
66
67 BUILT_SOURCES += resources.h resources.c
68 DISTCLEANFILES += \
69 resources.h resources.c \
70 pixbuf-save-options \
71 pixbuf-randomly-modified-image \
72- pixbuf-save-roundtrip
73+ pixbuf-save-roundtrip \
74+ $(NULL)
75
76 EXTRA_DIST += resources.gresource.xml
77 TESTS_ENVIRONMENT += GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache
78diff --git a/tests/pixbuf-icc.c b/tests/pixbuf-icc.c
79index 9cb9c90..3b95b09 100644
80--- a/tests/pixbuf-icc.c
81+++ b/tests/pixbuf-icc.c
82@@ -22,6 +22,7 @@
83
84 #include "config.h"
85 #include "gdk-pixbuf/gdk-pixbuf.h"
86+#include "test-common.h"
87
88 static void
89 test_incremental (gconstpointer data)
90@@ -34,7 +35,12 @@ test_incremental (gconstpointer data)
91 gchar *contents;
92 gsize size;
93
94-
95+ if (!format_supported (filename))
96+ {
97+ g_test_skip ("format not supported");
98+ return;
99+ }
100+
101 g_file_get_contents (g_test_get_filename (G_TEST_DIST, filename, NULL), &contents, &size, &error);
102 g_assert_no_error (error);
103
104@@ -62,6 +68,12 @@ test_nonincremental (gconstpointer data)
105 GdkPixbuf *pixbuf;
106 const gchar *profile;
107
108+ if (!format_supported (filename))
109+ {
110+ g_test_skip ("format not supported");
111+ return;
112+ }
113+
114 pixbuf = gdk_pixbuf_new_from_file (g_test_get_filename (G_TEST_DIST, filename, NULL), &error);
115 g_assert_no_error (error);
116
117diff --git a/tests/pixbuf-icon-serialize.c b/tests/pixbuf-icon-serialize.c
118index 20bf6e1..880c654 100644
119--- a/tests/pixbuf-icon-serialize.c
120+++ b/tests/pixbuf-icon-serialize.c
121@@ -1,5 +1,6 @@
122 #include "config.h"
123 #include "gdk-pixbuf/gdk-pixbuf.h"
124+#include "test-common.h"
125 #include <string.h>
126 #include <glib.h>
127
128@@ -13,6 +14,12 @@ test_serialize (void)
129 GIcon *icon;
130 GInputStream *stream;
131
132+ if (!format_supported ("png"))
133+ {
134+ g_test_skip ("format not supported");
135+ return;
136+ }
137+
138 pixbuf = gdk_pixbuf_new_from_file (g_test_get_filename (G_TEST_DIST, "test-image.png", NULL), &error);
139 g_assert_no_error (error);
140 g_assert (pixbuf != NULL);
141diff --git a/tests/pixbuf-resource.c b/tests/pixbuf-resource.c
142index a747bca..aa0bed8 100644
143--- a/tests/pixbuf-resource.c
144+++ b/tests/pixbuf-resource.c
145@@ -22,6 +22,7 @@
146
147 #include "config.h"
148 #include "gdk-pixbuf/gdk-pixbuf.h"
149+#include "test-common.h"
150 #include <string.h>
151
152 #define compare_option(p1, p2, key) \
153@@ -77,6 +78,12 @@ test_resource (void)
154 GError *error = NULL;
155 GdkPixbuf *pixbuf, *ref;
156
157+ if (!format_supported ("png"))
158+ {
159+ g_test_skip ("format not supported");
160+ return;
161+ }
162+
163 path = g_test_get_filename (G_TEST_DIST, "icc-profile.png", NULL);
164 ref = gdk_pixbuf_new_from_file (path, &error);
165 g_assert_no_error (error);
166@@ -111,6 +118,12 @@ test_resource_at_scale (void)
167 GError *error = NULL;
168 GdkPixbuf *pixbuf, *ref;
169
170+ if (!format_supported ("png"))
171+ {
172+ g_test_skip ("format not supported");
173+ return;
174+ }
175+
176 path = g_test_get_filename (G_TEST_DIST, "icc-profile.png", NULL);
177 ref = gdk_pixbuf_new_from_file_at_scale (path, 40, 10, FALSE, &error);
178 g_assert_no_error (error);
179diff --git a/tests/pixbuf-save.c b/tests/pixbuf-save.c
180index f7df29b..78ab288 100644
181--- a/tests/pixbuf-save.c
182+++ b/tests/pixbuf-save.c
183@@ -21,6 +21,7 @@
184 */
185
186 #include "gdk-pixbuf/gdk-pixbuf.h"
187+#include "test-common.h"
188 #include <string.h>
189
190 #define compare_option(p1, p2, key) \
191@@ -76,6 +77,12 @@ test_save_roundtrip (void)
192 GdkPixbuf *ref;
193 GdkPixbuf *pixbuf;
194
195+ if (!format_supported ("png"))
196+ {
197+ g_test_skip ("format not supported");
198+ return;
199+ }
200+
201 ref = gdk_pixbuf_new_from_file (g_test_get_filename (G_TEST_DIST, "test-image.png", NULL), &error);
202 g_assert_no_error (error);
203
204@@ -98,6 +105,12 @@ test_save_options (void)
205 GdkPixbuf *pixbuf;
206 GError *error = NULL;
207
208+ if (!format_supported ("png"))
209+ {
210+ g_test_skip ("format not supported");
211+ return;
212+ }
213+
214 ref = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 10, 10);
215 gdk_pixbuf_fill (ref, 0xff00ff00);
216
217diff --git a/tests/pixbuf-scale.c b/tests/pixbuf-scale.c
218index 4fd9fd5..d57e56a 100644
219--- a/tests/pixbuf-scale.c
220+++ b/tests/pixbuf-scale.c
221@@ -22,6 +22,7 @@
222
223 #include "config.h"
224 #include "gdk-pixbuf/gdk-pixbuf.h"
225+#include "test-common.h"
226
227 static void
228 test_scale (gconstpointer data)
229@@ -33,6 +34,12 @@ test_scale (gconstpointer data)
230 GdkPixbuf *pixbuf;
231 gint width, height;
232
233+ if (!format_supported (filename))
234+ {
235+ g_test_skip ("format not supported");
236+ return;
237+ }
238+
239 path = g_test_get_filename (G_TEST_DIST, filename, NULL);
240 ref = gdk_pixbuf_new_from_file (path, &error);
241 g_assert_no_error (error);
242diff --git a/tests/pixbuf-stream.c b/tests/pixbuf-stream.c
243index 0c2cebe..d66ce3e 100644
244--- a/tests/pixbuf-stream.c
245+++ b/tests/pixbuf-stream.c
246@@ -22,6 +22,7 @@
247
248 #include "config.h"
249 #include "gdk-pixbuf/gdk-pixbuf.h"
250+#include "test-common.h"
251 #include <string.h>
252
253 #define compare_option(p1, p2, key) \
254@@ -71,6 +72,12 @@ test_stream (gconstpointer data)
255 GFile *file;
256 GInputStream *stream;
257
258+ if (!format_supported (filename))
259+ {
260+ g_test_skip ("format not supported");
261+ return;
262+ }
263+
264 path = g_test_get_filename (G_TEST_DIST, filename, NULL);
265 ref = gdk_pixbuf_new_from_file (path, &error);
266 g_assert_no_error (error);
267@@ -116,6 +123,12 @@ test_stream_async (gconstpointer data)
268 gsize size;
269 GInputStream *stream;
270
271+ if (!format_supported (filename))
272+ {
273+ g_test_skip ("format not supported");
274+ return;
275+ }
276+
277 path = g_test_get_filename (G_TEST_DIST, filename, NULL);
278 ref = gdk_pixbuf_new_from_file (path, &error);
279 g_assert_no_error (error);
280@@ -138,6 +151,12 @@ test_stream_at_scale (gconstpointer data)
281 GFile *file;
282 GInputStream *stream;
283
284+ if (!format_supported (filename))
285+ {
286+ g_test_skip ("format not supported");
287+ return;
288+ }
289+
290 path = g_test_get_filename (G_TEST_DIST, filename, NULL);
291 ref = gdk_pixbuf_new_from_file_at_scale (path, 20, 30, TRUE, &error);
292 g_assert_no_error (error);
293@@ -167,6 +186,12 @@ test_stream_at_scale_async (gconstpointer data)
294 gsize size;
295 GInputStream *stream;
296
297+ if (!format_supported (filename))
298+ {
299+ g_test_skip ("format not supported");
300+ return;
301+ }
302+
303 path = g_test_get_filename (G_TEST_DIST, filename, NULL);
304 ref = gdk_pixbuf_new_from_file_at_scale (path, 40, 10, FALSE, &error);
305 g_assert_no_error (error);
306diff --git a/tests/pixbuf-threads.c b/tests/pixbuf-threads.c
307index 5eeb9dd..f2694fd 100644
308--- a/tests/pixbuf-threads.c
309+++ b/tests/pixbuf-threads.c
310@@ -18,7 +18,9 @@
311 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
312 */
313
314+#include "config.h"
315 #include "gdk-pixbuf/gdk-pixbuf.h"
316+#include "test-common.h"
317
318 static void
319 load_image (gpointer data,
320@@ -71,15 +73,24 @@ test_threads (void)
321
322 for (i = 0; i < iterations; i++)
323 {
324- g_thread_pool_push (pool, "valid_jpeg_test", NULL);
325- g_thread_pool_push (pool, "valid_png_test", NULL);
326- g_thread_pool_push (pool, "valid_gif_test", NULL);
327- g_thread_pool_push (pool, "valid_bmp_test", NULL);
328- g_thread_pool_push (pool, "valid_jpeg_progressive_test", NULL);
329- g_thread_pool_push (pool, "valid_xpm_test", NULL);
330- g_thread_pool_push (pool, "valid_ras_test", NULL);
331- g_thread_pool_push (pool, "valid_tga_test", NULL);
332- g_thread_pool_push (pool, "valid_tiff1_test", NULL);
333+ if (format_supported ("jpeg"))
334+ g_thread_pool_push (pool, "valid_jpeg_test", NULL);
335+ if (format_supported ("png"))
336+ g_thread_pool_push (pool, "valid_png_test", NULL);
337+ if (format_supported ("gif"))
338+ g_thread_pool_push (pool, "valid_gif_test", NULL);
339+ if (format_supported ("bmp"))
340+ g_thread_pool_push (pool, "valid_bmp_test", NULL);
341+ if (format_supported ("jpeg"))
342+ g_thread_pool_push (pool, "valid_jpeg_progressive_test", NULL);
343+ if (format_supported ("xpm"))
344+ g_thread_pool_push (pool, "valid_xpm_test", NULL);
345+ if (format_supported ("ras"))
346+ g_thread_pool_push (pool, "valid_ras_test", NULL);
347+ if (format_supported ("tga"))
348+ g_thread_pool_push (pool, "valid_tga_test", NULL);
349+ if (format_supported ("tiff"))
350+ g_thread_pool_push (pool, "valid_tiff1_test", NULL);
351 }
352
353 g_thread_pool_free (pool, FALSE, TRUE);
354diff --git a/tests/test-common.c b/tests/test-common.c
355new file mode 100644
356index 0000000..c7673e3
357--- /dev/null
358+++ b/tests/test-common.c
359@@ -0,0 +1,65 @@
360+/* -*- Mode: C; c-basic-offset: 2; -*- */
361+/* GdkPixbuf library - test loaders
362+ *
363+ * Copyright (C) 2014 Red Hat, Inc.
364+ *
365+ * This program is free software; you can redistribute it and/or modify
366+ * it under the terms of the GNU General Public License as published by
367+ * the Free Software Foundation; either version 2 of the License, or
368+ * (at your option) any later version.
369+ *
370+ * This program is distributed in the hope that it will be useful,
371+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
372+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
373+ * GNU General Public License for more details.
374+ *
375+ * You should have received a copy of the GNU General Public License
376+ * along with this program; if not, write to the Free Software
377+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
378+ *
379+ * Author: Matthias Clasen
380+ */
381+
382+#include "config.h"
383+#include "test-common.h"
384+#include "gdk-pixbuf/gdk-pixbuf.h"
385+
386+#include <string.h>
387+
388+gboolean
389+format_supported (const gchar *filename)
390+{
391+ const gchar *name = NULL;
392+ GSList *formats, *l;
393+ gboolean retval;
394+ const gchar *names[] = { "png", "jpeg", "bmp", "gif", "ras",
395+ "tga", "xpm", "xbm" };
396+ gint i;
397+
398+ for (i = 0; i < G_N_ELEMENTS (names); i++)
399+ {
400+ if (strstr (filename, names[i]))
401+ {
402+ name = names[i];
403+ break;
404+ }
405+ }
406+ if (name == NULL)
407+ return FALSE;
408+
409+ retval = FALSE;
410+ formats = gdk_pixbuf_get_formats ();
411+ for (l = formats; l; l = l->next)
412+ {
413+ GdkPixbufFormat *format = l->data;
414+
415+ if (g_str_equal (gdk_pixbuf_format_get_name (format), name))
416+ {
417+ retval = TRUE;
418+ break;
419+ }
420+ }
421+ g_slist_free (formats);
422+
423+ return retval;
424+}
425diff --git a/tests/test-common.h b/tests/test-common.h
426new file mode 100644
427index 0000000..32ff35a
428--- /dev/null
429+++ b/tests/test-common.h
430@@ -0,0 +1,33 @@
431+/* -*- Mode: C; c-basic-offset: 2; -*- */
432+/* GdkPixbuf library - test loaders
433+ *
434+ * Copyright (C) 2014 Red Hat, Inc.
435+ *
436+ * This program is free software; you can redistribute it and/or modify
437+ * it under the terms of the GNU General Public License as published by
438+ * the Free Software Foundation; either version 2 of the License, or
439+ * (at your option) any later version.
440+ *
441+ * This program is distributed in the hope that it will be useful,
442+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
443+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
444+ * GNU General Public License for more details.
445+ *
446+ * You should have received a copy of the GNU General Public License
447+ * along with this program; if not, write to the Free Software
448+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
449+ *
450+ * Author: Matthias Clasen
451+ */
452+
453+#ifndef __TEST_COMMON_H__
454+
455+#include <glib.h>
456+
457+G_BEGIN_DECLS
458+
459+gboolean format_supported (const gchar *filename);
460+
461+G_END_DECLS
462+
463+#endif /* __TEST_COMMON_H__ */
464--
465cgit v0.9.2 \ No newline at end of file
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
new file mode 100644
index 0000000..50e54d8
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
@@ -0,0 +1,105 @@
1SUMMARY = "Image loading library for GTK+"
2HOMEPAGE = "http://www.gtk.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "LGPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
7 file://gdk-pixbuf/gdk-pixbuf.h;endline=26;md5=5066b71daefeff678494fffa3040aba9"
8
9SECTION = "libs"
10
11DEPENDS = "glib-2.0"
12DEPENDS_append_linuxstdbase = " virtual/libx11"
13
14MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
15
16SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
17 file://hardcoded_libtool.patch \
18 file://extending-libinstall-dependencies.patch \
19 file://run-ptest \
20 file://tests-check.patch \
21 file://fatal-loader.patch \
22 "
23
24SRC_URI[md5sum] = "81161cc895eb43afd9ae7354b87e2261"
25SRC_URI[sha256sum] = "c229c53f59573eab9410b53690a4b9db770312c80a4d84ecd6295aa894574494"
26
27inherit autotools pkgconfig gettext pixbufcache ptest
28
29LIBV = "2.10.0"
30
31GDK_PIXBUF_LOADERS ?= "png jpeg"
32
33PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}"
34PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${GDK_PIXBUF_LOADERS}"
35PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}"
36
37PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng"
38PACKAGECONFIG[jpeg] = "--with-libjpeg,--without-libjpeg,jpeg"
39PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff"
40PACKAGECONFIG[jpeg2000] = "--with-libjasper,--without-libjasper,jasper"
41
42# Use GIO to sniff image format instead of trying all loaders
43PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info"
44PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
45
46EXTRA_OECONF = "\
47 --disable-introspection \
48 ${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)} \
49"
50
51PACKAGES =+ "${PN}-xlib"
52
53FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
54ALLOW_EMPTY_${PN}-xlib = "1"
55
56FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
57 ${bindir}/gdk-pixbuf-pixdata \
58 ${libdir}/lib*.so.*"
59
60FILES_${PN}-dev += " \
61 ${bindir}/gdk-pixbuf-csource \
62 ${includedir}/* \
63 ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/*.la \
64"
65
66FILES_${PN}-dbg += " \
67 ${libdir}/.debug/* \
68 ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \
69"
70
71FILES_${PN}-ptest += "${libdir}/gdk-pixbuf/installed-tests \
72 ${datadir}/installed-tests/gdk-pixbuf"
73
74RDEPENDS_${PN}-ptest += "gnome-desktop-testing"
75
76PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*"
77PACKAGES_DYNAMIC_class-native = ""
78
79python populate_packages_prepend () {
80 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
81
82 loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders')
83
84 packages = ' '.join(do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s'))
85 d.setVar('PIXBUF_PACKAGES', packages)
86
87 # The test suite exercises all the loaders, so ensure they are all
88 # dependencies of the ptest package.
89 d.appendVar("RDEPENDS_gdk-pixbuf-ptest", " " + packages)
90}
91
92do_install_append_class-native() {
93 find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
94
95 create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \
96 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
97
98 create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \
99 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
100
101 create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \
102 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \
103 GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders
104}
105BBCLASSEXTEND = "native"
diff --git a/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch b/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch
new file mode 100644
index 0000000..59a7ca7
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch
@@ -0,0 +1,19 @@
1Upstream-Status: Pending
2
3Remove '+' from invalid characters list
4
5Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
6
7Index: GConf-3.2.5/gconf/gconf-backend.c
8===================================================================
9--- GConf-3.2.5.orig/gconf/gconf-backend.c
10+++ GConf-3.2.5/gconf/gconf-backend.c
11@@ -37,7 +37,7 @@ static const char invalid_chars[] =
12 /* Space is common in user names (and thus home directories) on Windows */
13 " "
14 #endif
15- "\t\r\n\"$&<>,+=#!()'|{}[]?~`;%\\";
16+ "\t\r\n\"$&<>,=#!()'|{}[]?~`;%\\";
17
18 static gboolean
19 gconf_address_valid (const char *address,
diff --git a/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch b/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch
new file mode 100644
index 0000000..f758a4b
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch
@@ -0,0 +1,95 @@
1Fixes errors such as this in the rootfs generation:
2
3(gconftool-2.real:10095): GConf-WARNING **: Client failed to connect to the D-BUS daemon:
4Using X11 for dbus-daemon autolaunch was disabled at compile time, set your DBUS_SESSION_BUS_ADDRESS instead
5
6Upstream-Status: Backport
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001
10From: Ray Strode <rstrode@redhat.com>
11Date: Mon, 15 Apr 2013 09:57:34 -0400
12Subject: [PATCH] dbus: Don't spew to console when unable to connect to dbus
13 daemon
14
15Instead pass the error up for the caller to decide what to do.
16
17This prevent untrappable warning messages from showing up at the
18console if gconftool --makefile-install-rule is called.
19---
20 gconf/gconf-dbus.c | 24 ++++++++++++------------
21 1 file changed, 12 insertions(+), 12 deletions(-)
22
23diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
24index 5610fcf..048e3ea 100644
25--- a/gconf/gconf-dbus.c
26+++ b/gconf/gconf-dbus.c
27@@ -105,7 +105,7 @@ static GHashTable *engines_by_db = NULL;
28 static GHashTable *engines_by_address = NULL;
29 static gboolean dbus_disconnected = FALSE;
30
31-static gboolean ensure_dbus_connection (void);
32+static gboolean ensure_dbus_connection (GError **error);
33 static gboolean ensure_service (gboolean start_if_not_found,
34 GError **err);
35 static gboolean ensure_database (GConfEngine *conf,
36@@ -383,7 +383,7 @@ gconf_engine_detach (GConfEngine *conf)
37 }
38
39 static gboolean
40-ensure_dbus_connection (void)
41+ensure_dbus_connection (GError **err)
42 {
43 DBusError error;
44
45@@ -392,7 +392,9 @@ ensure_dbus_connection (void)
46
47 if (dbus_disconnected)
48 {
49- g_warning ("The connection to DBus was broken. Can't reinitialize it.");
50+ g_set_error (err, GCONF_ERROR,
51+ GCONF_ERROR_NO_SERVER,
52+ "The connection to DBus was broken. Can't reinitialize it.");
53 return FALSE;
54 }
55
56@@ -402,7 +404,10 @@ ensure_dbus_connection (void)
57
58 if (!global_conn)
59 {
60- g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message);
61+ g_set_error (err, GCONF_ERROR,
62+ GCONF_ERROR_NO_SERVER,
63+ "Client failed to connect to the D-BUS daemon:\n%s",
64+ error.message);
65
66 dbus_error_free (&error);
67 return FALSE;
68@@ -431,13 +436,8 @@ ensure_service (gboolean start_if_not_found,
69
70 if (global_conn == NULL)
71 {
72- if (!ensure_dbus_connection ())
73- {
74- g_set_error (err, GCONF_ERROR,
75- GCONF_ERROR_NO_SERVER,
76- _("No D-BUS daemon running\n"));
77- return FALSE;
78- }
79+ if (!ensure_dbus_connection (err))
80+ return FALSE;
81
82 g_assert (global_conn != NULL);
83 }
84@@ -2512,7 +2512,7 @@ gconf_ping_daemon (void)
85 {
86 if (global_conn == NULL)
87 {
88- if (!ensure_dbus_connection ())
89+ if (!ensure_dbus_connection (NULL))
90 {
91 return FALSE;
92 }
93--
941.7.10.4
95
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
new file mode 100644
index 0000000..e081ec3
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
@@ -0,0 +1,60 @@
1SUMMARY = "GNOME configuration system"
2SECTION = "x11/gnome"
3LICENSE = "LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
5
6DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native gobject-introspection-stub"
7DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
8
9
10inherit gnomebase gtk-doc gettext
11
12SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \
13 file://remove_plus_from_invalid_characters_list.patch \
14 file://unable-connect-dbus.patch \
15"
16
17SRC_URI[archive.md5sum] = "2b16996d0e4b112856ee5c59130e822c"
18SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c"
19
20S = "${WORKDIR}/GConf-${PV}"
21
22EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
23 --disable-introspection --disable-orbit --with-openldap=no --disable-gtk"
24
25# Disable PolicyKit by default
26PACKAGECONFIG ??= ""
27# We really don't want PolicyKit for native or uclibc
28PACKAGECONFIG_class-native = ""
29PACKAGECONFIG_libc-uclibc = ""
30
31PACKAGECONFIG[policykit] = "--enable-defaults-service,--disable-defaults-service,polkit"
32
33do_install_append() {
34 # this directory need to be created to avoid an Error 256 at gdm launch
35 install -d ${D}${sysconfdir}/gconf/gconf.xml.system
36
37 # this stuff is unusable
38 rm -f ${D}${libdir}/GConf/*/*.*a
39 rm -f ${D}${libdir}/gio/*/*.*a
40}
41
42do_install_append_class-native() {
43 create_wrapper ${D}/${bindir}/gconftool-2 \
44 GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2
45}
46
47# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
48RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
49RDEPENDS_${PN}_class-native = ""
50
51FILES_${PN} += "${libdir}/GConf/* \
52 ${libdir}/gio/*/*.so \
53 ${datadir}/polkit* \
54 ${datadir}/dbus-1/services/*.service \
55 ${datadir}/dbus-1/system-services/*.service \
56 "
57FILES_${PN}-dbg += "${libdir}/*/*/.debug"
58FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd"
59
60BBCLASSEXTEND = "native"
diff --git a/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb b/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
new file mode 100644
index 0000000..1fd2d83
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
@@ -0,0 +1,22 @@
1SUMMARY = "Common macros for building GNOME applications"
2HOMEPAGE = "http://www.gnome.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7
8SECTION = "x11/gnome"
9inherit gnomebase allarch
10
11GNOME_COMPRESS_TYPE = "xz"
12
13SRC_URI[archive.md5sum] = "974cd54626f1d1787481288ef26bd4ba"
14SRC_URI[archive.sha256sum] = "2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b"
15
16EXTRA_AUTORECONF = ""
17DEPENDS = ""
18
19FILES_${PN} += "${datadir}/aclocal"
20FILES_${PN}-dev = ""
21
22BBCLASSEXTEND = "native"
diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc
new file mode 100644
index 0000000..3853022
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-desktop.inc
@@ -0,0 +1,23 @@
1SUMMARY = "GNOME library for reading .desktop files"
2SECTION = "x11/gnome"
3LICENSE = "GPLv2 & LGPLv2"
4DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification"
5
6EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
7
8do_configure_prepend () {
9 cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S}
10}
11
12FILES_${PN} += "${datadir}/gnome-about ${datadir}/libgnome-desktop/pnp.ids"
13
14PR = "r6"
15
16inherit gnomebase
17
18do_install_append () {
19 sed -i -e's,${STAGING_BINDIR_NATIVE},${bindir},g' ${D}${bindir}/gnome-about
20 sed -i -e '1s,#!.*python,#! ${USRBINPATH}/env python,' ${D}${bindir}/gnome-about
21}
22
23
diff --git a/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb
new file mode 100644
index 0000000..424eafe
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb
@@ -0,0 +1,7 @@
1require gnome-desktop.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
4 file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
5
6SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67"
7SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d"
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
new file mode 100644
index 0000000..e148ce3
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -0,0 +1,31 @@
1SUMMARY = "A collection of documentation utilities for the Gnome project"
2DESCRIPTION = "The GNOME Documentation Build Utilities (gnome-doc- \
3utils) were created to make it easier for application developers to \
4include and create documentation in their releases. They include the \
5xml2po tool which makes it easier to translate and keep up to date \
6translations of documentation."
7LICENSE = "GPLv2 & LGPLv2.1"
8DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0"
9DEPENDS_class-native = "libxml2-native libxslt-native intltool-native glib-2.0-native"
10
11inherit gnomebase gettext python-dir pythonnative autotools-brokensep
12
13EXTRA_OECONF += "--disable-scrollkeeper"
14
15do_install_append() {
16 mkdir -p ${D}${datadir}/xml/gnome/xslt/
17 cp -pPr ${S}/xslt/* ${D}${datadir}/xml/gnome/xslt/
18
19 chown -R root:root ${D}
20}
21
22do_install_append_class-native () {
23 sed -i -e 's|^#!.*/usr/bin/env python|#! /usr/bin/env nativepython|' ${D}${bindir}/xml2po
24}
25
26FILES_${PN} += "${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/*"
27
28RDEPENDS_${PN} = "bash"
29RDEPENDS_${PN}_class-native = ""
30
31BBCLASSEXTEND = "native"
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
new file mode 100644
index 0000000..416d698
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
@@ -0,0 +1,35 @@
1In cross environment we have to prepend the sysroot to the path found by
2pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
3it ends up using the files from host system. Now usually people have gnome installed
4so the build succeeds but if you dont have gnome installed on build host then
5it wont find the files on host system and packages using gnome-doc-utils wont
6compile.
7
8This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
9will be empty
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
14
15Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
16===================================================================
17--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
18+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
19@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
20 _xml2po ?= `which xml2po`
21 _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
22
23-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
24-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
25-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
26-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
27-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
28+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
29+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
30+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
31+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
32+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
33
34 if ENABLE_SK
35 _ENABLE_SK = true
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
new file mode 100644
index 0000000..0e196c0
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
@@ -0,0 +1,30 @@
1We can't use #!/full/path/to/python -u as this can be longer than shebang
2allows for. In order to be appropraite for upstream more work would be
3needed to make sure that the main xml2po code doesn't rely on python
4being invoked with -u (force stdin/out/err to be used raw).
5
6Upstream-Status: Inappropriate [Would break behavior on Windows]
7Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
8
9Index: gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am
10===================================================================
11--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/Makefile.am
12+++ gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am
13@@ -7,7 +7,6 @@ CLEANFILES = xml2po
14
15 xml2po: xml2po.py.in
16 $(AM_V_GEN)sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
17- -e "s+^#!.*python.*+#!$(PYTHON)+" \
18 < $(srcdir)/xml2po.py.in > xml2po
19 $(AM_V_at)chmod +x xml2po
20
21Index: gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
22===================================================================
23--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in
24+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
25@@ -1,4 +1,4 @@
26-#!/usr/bin/python -u
27+#!/usr/bin/env python
28 # -*- encoding: utf-8 -*-
29 # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
30 # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
new file mode 100644
index 0000000..9346494
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
@@ -0,0 +1,95 @@
1This adds the -nonet option to xsltproc invocations, which fixes
2compile errors when building the gnome-doc-utils docs.
3
4Upstream-Status: Inappropriate [configuration]
5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
7
8Index: gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
9===================================================================
10--- gnome-doc-utils-0.20.10.orig/doc/xslt/Makefile.am
11+++ gnome-doc-utils-0.20.10/doc/xslt/Makefile.am
12@@ -21,14 +21,14 @@ all: $(xsldoc_docs) $(xsldoc_xmls)
13
14 $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
15 $(AM_V_GEN)$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
16- | xsltproc -o "$@" \
17+ | xsltproc -nonet -o "$@" \
18 --stringparam basename "$(basename $(notdir $@))" \
19 --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
20 "$(srcdir)/xsldoc-fill.xsl" -
21
22 $(xsldoc_xmls): xsldoc-docbook.xsl
23 $(xsldoc_xmls): C/%.xml : C/%.xsldoc
24- $(AM_V_GEN)xsltproc -o "$@" \
25+ $(AM_V_GEN)xsltproc -nonet -o "$@" \
26 --stringparam basename "$(basename $(notdir $@))" \
27 --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
28 "$(srcdir)/xsldoc-docbook.xsl" "$<"
29@@ -62,7 +62,7 @@ gnome-doc-xslt-check-includes:
30 gnome-doc-xslt-check-xsldoc: $(xsldoc_docs)
31 @echo "Running xsldoc checks";
32 @(echo "<xsldoc>"; cat $(xsldoc_docs); echo "</xsldoc>") \
33- | xsltproc "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null
34+ | xsltproc -nonet "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null
35
36 .PHONY: clean-xsldoc
37 clean-local: clean_xsldoc
38Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
39===================================================================
40--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make
41+++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make
42@@ -37,7 +37,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
43 list='$(DOC_H_DOCS)'; for doc in $$list; do \
44 xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
45 if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
46- xsltproc --path "$$xmlpath" $(_credits) $$doc; \
47+ xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \
48 done | sort | uniq \
49 | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
50 | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
51@@ -50,7 +50,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
52 docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
53 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
54 echo $$xmlpath; \
55- ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
56+ ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
57 for id in $$ids; do \
58 echo '#define HELP_'`echo $$docid`'_'`echo $$id \
59 | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
60@@ -197,7 +197,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %
61 echo "The file '$(_skcontentslist)' does not exist." >&2; \
62 echo "Please check your ScrollKeeper installation." >&2; \
63 exit 1; }
64- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
65+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
66
67 ## @ _DOC_OMF_HTML
68 ## The OMF files for HTML output
69@@ -212,7 +212,7 @@ if ENABLE_SK
70 echo "Please check your ScrollKeeper installation." >&2; \
71 exit 1; }
72 endif
73- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
74+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
75
76 ## @ _DOC_OMF_ALL
77 ## All OMF output files to be built
78@@ -267,7 +267,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES),
79 ## All HTML documentation in the C locale
80 # FIXME: probably have to shell escape to determine the file names
81 _DOC_C_HTML = $(foreach f, \
82- $(shell xsltproc --xinclude \
83+ $(shell xsltproc -nonet --xinclude \
84 --stringparam db.chunk.basename "$(DOC_MODULE)" \
85 $(_chunks) "C/$(DOC_MODULE).xml"), \
86 C/$(f).xhtml)
87@@ -393,7 +393,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,
88 _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
89
90 $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
91- $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
92+ $(GDU_V_DB2HTM)xsltproc -nonet -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
93
94
95 ################################################################################
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
new file mode 100644
index 0000000..321eb7f
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
@@ -0,0 +1,13 @@
1require gnome-doc-utils.inc
2LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
3 file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
4
5GNOME_COMPRESS_TYPE = "xz"
6
7SRC_URI += "file://xsltproc_nonet.patch \
8 file://use-usr-bin-env-for-python-in-xml2po.patch \
9 file://sysrooted-pkg-config.patch \
10 "
11
12SRC_URI[archive.md5sum] = "3c64ad7bacd617b04999e4a168afaac5"
13SRC_URI[archive.sha256sum] = "cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6"
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
new file mode 100644
index 0000000..f840fca
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
@@ -0,0 +1,49 @@
1Version of the patch of the same name from sato-icon-theme JL - 20/10/10
2"
3pkg-config will only search the target sysroot and we want the native script. This
4patch adds an option to allow the path to the tool to be specified.
5
6RP - 12/8/10"
7
8Upstream-Status: Pending
9
10Index: gnome-icon-theme-2.31.0/configure.ac
11===================================================================
12--- gnome-icon-theme-2.31.0.orig/configure.ac 2010-12-01 11:00:22.000000000 +0800
13+++ gnome-icon-theme-2.31.0/configure.ac 2010-12-01 11:02:16.000000000 +0800
14@@ -38,18 +38,24 @@
15 ICONMAP="true"
16 if test "x$enable_mapping" != "xno"; then
17 UTILS_REQUIRED=0.8.7
18+ PKG_PROG_PKG_CONFIG()
19
20- AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
21- PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
22- have_utils=yes, have_utils=no)
23- if test "x$have_utils" = "xyes"; then
24- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
25- ICONMAP="$UTILS_PATH/icon-name-mapping"
26- AC_MSG_RESULT([yes])
27- else
28- AC_MSG_RESULT([no])
29- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
30- and install gnome-icon-theme])
31+ AC_ARG_WITH(iconmap,
32+ AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
33+ ICONMAP=$withval, ICONMAP="")
34+ if test "x$ICONMAP" = "x"; then
35+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
36+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
37+ have_utils=yes, have_utils=no)
38+ if test "x$have_utils" = "xyes"; then
39+ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
40+ ICONMAP="$UTILS_PATH/icon-name-mapping"
41+
42+ AC_MSG_RESULT([yes])
43+ else
44+ AC_MSG_RESULT([no])
45+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install sato-icon-theme"])
46+ fi
47 fi
48 else
49 ICONMAP="false"
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
new file mode 100644
index 0000000..eb65224
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
@@ -0,0 +1,24 @@
1SUMMARY = "GNOME 2 default icon themes"
2HOMEPAGE = "http://www.gnome.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4SECTION = "x11/gnome"
5
6LICENSE = "LGPLv3+ | CC-BY-SA-3.0"
7LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e"
8
9PR = "r5"
10
11DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native libxml-simple-perl-native"
12
13inherit autotools perlnative gtk-icon-cache
14
15SRC_URI = "${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \
16 file://iconpath-option.patch"
17
18SRC_URI[md5sum] = "8e727703343d4c18c73c79dd2009f8ed"
19SRC_URI[sha256sum] = "ea7e05b77ead159379392b3b275ca0c9cbacd7d936014e447cc7c5e27a767982"
20
21EXTRA_OECONF = "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('gnome-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
22
23FILES_${PN} += "${datadir}/*"
24RRECOMMENDS_${PN} += "librsvg-gtk"
diff --git a/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch b/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch
new file mode 100644
index 0000000..0903425
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: gnome-mime-data-2.18.0/Makefile.am
4===================================================================
5--- gnome-mime-data-2.18.0.orig/Makefile.am 2009-06-11 17:27:48.000000000 +0100
6+++ gnome-mime-data-2.18.0/Makefile.am 2009-06-11 17:27:59.000000000 +0100
7@@ -1,6 +1,6 @@
8 SUBDIRS = man po
9
10-pkgconfigdir = $(datadir)/pkgconfig
11+pkgconfigdir = $(libdir)/pkgconfig
12 pkgconfig_DATA = gnome-mime-data-2.0.pc
13
14 NULL=
diff --git a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
new file mode 100644
index 0000000..65b79f0
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
@@ -0,0 +1,18 @@
1SUMMARY = "Base MIME and Application database for GNOME"
2HOMEPAGE = "http://www.gnome.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2 & GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
7 file://check-mime.pl;endline=26;md5=a95b63c92c33d4ca1af61a315888f450"
8
9inherit gnomebase mime
10PR = "r4"
11
12SRC_URI += "file://pkgconfig.patch"
13
14SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c"
15SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7"
16
17DEPENDS += "shared-mime-info intltool-native"
18RDEPENDS_${PN} = "shared-mime-info"
diff --git a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb
new file mode 100644
index 0000000..7217c66
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb
@@ -0,0 +1,16 @@
1SUMMARY = "GNOME desktop-wide GSettings schemas"
2HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
7PR = "r1"
8
9DEPENDS = "glib-2.0"
10
11inherit gnomebase gsettings gettext
12
13GNOME_COMPRESS_TYPE = "xz"
14
15SRC_URI[archive.md5sum] = "f9ffca591a984f19a1dd9caeb96b5f23"
16SRC_URI[archive.sha256sum] = "452378c4960a145747ec69f8c6a874e5b7715454df3e2452d1ff1a0a82e76811"
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
new file mode 100644
index 0000000..190ba96
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
@@ -0,0 +1,17 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libart_lgpl-2.3.21/Makefile.am
4===================================================================
5--- libart_lgpl-2.3.21.orig/Makefile.am 2009-04-18 05:29:25.000000000 -0700
6+++ libart_lgpl-2.3.21/Makefile.am 2010-11-23 23:12:32.445450075 -0800
7@@ -7,8 +7,8 @@
8
9 BUILT_SOURCES = art_config.h
10
11-art_config.h:
12- ./gen_art_config.sh > art_config.h
13+#art_config.h:
14+# ./gen_art_config.sh > art_config.h
15
16 EXTRA_DIST = \
17 libart.def \
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/aarch64/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/aarch64/art_config.h
new file mode 100644
index 0000000..500ffc3
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/aarch64/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config.c */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 8
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h
new file mode 100644
index 0000000..b0e74ad
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config.c */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 4
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h
new file mode 100644
index 0000000..b0e74ad
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config.c */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 4
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h
new file mode 100644
index 0000000..b0e74ad
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config.c */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 4
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h
new file mode 100644
index 0000000..b0e74ad
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config.c */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 4
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/mips/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/mips/art_config.h
new file mode 100644
index 0000000..b0e74ad
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/mips/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config.c */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 4
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/mips64/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/mips64/art_config.h
new file mode 100644
index 0000000..d10cd95
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/mips64/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 8
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/mips64el/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/mips64el/art_config.h
new file mode 100644
index 0000000..d10cd95
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/mips64el/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 8
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/mipsel/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/mipsel/art_config.h
new file mode 100644
index 0000000..b0e74ad
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/mipsel/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config.c */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 4
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/powerpc/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/powerpc/art_config.h
new file mode 100644
index 0000000..b0e74ad
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/powerpc/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config.c */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 4
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h
new file mode 100644
index 0000000..500ffc3
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config.c */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 8
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/x86_64/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/x86_64/art_config.h
new file mode 100644
index 0000000..500ffc3
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/x86_64/art_config.h
@@ -0,0 +1,10 @@
1/* Automatically generated by gen_art_config.c */
2
3#define ART_SIZEOF_CHAR 1
4#define ART_SIZEOF_SHORT 2
5#define ART_SIZEOF_INT 4
6#define ART_SIZEOF_LONG 8
7
8typedef unsigned char art_u8;
9typedef unsigned short art_u16;
10typedef unsigned int art_u32;
diff --git a/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb b/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
new file mode 100644
index 0000000..4966ea4
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
@@ -0,0 +1,28 @@
1SUMMARY = "Library of functions for 2D graphics"
2SECTION = "x11/gnome"
3LICENSE = "LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
5PR = "r2"
6
7ART_CONFIG = "${HOST_ARCH}/art_config.h"
8
9# can't use gnome.oeclass due to _ in filename
10SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
11 file://${ART_CONFIG} \
12 file://Makefile.am.patch"
13
14SRC_URI[md5sum] = "08559ff3c67fd95d57b0c5e91a6b4302"
15SRC_URI[sha256sum] = "fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"
16
17inherit autotools pkgconfig
18
19DEPENDS = ""
20
21FILES_${PN} = "${libdir}/*.so.*"
22FILES_${PN}-dev += "${bindir}/libart2-config"
23
24S = "${WORKDIR}/libart_lgpl-${PV}"
25
26do_configure_prepend() {
27 cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
28}
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
new file mode 100644
index 0000000..71e334d
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
@@ -0,0 +1,48 @@
1From d1f7a894674dfdd6769f1bbae31eb1a69e451a5c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 16 Nov 2012 22:07:28 +0100
4Subject: [PATCH] GtkButton: do not prelight in touchscreen mode
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Code was copied from GtkToggleButton.
10
11Upstream-Status: submitted [1]
12
13[1] https://bugzilla.gnome.org/show_bug.cgi?id=689138
14
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16---
17 gtk/gtkbutton.c | 8 ++++++--
18 1 files changed, 6 insertions(+), 2 deletions(-)
19
20diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
21index f472007..1beb1b6 100644
22--- a/gtk/gtkbutton.c
23+++ b/gtk/gtkbutton.c
24@@ -2079,15 +2079,19 @@ _gtk_button_set_depressed (GtkButton *button,
25 static void
26 gtk_button_update_state (GtkButton *button)
27 {
28- gboolean depressed;
29+ gboolean depressed, touchscreen;
30 GtkStateType new_state;
31
32+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (button)),
33+ "gtk-touchscreen-mode", &touchscreen,
34+ NULL);
35+
36 if (button->activate_timeout)
37 depressed = button->depress_on_activate;
38 else
39 depressed = button->in_button && button->button_down;
40
41- if (button->in_button && (!button->button_down || !depressed))
42+ if (!touchscreen && button->in_button && (!button->button_down || !depressed))
43 new_state = GTK_STATE_PRELIGHT;
44 else
45 new_state = depressed ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL;
46--
471.7.6.5
48
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
new file mode 100644
index 0000000..354f0ab
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
@@ -0,0 +1,30 @@
1From 69b9441eab2a7215509687dc22b48b6f212d22aa Mon Sep 17 00:00:00 2001
2From: Rob Bradford <rob@linux.intel.com>
3Date: Thu, 4 Jun 2009 15:43:20 +0100
4Subject: [PATCH] =?utf-8?q?bgo#584832=20=E2=80=93=20Duplicate=20the=20exec=20string=20returned=20by=20gtk=5Frecent=5Finfo=5Fget=5Fapplication=5Finfo?=
5MIME-Version: 1.0
6Content-Type: text/plain; charset=utf-8
7Content-Transfer-Encoding: 8bit
8
9This function states that the caller is responsible for freeing the string
10passed returned by reference. Unfortunately if you do this you get a crash
11since the internal value is returned without being duplicated.
12---
13 gtk/gtkrecentmanager.c | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-)
15
16Upstream-Status: Pending
17
18Index: gtk+-2.21.2/gtk/gtkrecentmanager.c
19===================================================================
20--- gtk+-2.21.2.orig/gtk/gtkrecentmanager.c 2010-06-22 18:11:30.000000000 +0800
21+++ gtk+-2.21.2/gtk/gtkrecentmanager.c 2010-06-22 18:11:53.000000000 +0800
22@@ -1766,7 +1766,7 @@
23 }
24
25 if (app_exec)
26- *app_exec = ai->exec;
27+ *app_exec = g_strdup (ai->exec);
28
29 if (count)
30 *count = ai->count;
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch
new file mode 100644
index 0000000..ba89329
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch
@@ -0,0 +1,31 @@
1Upstream-Status: Pending
2
3Index: gtk/gtkcellrenderer.c
4===================================================================
5--- gtk/gtkcellrenderer.c.orig 2010-06-22 17:21:22.000000000 +0800
6+++ gtk/gtkcellrenderer.c 2010-06-22 17:21:25.000000000 +0800
7@@ -566,6 +566,7 @@
8
9 if (cell->cell_background_set && !selected)
10 {
11+#ifdef USE_CAIRO_INTERNALLY
12 cairo_t *cr = gdk_cairo_create (window);
13
14 gdk_cairo_rectangle (cr, background_area);
15@@ -573,6 +574,16 @@
16 cairo_fill (cr);
17
18 cairo_destroy (cr);
19+#else
20+ GdkGC *gc;
21+
22+ gc = gdk_gc_new (window);
23+ gdk_gc_set_rgb_fg_color (gc, &priv->cell_background);
24+ gdk_draw_rectangle (window, gc, TRUE,
25+ background_area->x, background_area->y,
26+ background_area->width, background_area->height);
27+ g_object_unref (gc);
28+#endif
29 }
30
31 GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell,
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch
new file mode 100644
index 0000000..d67b797
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch
@@ -0,0 +1,21 @@
1Upstream-Status: Pending
2https://bugzilla.gnome.org/show_bug.cgi?id=671515
3
4Signed-Off-By: Xiaofeng Yan <xiaofeng.yan@windriver.com>
5# Pick up ${NM} from the environment
6
7Updated to apply to gtk+-2.24.15
8
9Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
10diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac
11--- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200
12+++ gtk+-2.24.15/configure.ac 2013-02-12 21:25:06.073937041 +0200
13@@ -190,7 +190,7 @@
14 AC_SYS_LARGEFILE
15
16 AM_PROG_AS
17-AC_PATH_PROG(NM, nm, nm)
18+AC_CHECK_TOOLS(NM, [$NM nm], nm)
19
20 dnl Initialize maintainer mode
21 AM_MAINTAINER_MODE([enable])
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch
new file mode 100644
index 0000000..2803691
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch
@@ -0,0 +1,87 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: gtk+-2.21.2/docs/faq/Makefile.am
4===================================================================
5--- gtk+-2.21.2.orig/docs/faq/Makefile.am 2010-04-09 10:29:53.000000000 +0800
6+++ gtk+-2.21.2/docs/faq/Makefile.am 2010-06-22 17:39:24.000000000 +0800
7@@ -3,34 +3,36 @@
8 EXTRA_DIST += \
9 gtk-faq.sgml
10
11-if HAVE_DOCBOOK
12+
13 html:
14+if HAVE_DOCBOOK
15 if test -w $(srcdir); then \
16 (cd $(srcdir); \
17 db2html gtk-faq.sgml; \
18 test -d html && rm -r html; \
19 mv gtk-faq html); \
20 fi
21-
22-pdf:
23- if test -w $(srcdir); then \
24- (cd $(srcdir); db2pdf gtk-faq.sgml); \
25- fi
26-
27-dist-hook: html
28- cp -Rp $(srcdir)/html $(distdir)
29 else
30-html:
31 echo "***"
32 echo "*** Warning: FAQ not built"
33 echo "***"
34+endif
35
36 pdf:
37+if HAVE_DOCBOOK
38+ if test -w $(srcdir); then \
39+ (cd $(srcdir); db2pdf gtk-faq.sgml); \
40+ fi
41+else
42 echo "***"
43 echo "*** Warning: FAQ not built"
44 echo "***"
45+endif
46
47-dist-hook:
48+dist-hook: html
49+if HAVE_DOCBOOK
50+ cp -Rp $(srcdir)/html $(distdir)
51+else
52 echo "***"
53 echo "*** Warning: FAQ not built"
54 echo "*** DISTRIBUTION IS INCOMPLETE"
55Index: gtk+-2.21.2/gtk-doc.make
56===================================================================
57--- gtk+-2.21.2.orig/gtk-doc.make 2010-05-28 00:01:48.000000000 +0800
58+++ gtk+-2.21.2/gtk-doc.make 2010-06-22 17:39:24.000000000 +0800
59@@ -23,7 +23,7 @@
60
61 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
62
63-EXTRA_DIST = \
64+EXTRA_DIST += \
65 $(content_files) \
66 $(HTML_IMAGES) \
67 $(DOC_MAIN_SGML_FILE) \
68Index: gtk+-2.21.2/gtk/tests/Makefile.am
69===================================================================
70--- gtk+-2.21.2.orig/gtk/tests/Makefile.am 2010-06-10 20:53:46.000000000 +0800
71+++ gtk+-2.21.2/gtk/tests/Makefile.am 2010-06-22 17:39:24.000000000 +0800
72@@ -58,13 +58,13 @@
73 # this doesn't work in make distcheck, since running
74 # on a naked X server creates slightly different event
75 # sequences than running on a normal desktop
76-# TEST_PROGS += crossingevents
77+#TEST_PROGS += crossingevents
78 crossingevents_SOURCES = crossingevents.c
79 crossingevents_LDADD = $(progs_ldadd)
80
81 # this doesn't work in make distcheck, since it doesn't
82 # find file-chooser-test-dir
83-# TEST_PROGS += filechooser
84+#TEST_PROGS += filechooser
85 filechooser_SOURCES = filechooser.c pixbuf-init.c
86 filechooser_LDADD = $(progs_ldadd)
87
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch
new file mode 100644
index 0000000..74e479f
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch
@@ -0,0 +1,22 @@
1There are issues building the gtk+ tutorial and faq documentation.
2Since they were removed in gtk+ upstream and are superfluous in
3embedded applications, just don't build them.
4
5Thanks to Joshua Lock for suggesting this approach.
6
7Signed-off-by: Scott Garman <scott.a.garman@intel.com>
8
9Upstream-Status: Inappropriate [embedded specific]
10
11diff -urN gtk+-2.22.1.orig/docs/Makefile.am gtk+-2.22.1/docs/Makefile.am
12--- gtk+-2.22.1.orig/docs/Makefile.am 2010-11-15 04:13:09.000000000 -0800
13+++ gtk+-2.22.1/docs/Makefile.am 2011-02-23 19:25:16.914815097 -0800
14@@ -1,7 +1,7 @@
15 ## Process this file with automake to produce Makefile.in
16 include $(top_srcdir)/Makefile.decl
17
18-SUBDIRS = tutorial faq reference tools
19+SUBDIRS = reference tools
20
21 EXTRA_DIST += \
22 defsformat.txt \
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch
new file mode 100644
index 0000000..3083b77
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch
@@ -0,0 +1,105 @@
1Upstream-Status: Pending
2
3Index: gtk/gtkentry.c
4===================================================================
5RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
6retrieving revision 1.317
7diff -u -r1.317 gtkentry.c
8--- gtk/gtkentry.c 29 Jun 2006 09:18:05 -0000 1.317
9+++ gtk/gtkentry.c 2 Jul 2006 14:14:24 -0000
10@@ -3337,7 +3337,9 @@
11 if (GTK_WIDGET_DRAWABLE (entry))
12 {
13 PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE);
14+#ifdef USE_CAIRO_INTERNALLY
15 cairo_t *cr;
16+#endif
17 gint x, y;
18 gint start_pos, end_pos;
19
20@@ -3345,23 +3347,35 @@
21
22 get_layout_position (entry, &x, &y);
23
24+#ifdef USE_CAIRO_INTERNALLY
25 cr = gdk_cairo_create (entry->text_area);
26
27 cairo_move_to (cr, x, y);
28 gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]);
29 pango_cairo_show_layout (cr, layout);
30+#else
31+ gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state],
32+ x, y,
33+ layout);
34+#endif
35
36 if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos))
37 {
38 gint *ranges;
39 gint n_ranges, i;
40 PangoRectangle logical_rect;
41- GdkColor *selection_color, *text_color;
42 GtkBorder inner_border;
43+#ifdef USE_CAIRO_INTERNALLY
44+ GdkColor *selection_color, *text_color;
45+#else
46+ GdkGC *selection_gc, *text_gc;
47+ GdkRegion *clip_region;
48+#endif
49
50 pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
51 gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
52
53+#ifdef USE_CAIRO_INTERNALLY
54 if (GTK_WIDGET_HAS_FOCUS (entry))
55 {
56 selection_color = &widget->style->base [GTK_STATE_SELECTED];
57@@ -3390,11 +3404,46 @@
58 cairo_move_to (cr, x, y);
59 gdk_cairo_set_source_color (cr, text_color);
60 pango_cairo_show_layout (cr, layout);
61-
62+#else
63+ if (GTK_WIDGET_HAS_FOCUS (entry))
64+ {
65+ selection_gc = widget->style->base_gc [GTK_STATE_SELECTED];
66+ text_gc = widget->style->text_gc [GTK_STATE_SELECTED];
67+ }
68+ else
69+ {
70+ selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE];
71+ text_gc = widget->style->text_gc [GTK_STATE_ACTIVE];
72+ }
73+
74+ clip_region = gdk_region_new ();
75+ for (i = 0; i < n_ranges; ++i)
76+ {
77+ GdkRectangle rect;
78+
79+ rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i];
80+ rect.y = y;
81+ rect.width = ranges[2 * i + 1];
82+ rect.height = logical_rect.height;
83+
84+ gdk_draw_rectangle (entry->text_area, selection_gc, TRUE,
85+ rect.x, rect.y, rect.width, rect.height);
86+
87+ gdk_region_union_with_rect (clip_region, &rect);
88+ }
89+
90+ gdk_gc_set_clip_region (text_gc, clip_region);
91+ gdk_draw_layout (entry->text_area, text_gc,
92+ x, y,
93+ layout);
94+ gdk_gc_set_clip_region (text_gc, NULL);
95+ gdk_region_destroy (clip_region);
96+#endif
97 g_free (ranges);
98 }
99-
100+#ifdef USE_CAIRO_INTERNALLY
101 cairo_destroy (cr);
102+#endif
103 }
104 }
105
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch
new file mode 100644
index 0000000..13ff318
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch
@@ -0,0 +1,1814 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Updated to apply to gtk+-2.24.15
4
5Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
6diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac
7--- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200
8+++ gtk+-2.24.15/configure.ac 2013-02-12 21:33:30.689925967 +0200
9@@ -415,7 +415,7 @@
10 case $enable_explicit_deps in
11 auto)
12 export SED
13- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
14+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
15 if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
16 enable_explicit_deps=yes
17 else
18@@ -774,7 +774,7 @@
19 dnl Now we check to see if our libtool supports shared lib deps
20 dnl (in a rather ugly way even)
21 if $dynworks; then
22- module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
23+ module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
24 module_deplibs_check=`$module_libtool_config | \
25 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
26 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
27@@ -1574,7 +1574,7 @@
28 # We are using gmodule-no-export now, but I'm leaving the stripping
29 # code in place for now, since pango and atk still require gmodule.
30 export SED
31-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
32+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
33 if test -n "$export_dynamic"; then
34 GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
35 GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
36diff -Nurd gtk+-2.24.15/configure.ac.orig gtk+-2.24.15/configure.ac.orig
37--- gtk+-2.24.15/configure.ac.orig 1970-01-01 02:00:00.000000000 +0200
38+++ gtk+-2.24.15/configure.ac.orig 2013-02-12 21:33:21.821926163 +0200
39@@ -0,0 +1,1775 @@
40+# Process this file with autoconf to produce a configure script.
41+# Process this file with autoconf to produce a configure script.
42+# require autoconf 2.54
43+AC_PREREQ(2.62)
44+
45+# Making releases:
46+# GTK_MICRO_VERSION += 1;
47+# GTK_INTERFACE_AGE += 1;
48+# GTK_BINARY_AGE += 1;
49+# if any functions have been added, set GTK_INTERFACE_AGE to 0.
50+# if backwards compatibility has been broken,
51+# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
52+
53+m4_define([gtk_major_version], [2])
54+m4_define([gtk_minor_version], [24])
55+m4_define([gtk_micro_version], [15])
56+m4_define([gtk_interface_age], [15])
57+m4_define([gtk_binary_age],
58+ [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
59+m4_define([gtk_version],
60+ [gtk_major_version.gtk_minor_version.gtk_micro_version])
61+# This is the X.Y used in -lgtk-FOO-X.Y
62+m4_define([gtk_api_version], [2.0])
63+
64+# Define a string for the earliest version that this release has
65+# backwards binary compatibility with for all interfaces a module
66+# might. Unless we add module-only API with lower stability
67+# guarantees, this should be unchanged until we break binary compat
68+# for GTK+.
69+#
70+#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
71+m4_define([gtk_binary_version], [2.10.0])
72+
73+# required versions of other packages
74+m4_define([glib_required_version], [2.28.0])
75+m4_define([pango_required_version], [1.20])
76+m4_define([atk_required_version], [1.29.2])
77+m4_define([cairo_required_version], [1.6])
78+m4_define([gdk_pixbuf_required_version], [2.21.0])
79+
80+
81+AC_INIT([gtk+], [gtk_version],
82+ [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
83+ [gtk+])
84+
85+AC_CONFIG_SRCDIR([gdk/gdktypes.h])
86+AC_CONFIG_HEADERS([config.h])
87+AC_CONFIG_MACRO_DIR([m4])
88+
89+# Save this value here, since automake will set cflags later
90+cflags_set=${CFLAGS+set}
91+
92+AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
93+
94+# Support silent build rules, requires at least automake-1.11. Enable
95+# by either passing --enable-silent-rules to configure or passing V=0
96+# to make
97+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
98+
99+#
100+# For each of the libraries we build, we define the following
101+
102+# substituted variables:
103+#
104+# foo_PACKAGES: pkg-config packages this library requires
105+# foo_EXTRA_LIBS: Libraries this module requires not pulled in by pkg-config
106+# foo_EXTRA_CFLAGS: cflags this module requires not pulled in by pkg-config
107+# foo_DEP_LIBS: All libraries this module requires
108+# foo_DEP_CFLAGS: All cflags this module requires
109+
110+
111+GTK_MAJOR_VERSION=gtk_major_version
112+GTK_MINOR_VERSION=gtk_minor_version
113+GTK_MICRO_VERSION=gtk_micro_version
114+GTK_INTERFACE_AGE=gtk_interface_age
115+GTK_BINARY_AGE=gtk_binary_age
116+GTK_VERSION=gtk_version
117+GTK_API_VERSION=gtk_api_version
118+GTK_BINARY_VERSION=gtk_binary_version
119+AC_SUBST(GTK_MAJOR_VERSION)
120+AC_SUBST(GTK_MINOR_VERSION)
121+AC_SUBST(GTK_MICRO_VERSION)
122+AC_SUBST(GTK_INTERFACE_AGE)
123+AC_SUBST(GTK_BINARY_AGE)
124+AC_SUBST(GTK_API_VERSION)
125+AC_SUBST(GTK_VERSION)
126+AC_SUBST(GTK_BINARY_VERSION)
127+
128+# libtool versioning
129+#LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
130+#LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
131+#LT_REVISION=$GTK_INTERFACE_AGE
132+#LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
133+#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
134+
135+m4_define([lt_current], [m4_eval(100 * gtk_minor_version + gtk_micro_version - gtk_interface_age)])
136+m4_define([lt_revision], [gtk_interface_age])
137+m4_define([lt_age], [m4_eval(gtk_binary_age - gtk_interface_age)])
138+LT_VERSION_INFO="lt_current:lt_revision:lt_age"
139+LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
140+AC_SUBST(LT_VERSION_INFO)
141+AC_SUBST(LT_CURRENT_MINUS_AGE)
142+
143+m4_define([gail_lt_current],[18])
144+m4_define([gail_lt_revision],[1])
145+m4_define([gail_lt_age],[0])
146+m4_define([gail_lt_version_info],[gail_lt_current:gail_lt_revision:gail_lt_age])
147+m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)])
148+AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info])
149+AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
150+
151+GETTEXT_PACKAGE=gtk20
152+AC_SUBST(GETTEXT_PACKAGE)
153+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
154+ [The prefix for our gettext translation domains.])
155+
156+AC_CANONICAL_HOST
157+
158+MATH_LIB=-lm
159+AC_MSG_CHECKING([for native Win32])
160+LIB_EXE_MACHINE_FLAG=X86
161+EXE_MANIFEST_ARCHITECTURE=X86
162+case "$host" in
163+ *-*-mingw*)
164+ os_win32=yes
165+ gio_can_sniff=no
166+ MATH_LIB=
167+ case "$host" in
168+ x86_64-*-*)
169+ LIB_EXE_MACHINE_FLAG=X64
170+ EXE_MANIFEST_ARCHITECTURE=AMD64
171+ ;;
172+ esac
173+ ;;
174+ *)
175+ os_win32=no
176+ ;;
177+esac
178+AC_MSG_RESULT([$os_win32])
179+
180+AC_SUBST(LIB_EXE_MACHINE_FLAG)
181+AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
182+
183+case $host in
184+ *-*-linux*)
185+ os_linux=yes
186+ ;;
187+esac
188+
189+dnl Initialize libtool
190+AC_PROG_CC
191+AM_DISABLE_STATIC
192+
193+dnl
194+dnl Check for a working C++ compiler, but do not bail out, if none is found.
195+dnl We use this for an automated test for C++ header correctness.
196+dnl
197+AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
198+AC_LANG_SAVE
199+AC_LANG_CPLUSPLUS
200+
201+AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=)
202+AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
203+
204+gtk_save_cxxflags="$CXXFLAGS"
205+CXXFLAGS="$CXXFLAGS -x objective-c++"
206+AC_TRY_COMPILE([@interface Foo @end],,OBJC=yes,OBJC=no)
207+AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes")
208+CXXFLAGS="$gtk_save_cxxflags"
209+AC_LANG_RESTORE
210+
211+if test "$os_win32" = "yes"; then
212+ if test x$enable_static = xyes -o x$enable_static = x; then
213+ AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
214+ enable_static=no
215+ fi
216+ if test x$enable_shared = xno; then
217+ AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
218+ fi
219+ enable_shared=yes
220+fi
221+
222+AC_LIBTOOL_WIN32_DLL
223+AM_PROG_LIBTOOL
224+dnl when using libtool 2.x create libtool early, because it's used in configure
225+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
226+
227+
228+# Make sure we use 64-bit versions of various file stuff.
229+AC_SYS_LARGEFILE
230+
231+AM_PROG_AS
232+AC_PATH_PROG(NM, nm, nm)
233+
234+dnl Initialize maintainer mode
235+AM_MAINTAINER_MODE([enable])
236+
237+AC_MSG_CHECKING([for some Win32 platform])
238+case "$host" in
239+ *-*-mingw*|*-*-cygwin*)
240+ platform_win32=yes
241+ ;;
242+ *)
243+ platform_win32=no
244+ ;;
245+esac
246+AC_MSG_RESULT([$platform_win32])
247+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
248+
249+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
250+AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
251+AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")
252+
253+if test "$os_win32" = "yes"; then
254+ AC_CHECK_TOOL(WINDRES, windres, no)
255+ if test "$WINDRES" = no; then
256+ AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
257+ fi
258+ AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
259+fi
260+AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
261+
262+m4_define([debug_default],
263+ m4_if(m4_eval(gtk_minor_version % 2), [1], [yes], [minimum]))
264+
265+dnl declare --enable-* args and collect ac_help strings
266+AC_ARG_ENABLE(debug,
267+ AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
268+ [turn on debugging @<:@default=debug_default@:>@]),,
269+ enable_debug=debug_default)
270+AC_ARG_ENABLE(shm,
271+ [AC_HELP_STRING([--enable-shm],
272+ [support shared memory if available [default=yes]])],,
273+ [enable_shm="yes"])
274+AC_ARG_ENABLE(xkb,
275+ [AC_HELP_STRING([--enable-xkb],
276+ [support XKB [default=maybe]])],,
277+ [enable_xkb="maybe"])
278+AC_ARG_ENABLE(xinerama,
279+ [AC_HELP_STRING([--enable-xinerama],
280+ [support xinerama extension if available [default=yes]])],,
281+ [enable_xinerama="yes"])
282+AC_ARG_ENABLE(rebuilds,
283+ [AC_HELP_STRING([--disable-rebuilds],
284+ [disable all source autogeneration rules])],,
285+ [enable_rebuilds=yes])
286+AC_ARG_ENABLE(visibility,
287+ [AC_HELP_STRING([--disable-visibility],
288+ [don't use ELF visibility attributes])],,
289+ [enable_visibility=yes])
290+
291+AC_ARG_WITH(xinput,
292+ [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
293+
294+if test "$platform_win32" = yes; then
295+ gdktarget=win32
296+else
297+ gdktarget=x11
298+fi
299+
300+AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
301+ gdktarget=$with_gdktarget)
302+
303+AC_SUBST(gdktarget)
304+case $gdktarget in
305+ x11|win32|quartz|directfb) ;;
306+ *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
307+esac
308+
309+gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
310+gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
311+
312+AC_SUBST(gdktargetlib)
313+AC_SUBST(gtktargetlib)
314+
315+if test "x$enable_debug" = "xyes"; then
316+ test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
317+ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
318+else
319+ if test "x$enable_debug" = "xno"; then
320+ GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
321+ else
322+ GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
323+ fi
324+fi
325+
326+
327+if test "x$enable_visibility" = "xno"; then
328+ GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY"
329+fi
330+
331+
332+AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}",
333+ [Define if debugging is enabled])
334+
335+
336+# Build time sanity check...
337+AM_SANITY_CHECK
338+
339+# Checks for programs.
340+AC_ISC_POSIX
341+AM_PROG_CC_C_O
342+AC_PROG_INSTALL
343+AC_PROG_MAKE_SET
344+
345+changequote(,)dnl
346+if test "x$GCC" = "xyes"; then
347+ case " $CFLAGS " in
348+ *[\ \ ]-Wall[\ \ ]*) ;;
349+ *) CFLAGS="$CFLAGS -Wall" ;;
350+ esac
351+
352+ if test "x$enable_ansi" = "xyes"; then
353+ case " $CFLAGS " in
354+ *[\ \ ]-ansi[\ \ ]*) ;;
355+ *) CFLAGS="$CFLAGS -ansi" ;;
356+ esac
357+
358+ case " $CFLAGS " in
359+ *[\ \ ]-pedantic[\ \ ]*) ;;
360+ *) CFLAGS="$CFLAGS -pedantic" ;;
361+ esac
362+ fi
363+fi
364+changequote([,])dnl
365+
366+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
367+
368+# Ensure MSVC-compatible struct packing convention is used when
369+# compiling for Win32 with gcc.
370+# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
371+# gcc2 uses "-fnative-struct".
372+if test x"$os_win32" = xyes; then
373+ if test x"$GCC" = xyes; then
374+ msnative_struct=''
375+ AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
376+ if test -z "$ac_cv_prog_CC"; then
377+ our_gcc="$CC"
378+ else
379+ our_gcc="$ac_cv_prog_CC"
380+ fi
381+ case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
382+ 2.)
383+ if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
384+ msnative_struct='-fnative-struct'
385+ fi
386+ ;;
387+ *)
388+ if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
389+ msnative_struct='-mms-bitfields'
390+ fi
391+ ;;
392+ esac
393+ if test x"$msnative_struct" = x ; then
394+ AC_MSG_RESULT([no way])
395+ AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code])
396+ else
397+ CFLAGS="$CFLAGS $msnative_struct"
398+ AC_MSG_RESULT([${msnative_struct}])
399+ fi
400+ fi
401+fi
402+
403+# Honor aclocal flags
404+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
405+
406+## Initial sanity check, done here so that users get told they
407+## have the wrong dependencies as early in the process as possible.
408+## Later on we actually use the cflags/libs from separate pkg-config
409+## calls. Oh, also the later pkg-config calls don't include
410+## the version requirements since those make the module lists
411+## annoying to construct
412+PKG_CHECK_MODULES(BASE_DEPENDENCIES,
413+ [glib-2.0 >= glib_required_version dnl
414+ atk >= atk_required_version dnl
415+ pango >= pango_required_version dnl
416+ cairo >= cairo_required_version dnl
417+ gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
418+
419+## In addition to checking that cairo is present, we also need to
420+## check that the correct cairo backend is there. E.g. if the GDK
421+## target is win32 we need the cairo-win32 backend and so on.
422+cairo_backend=$gdktarget
423+
424+# GDK calls the xlib backend "x11," cairo calls it "xlib." Other
425+# backend names are identical.
426+if test "x$cairo_backend" = "xx11"; then
427+ cairo_backend=xlib
428+fi
429+PKG_CHECK_MODULES(CAIRO_BACKEND,
430+ [cairo-$cairo_backend >= cairo_required_version])
431+
432+PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
433+
434+if test "$os_win32" != yes; then
435+ # libtool option to control which symbols are exported
436+ # right now, symbols starting with _ are not exported
437+ LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
438+else
439+ # We currently use .def files on Windows (for gdk and gtk)
440+ LIBTOOL_EXPORT_OPTIONS=
441+fi
442+AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
443+
444+dnl ******************************************************
445+dnl * See whether to include shared library dependencies *
446+dnl ******************************************************
447+
448+AC_ARG_ENABLE(explicit-deps,
449+ [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
450+ [use explicit dependencies in .pc files [default=auto]])],,
451+ [enable_explicit_deps=auto])
452+
453+AC_MSG_CHECKING([Whether to write dependencies into .pc files])
454+case $enable_explicit_deps in
455+ auto)
456+ export SED
457+ deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
458+ if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
459+ enable_explicit_deps=yes
460+ else
461+ enable_explicit_deps=no
462+ fi
463+ ;;
464+ yes|no)
465+ ;;
466+ *) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto])
467+ ;;
468+esac
469+AC_MSG_RESULT($enable_explicit_deps)
470+
471+AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no)
472+
473+# define a MAINT-like variable REBUILD which is set if Perl
474+# and awk are found, so autogenerated sources can be rebuilt
475+
476+AC_PATH_PROGS(PERL, perl5 perl)
477+
478+# We would like indent, but don't require it.
479+AC_CHECK_PROG(INDENT, indent, indent)
480+
481+REBUILD=\#
482+if test "x$enable_rebuilds" = "xyes" && \
483+ test -n "$PERL" && \
484+ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
485+ REBUILD=
486+fi
487+AC_SUBST(REBUILD)
488+
489+AC_CHECK_FUNCS(lstat mkstemp flockfile getc_unlocked)
490+AC_CHECK_FUNCS(localtime_r)
491+
492+# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
493+AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
494+AC_TRY_LINK([#include <langinfo.h>], [
495+char c;
496+c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
497+], gtk_ok=yes, gtk_ok=no)
498+AC_MSG_RESULT($gtk_ok)
499+if test "$gtk_ok" = "yes"; then
500+ AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
501+ [Define if _NL_TIME_FIRST_WEEKDAY is available])
502+fi
503+
504+# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define
505+AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT])
506+AC_TRY_LINK([#include <langinfo.h>], [
507+char c;
508+c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));
509+], gtk_ok=yes, gtk_ok=no)
510+AC_MSG_RESULT($gtk_ok)
511+if test "$gtk_ok" = "yes"; then
512+ AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1],
513+ [Define if _NL_MEASUREMENT_MEASUREMENT is available])
514+fi
515+
516+# _NL_PAPER_HEIGHT is an enum and not a define
517+AC_MSG_CHECKING([for _NL_PAPER_HEIGHT])
518+AC_TRY_LINK([#include <langinfo.h>], [
519+char c;
520+c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT));
521+], gtk_ok=yes, gtk_ok=no)
522+AC_MSG_RESULT($gtk_ok)
523+if test "$gtk_ok" = "yes"; then
524+ AC_DEFINE([HAVE__NL_PAPER_HEIGHT], [1],
525+ [Define if _NL_PAPER_HEIGHT is available])
526+fi
527+
528+# _NL_PAPER_WIDTH is an enum and not a define
529+AC_MSG_CHECKING([for _NL_PAPER_WIDTH])
530+AC_TRY_LINK([#include <langinfo.h>], [
531+char c;
532+c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH));
533+], gtk_ok=yes, gtk_ok=no)
534+AC_MSG_RESULT($gtk_ok)
535+if test "$gtk_ok" = "yes"; then
536+ AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1],
537+ [Define if _NL_PAPER_WIDTH is available])
538+fi
539+
540+# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
541+AC_MSG_CHECKING(for sigsetjmp)
542+AC_TRY_LINK([#include <setjmp.h>], [
543+sigjmp_buf env;
544+sigsetjmp(env, 0);
545+], gtk_ok=yes, gtk_ok=no)
546+AC_MSG_RESULT($gtk_ok)
547+if test "$gtk_ok" = "yes"; then
548+ AC_DEFINE(HAVE_SIGSETJMP, 1,
549+ [Define to 1 if sigsetjmp is available])
550+fi
551+
552+# i18n stuff
553+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
554+AM_GLIB_GNU_GETTEXT
555+LIBS="$LIBS $INTLLIBS"
556+AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
557+ sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
558+ esac])
559+
560+dnl Snippet below is copied from AM_GLIB_GNU_GETTEXT to generate a first
561+dnl po-properties/POTFILES during configure; see GNOME #573515.
562+dnl
563+dnl Generate list of files to be processed by xgettext which will
564+dnl be included in po-properties/Makefile.
565+test -d po-properties || mkdir po-properties
566+if test "x$srcdir" != "x."; then
567+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
568+ popropsrcprefix="$srcdir/"
569+ else
570+ popropsrcprefix="../$srcdir/"
571+ fi
572+else
573+ popropsrcprefix="../"
574+fi
575+rm -f po-properties/POTFILES
576+sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $popropsrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
577+< $srcdir/po-properties/POTFILES.in > po-properties/POTFILES
578+dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.)
579+
580+AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
581+
582+dnl The DU4 header files don't provide library prototypes unless
583+dnl -std1 is given to the native cc.
584+AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
585+
586+gtk_save_LIBS=$LIBS
587+LIBS="$LIBS -lm"
588+AC_TRY_RUN([#include <math.h>
589+ int main (void) { return (log(1) != log(1.)); }],
590+ AC_MSG_RESULT(none needed),
591+ gtk_save_CFLAGS="$CFLAGS"
592+ CFLAGS="$CFLAGS -std1"
593+ AC_TRY_RUN([#include <math.h>
594+ int main (void) { return (log(1) != log(1.)); }],
595+ AC_MSG_RESULT(-std1),
596+ AC_MSG_RESULT()
597+ CFLAGS="$gtk_save_CFLAGS"
598+ AC_MSG_WARN(
599+ [No ANSI prototypes found in library. (-std1 didn't work.)]),
600+ true
601+ ),
602+ AC_MSG_RESULT(none needed)
603+)
604+LIBS=$gtk_save_LIBS
605+
606+AC_MSG_CHECKING(for the BeOS)
607+case $host in
608+ *-*-beos*)
609+ AC_MSG_RESULT(yes)
610+ MATH_LIB=
611+ ;;
612+ *)
613+ AC_MSG_RESULT(no)
614+ ;;
615+esac
616+
617+AC_SUBST(MATH_LIB)
618+#
619+# see bug 162979
620+#
621+AC_MSG_CHECKING(for HP-UX)
622+case $host_os in
623+ hpux9* | hpux10* | hpux11*)
624+ AC_MSG_RESULT(yes)
625+ CFLAGS="$CFLAGS -DHPPEX -DSHMLINK"
626+ ;;
627+ *)
628+ AC_MSG_RESULT(no)
629+ ;;
630+esac
631+
632+dnl NeXTStep cc seems to need this
633+AC_MSG_CHECKING([for extra flags for POSIX compliance])
634+AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
635+ AC_MSG_RESULT(none needed),
636+ gtk_save_CFLAGS="$CFLAGS"
637+ CFLAGS="$CFLAGS -posix"
638+ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
639+ AC_MSG_RESULT(-posix),
640+ AC_MSG_RESULT()
641+ CFLAGS="$gtk_save_CFLAGS"
642+ AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
643+
644+#
645+# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
646+#
647+
648+GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0"
649+
650+AM_PATH_GLIB_2_0(glib_required_version, :,
651+ AC_MSG_ERROR([
652+*** GLIB glib_required_version or better is required. The latest version of
653+*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
654+ gobject gmodule-no-export gthread)
655+
656+# See if it's safe to turn G_DISABLE_DEPRECATED on.
657+GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"`
658+GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo glib_required_version | sed "s/\.@<:@^.@:>@*\$//"`
659+if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
660+ CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
661+fi
662+
663+CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
664+
665+
666+dnl
667+dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
668+dnl
669+gtk_save_LIBS=$LIBS
670+LIBS="$LIBS $GLIB_LIBS"
671+AC_CHECK_FUNCS(bind_textdomain_codeset)
672+LIBS=$gtk_save_LIBS
673+
674+AC_CHECK_HEADERS(pwd.h,
675+ AC_DEFINE(HAVE_PWD_H, 1,
676+ [Define to 1 if pwd.h is available]))
677+AC_CHECK_HEADERS(sys/time.h,
678+ AC_DEFINE(HAVE_SYS_TIME_H, 1,
679+ [Define to 1 if time.h is available]))
680+AC_CHECK_HEADERS(unistd.h,
681+ AC_DEFINE(HAVE_UNISTD_H, 1,
682+ [Define to 1 if unistd.h is available]))
683+AC_CHECK_HEADERS(ftw.h,
684+ AC_DEFINE(HAVE_FTW_H, 1,
685+ [Define to 1 if ftw.h is available]))
686+
687+AC_MSG_CHECKING([for GNU ftw extensions])
688+AC_TRY_COMPILE([#define _XOPEN_SOURCE 500
689+#define _GNU_SOURCE
690+#include <ftw.h>], [int flags = FTW_ACTIONRETVAL;], gtk_ok=yes, gtk_ok=no)
691+if test $gtk_ok = yes; then
692+ AC_MSG_RESULT([yes])
693+ AC_DEFINE(HAVE_GNU_FTW, 1, [Have GNU ftw])
694+else
695+ AC_MSG_RESULT([no])
696+fi
697+
698+saved_cflags="$CFLAGS"
699+saved_ldflags="$LDFLAGS"
700+
701+
702+# Checks for header files.
703+AC_HEADER_STDC
704+
705+# Checks for typedefs, structures, and compiler characteristics.
706+AC_C_CONST
707+
708+# Checks for library functions.
709+AC_TYPE_SIGNAL
710+AC_FUNC_MMAP
711+
712+AC_CHECK_FUNCS(mallinfo)
713+AC_CHECK_FUNCS(getresuid)
714+AC_TYPE_UID_T
715+
716+# Check if <sys/select.h> needs to be included for fd_set
717+AC_MSG_CHECKING([for fd_set])
718+AC_TRY_COMPILE([#include <sys/types.h>],
719+ [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no)
720+if test $gtk_ok = yes; then
721+ AC_MSG_RESULT([yes, found in sys/types.h])
722+else
723+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
724+ if test $gtk_ok = yes; then
725+ AC_DEFINE(HAVE_SYS_SELECT_H, 1,
726+ [Define to 1 if sys/select.h is available])
727+ AC_MSG_RESULT([yes, found in sys/select.h])
728+ else
729+ AC_DEFINE(NO_FD_SET, 1,
730+ [Define to 1 if fd_set is not available])
731+ AC_MSG_RESULT(no)
732+ fi
733+fi
734+
735+# `widechar' tests for gdki18n.h
736+AC_MSG_CHECKING(for wchar.h)
737+AC_TRY_CPP([#include <wchar.h>], gdk_wchar_h=yes, gdk_wchar_h=no)
738+if test $gdk_wchar_h = yes; then
739+ AC_DEFINE(HAVE_WCHAR_H, 1, [Have wchar.h include file])
740+fi
741+AC_MSG_RESULT($gdk_wchar_h)
742+
743+# Check for wctype.h (for iswalnum)
744+AC_MSG_CHECKING(for wctype.h)
745+AC_TRY_CPP([#include <wctype.h>], gdk_wctype_h=yes, gdk_wctype_h=no)
746+if test $gdk_wctype_h = yes; then
747+ AC_DEFINE(HAVE_WCTYPE_H, 1, [Have wctype.h include file])
748+fi
749+AC_MSG_RESULT($gdk_wctype_h)
750+
751+# in Solaris 2.5, `iswalnum' is in -lw
752+GDK_WLIBS=
753+AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
754+
755+oLIBS="$LIBS"
756+LIBS="$LIBS $GDK_WLIBS"
757+# The following is necessary for Linux libc-5.4.38
758+AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
759+AC_TRY_LINK([#include <stdlib.h>],[
760+#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
761+# ifdef HAVE_WCTYPE_H
762+# include <wctype.h>
763+# else
764+# ifdef HAVE_WCHAR_H
765+# include <wchar.h>
766+# endif
767+# endif
768+#else
769+# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
770+#endif
771+iswalnum((wchar_t) 0);
772+], gdk_working_wctype=yes, gdk_working_wctype=no)
773+LIBS="$oLIBS"
774+
775+if test $gdk_working_wctype = no; then
776+ AC_DEFINE(HAVE_BROKEN_WCTYPE, 1, [Is the wctype implementation broken])
777+ GDK_WLIBS=
778+fi
779+AC_MSG_RESULT($gdk_working_wctype)
780+AC_SUBST(GDK_WLIBS)
781+
782+# Check for uxtheme.h (for MS-Windows Engine)
783+AC_MSG_CHECKING(for uxtheme.h)
784+AC_TRY_CPP([#include <uxtheme.h>], gtk_uxtheme_h=yes, gtk_uxtheme_h=no)
785+if test $gtk_uxtheme_h = yes; then
786+ AC_DEFINE(HAVE_UXTHEME_H, 1, [Have uxtheme.h include file])
787+fi
788+AC_MSG_RESULT($gtk_uxtheme_h)
789+
790+# Checks for gdkspawn
791+AC_CHECK_HEADERS(crt_externs.h)
792+AC_CHECK_FUNCS(_NSGetEnviron)
793+
794+AC_MSG_CHECKING(whether to build dynamic modules)
795+
796+AC_ARG_ENABLE(modules,
797+ [AC_HELP_STRING([--disable-modules],
798+ [disable dynamic module loading])])
799+
800+dynworks=false
801+deps=
802+if test x$enable_modules = xno; then
803+ AC_MSG_RESULT(no)
804+else
805+ AC_MSG_RESULT(yes)
806+ AC_MSG_CHECKING(whether dynamic modules work)
807+ ## for loop is to strip newline
808+ tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
809+ for I in $tmp; do
810+ dynworks=$I
811+ done
812+
813+ dnl Now we check to see if our libtool supports shared lib deps
814+ dnl (in a rather ugly way even)
815+ if $dynworks; then
816+ module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
817+ module_deplibs_check=`$module_libtool_config | \
818+ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
819+ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
820+ if test "x$module_deplibs_check" = "xnone" || \
821+ test "x$module_deplibs_check" = "xunknown" || \
822+ test "x$module_deplibs_check" = "x"; then
823+ dynworks=false
824+ fi
825+ fi
826+
827+ if $dynworks; then
828+ AC_DEFINE(USE_GMODULE, 1,
829+ [Define to 1 if gmodule works and should be used])
830+ AC_MSG_RESULT(yes)
831+ else
832+ AC_MSG_RESULT(no)
833+ fi
834+fi
835+
836+AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
837+
838+#
839+# Allow building some or all immodules included
840+#
841+AC_MSG_CHECKING(immodules to build)
842+
843+dnl due to an autoconf bug, commas in the first arg to
844+dnl AC_HELP_STRING cause problems.
845+dnl AC_HELP_STRING([--with-included-immodules=MODULE1 MODULE2 ...],
846+dnl [build the specified input method modules into gtk])
847+AC_ARG_WITH(included_immodules,
848+[ --with-included-immodules=MODULE1,MODULE2,...
849+ build the specified input methods into gtk])
850+
851+if $dynworks; then
852+ :
853+else
854+ ## if the option was specified, leave it; otherwise disable included immodules
855+ if test x$with_included_immodules = xno; then
856+ with_included_immodules=yes
857+ fi
858+fi
859+
860+all_immodules="am-et,cedilla,cyrillic-translit"
861+if test "$gdktarget" = "win32"; then
862+ all_immodules="${all_immodules},ime"
863+fi
864+all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr"
865+if test "$gdktarget" = "x11"; then
866+ all_immodules="${all_immodules},xim"
867+fi
868+
869+included_immodules=""
870+# If the switch specified without listing any specific ones, include all
871+if test "x$with_included_immodules" = xyes ; then
872+ included_immodules="$all_immodules"
873+else
874+ included_immodules="$with_included_immodules"
875+fi
876+
877+AC_MSG_RESULT($included_immodules)
878+AM_CONDITIONAL(HAVE_INCLUDED_IMMMODULES, test "x$included_immodules" != x)
879+
880+INCLUDED_IMMODULE_OBJ=
881+INCLUDED_IMMODULE_DEFINE=
882+
883+IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS=","
884+for immodule in $included_immodules; do
885+ immodule_underscores=`echo $immodule | sed -e 's/-/_/g'`
886+ if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then
887+ :
888+ else
889+ AC_MSG_ERROR([the specified input method $immodule does not exist])
890+ fi
891+
892+ INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la"
893+ INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores"
894+ eval INCLUDE_$immodule_underscores=yes
895+done
896+IFS="$gtk_save_ifs"
897+AC_SUBST(INCLUDED_IMMODULE_OBJ)
898+AC_SUBST(INCLUDED_IMMODULE_DEFINE)
899+
900+AM_CONDITIONAL(INCLUDE_IM_AM_ET, [test x"$INCLUDE_am_et" = xyes])
901+AM_CONDITIONAL(INCLUDE_IM_CEDILLA, [test x"$INCLUDE_cedilla" = xyes])
902+AM_CONDITIONAL(INCLUDE_IM_CYRILLIC_TRANSLIT, [test x"$INCLUDE_cyrillic_translit" = xyes])
903+AM_CONDITIONAL(INCLUDE_IM_IME, [test x"$INCLUDE_ime" = xyes])
904+AM_CONDITIONAL(INCLUDE_IM_INUKTITUT, [test x"$INCLUDE_inuktitut" = xyes])
905+AM_CONDITIONAL(INCLUDE_IM_IPA, [test x"$INCLUDE_ipa" = xyes])
906+AM_CONDITIONAL(INCLUDE_IM_MULTIPRESS, [test x"$INCLUDE_multipress" = xyes])
907+AM_CONDITIONAL(INCLUDE_IM_THAI, [test x"$INCLUDE_thai" = xyes])
908+AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes])
909+AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes])
910+AM_CONDITIONAL(INCLUDE_IM_VIQR, [test x"$INCLUDE_viqr" = xyes])
911+AM_CONDITIONAL(INCLUDE_IM_XIM, [test x"$INCLUDE_xim" = xyes])
912+
913+AC_HEADER_SYS_WAIT
914+
915+AC_TYPE_SIGNAL
916+
917+# Checks to see whether we should include mediaLib
918+# support.
919+#
920+AC_CHECK_HEADER(sys/systeminfo.h,
921+ AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1,
922+ [Define to 1 if sys/systeminfo.h is available]))
923+AC_CHECK_HEADER(sys/sysinfo.h,
924+ AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
925+ [Define to 1 if sys/sysinfo.h is available]))
926+
927+AC_MSG_CHECKING(for mediaLib 2.3)
928+use_mlib25=no
929+# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib
930+# patch requires.
931+AC_CHECK_LIB(mlib, mlib_ImageSetStruct, use_mlib=yes, use_mlib=no)
932+if test $use_mlib = yes; then
933+ AC_DEFINE(USE_MEDIALIB, 1,
934+ [Define to 1 if medialib is available and should be used])
935+ MEDIA_LIB=-lmlib
936+
937+ AC_MSG_CHECKING(for mediaLib 2.5)
938+ # Check for a mediaLib 2.5 function since that is what is needed for
939+ # gdk_rgb_convert integration.
940+ AC_CHECK_LIB(mlib, mlib_VideoColorRGBint_to_BGRAint, use_mlib25=yes, use_mlib25=no)
941+ if test $use_mlib25 = yes; then
942+ AC_DEFINE(USE_MEDIALIB25, 1,
943+ [Define to 1 if medialib 2.5 is available])
944+ fi
945+fi
946+AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes)
947+AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
948+
949+dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
950+
951+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
952+
953+if test $cross_compiling = yes; then
954+ AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
955+ if test x$GTK_UPDATE_ICON_CACHE = xno; then
956+ REBUILD_PNGS=#
957+ fi
958+fi
959+
960+AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
961+
962+if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
963+ test "x$REBUILD_PNGS" = "x#" ; then
964+ AC_MSG_ERROR([
965+*** gtkbuiltincache.h is not in the tree, and cannot be built
966+*** because you don't have libpng, or (when cross-compiling) you
967+*** don't have a prebuilt gtk-update-icon-cache on the build system.])
968+fi
969+
970+########################################
971+# Windowing system checks
972+########################################
973+
974+GDK_EXTRA_LIBS="$GDK_WLIBS"
975+GDK_EXTRA_CFLAGS=
976+
977+# GTK+ uses some X calls, so needs to link against X directly
978+GTK_DEP_PACKAGES_FOR_X=
979+GTK_DEP_LIBS_FOR_X=
980+
981+if test "x$gdktarget" = "xx11"; then
982+ X_PACKAGES=fontconfig
983+
984+ #
985+ # We use fontconfig very peripherally when decoding the default
986+ # settings.
987+ #
988+ if $PKG_CONFIG --exists fontconfig; then : ; else
989+ AC_MSG_ERROR([
990+*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
991+ fi
992+
993+ #
994+ # Check for basic X packages; we use pkg-config if available
995+ #
996+ if $PKG_CONFIG --exists x11 xext xrender; then
997+ have_base_x_pc=true
998+ X_PACKAGES="$X_PACKAGES x11 xext xrender"
999+ x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
1000+ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
1001+
1002+ # Strip out any .la files that pkg-config might give us (this happens
1003+ # with -uninstalled.pc files)
1004+ x_libs_for_checks=
1005+ for I in $x_libs ; do
1006+ case $I in
1007+ *.la) ;;
1008+ *) x_libs_for_checks="$x_libs_for_checks $I" ;;
1009+ esac
1010+ done
1011+
1012+ GTK_PACKAGES_FOR_X="x11"
1013+ else
1014+ have_base_x_pc=false
1015+ AC_PATH_XTRA
1016+ if test x$no_x = xyes ; then
1017+ AC_MSG_ERROR([X development libraries not found])
1018+ fi
1019+
1020+ x_cflags="$X_CFLAGS"
1021+ x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
1022+
1023+ GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS"
1024+ fi
1025+
1026+ # Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
1027+ x_extra_libs=
1028+
1029+ gtk_save_cppflags="$CPPFLAGS"
1030+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
1031+
1032+ gtk_save_LIBS=$LIBS
1033+ LIBS="$x_libs_for_checks $LIBS"
1034+
1035+ # Sanity check for the X11 and Xext libraries. While everything we need from
1036+ # Xext is optional, the chances a system has *none* of these things is so
1037+ # small that we just unconditionally require it.
1038+ AC_CHECK_FUNC(XOpenDisplay, :,
1039+ AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
1040+ AC_CHECK_FUNC(XextFindDisplay, :,
1041+ AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
1042+ AC_CHECK_FUNC(XRenderQueryExtension, :,
1043+ AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.]))
1044+
1045+ # Check for xReply
1046+
1047+ AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
1048+ AC_TRY_COMPILE([#include <X11/Xlibint.h>],
1049+ [xReply *rep;],
1050+ [AC_MSG_RESULT([no])],
1051+ [AC_TRY_COMPILE([#include <X11/extensions/XIproto.h>
1052+#include <X11/Xlibint.h>],
1053+ [xReply *rep;],
1054+ [AC_MSG_RESULT([yes])
1055+ AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1,
1056+ [Define if <X11/extensions/XIproto.h> needed for xReply])],
1057+ [AC_MSG_RESULT([unknown])
1058+ AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])
1059+
1060+ # Check for XConvertCase, XInternAtoms (X11R6 specific)
1061+
1062+ AC_CHECK_FUNCS(XConvertCase XInternAtoms)
1063+
1064+ # Generic X11R6 check needed for XIM support; we could
1065+ # probably use this to replace the above, but we'll
1066+ # leave the separate checks for XConvertCase and XInternAtoms
1067+ # for clarity
1068+
1069+ have_x11r6=false
1070+ AC_CHECK_FUNC(XAddConnectionWatch,
1071+ have_x11r6=true)
1072+
1073+ if $have_x11r6; then
1074+ AC_DEFINE(HAVE_X11R6, 1, [Define if we have X11R6])
1075+ fi
1076+ AM_CONDITIONAL(HAVE_X11R6, $have_x11r6)
1077+
1078+ # Check for XKB support.
1079+
1080+ if test "x$enable_xkb" = "xyes"; then
1081+ AC_MSG_WARN(XKB support explicitly enabled)
1082+ AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension])
1083+ elif test "x$enable_xkb" = "xmaybe"; then
1084+ AC_CHECK_FUNC(XkbQueryExtension,
1085+ AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]))
1086+ else
1087+ AC_MSG_WARN(XKB support explicitly disabled)
1088+ fi
1089+
1090+ # Check for shaped window extension
1091+
1092+ AC_CHECK_FUNC(XShapeCombineMask, :,
1093+ [AC_MSG_ERROR([Shape extension not found, check your development headers])])
1094+
1095+ # X SYNC check
1096+ gtk_save_CFLAGS="$CFLAGS"
1097+ CFLAGS="$CFLAGS $x_cflags"
1098+
1099+ AC_CHECK_FUNC(XSyncQueryExtension,
1100+ [AC_CHECK_HEADER(X11/extensions/sync.h,
1101+ AC_DEFINE(HAVE_XSYNC, 1, [Have the SYNC extension library]),
1102+ :, [#include <X11/Xlib.h>])])
1103+
1104+ CFLAGS="$gtk_save_CFLAGS"
1105+
1106+ # Xshm checks
1107+
1108+ if test "x$enable_shm" = "xyes"; then
1109+ # Check for the XShm extension, normally in Xext
1110+ AC_CHECK_FUNC(XShmAttach,
1111+ :,
1112+ # On AIX, it is in XextSam instead
1113+ [AC_CHECK_LIB(XextSam, XShmAttach,
1114+ [GTK_ADD_LIB(x_extra_libs,XextSam)])])
1115+ fi
1116+
1117+ if test "x$enable_shm" = "xyes"; then
1118+ # Check for shared memory
1119+ AC_CHECK_HEADER(sys/ipc.h,
1120+ AC_DEFINE(HAVE_IPC_H, 1,
1121+ [Define to 1 if ipc.h is available]),
1122+ no_sys_ipc=yes)
1123+ AC_CHECK_HEADER(sys/shm.h,
1124+ AC_DEFINE(HAVE_SHM_H, 1,
1125+ [Define to 1 if shm.h is available]),
1126+ no_sys_shm=yes)
1127+
1128+ # Check for the X shared memory extension header file
1129+ have_xshm=no
1130+ AC_MSG_CHECKING(X11/extensions/XShm.h)
1131+ if test "x$no_xext_lib" = "xyes"; then
1132+ :
1133+ else
1134+ gtk_save_CFLAGS="$CFLAGS"
1135+ CFLAGS="$CFLAGS $x_cflags"
1136+ AC_TRY_COMPILE([
1137+#include <stdlib.h>
1138+#include <sys/types.h>
1139+#include <sys/ipc.h>
1140+#include <sys/shm.h>
1141+#include <X11/Xlib.h>
1142+#include <X11/Xutil.h>
1143+#include <X11/extensions/XShm.h>
1144+], [XShmSegmentInfo *x_shm_info;], have_xshm=yes)
1145+ CFLAGS="$gtk_save_CFLAGS"
1146+ fi
1147+ AC_MSG_RESULT($have_xshm)
1148+ if test $have_xshm = yes ; then
1149+ AC_DEFINE(HAVE_XSHM_H, 1,
1150+ [Define to 1 if xshm.h is available])
1151+ fi
1152+ fi
1153+
1154+ if test "x$enable_xinerama" = "xyes"; then
1155+ # Check for Xinerama extension (Solaris impl or Xfree impl)
1156+ gtk_save_cppflags="$CPPFLAGS"
1157+ CPPFLAGS="$CPPFLAGS $x_cflags"
1158+
1159+ # Check for XFree
1160+ AC_MSG_CHECKING(for Xinerama support on XFree86)
1161+
1162+ have_xfree_xinerama=false
1163+ if $PKG_CONFIG --exists xinerama ; then
1164+ have_xfree_xinerama=true
1165+ X_PACKAGES="$X_PACKAGES xinerama"
1166+ else
1167+ AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
1168+ [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
1169+ [GTK_ADD_LIB(x_extra_libs,Xinerama)
1170+ have_xfree_xinerama=true], :,
1171+ [#include <X11/Xlib.h>])])
1172+ fi
1173+
1174+ if $have_xfree_xinerama ; then
1175+ AC_DEFINE(HAVE_XFREE_XINERAMA, 1,
1176+ [Define to 1 if XFree Xinerama is available])
1177+ AC_DEFINE(HAVE_XINERAMA, 1,
1178+ [Define to 1 is Xinerama is available])
1179+ AC_MSG_RESULT(yes)
1180+ else
1181+ AC_MSG_RESULT(no)
1182+
1183+ case "$host" in
1184+ *-*-solaris*)
1185+ # Check for solaris
1186+ AC_MSG_CHECKING(for Xinerama support on Solaris)
1187+
1188+ have_solaris_xinerama=false
1189+ AC_CHECK_FUNC(XineramaGetInfo,
1190+ [AC_CHECK_HEADER(X11/extensions/xinerama.h,
1191+ [have_solaris_xinerama=true], :,
1192+ [#include <X11/Xlib.h>])])
1193+
1194+ if $have_solaris_xinerama ; then
1195+ AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
1196+ [Define to 1 if solaris xinerama is available])
1197+ AC_DEFINE(HAVE_XINERAMA, 1,
1198+ [Define to 1 if xinerama is available])
1199+ AC_MSG_RESULT(yes)
1200+ else
1201+ AC_MSG_RESULT(no)
1202+ fi
1203+ ;;
1204+ *)
1205+ ;;
1206+ esac
1207+ fi
1208+ fi
1209+
1210+ # set up things for XInput
1211+
1212+ if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
1213+ AC_DEFINE(XINPUT_XFREE, 1,
1214+ [Define to 1 if XFree XInput should be used])
1215+
1216+ if $PKG_CONFIG --exists xi ; then
1217+ X_PACKAGES="$X_PACKAGES xi"
1218+ else
1219+ GTK_ADD_LIB(x_extra_libs, Xi)
1220+ fi
1221+ else
1222+ AC_DEFINE(XINPUT_NONE, 1,
1223+ [Define to 1 if no XInput should be used])
1224+ fi
1225+
1226+ AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes)
1227+
1228+ # Check for the RANDR extension
1229+ if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
1230+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
1231+
1232+ X_PACKAGES="$X_PACKAGES xrandr"
1233+ fi
1234+
1235+ # Checks for Xcursor library
1236+
1237+ if $PKG_CONFIG --exists xcursor ; then
1238+ AC_DEFINE(HAVE_XCURSOR, 1, [Have the Xcursor library])
1239+
1240+ X_PACKAGES="$X_PACKAGES xcursor"
1241+ fi
1242+
1243+ # Checks for XFixes extension
1244+
1245+ if $PKG_CONFIG --exists xfixes ; then
1246+ AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
1247+
1248+ X_PACKAGES="$X_PACKAGES xfixes"
1249+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
1250+ fi
1251+
1252+ # Checks for Xcomposite extension
1253+
1254+ if $PKG_CONFIG --exists xcomposite ; then
1255+ AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
1256+
1257+ X_PACKAGES="$X_PACKAGES xcomposite"
1258+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite"
1259+ fi
1260+
1261+ # Checks for Xdamage extension
1262+
1263+ if $PKG_CONFIG --exists xdamage ; then
1264+ AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension])
1265+
1266+ X_PACKAGES="$X_PACKAGES xdamage"
1267+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage"
1268+ fi
1269+
1270+ if $have_base_x_pc ; then
1271+ GDK_EXTRA_LIBS="$x_extra_libs"
1272+ else
1273+ GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS"
1274+ fi
1275+
1276+ CPPFLAGS="$gtk_save_cppflags"
1277+ LIBS="$gtk_save_libs"
1278+
1279+ AM_CONDITIONAL(USE_X11, true)
1280+else
1281+ XPACKAGES=
1282+
1283+ AM_CONDITIONAL(XINPUT_XFREE, false)
1284+ AM_CONDITIONAL(USE_X11, false)
1285+ AM_CONDITIONAL(HAVE_X11R6, false)
1286+fi
1287+
1288+if test "x$gdktarget" = "xwin32"; then
1289+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
1290+ AM_CONDITIONAL(USE_WIN32, true)
1291+else
1292+ AM_CONDITIONAL(USE_WIN32, false)
1293+fi
1294+
1295+AC_ARG_ENABLE(quartz-relocation,
1296+ [AS_HELP_STRING([--enable-quartz-relocation],
1297+ [enable bundle-based relocation functions])],
1298+ [quartz_relocation=yes])
1299+
1300+if test "x$gdktarget" = "xquartz"; then
1301+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
1302+ AM_CONDITIONAL(USE_QUARTZ, true)
1303+ if test "x$quartz_relocation" = xyes; then
1304+ AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
1305+ fi
1306+
1307+else
1308+ AM_CONDITIONAL(USE_QUARTZ, false)
1309+fi
1310+
1311+if test "x$gdktarget" = "xdirectfb"; then
1312+ DIRECTFB_REQUIRED_VERSION=1.0.0
1313+ AC_MSG_CHECKING(for DirectFB)
1314+
1315+ PKG_CHECK_MODULES(DIRECTFB, [directfb >= $DIRECTFB_REQUIRED_VERSION])
1316+ AM_CONDITIONAL(USE_DIRECTFB, true)
1317+else
1318+ AM_CONDITIONAL(USE_DIRECTFB, false)
1319+fi
1320+
1321+
1322+# Check for Pango flags
1323+
1324+if test "x$gdktarget" = "xwin32"; then
1325+ PANGO_PACKAGES="pangowin32 pangocairo"
1326+else
1327+ PANGO_PACKAGES="pango pangocairo"
1328+fi
1329+
1330+AC_MSG_CHECKING(Pango flags)
1331+if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
1332+ PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
1333+ PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES`
1334+
1335+ AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS)
1336+else
1337+ AC_MSG_ERROR([
1338+*** Pango not found. Pango built with Cairo support is required
1339+*** to build GTK+. See http://www.pango.org for Pango information.
1340+])
1341+fi
1342+
1343+CFLAGS="$CFLAGS $PANGO_CFLAGS"
1344+
1345+if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
1346+ :
1347+else
1348+ gtk_save_LIBS="$LIBS"
1349+ LIBS="$PANGO_LIBS $LIBS"
1350+ AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
1351+*** Can't link to Pango. Pango is required to build
1352+*** GTK+. For more information see http://www.pango.org]))
1353+ LIBS="$gtk_save_LIBS"
1354+fi
1355+
1356+CFLAGS="$saved_cflags"
1357+LDFLAGS="$saved_ldflags"
1358+
1359+# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
1360+if test "x$gdktarget" = "xx11"; then
1361+ GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
1362+else
1363+ GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
1364+fi
1365+
1366+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
1367+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
1368+#
1369+# If we aren't writing explicit dependencies, then don't put the extra libraries we need
1370+# into the pkg-config files
1371+#
1372+if test $enable_explicit_deps != yes ; then
1373+ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
1374+ GDK_EXTRA_LIBS=
1375+fi
1376+
1377+AC_SUBST(GDK_PACKAGES)
1378+AC_SUBST(GDK_EXTRA_LIBS)
1379+AC_SUBST(GDK_EXTRA_CFLAGS)
1380+AC_SUBST(GDK_DEP_LIBS)
1381+AC_SUBST(GDK_DEP_CFLAGS)
1382+
1383+
1384+########################################
1385+# Check for Accessibility Toolkit flags
1386+########################################
1387+
1388+ATK_PACKAGES=atk
1389+AC_MSG_CHECKING(ATK flags)
1390+if $PKG_CONFIG --exists $ATK_PACKAGES ; then
1391+ ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES`
1392+ ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES`
1393+
1394+ AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS)
1395+else
1396+ AC_MSG_ERROR([
1397+*** Accessibility Toolkit not found. Accessibility Toolkit is required
1398+*** to build GTK+.
1399+])
1400+fi
1401+
1402+if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
1403+ :
1404+else
1405+ gtk_save_LIBS="$LIBS"
1406+ LIBS="$ATK_LIBS $LIBS"
1407+ AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([
1408+ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
1409+ *** to build GTK+]))
1410+ LIBS="$gtk_save_LIBS"
1411+fi
1412+
1413+GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0"
1414+if test "x$gdktarget" = "xx11"; then
1415+ GTK_PACKAGES="$GTK_PACKAGES pangoft2"
1416+fi
1417+GTK_EXTRA_LIBS=
1418+GTK_EXTRA_CFLAGS=
1419+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB"
1420+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
1421+
1422+if test x"$os_win32" = xyes; then
1423+ GTK_EXTRA_CFLAGS="$msnative_struct"
1424+fi
1425+
1426+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
1427+ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
1428+PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
1429+CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
1430+
1431+AC_SUBST(GTK_PACKAGES)
1432+AC_SUBST(GTK_EXTRA_LIBS)
1433+AC_SUBST(GTK_EXTRA_CFLAGS)
1434+AC_SUBST(GTK_DEP_LIBS)
1435+AC_SUBST(GTK_DEP_CFLAGS)
1436+
1437+AC_SUBST(GLIB_PREFIX)
1438+AC_SUBST(ATK_PREFIX)
1439+AC_SUBST(PANGO_PREFIX)
1440+AC_SUBST(CAIRO_PREFIX)
1441+
1442+AC_SUBST(GTK_DEBUG_FLAGS)
1443+AC_SUBST(GTK_XIM_FLAGS)
1444+
1445+GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0`
1446+AC_SUBST(GDK_PIXBUF_LIBS)
1447+
1448+########################
1449+# Checks needed for gail
1450+########################
1451+
1452+old_LIBS="$LIBS"
1453+dnl Checks for inet libraries:
1454+AC_SEARCH_LIBS(gethostent, nsl)
1455+AC_SEARCH_LIBS(setsockopt, socket)
1456+AC_SEARCH_LIBS(connect, inet)
1457+
1458+dnl check for the sockaddr_un.sun_len member
1459+AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
1460+ [struct_sockaddr_un_sun_len=true],
1461+ [struct_sockaddr_un_suin_len=false],
1462+ [#include <sys/types.h>
1463+ #include <sys/un.h>]
1464+ )
1465+case $struct_sockaddr_un_sun_len in
1466+ true)
1467+ AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1,
1468+ [Have the sockaddr_un.sun_len member])
1469+ ;;
1470+ *)
1471+ ;;
1472+esac
1473+
1474+GAIL_INET_LIBS="$LIBS"
1475+AC_SUBST([GAIL_INET_LIBS])