From 5a47ea4c2839104d68bf89d33bfbcaaa75cfc67d Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 18 Sep 2019 15:42:30 +0200 Subject: [PATCH] [cp] Bundle OpenDyslexic font Change-Id: Ib05a6d6418563fd9333821594f0aca5ab724f3e8 Reviewed-on: https://gerrit.libreoffice.org/79099 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar --- Makefile.fetch | 3 +++ Repository.mk | 1 + download.lst | 5 +++++ external/more_fonts/ExternalPackage_opendyslexic.mk | 19 +++++++++++++++++++ external/more_fonts/Module_more_fonts.mk | 2 ++ external/more_fonts/UnpackedTarball_opendyslexic.mk | 14 ++++++++++++++ readlicense_oo/license/license.xml | 6 ++++++ solenv/flatpak-manifest.in | 6 ++++++ 8 files changed, 56 insertions(+) create mode 100644 external/more_fonts/ExternalPackage_opendyslexic.mk create mode 100644 external/more_fonts/UnpackedTarball_opendyslexic.mk diff --git a/Makefile.fetch b/Makefile.fetch index 9dd4588388fc..8327d703ee90 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -235,6 +235,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_SC_TARBALL) \ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_TC_TARBALL) \ ,$(call fetch_Download_item,https://noto-website-2.storage.googleapis.com/pkgs,$(item))) + $(foreach item, \ + $(call fetch_Optional,MORE_FONTS,FONT_OPENDYSLEXIC_TARBALL) \ + ,$(call fetch_Download_item,https://github.com/antijingoist/opendyslexic/releases/download/v0.91.12,$(item))) @mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@)/Executable diff --git a/Repository.mk b/Repository.mk index 6c6a8f27741e..8f3ff83ab181 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1047,6 +1047,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_libertineg \ fonts_libre_hebrew \ fonts_noto \ + fonts_opendyslexic \ fonts_reem \ fonts_sourcesans \ fonts_scheherazade \ diff --git a/download.lst b/download.lst index 2531ce5bb414..923935f0e2ec 100644 --- a/download.lst +++ b/download.lst @@ -246,6 +246,11 @@ FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_OPENDYSLEXIC_SHA256SUM := b92d7fcb9409f2bcfd23b65ac71647256eb49c429f4fbb1cc870381fc93eb486 +FONT_OPENDYSLEXIC_TARBALL := opendyslexic-0.910.12-rc2-2019.10.17.zip +# three static lines +# so that git cherry-pick +# will not run into conflicts FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz # three static lines diff --git a/external/more_fonts/ExternalPackage_opendyslexic.mk b/external/more_fonts/ExternalPackage_opendyslexic.mk new file mode 100644 index 000000000000..0afaa9bf5be5 --- /dev/null +++ b/external/more_fonts/ExternalPackage_opendyslexic.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opendyslexic,font_opendyslexic)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opendyslexic,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + OpenDyslexic-Bold-Italic.otf \ + OpenDyslexic-Bold.otf \ + OpenDyslexic-Italic.otf \ + OpenDyslexic-Regular.otf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index c1623537508c..12376636e857 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_noto \ ExternalPackage_reem \ ExternalPackage_scheherazade \ + ExternalPackage_opendyslexic \ UnpackedTarball_alef \ UnpackedTarball_amiri \ UnpackedTarball_caladea \ @@ -42,6 +43,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_noto \ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ + UnpackedTarball_opendyslexic \ )) # vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_opendyslexic.mk b/external/more_fonts/UnpackedTarball_opendyslexic.mk new file mode 100644 index 000000000000..6a8f513deab8 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_opendyslexic.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_opendyslexic)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_opendyslexic,$(FONT_OPENDYSLEXIC_TARBALL),0)) + +# vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index b9c3a9e7b8ef..dace48da93b9 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -2683,6 +2683,12 @@

This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL

Jump to SIL Open Font License, Version 1.1

+

OpenDyslexic

+

Copyright (c) 2019-07-29, Abbie Gonzalez (https://abbiecod.es|support@abbiecod.es), + with Reserved Font Name OpenDyslexic.

+

Copyright (c) 12/2012 - 2019

+

This Font Software is licensed under the SIL Open Font License, Version 1.1 as shown below.

+

Jump to SIL Open Font License, Version 1.1

Reem Kufi

The following software may be included in this product: Reem Kufi fonts. Use of any of this software is governed by the terms of the license below:

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 60f6bf8c87cc..836fdd5cfc85 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -648,6 +648,12 @@ "dest": "external/tarballs", "dest-filename": "@OPENSYMBOL_TTF@" } + { + "url": "https://github.com/antijingoist/opendyslexic/releases/download/v0.9.10/opendyslexic-0.9.10-beta-2019.09.16.zip", + "sha256": "ff19e6ba9b4ed56bca374bdbd2ad7ed11267addd18478f3c2f96ad9d744975f1", + "type": "file", + "dest-filename": "external/tarballs/opendyslexic-0.9.10-beta-2019.09.16.zip" + } ], "buildsystem": "simple", "build-commands": [ -- 2.11.4.GIT