diff mbox series

[v1,1/4] qt5virtualkeyboard: fix example build issue with 5.6

Message ID 20180903123747.5234-2-gael.portay@savoirfairelinux.com
State Accepted
Headers show
Series qt5virtualkeyboard: fix build issues with 5.6 | expand

Commit Message

Gaël PORTAY Sept. 3, 2018, 12:37 p.m. UTC 
The patch does not apply properly and needs to be fixed.

The patch was backported from 5.7 [1] with path adaptation in commit
(cb97d9473b qt5virtualkeyboard: allow to build with qt5.6), but the
submitted patch did not reflect that said adaptation.

Apply the said patch adaptation (i.e. add missing basic subdirectory) to
apply properly the patch.

Fixes:

	>>> qt5virtualkeyboard 2.0 Patching

	Applying 0001-remove-weird-install-path-for-example.patch using patch:
	patching file examples/virtualkeyboard/basic/basic.pro
	Hunk #1 FAILED at 7.
	1 out of 1 hunk FAILED -- saving rejects to file examples/virtualkeyboard/basic/basic.pro.rej
	make: ***[/home/test/autobuild/run/instance-2/output/build/qt5virtualkeyboard-2.0/.stamp_patched] Error 1

[1]: https://github.com/qt/qtvirtualkeyboard/commit/aef55eb7b3470ba6dee4abc67acda1d308c90e97

Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
---
 .../2.0/0001-remove-weird-install-path-for-example.patch            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni Sept. 5, 2018, 8:47 p.m. UTC | #1 
Hello Gaël,

On Mon,  3 Sep 2018 08:37:44 -0400, Gaël PORTAY wrote:
> The patch does not apply properly and needs to be fixed.
> 
> The patch was backported from 5.7 [1] with path adaptation in commit
> (cb97d9473b qt5virtualkeyboard: allow to build with qt5.6), but the
> submitted patch did not reflect that said adaptation.
> 
> Apply the said patch adaptation (i.e. add missing basic subdirectory) to
> apply properly the patch.
> 
> Fixes:
> 
> 	>>> qt5virtualkeyboard 2.0 Patching  
> 
> 	Applying 0001-remove-weird-install-path-for-example.patch using patch:
> 	patching file examples/virtualkeyboard/basic/basic.pro
> 	Hunk #1 FAILED at 7.
> 	1 out of 1 hunk FAILED -- saving rejects to file examples/virtualkeyboard/basic/basic.pro.rej
> 	make: ***[/home/test/autobuild/run/instance-2/output/build/qt5virtualkeyboard-2.0/.stamp_patched] Error 1
> 
> [1]: https://github.com/qt/qtvirtualkeyboard/commit/aef55eb7b3470ba6dee4abc67acda1d308c90e97
> 
> Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>

The title is wrong: it does not fix the "example build", it fixes
applying the patches. Even if you don't build the examples, the patch
doesn't apply and prevents building the package entirely.

I fixed up the title and did some minor tweaks in the commit log, and
applied to master. Thanks!

We really need something that tests the build of this Qt stack in 5.6
version, because we have found many legal-info issues and build issues
recently.

Thomas
diff mbox series

Patch

diff --git a/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch b/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch
index 2f8ea3bc94..367cc4a1f7 100644
--- a/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch
+++ b/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch
@@ -23,13 +23,13 @@  index 28cc4dc..0f71e0e 100644
      QTPLUGIN += qtvirtualkeyboardplugin
  }
 -android-no-sdk|!isEmpty(CROSS_COMPILE) {
--    TARGETPATH = /data/user/qt/virtualkeyboard
+-    TARGETPATH = /data/user/qt/virtualkeyboard/basic
 -} else {
--    TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard
+-    TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
 -}
 -target.path = $$TARGETPATH
 +
-+target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard
++target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
  INSTALLS += target
  
  RESOURCES += \