[oe] [PATCH][meta-qt5][jansa/qt5-5.2.0]] qtbase: fix typo in PATH_EXTERNAL_HOST_BINS-patch

[Martin Jansa]

On Fri, Jan 10, 2014 at 12:29:37AM +0100, Martin Jansa wrote:
> On Thu, Jan 09, 2014 at 05:48:26PM +0100, Andreas Müller wrote:
> > libraries based on cmake and depending on qt5qml failed to configure with:
> > 
> > |   The imported target "Qt5::DBus" references the file
> > |
> > |      "/home/a.mueller/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/qt5/qdbusxml2xml"
> 
> Thanks, it's typo only in 5.2.0, there was extra bindir in paths and
> when I was fixing it I've noticed that OE_QMAKE_PATH_EXTERNAL_HOST_BINS
> wasint used for qdbus*.
> 
> Last thing I want to fix in 5.2.0 before merge to master are wrong
> (mostly empty) PRIVATE_INCLUDE_DIRS variables in cmake - that's what
> prevents me to switch webos-ports to 5.2.0 now.
> 
> A bit longer description is now included in
> https://github.com/meta-qt5/qtbase/blob/stable/oe-patches.txt

This is now fixed by last commit
https://github.com/meta-qt5/meta-qt5/tree/jansa/qt5-5.2.0

but I have found one new issue after this -
meta-webos-ports/recipes-qt/qt5/qt5-qpa-hwcomposer-plugin_git.bb
started to fail just after this header change, so I need to check if it
has some other bad side-effects.

and I would like to give Jacob a chance to debug
http://lists.openembedded.org/pipermail/openembedded-devel/2014-January/093688.html

> > Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
> > ---
> >  .../0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch     | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/recipes-qt/qt5/qtbase/0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase/0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
> > index e3f1b72..ea3364e 100644
> > --- a/recipes-qt/qt5/qtbase/0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
> > +++ b/recipes-qt/qt5/qtbase/0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
> > @@ -54,7 +54,7 @@ index 1d94715..617efa8 100644
> >       set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
> >   !!ELSE
> >  -    set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
> > -+    set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2xml$$CMAKE_BIN_SUFFIX\")
> > ++    set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
> >   !!ENDIF
> >       _qt5_DBus_check_file_exists(${imported_location})
> >   
> > -- 
> > 1.8.3.1
> > 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20140113/93312345/attachment-0002.sig>