On Tue, Jun 8, 2010 at 12:25 AM, Martin Jansa <[email protected]> wrote: > Signed-off-by: Martin Jansa <[email protected]>
Acked-by: Khem Raj <[email protected]> > --- > recipes/qt4/qt-4.6.2+4.7.0-beta1.inc | 4 ++-- > recipes/qt4/qt4-tools-native_4.7.0-beta1.bb | 9 ++++++++- > recipes/qt4/qt4-x11-free_4.7.0-beta1.bb | 3 ++- > 3 files changed, 12 insertions(+), 4 deletions(-) > > diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc > b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc > index eb19285..9de3a5d 100644 > --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc > +++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc > @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1 GPLv3" > FILESPATHPKG .= ":qt-${PV}" > > SRC_URI = "\ > - > ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ > + > ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${SRCVER}.tar.gz > \ > file://0004-no-qmake.patch \ > file://hack-out-pg_config.patch \ > file://0006-freetype-host-includes.patch \ > @@ -19,7 +19,7 @@ SRC_URI = "\ > file://linux.conf \ > " > > -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" > +S = "${WORKDIR}/qt-everywhere-opensource-src-${SRCVER}" > > QT_LIB_NAMES += "QtDeclarative" > FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" > diff --git a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb > b/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb > index 0539c04..fb08ded 100644 > --- a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb > +++ b/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb > @@ -3,9 +3,16 @@ DEFAULT_PREFERENCE = "-1" > require qt4-tools-native.inc > LICENSE = "LGPLv2.1 GPLv3" > > -PV = "4.6.2+4.7.0-beta1" > +SRCVER = "4.7.0-beta1" > +PV = "4.6.2+${SRCVER}" > PR = "${INC_PR}.0" > > +SRC_URI = > "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${SRCVER}.tar.gz > \ > + file://qt-config.patch \ > + file://g++.conf \ > + file://linux.conf" > +S = "${WORKDIR}/qt-everywhere-opensource-src-${SRCVER}" > + > EXTRA_OECONF += " -no-fast -silent -no-rpath" > > TOBUILD := "src/tools/bootstrap ${TOBUILD}" > diff --git a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb > b/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb > index beef158..c489a48 100644 > --- a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb > +++ b/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb > @@ -2,7 +2,8 @@ DEFAULT_PREFERENCE = "-1" > > require qt4-x11-free.inc > > -PV = "4.6.2+4.7.0-beta1" > +SRCVER = "4.7.0-beta1" > +PV = "4.6.2+${SRCVER}" > PR = "${INC_PR}.1" > > QT_CONFIG_FLAGS_append_armv6 = " -no-neon " > -- > 1.7.1 > > > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
