summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/maliit/maliit-framework
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
commit1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch)
treea21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-support/maliit/maliit-framework
downloadmeta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-support/maliit/maliit-framework')
-rw-r--r--meta-oe/recipes-support/maliit/maliit-framework/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch34
-rw-r--r--meta-oe/recipes-support/maliit/maliit-framework/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch34
-rw-r--r--meta-oe/recipes-support/maliit/maliit-framework/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch23
-rw-r--r--meta-oe/recipes-support/maliit/maliit-framework/0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch33
-rw-r--r--meta-oe/recipes-support/maliit/maliit-framework/maliit-server.desktop6
5 files changed, 130 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/maliit/maliit-framework/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch b/meta-oe/recipes-support/maliit/maliit-framework/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch
new file mode 100644
index 000000000..acd9a57a5
--- /dev/null
+++ b/meta-oe/recipes-support/maliit/maliit-framework/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch
@@ -0,0 +1,34 @@
1From 33554f9b3fd493c7e28617fd01466ffa87251f27 Mon Sep 17 00:00:00 2001
2From: Samuel Stirtzel <s.stirtzel@googlemail.com>
3Date: Wed, 1 Aug 2012 13:21:51 +0200
4Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded
5
6Upstream-Status: Inappropriate [configuration]
7
8Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
9---
10 config.pri | 8 +++++---
11 1 file changed, 5 insertions(+), 3 deletions(-)
12
13diff --git a/config.pri b/config.pri
14index b037b8c..43409f3 100644
15--- a/config.pri
16+++ b/config.pri
17@@ -161,9 +161,11 @@ contains(QT_MAJOR_VERSION, 4) {
18 QT_WIDGETS = gui widgets
19 }
20
21-MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features
22-local-install {
23- MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX)
24+isEmpty(MALIIT_INSTALL_PRF) {
25+ MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features
26+ local-install {
27+ MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX)
28+ }
29 }
30
31 defineTest(outputFile) {
32--
331.7.9.5
34
diff --git a/meta-oe/recipes-support/maliit/maliit-framework/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch b/meta-oe/recipes-support/maliit/maliit-framework/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch
new file mode 100644
index 000000000..830e6deb4
--- /dev/null
+++ b/meta-oe/recipes-support/maliit/maliit-framework/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch
@@ -0,0 +1,34 @@
1From fb6acbd2af9ed288c1c4f4200fc73d8d9955486a Mon Sep 17 00:00:00 2001
2From: Samuel Stirtzel <s.stirtzel@googlemail.com>
3Date: Wed, 1 Aug 2012 13:33:10 +0200
4Subject: [PATCH] Fix QT_IM_PLUGIN_PATH to allow openembedded to build Maliit
5
6Upstream-Status: Inappropriate [configuration]
7
8Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
9---
10 input-context/input-context.pri | 10 ++++++----
11 1 file changed, 6 insertions(+), 4 deletions(-)
12
13diff --git a/input-context/input-context.pri b/input-context/input-context.pri
14index d94e6a3..d460e70 100644
15--- a/input-context/input-context.pri
16+++ b/input-context/input-context.pri
17@@ -25,8 +25,10 @@ for(OPTION,$$list($$lower($$COV_OPTION))){
18
19 QMAKE_CLEAN += $$OBJECTS_DIR/*.gcno $$OBJECTS_DIR/*.gcda
20
21-QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods
22-QT_PREFIX = $$[QT_INSTALL_PREFIX]
23-local-install {
24- QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX)
25+isEmpty(QT_IM_PLUGIN_PATH) {
26+ QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods
27+ QT_PREFIX = $$[QT_INSTALL_PREFIX]
28+ local-install {
29+ QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX)
30+ }
31 }
32--
331.7.9.5
34
diff --git a/meta-oe/recipes-support/maliit/maliit-framework/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch b/meta-oe/recipes-support/maliit/maliit-framework/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch
new file mode 100644
index 000000000..c2291c6b7
--- /dev/null
+++ b/meta-oe/recipes-support/maliit/maliit-framework/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch
@@ -0,0 +1,23 @@
1From cc33efdedbec9e9a55e9a0c6756516fd84d42e53 Mon Sep 17 00:00:00 2001
2From: Samuel Stirtzel <s.stirtzel@googlemail.com>
3Date: Fri, 1 Mar 2013 11:31:41 +0100
4Subject: [PATCH] Link to libmaliit-1,0 in inputcontext plugin
5
6Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
7---
8 .../input-context-plugin/input-context-plugin.pro | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/input-context/input-context-plugin/input-context-plugin.pro b/input-context/input-context-plugin/input-context-plugin.pro
12index eefbe93..296e2fa 100644
13--- a/input-context/input-context-plugin/input-context-plugin.pro
14+++ b/input-context/input-context-plugin/input-context-plugin.pro
15@@ -15,3 +15,5 @@ CONFIG += plugin
16
17 INSTALLS += target
18 target.path += $$QT_IM_PLUGIN_PATH
19+
20+LIBS += -L../../lib -l"maliit-1.0"
21--
221.7.9.5
23
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 @@
1From 839e0933f09309a0374aa58cc58439c3a1f157b2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Tue, 14 May 2013 10:24:48 +0200
4Subject: [PATCH] ut_maliit_glib_settings: fix build for glib 2.36
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Inappropriate [code removed upstream]
10
11Signed-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
16diff --git a/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c b/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c
17index 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--
321.7.6.5
33
diff --git a/meta-oe/recipes-support/maliit/maliit-framework/maliit-server.desktop b/meta-oe/recipes-support/maliit/maliit-framework/maliit-server.desktop
new file mode 100644
index 000000000..24bdf9b52
--- /dev/null
+++ b/meta-oe/recipes-support/maliit/maliit-framework/maliit-server.desktop
@@ -0,0 +1,6 @@
1[Desktop Entry]
2Name=Maliit server
3Exec=/usr/bin/maliit-server
4Icon=
5Type=Application
6Categories=Utility;