diff options
| author |   Samuel Stirtzel <s.stirtzel@googlemail.com> | 2012-10-17 08:55:32 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-10-17 13:04:57 +0200 |
| commit | d9b7d6b4cd6b959b3998ddfec9775b64ffa61fe0 (patch) | |
| tree | a60ad43303088281e7324b7fe1190903e12e6838 /meta-oe/recipes-support/maliit/maliit-framework | |
| parent | 0caaa82c3d7e6b4704c27ad40e37c0eb5db7048b (diff) | |
| download | meta-openembedded-contrib-d9b7d6b4cd6b959b3998ddfec9775b64ffa61fe0.tar.gz | |
Maliit: Add initial recipes
Maliit is a Qt based virtual keyboard under liberal license (LGPLv2.1 / BSD)
The inputmethod framework from Qt is used and it supports gtk-immodules.
It can also be used without dependencies to GTK+ (separate package for GTK+)
Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support/maliit/maliit-framework')
2 files changed, 68 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 0000000000..acd9a57a57 --- /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 @@ +From 33554f9b3fd493c7e28617fd01466ffa87251f27 Mon Sep 17 00:00:00 2001 +From: Samuel Stirtzel <s.stirtzel@googlemail.com> +Date: Wed, 1 Aug 2012 13:21:51 +0200 +Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> +--- + config.pri | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/config.pri b/config.pri +index b037b8c..43409f3 100644 +--- a/config.pri ++++ b/config.pri +@@ -161,9 +161,11 @@ contains(QT_MAJOR_VERSION, 4) { + QT_WIDGETS = gui widgets + } + +-MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features +-local-install { +- MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX) ++isEmpty(MALIIT_INSTALL_PRF) { ++ MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features ++ local-install { ++ MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX) ++ } + } + + defineTest(outputFile) { +-- +1.7.9.5 + 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 0000000000..830e6deb4e --- /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 @@ +From fb6acbd2af9ed288c1c4f4200fc73d8d9955486a Mon Sep 17 00:00:00 2001 +From: Samuel Stirtzel <s.stirtzel@googlemail.com> +Date: Wed, 1 Aug 2012 13:33:10 +0200 +Subject: [PATCH] Fix QT_IM_PLUGIN_PATH to allow openembedded to build Maliit + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> +--- + input-context/input-context.pri | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/input-context/input-context.pri b/input-context/input-context.pri +index d94e6a3..d460e70 100644 +--- a/input-context/input-context.pri ++++ b/input-context/input-context.pri +@@ -25,8 +25,10 @@ for(OPTION,$$list($$lower($$COV_OPTION))){ + + QMAKE_CLEAN += $$OBJECTS_DIR/*.gcno $$OBJECTS_DIR/*.gcda + +-QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods +-QT_PREFIX = $$[QT_INSTALL_PREFIX] +-local-install { +- QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX) ++isEmpty(QT_IM_PLUGIN_PATH) { ++ QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods ++ QT_PREFIX = $$[QT_INSTALL_PREFIX] ++ local-install { ++ QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX) ++ } + } +-- +1.7.9.5 + |