Skip to contentSkip to conversation

package/qt5virtualkeyboard: fix install for Qt 5.12.x

PATCH New Peter Seiderer 2 participants 2 messages Jan 13, 2020 – Jan 17, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qt5virtualkeyboard: fix install for Qt 5.12.x

With Qt 5.12.x only handwriting/lipi-toolkit needs 3rdparty parts installation (with Qt 5.6.x although zn_CZ/pinyin and zh_TW tcime).

Fixes:
- https://bugs.busybox.net/show_bug.cgi?id=12456

cp: cannot stat '.../host/arm-buildroot-linux-gnueabihf/sysroot/usr/qtvirtualkeyboard': No such file or directory

---
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +2 -2
index 59ee30c2d2..995e3e3aba 100644
@@ -34,9 +34,9 @@ endif
 endif
 
 ifneq ($(filter zh_CN all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
-QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
 QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (pinyin)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
+QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
 QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/pinyin/NOTICE
 else
 QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/pinyin/3rdparty/pinyin/NOTICE
@@ -44,9 +44,9 @@ endif
 endif
 
 ifneq ($(filter zh_TW all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
-QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
 QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (tcime), BSD-3-Clause (tcime)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
+QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
 QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/tcime/COPYING
 else
 QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/tcime/3rdparty/tcime/COPYING
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/1 package/qt5virtualkeyboard: fix install for Qt 5.12.x

Peter, All,

On 2020-01-13 09:38 +0100, Peter Seiderer spake thusly:

Quoted 10 lines

With Qt 5.12.x only handwriting/lipi-toolkit needs 3rdparty parts installation (with Qt 5.6.x although zn_CZ/pinyin and zh_TW tcime).

Fixes:
- https://bugs.busybox.net/show_bug.cgi?id=12456

cp: cannot stat '.../host/arm-buildroot-linux-gnueabihf/sysroot/usr/qtvirtualkeyboard': No such file or directory

Applied to master, thanks.

I also "fixed" the way we actually test that variable, to test for equality rather than for existence.

Regards,
Yann E. MORIN.

Quoted 37 lines
---
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +2 -2
index 59ee30c2d2..995e3e3aba 100644
@@ -34,9 +34,9 @@ endif
 endif
 
 ifneq ($(filter zh_CN all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
-QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
 QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (pinyin)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
+QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
 QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/pinyin/NOTICE
 else
 QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/pinyin/3rdparty/pinyin/NOTICE
@@ -44,9 +44,9 @@ endif
 endif
 
 ifneq ($(filter zh_TW all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
-QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
 QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (tcime), BSD-3-Clause (tcime)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
+QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
 QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/tcime/COPYING
 else
 QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/tcime/3rdparty/tcime/COPYING
Signature · 6 lines
2.24.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'