qt: add font license information
PATCH v3 1/1 qt: add font license information
With this implementation, the different licenses will be separated with <space><comma>. This is not nice, but to avoid it a pretty ugly construct is needed:
QT_LICENSE = $(shell echo $(QT_LICENSE_BITS) | sed 's% , %, %g')
Since the <space><comma> is just a minor nuisance, we're not going to that kind of complexity.
---
Changes v2 -> v3:
- update fixed font license reference and compacted public domain license line for micro/fixed (suggested by Arnout Vandecappelle)
- add extra space rationale to commit log (as suggested by Arnout Vandecappelle)
Changes v1 -> v2:
- update most font licenses (thanks to Arnout Vandecappelle)
- add comma-separator between the licenses (no nice solution, will add ' ,', but without the starting problem at:
QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y) QT_LICENSE += or Digia Qt Commercial license endif
--- package/qt/qt.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
package/qt/qt.mk +17 -0
@@ -660,13 +660,30 @@ define QT_INSTALL_TARGET_FONTS mkdir -p $(TARGET_DIR)/usr/lib/fonts cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts endef +ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),) +# as stated in the font source src/3rdparty/fonts/micro.bdf +# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf +QT_LICENSE += , Public Domain (Micro/Fixed font) endif +ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),) +QT_LICENSE += , Adobe Helvetica license (Helvetica/Japanese fonts) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica +endif +ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y) +QT_LICENSE += , Freeware (Unifont font) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont +endif +endif # QT_FONTS ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y) define QT_INSTALL_TARGET_FONTS_TTF mkdir -p $(TARGET_DIR)/usr/lib/fonts cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts endef +QT_LICENSE += , Bitstream license (DejaVu/Vera TrueType fonts) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \ + src/3rdparty/fonts/README.DejaVu \ + src/3rdparty/fonts/COPYRIGHT.Vera endif endif # BR2_PACKAGE_QT_EMBEDDED
Signature · 1 line
2.1.4
PATCH v3 1/1 qt: add font license information
Quoted 10 lines · Peter Seiderer
With this implementation, the different licenses will be separated with <space><comma>. This is not nice, but to avoid it a pretty ugly construct is needed:
QT_LICENSE= $(shell echo $(QT_LICENSE_BITS) | sed 's% , %, %g')Since the <space><comma> is just a minor nuisance, we're not going to that kind of complexity.
Signed-off-by Peter Seiderer <[email protected]>
Regards,
Arnout
Quoted 57 lines
---
Changes v2 -> v3:
- update fixed font license reference and compacted public domain license line for micro/fixed (suggested by Arnout Vandecappelle)
- add extra space rationale to commit log (as suggested by Arnout Vandecappelle)Changes v1 -> v2:
- update most font licenses (thanks to Arnout Vandecappelle)
- add comma-separator between the licenses (no nice solution, will add ' ,', but without the starting problem at:
QT_LICENSE= LGPLv2.1 with exceptions or GPLv3 ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)QT_LICENSE+= or Digia Qt Commercial license endif--- package/qt/qt.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)package/qt/qt.mk +17
-0@@ -660,13 +660,30 @@ define QT_INSTALL_TARGET_FONTS mkdir -p $(TARGET_DIR)/usr/lib/fonts cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts endef +ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),) +# as stated in the font source src/3rdparty/fonts/micro.bdf +# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf +QT_LICENSE += , Public Domain (Micro/Fixed font) endif +ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),) +QT_LICENSE += , Adobe Helvetica license (Helvetica/Japanese fonts) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica +endif +ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y) +QT_LICENSE += , Freeware (Unifont font) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont +endif +endif # QT_FONTS ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y) define QT_INSTALL_TARGET_FONTS_TTF mkdir -p $(TARGET_DIR)/usr/lib/fonts cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts endef +QT_LICENSE += , Bitstream license (DejaVu/Vera TrueType fonts) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \ + src/3rdparty/fonts/README.DejaVu \ + src/3rdparty/fonts/COPYRIGHT.Vera endif endif # BR2_PACKAGE_QT_EMBEDDED
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH v3 1/1 qt: add font license information
In reply to Peter SeidererQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
With this implementation, the different licenses will be separated with <space><comma>. This is not nice, but to avoid it a pretty ugly construct is needed:
Quoted 6 lines
QT_LICENSE= $(shell echo $(QT_LICENSE_BITS) | sed 's% , %, %g')Since the <space><comma> is just a minor nuisance, we're not going to that kind of complexity.
Signed-off-by Peter Seiderer <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v3 1/1 qt: add font license information
In reply to Peter SeidererPeter S.,
Quoted 9 lines · Peter Seiderer
With this implementation, the different licenses will be separated with <space><comma>. This is not nice, but to avoid it a pretty ugly construct is needed:
QT_LICENSE= $(shell echo $(QT_LICENSE_BITS) | sed 's% , %, %g')Since the <space><comma> is just a minor nuisance, we're not going to that kind of complexity.
The <space><comma> can be avoided during variable construction by doing this:
QT_LICENSE := BlahBlah
ifeq ...
QT_LICENSE:=$(QT_LICENSE), MoreBlahBlah
If you don't mind the X:=$(X) part, that is. IIRC, buildroot did a pass not long ago removing := from assignments that didn't actually need it.
Danomi -
Quoted 64 lines
Signed-off-by Peter Seiderer <[email protected]>---
Changes v2 -> v3:
- update fixed font license reference and compacted public domain license line for micro/fixed (suggested by Arnout Vandecappelle)
- add extra space rationale to commit log (as suggested by Arnout Vandecappelle)Changes v1 -> v2:
- update most font licenses (thanks to Arnout Vandecappelle)
- add comma-separator between the licenses (no nice solution, will add ' ,', but without the starting problem at:
QT_LICENSE= LGPLv2.1 with exceptions or GPLv3 ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)QT_LICENSE+= or Digia Qt Commercial license endif--- package/qt/qt.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)package/qt/qt.mk +17
-1@@ -660,13 +660,30 @@ define QT_INSTALL_TARGET_FONTS mkdir -p $(TARGET_DIR)/usr/lib/fonts cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts endef +ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),) +# as stated in the font source src/3rdparty/fonts/micro.bdf +# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf +QT_LICENSE += , Public Domain (Micro/Fixed font) endif +ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),) +QT_LICENSE += , Adobe Helvetica license (Helvetica/Japanese fonts) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica +endif +ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y) +QT_LICENSE += , Freeware (Unifont font) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont +endif +endif # QT_FONTS ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y) define QT_INSTALL_TARGET_FONTS_TTF mkdir -p $(TARGET_DIR)/usr/lib/fonts cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts endef +QT_LICENSE += , Bitstream license (DejaVu/Vera TrueType fonts) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \ + src/3rdparty/fonts/README.DejaVu \ + src/3rdparty/fonts/COPYRIGHT.Vera endif endif # BR2_PACKAGE_QT_EMBEDDED --2.1.4
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v3 1/1 qt: add font license information
Hello Danomi,
Quoted 15 lines · Danomi Manchego
Peter S.,
Quoted 9 lines · Peter Seiderer
With this implementation, the different licenses will be separated with <space><comma>. This is not nice, but to avoid it a pretty ugly construct is needed:
QT_LICENSE= $(shell echo $(QT_LICENSE_BITS) | sed 's% , %, %g')Since the <space><comma> is just a minor nuisance, we're not going to that kind of complexity.
The <space><comma> can be avoided during variable construction by doing this:
Quoted 9 lines
QT_LICENSE:= BlahBlahifeq ...
QT_LICENSE:=$(QT_LICENSE), MoreBlahBlahIf you don't mind the X:=$(X) part, that is. IIRC, buildroot did a pass not long ago removing := from assignments that didn't actually need it.
Thanks for the tip, tried it and works for me ;-), but [1] states:
Simply expanded variables are defined by lines using ?:=? or ?::=? (see Setting Variables). Both forms are equivalent in GNU make; however only the ?::=? form is described by the POSIX standard (support for ?::=? was added to the POSIX standard in 2012, so older versions of make won?t accept this form either).
Maybe this was the reason to avoid it in buildroot?
Regards,
Peter
[1] https://www.gnu.org/software/make/manual/html_node/Flavors.html#index-_003a_003a_003d
Quoted 71 lines
Danomi -
Quoted 60 lines
Signed-off-by Peter Seiderer <[email protected]>---
Changes v2 -> v3:
- update fixed font license reference and compacted public domain license line for micro/fixed (suggested by Arnout Vandecappelle)
- add extra space rationale to commit log (as suggested by Arnout Vandecappelle)Changes v1 -> v2:
- update most font licenses (thanks to Arnout Vandecappelle)
- add comma-separator between the licenses (no nice solution, will add ' ,', but without the starting problem at:
QT_LICENSE= LGPLv2.1 with exceptions or GPLv3 ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)QT_LICENSE+= or Digia Qt Commercial license endif--- package/qt/qt.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)package/qt/qt.mk +17
-1@@ -660,13 +660,30 @@ define QT_INSTALL_TARGET_FONTS mkdir -p $(TARGET_DIR)/usr/lib/fonts cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts endef +ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),) +# as stated in the font source src/3rdparty/fonts/micro.bdf +# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf +QT_LICENSE += , Public Domain (Micro/Fixed font) endif +ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),) +QT_LICENSE += , Adobe Helvetica license (Helvetica/Japanese fonts) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica +endif +ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y) +QT_LICENSE += , Freeware (Unifont font) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont +endif +endif # QT_FONTS ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y) define QT_INSTALL_TARGET_FONTS_TTF mkdir -p $(TARGET_DIR)/usr/lib/fonts cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts endef +QT_LICENSE += , Bitstream license (DejaVu/Vera TrueType fonts) +QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \ + src/3rdparty/fonts/README.DejaVu \ + src/3rdparty/fonts/COPYRIGHT.Vera endif endif # BR2_PACKAGE_QT_EMBEDDED --2.1.4
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v3 1/1 qt: add font license information
Quoted 28 lines · Peter Seiderer
Hello Danomi,
Quoted 17 lines · Danomi Manchego
Quoted 17 lines
Peter S.,
Quoted 9 lines · Peter Seiderer
Quoted 9 lines
With this implementation, the different licenses will be separated with <space><comma>. This is not nice, but to avoid it a pretty ugly construct is needed:
QT_LICENSE= $(shell echo $(QT_LICENSE_BITS) | sed 's% , %, %g')Since the <space><comma> is just a minor nuisance, we're not going to that kind of complexity.
The <space><comma> can be avoided during variable construction by doing this:
QT_LICENSE:= BlahBlahQuoted 7 lines
Quoted 7 lines
ifeq ...
QT_LICENSE:=$(QT_LICENSE), MoreBlahBlahIf you don't mind the X:=$(X) part, that is. IIRC, buildroot did a pass not long ago removing := from assignments that didn't actually need it.
Quoted 8 lines
Thanks for the tip, tried it and works for me ;-), but [1] states:
Simply expanded variables are defined by lines using ?:=? or ?::=? (see Setting Variables). Both forms are equivalent in GNU make; however only the ?::=? form is described by the POSIX standard (support for ?::=? was added to the POSIX standard in 2012, so older versions of make won?t accept this form either).
Maybe this was the reason to avoid it in buildroot?
Not at all - we use loads of GNU make specific things, like functions.
There is no big reason to avoid :=, only for consistency we prefer to use =
everywhere. So in this case it would be OK to use :=. Note however that there should be spaces around it (any whitespace after = will be stripped).
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF