diff options
author | Stefan Schmidt <stefan@datenfreihafen.org> | 2013-09-28 22:25:14 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-05 14:42:08 +0200 |
commit | d691c447784646688b3b0445d63359a7d9292926 (patch) | |
tree | 1af4ae2c2cdd56821e8c93823fed9c3db8e6e4e6 /recipes-qt/maliit/maliit-framework-qt5 | |
parent | f4188229f100349f4c88340b62a37d3ebfe51cc5 (diff) |
maliit: Import maliit recipes from meta-oe
* Imported from rev 13ae5105ee30410136beeae66ec41ee4a8a2e2b0
This is the first step to move these recipes over to qt5.
* maliit-framework-qt5: Build with qt5
Switch to new github repo
Update SRCREV and remove patches which now longer apply
Disable doc generation and xcb
Fix packaging
* maliit-plugins-qt5: Build with qt5.
Switch to new github repo
Update SRCREV and PV
Fix packaging
* maliit-*-qt5: Adjust MKSPEC path
* meta-framework-qt5: Cleanup packaging and enable dbus activation.
Move pkgconfig files, headers and spec files into dev.
Cleanup packaging rules
Enable dbus activation to start maliit server on demand
* maliit-plugins-qt5: Set MALIIT_PLUGINS_DATA_DIR to avoid path leakage from host
If not overriden here MALIIT_PLUGINS_DATA_DIR would point to some host
paths resulting in e.g. qml files not being found.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Diffstat (limited to 'recipes-qt/maliit/maliit-framework-qt5')
4 files changed, 97 insertions, 0 deletions
diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch new file mode 100644 index 00000000..acd9a57a --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/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/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch new file mode 100644 index 00000000..830e6deb --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/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 + diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch new file mode 100644 index 00000000..c2291c6b --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch @@ -0,0 +1,23 @@ +From cc33efdedbec9e9a55e9a0c6756516fd84d42e53 Mon Sep 17 00:00:00 2001 +From: Samuel Stirtzel <s.stirtzel@googlemail.com> +Date: Fri, 1 Mar 2013 11:31:41 +0100 +Subject: [PATCH] Link to libmaliit-1,0 in inputcontext plugin + +Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> +--- + .../input-context-plugin/input-context-plugin.pro | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/input-context/input-context-plugin/input-context-plugin.pro b/input-context/input-context-plugin/input-context-plugin.pro +index eefbe93..296e2fa 100644 +--- a/input-context/input-context-plugin/input-context-plugin.pro ++++ b/input-context/input-context-plugin/input-context-plugin.pro +@@ -15,3 +15,5 @@ CONFIG += plugin + + INSTALLS += target + target.path += $$QT_IM_PLUGIN_PATH ++ ++LIBS += -L../../lib -l"maliit-1.0" +-- +1.7.9.5 + diff --git a/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop b/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop new file mode 100644 index 00000000..24bdf9b5 --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Maliit server +Exec=/usr/bin/maliit-server +Icon= +Type=Application +Categories=Utility; |