diff options
Diffstat (limited to 'meta-oe/recipes-support/maliit/maliit-framework/0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch')
-rw-r--r-- | meta-oe/recipes-support/maliit/maliit-framework/0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/maliit/maliit-framework/0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch b/meta-oe/recipes-support/maliit/maliit-framework/0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch new file mode 100644 index 000000000..df4f1794e --- /dev/null +++ b/meta-oe/recipes-support/maliit/maliit-framework/0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 839e0933f09309a0374aa58cc58439c3a1f157b2 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Tue, 14 May 2013 10:24:48 +0200 | ||
4 | Subject: [PATCH] ut_maliit_glib_settings: fix build for glib 2.36 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Inappropriate [code removed upstream] | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | --- | ||
13 | .../ut_maliit_glib_settings.c | 3 ++- | ||
14 | 1 files changed, 2 insertions(+), 1 deletions(-) | ||
15 | |||
16 | diff --git a/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c b/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c | ||
17 | index 476ba33..09b6261 100644 | ||
18 | --- a/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c | ||
19 | +++ b/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c | ||
20 | @@ -188,8 +188,9 @@ test_settings_manager_emits_disconnected(void) | ||
21 | int | ||
22 | main (int argc, char **argv) { | ||
23 | g_test_init(&argc, &argv, NULL); | ||
24 | +#if !GLIB_CHECK_VERSION (2, 36, 0) | ||
25 | g_type_init(); | ||
26 | - | ||
27 | +#endif | ||
28 | g_test_add_func("/ut_maliit_glib_settings/MaliitSettingsManager/preferred_description_locale/default", | ||
29 | test_preferred_description_locale_default); | ||
30 | g_test_add_func("/ut_maliit_glib_settings/MaliitSettingsManager/preferred_description_locale/set-get-roundtrip", | ||
31 | -- | ||
32 | 1.7.6.5 | ||
33 | |||