mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
maliit-framework: fix for Qt applications
fixes a linking issue and also sets the required variable for X based programms Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
b07f0a239e
commit
c35842efb2
+23
@@ -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
|
||||||
|
|
||||||
@@ -10,6 +10,7 @@ inherit autotools qt4x11 gtk-immodules-cache
|
|||||||
SRC_URI = "git://gitorious.org/maliit/maliit-framework.git;branch=master \
|
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-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-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch \
|
||||||
|
file://0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRCREV = "750842dec74a9b17dca91ef779c4fc5a43c4d9dc"
|
SRCREV = "750842dec74a9b17dca91ef779c4fc5a43c4d9dc"
|
||||||
@@ -65,4 +66,25 @@ do_install_append() {
|
|||||||
sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${datadir}/qt4/mkspecs/features/maliit-plugins.prf
|
sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${datadir}/qt4/mkspecs/features/maliit-plugins.prf
|
||||||
}
|
}
|
||||||
|
|
||||||
S= "${WORKDIR}/git"
|
pkg_postinst_${PN} () {
|
||||||
|
#!/bin/sh
|
||||||
|
# should run online
|
||||||
|
if [ "x$D" != "x" ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "export QT_IM_MODULE=Maliit" >> /etc/xprofile
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postrm_${PN} () {
|
||||||
|
#!/bin/sh
|
||||||
|
# should run online
|
||||||
|
if [ "x$D" = "x" ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [ -e "/etc/xprofile" ]; then
|
||||||
|
sed -i -e "g|export QT_IM_MODULE=Maliit|d" /etc/xprofile
|
||||||
|
fi
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
S = "${WORKDIR}/git"
|
||||||
|
|||||||
Reference in New Issue
Block a user