[oe] [meta-qt5][PATCH v5] Upgrade to Qt 5.8

[Martin Jansa]

Strange I was applying https://patchwork.openembedded.org/patch/136285/ to
master-next yesterday, not sure why they aren't there.

Can you send rebased version, because the v5 doesn't apply cleanly:

OE @ ~/meta-qt5 $ pwam 136285
2017-01-26 15:33:41 URL:
https://patchwork.openembedded.org/patch/136285/mbox/ [149874] ->
"pw-am-136285.patch" [1]
Applying: Upgrade to Qt 5.8
.git/rebase-apply/patch:1590: trailing whitespace.
-- 
.git/rebase-apply/patch:2766: trailing whitespace.

.git/rebase-apply/patch:1592: new blank line at EOF.
+
error: patch failed: recipes-qt/qt5/qtbase_git.bb:43
error: recipes-qt/qt5/qtbase_git.bb: patch does not apply
.git/rebase-apply/patch:2766: new blank line at EOF.
+
error: patch failed: recipes-qt/qt5/qtwebengine_git.bb:110
error: recipes-qt/qt5/qtwebengine_git.bb: patch does not apply
Patch failed at 0001 Upgrade to Qt 5.8
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


So maybe I've missed something when applying it manually.

On Thu, Jan 26, 2017 at 2:17 PM, Samuli Piippo <samuli.piippo at gmail.com>
wrote:

> On Thu, Jan 26, 2017 at 2:54 PM, Martin Jansa <martin.jansa at gmail.com>
> wrote:
> > On Thu, Jan 26, 2017 at 11:00:59AM +0100, Johannes Pointner wrote:
> >> Hello,
> >>
> >> I tried to build qtbase after this update, but it failed to configure
> >> because of PACKAGECONFIG options which are no longer available or
> >> moved to another part (qtmultimedia):
> >> PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
> >>
> >> PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib"
> >> PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio"
> >
> > Yes, I'm seeing the same issue, the flags were removed in:
> >
> > commit 90c425642dfeae4564b43dacf15f80479962e910
> > Merge: 1a43199 9808b53
> > Author: Liang Qi <liang.qi at qt.io>
> > Date:   Wed Nov 16 07:37:38 2016 +0100
> >
> >     Merge remote-tracking branch 'origin/5.7' into 5.8
> >
> > but there is still PACKAGECONFIG in qtbase recipe, so this needs be
> > fixed in v6.
>
> The changes were part of v5, but they are now missing from the patch
> committed to master-next
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>