From 593003624586da93ad5a37bf5c3d605fbb86c1ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 14 May 2013 08:44:50 +0000 Subject: [PATCH] maliit-framework: fix build with glib 2.36 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. (From meta-openembedded rev: 136339818433b1a55de93085f77f9a48c0a94dbf) Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- ...iit_glib_settings-fix-build-for-glib-2.36.patch | 33 ++++++++++++++++++++++ .../recipes-support/maliit/maliit-framework_git.bb | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework/0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch diff --git a/meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework/0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch b/meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework/0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch new file mode 100644 index 0000000..df4f179 --- /dev/null +++ b/meta-openembedded/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?= +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 +--- + .../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 + diff --git a/meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework_git.bb b/meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework_git.bb index 2928562..15719f4 100644 --- a/meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework_git.bb @@ -11,11 +11,13 @@ SRC_URI = "git://gitorious.org/maliit/maliit-framework.git;branch=master \ file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \ file://0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch \ file://0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch \ + file://0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch \ file://maliit-server.desktop \ " SRCREV = "750842dec74a9b17dca91ef779c4fc5a43c4d9dc" PV = "0.92.3+git${SRCPV}" +PR = "r1" PACKAGES =+ "${PN}-gtk" -- 2.7.4