[OE-core] [PATCH 6/6] qt4: add RPROVIDES/RREPLACES for qmake2 recipe

[Koen Kooi]

Op 16 mrt. 2012, om 20:01 heeft Paul Eggleton het volgende geschreven:

> OE-Classic and meta-oe provide a qmake2 recipe; since this has been
> obsoleted by the recent change to provide qmake within the tools package
> and (in the latter case) will soon be removed, add an RREPLACES to aid
> upgrades and RPROVIDES to make it easy to install.
> 
> Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

Acked-by: Koen Kooi <koen at dominion.thruhere.net>

> ---
> meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
> meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
> meta/recipes-qt/qt4/qt4.inc          |    3 +++
> 3 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
> index 0e57e5a..8c15352 100644
> --- a/meta/recipes-qt/qt4/qt4-embedded.inc
> +++ b/meta/recipes-qt/qt4/qt4-embedded.inc
> @@ -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 = "r42"
> +INC_PR = "r43"
> 
> QT_BASE_LIB  ?= "libqt-embedded"
> 
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
> index e1bef64..072c522 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
> SECTION = "x11/libs"
> DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
> 
> -INC_PR = "r40"
> +INC_PR = "r41"
> 
> QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
> QT_GLFLAGS_qemux86 = "-opengl"
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 7f1f6f0..468a46f 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -155,6 +155,9 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
> RRECOMMENDS_${QT_BASE_NAME}-doc += " \
>             ${QT_BASE_NAME}-demos-doc"
> 
> +RPROVIDES_${QT_BASE_NAME}-tools += "qmake2"
> +RREPLACES_${QT_BASE_NAME}-tools += "qmake2"
> +
> FILES_${QT_BASE_NAME}-tools                = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/qmake ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
> FILES_${QT_BASE_NAME}-tools-dbg            = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/qmake ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
> FILES_${QT_BASE_NAME}-assistant            = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
> -- 
> 1.7.5.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core