From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joshua Henderson Date: Fri, 28 Jul 2017 09:31:13 -0700 Subject: [Buildroot] [PATCH v3] package/qt5location: handle plugins being conditionally built In-Reply-To: <20170725215220.6d447778@windsurf.home> References: <1500925803-3453-1-git-send-email-joshua.henderson@microchip.com> <20170725215220.6d447778@windsurf.home> Message-ID: <49674504-df74-e429-b49f-eacf299ef15b@microchip.com> List-Id: To: buildroot@busybox.net 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 >> Cc: Peter Seiderer >> Cc: Thomas Petazzoni >> Signed-off-by: Joshua Henderson >> >> -- >> >> 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