summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc30
-rw-r--r--meta/recipes-qt/qt4/qt4.inc25
2 files changed, 31 insertions, 24 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 9e8bf3a0d7..de1b88ee83 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -21,6 +21,9 @@ QT_CONFIG_FLAGS += " \
21require qt4.inc 21require qt4.inc
22 22
23do_install_append() { 23do_install_append() {
24 install -d ${D}/${libdir}/fonts
25 touch ${D}/${libdir}/fonts/fontdir
26
24 install -d ${D}${sysconfdir}/profile.d/ 27 install -d ${D}${sysconfdir}/profile.d/
25 install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/ 28 install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
26} 29}
@@ -31,5 +34,32 @@ PACKAGES += " ${PN}-conf"
31FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh" 34FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh"
32RRECOMMENDS_${PN} += " ${PN}-conf" 35RRECOMMENDS_${PN} += " ${PN}-conf"
33 36
37OTHER_PACKAGES += "\
38 ${QT_BASE_NAME}-fonts \
39 ${QT_BASE_NAME}-fonts-ttf-vera \
40 ${QT_BASE_NAME}-fonts-ttf-dejavu \
41 ${QT_BASE_NAME}-fonts-pfa \
42 ${QT_BASE_NAME}-fonts-pfb \
43 ${QT_BASE_NAME}-fonts-qpf"
44
45RRECOMMENDS_${QT_BASE_NAME}-fonts = " \
46 ${QT_BASE_NAME}-fonts-ttf-vera \
47 ${QT_BASE_NAME}-fonts-ttf-dejavu \
48 ${QT_BASE_NAME}-fonts-pfa \
49 ${QT_BASE_NAME}-fonts-pfb \
50 ${QT_BASE_NAME}-fonts-qpf"
51RRECOMMENDS_${QT_BASE_NAME}-demos += " \
52 ${QT_BASE_NAME}-fonts"
53
54ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
55PACKAGES_DYNAMIC += "${QT_BASE_NAME}-fonts-*"
56
57FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
58FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
59FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa"
60FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb"
61FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf*"
62FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir"
63
34inherit qt4e 64inherit qt4e
35 65
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 9b42f69861..b8c6baf3a2 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -93,12 +93,6 @@ OTHER_PACKAGES = "\
93 ${QT_BASE_NAME}-demos \ 93 ${QT_BASE_NAME}-demos \
94 ${QT_BASE_NAME}-designer \ 94 ${QT_BASE_NAME}-designer \
95 ${QT_BASE_NAME}-examples \ 95 ${QT_BASE_NAME}-examples \
96 ${QT_BASE_NAME}-fonts \
97 ${QT_BASE_NAME}-fonts-ttf-vera \
98 ${QT_BASE_NAME}-fonts-ttf-dejavu \
99 ${QT_BASE_NAME}-fonts-pfa \
100 ${QT_BASE_NAME}-fonts-pfb \
101 ${QT_BASE_NAME}-fonts-qpf \
102 ${QT_BASE_NAME}-linguist \ 96 ${QT_BASE_NAME}-linguist \
103 ${QT_BASE_NAME}-makeqpf \ 97 ${QT_BASE_NAME}-makeqpf \
104 ${QT_BASE_NAME}-mkspecs \ 98 ${QT_BASE_NAME}-mkspecs \
@@ -117,10 +111,9 @@ PACKAGES += " \
117 ${STATICDEV_PACKAGES} \ 111 ${STATICDEV_PACKAGES} \
118 ${OTHER_PACKAGES}" 112 ${OTHER_PACKAGES}"
119 113
120PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*" 114PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-*"
121 115
122ALLOW_EMPTY_${PN} = "1" 116ALLOW_EMPTY_${PN} = "1"
123ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
124FILES_${PN} = "" 117FILES_${PN} = ""
125FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*" 118FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
126FILES_${PN}-dbg = "${exec_prefix}/src/debug/" 119FILES_${PN}-dbg = "${exec_prefix}/src/debug/"
@@ -128,14 +121,7 @@ FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch"
128RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" 121RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
129RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" 122RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
130RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" 123RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
131RRECOMMENDS_${QT_BASE_NAME}-fonts = " \
132 ${QT_BASE_NAME}-fonts-ttf-vera \
133 ${QT_BASE_NAME}-fonts-ttf-dejavu \
134 ${QT_BASE_NAME}-fonts-pfa \
135 ${QT_BASE_NAME}-fonts-pfb \
136 ${QT_BASE_NAME}-fonts-qpf"
137RRECOMMENDS_${QT_BASE_NAME}-demos += " \ 124RRECOMMENDS_${QT_BASE_NAME}-demos += " \
138 ${QT_BASE_NAME}-fonts \
139 ${QT_BASE_NAME}-examples \ 125 ${QT_BASE_NAME}-examples \
140 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ 126 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
141 ${QT_BASE_NAME}-plugin-imageformat-jpeg \ 127 ${QT_BASE_NAME}-plugin-imageformat-jpeg \
@@ -170,12 +156,6 @@ FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
170FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*" 156FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
171FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a" 157FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
172FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*" 158FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*"
173FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
174FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
175FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa"
176FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb"
177FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf*"
178FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir"
179FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts" 159FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
180FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts" 160FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
181FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool" 161FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool"
@@ -368,9 +348,6 @@ do_install() {
368 -e 's:IP{:I${:g' $pc 348 -e 's:IP{:I${:g' $pc
369 done 349 done
370 350
371 install -d ${D}/${libdir}/fonts
372 touch ${D}/${libdir}/fonts/fontdir
373
374 #Append an E to the qtdemo file 351 #Append an E to the qtdemo file
375 if [ -n "${QT_LIBINFIX}" ] ; then 352 if [ -n "${QT_LIBINFIX}" ] ; then
376 [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} 353 [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}