| Message ID | 20200113083819.13783-1-ps.report@gmx.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1] package/qt5virtualkeyboard: fix install for Qt 5.12.x | expand |
Peter, All, On 2020-01-13 09:38 +0100, Peter Seiderer spake thusly: > 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 > > Reported-by: Sam Petrocelli<sam.petrocelli@gmail.com> > Signed-off-by: Peter Seiderer <ps.report@gmx.net> 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. > --- > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > index 59ee30c2d2..995e3e3aba 100644 > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > @@ -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 > -- > 2.24.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 59ee30c2d2..995e3e3aba 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -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
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 Reported-by: Sam Petrocelli<sam.petrocelli@gmail.com> Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)