summaryrefslogtreecommitdiffstats
path: root/recipes-qt/maliit/maliit-framework-qt5
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2013-09-28 22:25:14 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-05 14:42:08 +0200
commitd691c447784646688b3b0445d63359a7d9292926 (patch)
tree1af4ae2c2cdd56821e8c93823fed9c3db8e6e4e6 /recipes-qt/maliit/maliit-framework-qt5
parentf4188229f100349f4c88340b62a37d3ebfe51cc5 (diff)
downloadmeta-qt5-d691c447784646688b3b0445d63359a7d9292926.tar.gz
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')
-rw-r--r--recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch34
-rw-r--r--recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch34
-rw-r--r--recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch23
-rw-r--r--recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop6
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 @@
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/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 @@
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/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 @@
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/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 @@
1[Desktop Entry]
2Name=Maliit server
3Exec=/usr/bin/maliit-server
4Icon=
5Type=Application
6Categories=Utility;