From: "Gaël PORTAY" <gael.portay@savoirfairelinux.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v1 1/4] qt5virtualkeyboard: fix example build issue with 5.6
Date: Mon, 3 Sep 2018 08:37:44 -0400 [thread overview]
Message-ID: <20180903123747.5234-2-gael.portay@savoirfairelinux.com> (raw)
In-Reply-To: <20180903123747.5234-1-gael.portay@savoirfairelinux.com>
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(-)
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 += \
--
2.11.0
next prev parent reply other threads:[~2018-09-03 12:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-03 12:37 [Buildroot] [PATCH v1 0/4] qt5virtualkeyboard: fix build issues with 5.6 Gaël PORTAY
2018-09-03 12:37 ` Gaël PORTAY [this message]
2018-09-05 20:47 ` [Buildroot] [PATCH v1 1/4] qt5virtualkeyboard: fix example build issue " Thomas Petazzoni
2018-09-03 12:37 ` [Buildroot] [PATCH v1 2/4] qt5virtualkeyboard: fix target install " Gaël PORTAY
2018-09-05 20:51 ` Thomas Petazzoni
2018-09-06 8:12 ` Gaël PORTAY
2018-09-03 12:37 ` [Buildroot] [PATCH v1 3/4] qt5virtualkeyboard: fix legal-info " Gaël PORTAY
2018-09-05 21:11 ` Thomas Petazzoni
2018-09-06 7:32 ` Gaël PORTAY
2018-09-06 7:36 ` Thomas Petazzoni
2018-09-06 7:43 ` Gaël PORTAY
2018-09-03 12:37 ` [Buildroot] [PATCH v1 4/4] qt5virtualkeyboard: add hashes of 3rd-party licenses Gaël PORTAY
2018-09-05 21:34 ` Thomas Petazzoni
2018-09-09 10:42 ` Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180903123747.5234-2-gael.portay@savoirfairelinux.com \
--to=gael.portay@savoirfairelinux.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.