From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [RFC PATCH 1/1] package/googlefontdirectory: change to google repo
Date: Wed, 6 Feb 2019 14:10:21 +0100 [thread overview]
Message-ID: <20190206141021.43b95bdb@windsurf> (raw)
In-Reply-To: <20190117211422.14576-1-b.bilas@grinn-global.com>
Hello,
On Thu, 17 Jan 2019 22:14:22 +0100
Bartosz Bilas <b.bilas@grinn-global.com> wrote:
> As because the current repository doesn't support new fonts
> we need to change it to the new one official google github repository
> which contains a lot of new available fonts.
>
> Note: There are some things to improve like license files
> because in the new repository every directory with font
> contains separate license file however I have no idea
> how to do it in proper way.
>
> Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
> ---
> .../googlefontdirectory.hash | 2 +-
> .../googlefontdirectory.mk | 23 +++++++++++--------
> 2 files changed, 15 insertions(+), 10 deletions(-)
So, I've applied, but after doing a fair number of changes.
First, I've changed the semantic of the
BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS so that the value it contains
look like ufl/ubuntu, ofl/marvel, etc. rather than just the font name.
Thanks to that, the installation logic could be simplified, and I could
come up with a solution for the LICENSE and LICENSE_FILES variables.
The solution looks like this:
+ifneq ($(filter apache/%,$(GOOGLEFONTDIRECTORY_FONTS)),)
+GOOGLEFONTDIRECTORY_LICENSE += Apache-2.0
+GOOGLEFONTDIRECTORY_LICENSE_FILES += $(addsuffix /LICENSE.txt,$(filter apache/%,$(GOOGLEFONTDIRECTORY_FONTS)))
+endif
+
+ifneq ($(filter ofl/%,$(GOOGLEFONTDIRECTORY_FONTS)),)
+GOOGLEFONTDIRECTORY_LICENSE += OFL-1.1
+GOOGLEFONTDIRECTORY_LICENSE_FILES += $(addsuffix /OFL.txt,$(filter ofl/%,$(GOOGLEFONTDIRECTORY_FONTS)))
+endif
+
+ifneq ($(filter ufl/%,$(GOOGLEFONTDIRECTORY_FONTS)),)
+GOOGLEFONTDIRECTORY_LICENSE += UFL-1.1
+GOOGLEFONTDIRECTORY_LICENSE_FILES += $(addsuffix /LICENCE.txt,$(filter ufl/%,$(GOOGLEFONTDIRECTORY_FONTS)))
+endif
+
+GOOGLEFONTDIRECTORY_LICENSE := $(subst $(space),$(comma)$(space),$(GOOGLEFONTDIRECTORY_LICENSE))
It's a bit tricky, but it works :-)
I've also changed the .hash file to contain the hashes of all the
license files.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
prev parent reply other threads:[~2019-02-06 13:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-17 21:14 [Buildroot] [RFC PATCH 1/1] package/googlefontdirectory: change to google repo Bartosz Bilas
2019-02-06 13:10 ` Thomas Petazzoni [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190206141021.43b95bdb@windsurf \
--to=thomas.petazzoni@bootlin.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.