[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - download.lst external/more_fonts Makefile.fetch readlicense_oo/license Repository.mk solenv/flatpak-manifest.in
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Wed Sep 18 14:56:48 UTC 2019
Makefile.fetch | 3 +++
Repository.mk | 1 +
download.lst | 2 ++
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, 53 insertions(+)
New commits:
commit 9612812897c93cf0d86bcf1bf30096a669252e68
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Sep 18 15:42:30 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 18 16:55:58 2019 +0200
add OpenDyslexic font
Change-Id: Ib05a6d6418563fd9333821594f0aca5ab724f3e8
Reviewed-on: https://gerrit.libreoffice.org/79099
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index 5cede33b7de8..f174fce73cf4 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -240,6 +240,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.9.10,$(item)))
@mkdir -p $(dir $@) && touch $@
@mkdir -p $(dir $@)/Executable
diff --git a/Repository.mk b/Repository.mk
index 0de098bd6b1f..91b080963b6d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -995,6 +995,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
fonts_libertineg \
fonts_libre_hebrew \
fonts_noto \
+ fonts_opendyslexic \
fonts_reem \
fonts_sourcecode \
fonts_sourcesans \
diff --git a/download.lst b/download.lst
index ff4a93523680..a79bdf7a8c01 100644
--- a/download.lst
+++ b/download.lst
@@ -106,6 +106,8 @@ export FONT_REEM_SHA256SUM := f60c6508d209ce4236d2d7324256c2ffddd480be7e3d602377
export FONT_REEM_TARBALL := ReemKufi-0.7.zip
export FONT_SCHEHERAZADE_SHA256SUM := 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5
export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
+export FONT_OPENDYSLEXIC_SHA256SUM := ff19e6ba9b4ed56bca374bdbd2ad7ed11267addd18478f3c2f96ad9d744975f1
+export FONT_OPENDYSLEXIC_TARBALL := opendyslexic-0.9.10-beta-2019.09.16.zip
export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM := e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
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 526b06998941..92a9f7297fce 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_reem \
ExternalPackage_scheherazade \
ExternalPackage_EmojiOne_Color \
+ ExternalPackage_opendyslexic \
UnpackedTarball_alef \
UnpackedTarball_amiri \
UnpackedTarball_caladea \
@@ -50,6 +51,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_reem \
UnpackedTarball_scheherazade \
UnpackedTarball_EmojiOne_Color \
+ 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 a1260a905b2a..d617f4daa58e 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -2559,6 +2559,12 @@
<p>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: <a href="http://scripts.sil.org/OFL">http://scripts.sil.org/OFL</a></p>
<p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p>
+ <h2>OpenDyslexic</h2>
+ <p>Copyright (c) 2019-07-29, Abbie Gonzalez (https://abbiecod.es|support@abbiecod.es),
+ with Reserved Font Name OpenDyslexic.</p>
+ <p>Copyright (c) 12/2012 - 2019</p>
+ <p>This Font Software is licensed under the SIL Open Font License, Version 1.1 as shown below.</p>
+ <p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p>
<h2>Reem Kufi</h2>
<p>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:</p>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 0da0290f1210..2d164b084729 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -557,6 +557,12 @@
"type": "file",
"dest-filename": "external/tarballs/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.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": [
More information about the Libreoffice-commits
mailing list