Skip to contentSkip to conversation

qt5virtualkeyboard: fix build issues with 5.6

PATCH Superseded Gaël PORTAY 3 participants 14 messages Sep 3, 2018 – Sep 9, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover qt5virtualkeyboard: fix build issues with 5.6

Hi all,

This patch serie fixes three build issues with Qt 5.6. It also sets the license hashes of third-parties that are missing (5.6 and latest).

The first patch fixes the issue reported by the autobuilder [1]. The commit adapts the patch 0001-remove-weird-install-path-for-example.patch to make it appliable.

>>> 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
make: Leaving directory `/home/test/autobuild/run/instance-2/buildroot'

The second patch fixes the following build issue that appeared after the first patch is applied. Qt 5.6 and latest versions have a different location for the QML plugin. The commit differentiates installation of the QML plugin according to the Qt major version in use.

>>> qt5virtualkeyboard 2.0 Installing to target
mkdir -p /home/users/gportay/src/buildroot/output/target/usr/lib/qt/plugins/platforminputcontexts
cp -dpfr /home/users/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/qt/plugins/platforminputcontexts/libqtv cp -dpfr /home/users/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/qml/QtQuick/VirtualKeyboard /home/users/gpo
cp: cannot stat '/home/users/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/qml/QtQuick/VirtualKeyboard': No su package/pkg-generic.mk:310: recipe for target '/home/users/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/.stamp_target_install
make: *** [/home/users/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/.stamp_target_installed] Error 1

The third patch fixes the legal-info issue below. QtVirtualKeyboard 2.0 (shipped with Qt 5.6) doesn't contain any license files. The commit removes licenses from QT5VIRTUALKEYBOARD_LICENSE_FILES when Qt major version is set to 5.6.

>>> qt5virtualkeyboard 2.0 Collecting legal info
sha256sum: /home/users/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/LICENSE.GPL3: No such file or directory
ERROR: LICENSE.GPL3 has wrong sha256 hash:
ERROR: expected: 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903
ERROR: got :
ERROR: Incomplete download, or man-in-the-middle (MITM) attack

The last patch adds the license hashes of 3rd-parties that were missing (for 5.6 and latest).

[1]: http://autobuild.buildroot.net/results/ecfe70fb6a9abdc7578856453eba1acbc441ba17/

Regards,
Ga?l PORTAY (4):
qt5virtualkeyboard: fix example build issue with 5.6
qt5virtualkeyboard: fix target install issue with 5.6
qt5virtualkeyboard: fix legal-info with 5.6
qt5virtualkeyboard: add hashes of 3rd-party licenses

 .../0001-remove-weird-install-path-for-example.patch   |  6 +++---
 .../qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash |  5 +++++
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash |  3 +++
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk   | 18 +++++++++++++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/4 qt5virtualkeyboard: fix example build issue with 5.6

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

---
 .../2.0/0001-remove-weird-install-path-for-example.patch            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch +3 -3
index 2f8ea3bc94..367cc4a1f7 100644
@@ -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 += \
Signature · 1 line
2.11.0
#2 lore raw

PATCH 1/4 qt5virtualkeyboard: fix example build issue with 5.6

Hello Ga?l,

Quoted 19 lines · Ga?l PORTAY

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

Quoted 3 lines

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

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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 2/4 qt5virtualkeyboard: fix target install issue with 5.6

In reply to Gaël PORTAY

qt5virtualkeyboard 2.0 (shipped with Qt 5.6) installs the QML plugin under the directory Enterprise while the later versions install it without that directory.

Differentiate installation to target of the QML plugin according to the Qt major version in use.

Fixes:

>>> qt5virtualkeyboard 2.0 Installing to target
mkdir -p /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins/platforminputcontexts
cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins/platforminputcontexts cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/qml/QtQuick/VirtualKeyboard /home/gportay/src/buildroot/output/target/usr/qml/QtQuick
cp: cannot stat '/home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/qml/QtQuick/VirtualKeyboard': No such file or directory
package/pkg-generic.mk:310: recipe for target '/home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/.stamp_target_installed' failed
make: *** [/home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/.stamp_target_installed] Error 1

---
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +11 -1
index cbe24d27dc..a4c9492a91 100644
@@ -65,6 +65,16 @@ define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Entreprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
+endef
+else
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
+endef
+endif
+
 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
 define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/virtualkeyboard $(TARGET_DIR)/usr/lib/qt/examples/
@@ -75,7 +85,7 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \
 		$(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts
-	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
+	$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_QML)
 	$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS)
 	$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES)
 endef
Signature · 1 line
2.11.0
#4 lore raw

PATCH 2/4 qt5virtualkeyboard: fix target install issue with 5.6

Hello Ga?l,

Quoted 29 lines · Ga?l PORTAY

qt5virtualkeyboard 2.0 (shipped with Qt 5.6) installs the QML plugin under the directory Enterprise while the later versions install it without that directory.

Differentiate installation to target of the QML plugin according to the Qt major version in use.

Fixes:

>>> qt5virtualkeyboard 2.0 Installing to target
mkdir -p /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins/platforminputcontexts
cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins/platforminputcontexts cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/qml/QtQuick/VirtualKeyboard /home/gportay/src/buildroot/output/target/usr/qml/QtQuick
cp: cannot stat '/home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/qml/QtQuick/VirtualKeyboard': No such file or directory
package/pkg-generic.mk:310: recipe for target '/home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/.stamp_target_installed' failed
make: *** [/home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/.stamp_target_installed] Error 1

---
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +0 -0
index cbe24d27dc..a4c9492a91 100644
@@ -65,6 +65,16 @@ define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
 endef

package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS · line 76

Quoted 10 lines
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +9 -0
 
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Entreprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
+endef
+else
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
+endef
+endif

Here you are doing exactly the opposite of what your commit log says:
you are installing from /usr/qml/QtQuick/Entreprise/VirtualKeyboard for the latest Qt 5.11 version, and from /usr/qml/QtQuick/VirtualKeyboard for the older Qt 5.6 version.

This also doesn't match the build failure: the build failure happens with qt5virtualkeyboard 2.0, which is used with Qt 5.6, and your patch proposes to use exactly the same command for the old Qt as the one that is unconditionally used today.

I.e:

package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS · line 75

Quoted 4 lines
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +4 -0
+else
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
+endef

is exactly the same as:

package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS · line 78

Quoted 1 line
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +0 -1
-	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick

So I guess your condition is inverted, and the patch was not sufficiently tested ? :-)

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 2/4 qt5virtualkeyboard: fix target install issue with 5.6

Thomas,

Quoted 38 lines · Thomas Petazzoni
Quoted 8 lines

(...)

package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +0 -0
index cbe24d27dc..a4c9492a91 100644
@@ -65,6 +65,16 @@ define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
 endef

package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS · line 76

Quoted 10 lines
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +9 -0
 
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Entreprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
+endef
+else
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
+endef
+endif

Here you are doing exactly the opposite of what your commit log says:
you are installing from /usr/qml/QtQuick/Entreprise/VirtualKeyboard for the latest Qt 5.11 version, and from /usr/qml/QtQuick/VirtualKeyboard for the older Qt 5.6 version.

This also doesn't match the build failure: the build failure happens with qt5virtualkeyboard 2.0, which is used with Qt 5.6, and your patch proposes to use exactly the same command for the old Qt as the one that is unconditionally used today.

I.e:

package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS · line 75

Quoted 4 lines
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +4 -0
+else
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
+endef

is exactly the same as:

Quoted 5 lines

package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS · line 78

Quoted 1 line
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +0 -1
-	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick

So I guess your condition is inverted, and the patch was not sufficiently tested ? :-)

Facepalm... I did a last minute change and I forgot the remove the directory when I tested it. It seems my mind is still on holidays :/

This time, I am testing it from scratch.

Quoted 7 lines

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Regards,
Ga?l

#6 lore raw

PATCH 3/4 qt5virtualkeyboard: fix legal-info with 5.6

In reply to Gaël PORTAY

qt5virtualkeyboard 2.0 (shipped with Qt 5.6) doesn't contain any license files.

Conditionally remove LICENSE.GPL3 from QT5VIRTUALKEYBOARD_LICENSE_FILES when Qt major version is set to 5.6.

Fixes:

>>> qt5virtualkeyboard 2.0 Collecting legal info
sha256sum: /home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/LICENSE.GPL3: No such file or directory
ERROR: LICENSE.GPL3 has wrong sha256 hash:
ERROR: expected: 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903
ERROR: got :
ERROR: Incomplete download, or man-in-the-middle (MITM) attack

Also, the lipi-toolkit has a different filename between both supported Qt major version (5.6 and latest).

Conditionally set the license in QT5VIRTUALKEYBOARD_LICENSE_FILES for lipi-toolkit according to the Qt major version used.

Fixes:
>>> qt5virtualkeyboard 2.0 Collecting legal info
ERROR: No hash found for src/virtualkeyboard/3rdparty/openwnn/NOTICE
ERROR: No hash found for src/virtualkeyboard/3rdparty/pinyin/NOTICE
ERROR: No hash found for src/virtualkeyboard/3rdparty/tcime/COPYING
sha256sum: /home/gportay/src/buildroot/output/build/qt5virtualkeyboard-2.0/src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt: No such file or directory
ERROR: src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt has wrong sha256 hash:
ERROR: expected: 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10
ERROR: got :
ERROR: Incomplete download, or man-in-the-middle (MITM) attack

---
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +6 -0
index a4c9492a91..ce2dea7a3b 100644
@@ -16,7 +16,9 @@ QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg
 QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES
 
 QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3
+endif
 
 QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS))
 ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
@@ -44,8 +46,12 @@ ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING),y)
 QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
 QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=handwriting
 QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), MIT (lipi-toolkit)
+ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
+QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt
+else
 QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt
 endif
+endif
 
 ifdef QT5VIRTUALKEYBOARD_3RDPARTY_PARTS
 define QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS
Signature · 1 line
2.11.0
#7 lore raw

PATCH 3/4 qt5virtualkeyboard: fix legal-info with 5.6

Hello Ga?l,

Quoted 2 lines · Ga?l PORTAY

qt5virtualkeyboard 2.0 (shipped with Qt 5.6) doesn't contain any license files.

"any license files" is not true, because there's the lipi-toolkit license file. However, there is no "main" license file with the GPLv3 text. I've fixed that up.

Quoted 2 lines

Conditionally remove LICENSE.GPL3 from QT5VIRTUALKEYBOARD_LICENSE_FILES when Qt major version is set to 5.6.

Do we have any indication that the license is GPLv3 for the 2.0 version of qt5virtualkeyboard ?

Quoted 5 lines

Also, the lipi-toolkit has a different filename between both supported Qt major version (5.6 and latest).

Conditionally set the license in QT5VIRTUALKEYBOARD_LICENSE_FILES for lipi-toolkit according to the Qt major version used.

You forgot to add the hash for this license file.

I've fixed the commit log and added the hash for the 2.0 version of the lipi-toolkit license file, and applied to master.

It would be nice to get some confirmation that the license is really GPLv3.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#8 lore raw

PATCH 3/4 qt5virtualkeyboard: fix legal-info with 5.6

Thomas,

Quoted 8 lines · Thomas Petazzoni

(...)

Quoted 2 lines

Conditionally remove LICENSE.GPL3 from QT5VIRTUALKEYBOARD_LICENSE_FILES when Qt major version is set to 5.6.

Do we have any indication that the license is GPLv3 for the 2.0 version of qt5virtualkeyboard ?

I found this [1]. I also asked to Qt and I am waiting for their response.

I guess this Qt5 module is available in Open license since 5.7; thus 2.0 (5.6) is available only under their Commercial license.

Quoted 9 lines

(...)

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[1]: http://blog.qt.io/blog/2016/03/02/qt-virtual-keyboard-updated-with-handwriting-recognition/

Regards,
Ga?l

#9 lore raw

PATCH 3/4 qt5virtualkeyboard: fix legal-info with 5.6

Hello,

Quoted 4 lines · Ga?l PORTAY

I found this [1]. I also asked to Qt and I am waiting for their response.

I guess this Qt5 module is available in Open license since 5.7;

What do you call the "Open license" ?

Quoted 1 line

thus 2.0 (5.6) is available only under their Commercial license.

So the source code would be freely available, but can't be used without having their Commercial license ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#10 lore raw

PATCH 3/4 qt5virtualkeyboard: fix legal-info with 5.6

Thomas,

Quoted 11 lines · Thomas Petazzoni

Hello,

Quoted 4 lines · Ga?l PORTAY

I found this [1]. I also asked to Qt and I am waiting for their response.

I guess this Qt5 module is available in Open license since 5.7;

What do you call the "Open license" ?

I wanted to say that Qt VirtualKeyboard is available under GPLv3 since 5.7.

So I guess the version 2.0 is available only under the Qt Commercial license.

Quoted 5 lines
Quoted 1 line

thus 2.0 (5.6) is available only under their Commercial license.

So the source code would be freely available, but can't be used without having their Commercial license ?

I do not know yet. I asked and I will tell you once I get a response from them.

Ga?l

#11 lore raw

PATCH 4/4 qt5virtualkeyboard: add hashes of 3rd-party licenses

In reply to Gaël PORTAY

Add missing license hashes for those three third-parties:

- src/virtualkeyboard/3rdparty/openwnn/NOTICE
- src/virtualkeyboard/3rdparty/pinyin/NOTICE
- src/virtualkeyboard/3rdparty/tcime/COPYING

Fixes:

>>> qt5virtualkeyboard 5.11.1 Collecting legal info
LICENSE.GPL3: OK (sha256: 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903)
ERROR: No hash found for src/virtualkeyboard/3rdparty/openwnn/NOTICE
ERROR: No hash found for src/virtualkeyboard/3rdparty/pinyin/NOTICE
ERROR: No hash found for src/virtualkeyboard/3rdparty/tcime/COPYING src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt: OK (sha256: 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10)

---
 package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash | 5 +++++
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash     | 3 +++
 2 files changed, 8 insertions(+)
 create mode 100644 package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash
package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash new file +5 -0
new file mode 100644
index 0000000000..266fc3b695
@@ -0,0 +1,5 @@
+# Hashes for license files:
+sha256 6148d2793ca4e62ba3935a27bd3e46971a5d7c871dbe8f2687a867bd2c2589fb src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/virtualkeyboard/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/virtualkeyboard/3rdparty/pinyin/NOTICE
+sha256 ca3dd653e13c4a935622cfce00dc4e2d7a8295b64da99bd1d4f2a8ddb6b0956e src/virtualkeyboard/3rdparty/tcime/COPYING
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +3 -0
index bb916c06d3..9270366b93 100644
@@ -7,3 +7,6 @@ sha256 5b330dcc770976a2cfb8d85711d72a57c9764c1a9efb889c91e81f6071bbbf9b  qtvirtu
 # Hashes for license files:
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
 sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/virtualkeyboard/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/virtualkeyboard/3rdparty/pinyin/NOTICE
+sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/virtualkeyboard/3rdparty/tcime/COPYING
Signature · 1 line
2.11.0
#12 lore raw

PATCH 4/4 qt5virtualkeyboard: add hashes of 3rd-party licenses

Hello,

+Yann in Cc.

Quoted 8 lines · Ga?l PORTAY

Add missing license hashes for those three third-parties:

- src/virtualkeyboard/3rdparty/openwnn/NOTICE
- src/virtualkeyboard/3rdparty/pinyin/NOTICE
- src/virtualkeyboard/3rdparty/tcime/COPYING

Fixes:

Quoted 8 lines

>>> qt5virtualkeyboard 5.11.1 Collecting legal info
LICENSE.GPL3: OK (sha256: 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903)
ERROR: No hash found for src/virtualkeyboard/3rdparty/openwnn/NOTICE
ERROR: No hash found for src/virtualkeyboard/3rdparty/pinyin/NOTICE
ERROR: No hash found for src/virtualkeyboard/3rdparty/tcime/COPYING src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt: OK (sha256: 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10)

So, I've applied, but...

Quoted 3 lines
---
 package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash | 5 +++++
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash     | 3 +++

I'm not happy with how we handle per-version hash files. What you did is identical to what we do in qt5base, and you don't have much choice right now, but it's not great.

The download infrastructure only checks the main hash file, i.e package/<pkg>/<pkg>.hash, so we have to list in this file the hashes for all files that are downloaded, regardless of their version.

However, the legal-info stuff looks first in package/<pkg>/<version>/<pkg>.hash, and only if it doesn't exist, it looks in package/<pkg>/<pkg>.hash. This means that we can store per-version hashes for license files in package/<pkg>/<version>/<pkg>.hash. This is needed because a file named COPYING may exist in two different versions of a given package, but with different contents, and therefore different hashes.

I think this is not very consistent today. I see two possible options:

(1) Make the download stuff consistent with the legal-info stuff so that we can move the hashes for the downloaded stuff to the per-version folders.

(2) Keep things as they are today in terms of infra, but move the hashes for license files in qt5base and qt5virtualkeyboard to per-version directories.

I am fine with (2), but I find the current situation where hashes for some license files are in the main folder, and some hashes are in a per-version folder is very confusing.

Yann ?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#13 lore raw

PATCH 4/4 qt5virtualkeyboard: add hashes of 3rd-party licenses

Thomas, Ga?l, All,

On 2018-09-05 23:34 +0200, Thomas Petazzoni spake thusly:

Quoted 2 lines · Ga?l PORTAY
Quoted 1 line

Add missing license hashes for those three third-parties:

[--SNIP--]

Quoted 28 lines
Quoted 2 lines
 package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash | 5 +++++
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash     | 3 +++

I'm not happy with how we handle per-version hash files. What you did is identical to what we do in qt5base, and you don't have much choice right now, but it's not great.

The download infrastructure only checks the main hash file, i.e package/<pkg>/<pkg>.hash, so we have to list in this file the hashes for all files that are downloaded, regardless of their version.

However, the legal-info stuff looks first in package/<pkg>/<version>/<pkg>.hash, and only if it doesn't exist, it looks in package/<pkg>/<pkg>.hash. This means that we can store per-version hashes for license files in package/<pkg>/<version>/<pkg>.hash. This is needed because a file named COPYING may exist in two different versions of a given package, but with different contents, and therefore different hashes.

I think this is not very consistent today. I see two possible options:

(1) Make the download stuff consistent with the legal-info stuff so that we can move the hashes for the downloaded stuff to the per-version folders.

(2) Keep things as they are today in terms of infra, but move the hashes for license files in qt5base and qt5virtualkeyboard to per-version directories.

Quoted 5 lines

I am fine with (2), but I find the current situation where hashes for some license files are in the main folder, and some hashes are in a per-version folder is very confusing.

Yann ?

I think we should do (1). However, it might not be so trivial... :-/

Then, (1) implies we have to do (2) as well.

Furthermore, we should also check that, if there is a versioned sub-directory, then there is no un-versioned .hash file, because it is not going to be used.

Regards,
Yann E. MORIN.

Quoted 7 lines

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'