diff mbox

[v3] package/qt5location: handle plugins being conditionally built

Message ID 1500925803-3453-1-git-send-email-joshua.henderson@microchip.com
State Superseded
Headers show

Commit Message

Joshua Henderson July 24, 2017, 7:50 p.m. UTC 
Fixes a build issue [1] where the qt5location plugins are not built, but are
attempted to be installed by buildroot.

The qt5location plugins have dependencies that are automatically and incorrectly
resolved causing plugins to conditionally be built based on whether quick is
available. This change adds a patch for an upstream bug [2] that builds the
plugins directory irrelevant of the quick module.

[1] http://autobuild.buildroot.net/results/bc1/bc13abf3bb2fe1c991aec2334ee658c9641d1fd5/build-end.log
[2] https://bugreports.qt.io/browse/QTBUG-62098

Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com>

--

Changes for v3:
- Change commit message to be more inline with actual fix.
- Issue with upstream patch - use Peter's upstream patch instead.

Changes for v2:
- Instead of skipping missing files, fix the root cause of improper dependency
  on quick when building the position plugin.
---
 ...001-Fix-plugins-build-dependency-tracking.patch | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 package/qt5/qt5location/5.9.1/0001-Fix-plugins-build-dependency-tracking.patch

Comments

Thomas Petazzoni July 25, 2017, 7:52 p.m. UTC | #1 
Hello,

On Mon, 24 Jul 2017 12:50:03 -0700, Joshua Henderson wrote:
> Fixes a build issue [1] where the qt5location plugins are not built, but are
> attempted to be installed by buildroot.
> 
> The qt5location plugins have dependencies that are automatically and incorrectly
> resolved causing plugins to conditionally be built based on whether quick is
> available. This change adds a patch for an upstream bug [2] that builds the
> plugins directory irrelevant of the quick module.
> 
> [1] http://autobuild.buildroot.net/results/bc1/bc13abf3bb2fe1c991aec2334ee658c9641d1fd5/build-end.log
> [2] https://bugreports.qt.io/browse/QTBUG-62098
> 
> Cc: Julien Corjon <corjon.j@ecagroup.com>
> Cc: Peter Seiderer <ps.report@gmx.net>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com>
> 
> --
> 
> Changes for v3:
> - Change commit message to be more inline with actual fix.
> - Issue with upstream patch - use Peter's upstream patch instead.
> 
> Changes for v2:
> - Instead of skipping missing files, fix the root cause of improper dependency
>   on quick when building the position plugin.
> ---
>  ...001-Fix-plugins-build-dependency-tracking.patch | 39 ++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
>  create mode 100644 package/qt5/qt5location/5.9.1/0001-Fix-plugins-build-dependency-tracking.patch

Thanks, but Peter had sent an almost identical patch a few hours
before, and I've applied his patch.

Thanks a lot for all this work on Qt5, much appreciated! Note that we
still have a build failure of qt5webkit 5.6.1:

  http://autobuild.buildroot.net/results/2f3/2f381967c82775ad911a246a9607034ef489c1ce/build-end.log

Thanks!

Thomas
Peter Seiderer July 27, 2017, 7:09 a.m. UTC | #2 
Hello Thomas, Joshua,

> 
> Thanks, but Peter had sent an almost identical patch a few hours
> before, and I've applied his patch.
> 
> Thanks a lot for all this work on Qt5, much appreciated! Note that we
> still have a build failure of qt5webkit 5.6.1:
> 
>   http://autobuild.buildroot.net/results/2f3/2f381967c82775ad911a246a9607034ef489c1ce/build-end.log
> 

From the build-end.log:

  The WebKit build was disabled for the following reasons:
      * ICU is required.


ICU depends on BR2_HOST_GCC_AT_LEAST_4_8 and BR2_TOOLCHAIN_GCC_AT_LEAST_4_8, this dependency is propagated to
qt5webkit but not to qt-webkit-kiosk (which selects qt5webkit circumventing the icu prerequisite)...

Patch (propagating the icu dependencies to qt-webkit-kiosk) will follow...

Regards,
Peter


> Thanks!
> 
> Thomas
Joshua Henderson July 28, 2017, 4:31 p.m. UTC | #3 
Thomas, Peter,

On 07/25/2017 12:52 PM, Thomas Petazzoni wrote:
> Hello,
> 
> On Mon, 24 Jul 2017 12:50:03 -0700, Joshua Henderson wrote:
>> Fixes a build issue [1] where the qt5location plugins are not built, but are
>> attempted to be installed by buildroot.
>>
>> The qt5location plugins have dependencies that are automatically and incorrectly
>> resolved causing plugins to conditionally be built based on whether quick is
>> available. This change adds a patch for an upstream bug [2] that builds the
>> plugins directory irrelevant of the quick module.
>>
>> [1] http://autobuild.buildroot.net/results/bc1/bc13abf3bb2fe1c991aec2334ee658c9641d1fd5/build-end.log
>> [2] https://bugreports.qt.io/browse/QTBUG-62098
>>
>> Cc: Julien Corjon <corjon.j@ecagroup.com>
>> Cc: Peter Seiderer <ps.report@gmx.net>
>> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>> Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com>
>>
>> --
>>
>> Changes for v3:
>> - Change commit message to be more inline with actual fix.
>> - Issue with upstream patch - use Peter's upstream patch instead.
>>
>> Changes for v2:
>> - Instead of skipping missing files, fix the root cause of improper dependency
>>   on quick when building the position plugin.
>> ---
>>  ...001-Fix-plugins-build-dependency-tracking.patch | 39 ++++++++++++++++++++++
>>  1 file changed, 39 insertions(+)
>>  create mode 100644 package/qt5/qt5location/5.9.1/0001-Fix-plugins-build-dependency-tracking.patch
> 
> Thanks, but Peter had sent an almost identical patch a few hours
> before, and I've applied his patch.

It wasn't exactly identical.  The applied patch now causes a build failure for 5.6.2:

    qt5location 5.6.2 Patching
    Applying 0001-Fix-plugins-build-dependency.patch using patch: 
    patching file src/src.pro
    Hunk #1 FAILED at 7.
    Hunk #2 succeeded at 14 (offset -4 lines).
    1 out of 2 hunks FAILED -- saving rejects to file src/src.pro.rej

> 
> Thanks a lot for all this work on Qt5, much appreciated! Note that we
> still have a build failure of qt5webkit 5.6.1:
> 
>   http://autobuild.buildroot.net/results/2f3/2f381967c82775ad911a246a9607034ef489c1ce/build-end.log
> 

I also have several other patches to rev (add qt5wayland and license hashes for all of qt5).

Josh
Arnout Vandecappelle July 28, 2017, 9:17 p.m. UTC | #4 
On 28-07-17 18:31, Joshua Henderson wrote:
> Thomas, Peter,
> 
> On 07/25/2017 12:52 PM, Thomas Petazzoni wrote:
[snip]
>> Thanks, but Peter had sent an almost identical patch a few hours
>> before, and I've applied his patch.
> 
> It wasn't exactly identical.  The applied patch now causes a build failure for 5.6.2:

 If you noticed that Peter's patch was wrong, you could have mentioned it in the
commit message of your patch (below the --- line). Then Thomas might have seen
the difference and applied your patch instead.


>     qt5location 5.6.2 Patching
>     Applying 0001-Fix-plugins-build-dependency.patch using patch: 
>     patching file src/src.pro
>     Hunk #1 FAILED at 7.
>     Hunk #2 succeeded at 14 (offset -4 lines).
>     1 out of 2 hunks FAILED -- saving rejects to file src/src.pro.rej

 Care to send a fix (I guess just moving the patch to the right directory)?

 When you do, please also add a reference to the autobuilder failure:

http://autobuild.buildroot.net/results/676abe008c9c4bddfddd7b041d8db9999e9e899d

>>
>> Thanks a lot for all this work on Qt5, much appreciated! Note that we
>> still have a build failure of qt5webkit 5.6.1:
>>
>>   http://autobuild.buildroot.net/results/2f3/2f381967c82775ad911a246a9607034ef489c1ce/build-end.log
>>
> 
> I also have several other patches to rev (add qt5wayland and license hashes for all of qt5).

 For the qt5wayland patch, since you wrote yourself "This needs a v3 before
applying.", it's been marked as Changes Requested in patchwork so it won't be
applied and probably won't be reviewed either.

 Regards,
 Arnout

 Regards,
 Arnout
Joshua Henderson July 28, 2017, 9:54 p.m. UTC | #5 
Arnout,

On 07/28/2017 02:17 PM, Arnout Vandecappelle wrote:
> 
> 
> On 28-07-17 18:31, Joshua Henderson wrote:
>> Thomas, Peter,
>>
>> On 07/25/2017 12:52 PM, Thomas Petazzoni wrote:
> [snip]
>>> Thanks, but Peter had sent an almost identical patch a few hours
>>> before, and I've applied his patch.
>>
>> It wasn't exactly identical.  The applied patch now causes a build failure for 5.6.2:
> 
>  If you noticed that Peter's patch was wrong, you could have mentioned it in the
> commit message of your patch (below the --- line). Then Thomas might have seen
> the difference and applied your patch instead.

It was caught last night by a local build server.  Didn't notice it previously.  I
have actually been flying right along using his patch, but only with 5.9.1.  This
is only an issue with 5.6.2.

> 
> 
>>     qt5location 5.6.2 Patching
>>     Applying 0001-Fix-plugins-build-dependency.patch using patch: 
>>     patching file src/src.pro
>>     Hunk #1 FAILED at 7.
>>     Hunk #2 succeeded at 14 (offset -4 lines).
>>     1 out of 2 hunks FAILED -- saving rejects to file src/src.pro.rej
> 
>  Care to send a fix (I guess just moving the patch to the right directory)?

That should do it.  Done.

> 
>  When you do, please also add a reference to the autobuilder failure:
> 
> http://autobuild.buildroot.net/results/676abe008c9c4bddfddd7b041d8db9999e9e899d

OK.  Is there any way to subscribe to these failures?  Even better, for specific packages?

> 

...

>>
>> I also have several other patches to rev (add qt5wayland and license hashes for all of qt5).
> 
>  For the qt5wayland patch, since you wrote yourself "This needs a v3 before
> applying.", it's been marked as Changes Requested in patchwork so it won't be
> applied and probably won't be reviewed either.

OK.

Josh
Thomas Petazzoni July 28, 2017, 9:59 p.m. UTC | #6 
Hello,

On Fri, 28 Jul 2017 14:54:06 -0700, Joshua Henderson wrote:

> > http://autobuild.buildroot.net/results/676abe008c9c4bddfddd7b041d8db9999e9e899d  
> 
> OK.  Is there any way to subscribe to these failures?  Even better, for specific packages?

Yes: if you put your name in the DEVELOPERS file for specific
packages, you'll get notified of build failures happening on those
packages.

Best regards,

Thomas
Peter Seiderer July 28, 2017, 10:08 p.m. UTC | #7 
Hello Joshua,

On Fri, 28 Jul 2017 14:54:06 -0700, Joshua Henderson <joshua.henderson@microchip.com> wrote:

> Arnout,
> 
> On 07/28/2017 02:17 PM, Arnout Vandecappelle wrote:
> > 
> > 
> > On 28-07-17 18:31, Joshua Henderson wrote:
> >> Thomas, Peter,
> >>
> >> On 07/25/2017 12:52 PM, Thomas Petazzoni wrote:
> > [snip]
> >>> Thanks, but Peter had sent an almost identical patch a few hours
> >>> before, and I've applied his patch.
> >>
> >> It wasn't exactly identical.  The applied patch now causes a build failure for 5.6.2:
> > 
> >  If you noticed that Peter's patch was wrong, you could have mentioned it in the
> > commit message of your patch (below the --- line). Then Thomas might have seen
> > the difference and applied your patch instead.
> 
> It was caught last night by a local build server.  Didn't notice it previously.  I
> have actually been flying right along using his patch, but only with 5.9.1.  This
> is only an issue with 5.6.2.
> 

Ups, my fault...

> > 
> > 
> >>     qt5location 5.6.2 Patching
> >>     Applying 0001-Fix-plugins-build-dependency.patch using patch: 
> >>     patching file src/src.pro
> >>     Hunk #1 FAILED at 7.
> >>     Hunk #2 succeeded at 14 (offset -4 lines).
> >>     1 out of 2 hunks FAILED -- saving rejects to file src/src.pro.rej
> > 
> >  Care to send a fix (I guess just moving the patch to the right directory)?
> 
> That should do it.  Done.

Thanks...

> 
> > 
> >  When you do, please also add a reference to the autobuilder failure:
> > 
> > http://autobuild.buildroot.net/results/676abe008c9c4bddfddd7b041d8db9999e9e899d
> 
> OK.  Is there any way to subscribe to these failures?  Even better, for specific packages?
> 

The DEVELOPERS file in the buildroot root directory, send a patch adding yourself
for packages you contributed to/interested in...

> > 
> 
> ...
> 
> >>
> >> I also have several other patches to rev (add qt5wayland and license hashes for all of qt5).

Did not find time for testing the qt5wayland patch yet and missed the license hash patch...

Regards,
Peter

> > 
> >  For the qt5wayland patch, since you wrote yourself "This needs a v3 before
> > applying.", it's been marked as Changes Requested in patchwork so it won't be
> > applied and probably won't be reviewed either.
> 
> OK.
> 
> Josh
diff mbox

Patch

diff --git a/package/qt5/qt5location/5.9.1/0001-Fix-plugins-build-dependency-tracking.patch b/package/qt5/qt5location/5.9.1/0001-Fix-plugins-build-dependency-tracking.patch
new file mode 100644
index 0000000..df656cc
--- /dev/null
+++ b/package/qt5/qt5location/5.9.1/0001-Fix-plugins-build-dependency-tracking.patch
@@ -0,0 +1,39 @@ 
+From 3ac051c4549575634cecc706175b019f4ed4c3bf Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Sat, 22 Jul 2017 22:47:05 +0200
+Subject: [PATCH] Fix plugins build dependency
+
+Do not build the plugins before the dependency on module positioning for
+the plugin subdir position is available.
+
+Task-number: QTBUG-62098
+Change-Id: Ic7473db937359f3dad47aef0ffa3671be8cbd349
+Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
+---
+ src/src.pro | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index d0a1ee4..0c0bf50 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -7,8 +7,6 @@ SUBDIRS += positioning
+ positioning.depends = 3rdparty/clip2tri
+ 
+ qtHaveModule(quick) {
+-    plugins.depends += positioning
+-
+     SUBDIRS += location
+     location.depends += positioning 3rdparty/clip2tri
+ 
+@@ -18,6 +16,7 @@ qtHaveModule(quick) {
+     imports.depends += positioning location
+ }
+ 
++plugins.depends += positioning
+ SUBDIRS += plugins
+ 
+ !android:contains(QT_CONFIG, private_tests) {
+-- 
+2.7.4
+