diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2013-05-14 08:44:50 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-19 09:37:29 +0200 |
| commit | 136339818433b1a55de93085f77f9a48c0a94dbf (patch) | |
| tree | 869a42411f13d06d15b9f893d69afabea2162512 /meta-oe/recipes-support/maliit/maliit-framework | |
| parent | 47a3dd25e5e28e800dc60bcabf383b9adfc99ac8 (diff) | |
| download | meta-openembedded-contrib-136339818433b1a55de93085f77f9a48c0a94dbf.tar.gz | |
maliit-framework: fix build with glib 2.36
Upstream code has seen many structural changes and the failing test is gone.
Since changing to latest sources might cause huge reworking/test-efforts this
patch only fixes the build error.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/maliit/maliit-framework')
| -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 0000000000..df4f1794e3 --- /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 @@ +From 839e0933f09309a0374aa58cc58439c3a1f157b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Tue, 14 May 2013 10:24:48 +0200 +Subject: [PATCH] ut_maliit_glib_settings: fix build for glib 2.36 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [code removed upstream] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + .../ut_maliit_glib_settings.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c b/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c +index 476ba33..09b6261 100644 +--- a/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c ++++ b/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c +@@ -188,8 +188,9 @@ test_settings_manager_emits_disconnected(void) + int + main (int argc, char **argv) { + g_test_init(&argc, &argv, NULL); ++#if !GLIB_CHECK_VERSION (2, 36, 0) + g_type_init(); +- ++#endif + g_test_add_func("/ut_maliit_glib_settings/MaliitSettingsManager/preferred_description_locale/default", + test_preferred_description_locale_default); + g_test_add_func("/ut_maliit_glib_settings/MaliitSettingsManager/preferred_description_locale/set-get-roundtrip", +-- +1.7.6.5 + |