Qt 4 fixes
cover Qt 4 fixes
The following changes since commit ab0187c13b2b0a041bf3d98c3a53bd3f45a624de:
libxcb: Update for python-native changes (2012-07-30 16:53:49 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/qt4-fixes-1
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-fixes-1
Paul Eggleton (2):
qt4: allow recipes building commercial edition
qt4: make font packaging specific to embedded version
meta/classes/qt4x11.bbclass | 2 +- meta/recipes-qt/qt4/qt4-embedded.inc | 32 +++++++++++++++++++++++++++++++- meta/recipes-qt/qt4/qt4-x11-free.inc | 3 ++- meta/recipes-qt/qt4/qt4.inc | 32 +++++++------------------------- 4 files changed, 41 insertions(+), 28 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/2 qt4: allow recipes building commercial edition
To enable building the commercial edition of Qt (through additional recipes that are *not* provided by OE-Core) we need to tweak a few things:
* Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free
- instead add qt4-x11 to DEPENDS and then have qt4-x11-free include this in its PROVIDES. A commercial equivalent recipe should do the same.
* Add a QT_LICENSE_FILE variable that can be used to specify the license file required by the commercial edition.
* Add a QT_LICENSE_FLAGS variable which the recipe can set to select the license option being used. The default of "-opensource" retains the current behaviour; a commercial recipe should set it to "-commercial".
Fixes [YOCTO #2505].
--- meta/classes/qt4x11.bbclass | 2 +- meta/recipes-qt/qt4/qt4-embedded.inc | 2 +- meta/recipes-qt/qt4/qt4-x11-free.inc | 3 ++- meta/recipes-qt/qt4/qt4.inc | 7 ++++++- 4 files changed, 10 insertions(+), 4 deletions(-)
meta/classes/qt4x11.bbclass +1 -1
@@ -1,4 +1,4 @@ -DEPENDS_prepend = "${@["qt4-x11-free ", ""][(d.getVar('BPN', True)[:12] == 'qt4-x11-free')]}" +DEPENDS_prepend = "${@base_contains("PROVIDES", "qt4-x11", "", "qt4-x11 ", d)}" inherit qmake2
meta/recipes-qt/qt4/qt4-embedded.inc +1 -1
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is SECTION = "libs" HOMEPAGE = "http://qt.nokia.com" DEPENDS += "directfb tslib" -INC_PR = "r46" +INC_PR = "r47" QT_BASE_LIB ?= "libqt-embedded"
meta/recipes-qt/qt4/qt4-x11-free.inc +2 -1
@@ -4,8 +4,9 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is HOMEPAGE = "http://qt.nokia.com" SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" +PROVIDES += "qt4-x11" -INC_PR = "r44" +INC_PR = "r45" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl"
meta/recipes-qt/qt4/qt4.inc +6 -1
@@ -192,6 +192,10 @@ FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug" +# License options, to be set by the recipe if different values are needed +QT_LICENSE_FILE ?= "" +QT_LICENSE_FLAGS ?= "-opensource" + do_configure() { unset QMAKESPEC unset QTDIR
@@ -231,7 +235,7 @@ do_configure() { ${EXTRA_QMAKE_MUNGE}|| true - (echo o; echo yes) | ./configure -v \ + echo yes | QT_LICENSE_FILE="${QT_LICENSE_FILE}" ./configure -v \ -prefix ${prefix}/ \ -bindir ${bindir} \ -libdir ${libdir} \
@@ -248,6 +252,7 @@ do_configure() { -xplatform ${TARGET_OS}-oe-g++ \ ${QT_ENDIAN} \ -crossarch ${QT_ARCH} \ + ${QT_LICENSE_FLAGS} \ ${QT_CONFIG_FLAGS} -no-fast \ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \ -I${STAGING_INCDIR}/freetype2
Signature · 1 line
1.7.9.5
PATCH 2/2 qt4: make font packaging specific to embedded version
In reply to Paul EggletonQt 4's lib/fonts files are intended only for installation with Qt Embedded [1] so only install and package them with the embedded version.
Fixes [YOCTO #2809].
[1] http://lists.qt-project.org/pipermail/interest/2012-July/003062.html
--- meta/recipes-qt/qt4/qt4-embedded.inc | 30 ++++++++++++++++++++++++++++++ meta/recipes-qt/qt4/qt4.inc | 25 +------------------------ 2 files changed, 31 insertions(+), 24 deletions(-)
meta/recipes-qt/qt4/qt4-embedded.inc +30 -0
@@ -21,6 +21,9 @@ QT_CONFIG_FLAGS += " \ require qt4.inc do_install_append() { + install -d ${D}/${libdir}/fonts + touch ${D}/${libdir}/fonts/fontdir + install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/ }
@@ -31,5 +34,32 @@ PACKAGES += " ${PN}-conf" FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh" RRECOMMENDS_${PN} += " ${PN}-conf" +OTHER_PACKAGES += "\ + ${QT_BASE_NAME}-fonts \ + ${QT_BASE_NAME}-fonts-ttf-vera \ + ${QT_BASE_NAME}-fonts-ttf-dejavu \ + ${QT_BASE_NAME}-fonts-pfa \ + ${QT_BASE_NAME}-fonts-pfb \ + ${QT_BASE_NAME}-fonts-qpf" + +RRECOMMENDS_${QT_BASE_NAME}-fonts = " \ + ${QT_BASE_NAME}-fonts-ttf-vera \ + ${QT_BASE_NAME}-fonts-ttf-dejavu \ + ${QT_BASE_NAME}-fonts-pfa \ + ${QT_BASE_NAME}-fonts-pfb \ + ${QT_BASE_NAME}-fonts-qpf" +RRECOMMENDS_${QT_BASE_NAME}-demos += " \ + ${QT_BASE_NAME}-fonts" + +ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1" +PACKAGES_DYNAMIC += "${QT_BASE_NAME}-fonts-*" + +FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf" +FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf" +FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa" +FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb" +FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf*" +FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir" + inherit qt4e
meta/recipes-qt/qt4/qt4.inc +1 -24
@@ -93,12 +93,6 @@ OTHER_PACKAGES = "\ ${QT_BASE_NAME}-demos \ ${QT_BASE_NAME}-designer \ ${QT_BASE_NAME}-examples \ - ${QT_BASE_NAME}-fonts \ - ${QT_BASE_NAME}-fonts-ttf-vera \ - ${QT_BASE_NAME}-fonts-ttf-dejavu \ - ${QT_BASE_NAME}-fonts-pfa \ - ${QT_BASE_NAME}-fonts-pfb \ - ${QT_BASE_NAME}-fonts-qpf \ ${QT_BASE_NAME}-linguist \ ${QT_BASE_NAME}-makeqpf \ ${QT_BASE_NAME}-mkspecs \
@@ -117,10 +111,9 @@ PACKAGES += " \ ${STATICDEV_PACKAGES} \ ${OTHER_PACKAGES}" -PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*" +PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-*" ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1" FILES_${PN} = "" FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*" FILES_${PN}-dbg = "${exec_prefix}/src/debug/"
@@ -128,14 +121,7 @@ FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch" RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" -RRECOMMENDS_${QT_BASE_NAME}-fonts = " \ - ${QT_BASE_NAME}-fonts-ttf-vera \ - ${QT_BASE_NAME}-fonts-ttf-dejavu \ - ${QT_BASE_NAME}-fonts-pfa \ - ${QT_BASE_NAME}-fonts-pfb \ - ${QT_BASE_NAME}-fonts-qpf" RRECOMMENDS_${QT_BASE_NAME}-demos += " \ - ${QT_BASE_NAME}-fonts \ ${QT_BASE_NAME}-examples \ ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ ${QT_BASE_NAME}-plugin-imageformat-jpeg \
@@ -170,12 +156,6 @@ FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*" FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*" FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a" FILES_${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/*" -FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf" -FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf" -FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa" -FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb" -FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf*" -FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir" FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts" FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts" FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool"
@@ -368,9 +348,6 @@ do_install() { -e 's:IP{:I${:g' $pc done - install -d ${D}/${libdir}/fonts - touch ${D}/${libdir}/fonts/fontdir - #Append an E to the qtdemo file if [ -n "${QT_LIBINFIX}" ] ; then [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
Signature · 1 line
1.7.9.5
Richard Purdie
AppliedQuoted 4 lines · Paul Eggleton
The following changes since commit
ab0187c13b2b0a041bf3d98c3a53bd3f45a624de:libxcb: Update for python-native changes (2012-07-30 16:53:49 +0100)
Quoted 8 lines
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribpaule/qt4-fixes-1
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-fixes-1Paul Eggleton (2):
qt4: allow recipes building commercial edition
qt4: make font packaging specific to embedded version
Merged to master, thanks.
Richard