Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v3] qt: add font license information
@ 2016-02-25 22:34 Peter Seiderer
  2016-02-27  0:00 ` Arnout Vandecappelle
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Peter Seiderer @ 2016-02-25 22:34 UTC (permalink / raw)
  To: buildroot

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 <ps.report@gmx.net>
---
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(+)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index a64d32f..c4fff2d 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -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

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v3] qt: add font license information
  2016-02-25 22:34 [Buildroot] [PATCH v3] qt: add font license information Peter Seiderer
@ 2016-02-27  0:00 ` Arnout Vandecappelle
  2016-02-27 10:57 ` Peter Korsgaard
  2016-02-27 16:38 ` Danomi Manchego
  2 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2016-02-27  0:00 UTC (permalink / raw)
  To: buildroot

On 02/25/16 23:34, Peter Seiderer wrote:
> 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 <ps.report@gmx.net>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

> ---
> 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(+)
> 
> diff --git a/package/qt/qt.mk b/package/qt/qt.mk
> index a64d32f..c4fff2d 100644
> --- a/package/qt/qt.mk
> +++ b/package/qt/qt.mk
> @@ -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
>  
> 


-- 
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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v3] qt: add font license information
  2016-02-25 22:34 [Buildroot] [PATCH v3] qt: add font license information Peter Seiderer
  2016-02-27  0:00 ` Arnout Vandecappelle
@ 2016-02-27 10:57 ` Peter Korsgaard
  2016-02-27 16:38 ` Danomi Manchego
  2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2016-02-27 10:57 UTC (permalink / raw)
  To: buildroot

>>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> 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:

 > 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 <ps.report@gmx.net>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v3] qt: add font license information
  2016-02-25 22:34 [Buildroot] [PATCH v3] qt: add font license information Peter Seiderer
  2016-02-27  0:00 ` Arnout Vandecappelle
  2016-02-27 10:57 ` Peter Korsgaard
@ 2016-02-27 16:38 ` Danomi Manchego
  2016-02-27 21:00   ` Peter Seiderer
  2 siblings, 1 reply; 6+ messages in thread
From: Danomi Manchego @ 2016-02-27 16:38 UTC (permalink / raw)
  To: buildroot

Peter S.,

On Thu, Feb 25, 2016 at 5:34 PM, Peter Seiderer <ps.report@gmx.net> wrote:
> 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 -


> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> 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(+)
>
> diff --git a/package/qt/qt.mk b/package/qt/qt.mk
> index a64d32f..c4fff2d 100644
> --- a/package/qt/qt.mk
> +++ b/package/qt/qt.mk
> @@ -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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v3] qt: add font license information
  2016-02-27 16:38 ` Danomi Manchego
@ 2016-02-27 21:00   ` Peter Seiderer
  2016-02-27 22:23     ` Arnout Vandecappelle
  0 siblings, 1 reply; 6+ messages in thread
From: Peter Seiderer @ 2016-02-27 21:00 UTC (permalink / raw)
  To: buildroot

Hello Danomi,

On Sat, 27 Feb 2016 11:38:39 -0500, Danomi Manchego <danomimanchego123@gmail.com> wrote:

> Peter S.,
> 
> On Thu, Feb 25, 2016 at 5:34 PM, Peter Seiderer <ps.report@gmx.net> wrote:
> > 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.
> 

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

> Danomi -
> 
> 
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > ---
> > 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(+)
> >
> > diff --git a/package/qt/qt.mk b/package/qt/qt.mk
> > index a64d32f..c4fff2d 100644
> > --- a/package/qt/qt.mk
> > +++ b/package/qt/qt.mk
> > @@ -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
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v3] qt: add font license information
  2016-02-27 21:00   ` Peter Seiderer
@ 2016-02-27 22:23     ` Arnout Vandecappelle
  0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2016-02-27 22:23 UTC (permalink / raw)
  To: buildroot

On 02/27/16 22:00, Peter Seiderer wrote:
> Hello Danomi,
> 
> On Sat, 27 Feb 2016 11:38:39 -0500, Danomi Manchego <danomimanchego123@gmail.com> wrote:
> 
>> > Peter S.,
>> > 
>> > On Thu, Feb 25, 2016 at 5:34 PM, Peter Seiderer <ps.report@gmx.net> wrote:
>>> > > 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.
>> > 
> 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

-- 
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

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-27 22:23 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-25 22:34 [Buildroot] [PATCH v3] qt: add font license information Peter Seiderer
2016-02-27  0:00 ` Arnout Vandecappelle
2016-02-27 10:57 ` Peter Korsgaard
2016-02-27 16:38 ` Danomi Manchego
2016-02-27 21:00   ` Peter Seiderer
2016-02-27 22:23     ` Arnout Vandecappelle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox