diff options
Diffstat (limited to 'recipes-qt/maliit')
-rw-r--r-- | recipes-qt/maliit/maliit-framework-qt5_git.bb | 16 | ||||
-rw-r--r-- | recipes-qt/maliit/maliit-plugins-qt5_git.bb | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index 308f3d02..0f0ed7aa 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb | |||
@@ -22,9 +22,9 @@ GTKIMMODULES_PACKAGES = "${PN}-gtk" | |||
22 | 22 | ||
23 | DEPENDS = "qtdeclarative" | 23 | DEPENDS = "qtdeclarative" |
24 | 24 | ||
25 | RRECOMMENDS_${PN} = "maliit-plugins-qt5" | 25 | RRECOMMENDS:${PN} = "maliit-plugins-qt5" |
26 | 26 | ||
27 | FILES_${PN} += "\ | 27 | FILES:${PN} += "\ |
28 | ${libdir}/*.so* \ | 28 | ${libdir}/*.so* \ |
29 | ${bindir} \ | 29 | ${bindir} \ |
30 | ${datadir}/applications/maliit-server.desktop \ | 30 | ${datadir}/applications/maliit-server.desktop \ |
@@ -32,11 +32,11 @@ FILES_${PN} += "\ | |||
32 | ${OE_QMAKE_PATH_PLUGINS}/platforminputcontexts \ | 32 | ${OE_QMAKE_PATH_PLUGINS}/platforminputcontexts \ |
33 | " | 33 | " |
34 | 34 | ||
35 | FILES_${PN}-dbg += "\ | 35 | FILES:${PN}-dbg += "\ |
36 | ${libdir}/maliit-framework-tests \ | 36 | ${libdir}/maliit-framework-tests \ |
37 | " | 37 | " |
38 | 38 | ||
39 | FILES_${PN}-dev += "\ | 39 | FILES:${PN}-dev += "\ |
40 | ${includedir}/maliit \ | 40 | ${includedir}/maliit \ |
41 | ${libdir}/pkgconfig \ | 41 | ${libdir}/pkgconfig \ |
42 | ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \ | 42 | ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \ |
@@ -60,11 +60,11 @@ EXTRA_QMAKEVARS_PRE = "\ | |||
60 | " | 60 | " |
61 | 61 | ||
62 | # tests fail to build with clang | 62 | # tests fail to build with clang |
63 | EXTRA_QMAKEVARS_PRE_append_toolchain-clang = " CONFIG+=notests" | 63 | EXTRA_QMAKEVARS_PRE:append:toolchain-clang = " CONFIG+=notests" |
64 | 64 | ||
65 | EXTRA_OEMAKE += "INSTALL_ROOT=${D}" | 65 | EXTRA_OEMAKE += "INSTALL_ROOT=${D}" |
66 | 66 | ||
67 | do_install_append() { | 67 | do_install:append() { |
68 | #Fix absolute paths | 68 | #Fix absolute paths |
69 | sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-framework.prf | 69 | sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-framework.prf |
70 | sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-plugins.prf | 70 | sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-plugins.prf |
@@ -73,7 +73,7 @@ do_install_append() { | |||
73 | install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications | 73 | install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications |
74 | } | 74 | } |
75 | 75 | ||
76 | pkg_postinst_${PN} () { | 76 | pkg_postinst:${PN} () { |
77 | #!/bin/sh | 77 | #!/bin/sh |
78 | # should run online | 78 | # should run online |
79 | if [ "x$D" != "x" ]; then | 79 | if [ "x$D" != "x" ]; then |
@@ -83,7 +83,7 @@ echo "export QT_IM_MODULE=Maliit" >> /etc/xprofile | |||
83 | ln -s /usr/share/applications/maliit-server.desktop /etc/xdg/autostart/maliit-server.desktop | 83 | ln -s /usr/share/applications/maliit-server.desktop /etc/xdg/autostart/maliit-server.desktop |
84 | } | 84 | } |
85 | 85 | ||
86 | pkg_postrm_${PN} () { | 86 | pkg_postrm:${PN} () { |
87 | #!/bin/sh | 87 | #!/bin/sh |
88 | # should run online | 88 | # should run online |
89 | if [ "x$D" = "x" ]; then | 89 | if [ "x$D" = "x" ]; then |
diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb index 8464e1f0..d60d4fd7 100644 --- a/recipes-qt/maliit/maliit-plugins-qt5_git.bb +++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb | |||
@@ -8,7 +8,7 @@ inherit qmake5 | |||
8 | 8 | ||
9 | DEPENDS = "maliit-framework-qt5" | 9 | DEPENDS = "maliit-framework-qt5" |
10 | 10 | ||
11 | RDEPENDS_${PN} += "qtsvg-plugins" | 11 | RDEPENDS:${PN} += "qtsvg-plugins" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/maliit/plugins.git;branch=master \ | 13 | SRC_URI = "git://github.com/maliit/plugins.git;branch=master \ |
14 | file://0001-Do-not-use-tr1-namespace.patch \ | 14 | file://0001-Do-not-use-tr1-namespace.patch \ |
@@ -26,9 +26,9 @@ EXTRA_QMAKEVARS_PRE = "\ | |||
26 | " | 26 | " |
27 | 27 | ||
28 | # tests fail to build with clang | 28 | # tests fail to build with clang |
29 | EXTRA_QMAKEVARS_PRE_append_toolchain-clang = " CONFIG+=notests" | 29 | EXTRA_QMAKEVARS_PRE:append:toolchain-clang = " CONFIG+=notests" |
30 | 30 | ||
31 | FILES_${PN} += "\ | 31 | FILES:${PN} += "\ |
32 | ${libdir}/maliit \ | 32 | ${libdir}/maliit \ |
33 | ${datadir} \ | 33 | ${datadir} \ |
34 | " | 34 | " |