summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2019-09-18 15:42:30 +0200
committerAndras Timar <andras.timar@collabora.com>2022-02-11 16:12:34 +0100
commit9f0bcaac08f13a58a341e0e51b7a2c647271a7d4 (patch)
tree81986eaf95469c4f1a61ae8a5a14b24ce90296fd
parentc6376042782647288ff3f4e122213341846e5855 (diff)
[cp] Bundle OpenDyslexic font
Change-Id: Ib05a6d6418563fd9333821594f0aca5ab724f3e8 Reviewed-on: https://gerrit.libreoffice.org/79099 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--Makefile.fetch3
-rw-r--r--Repository.mk1
-rw-r--r--download.lst2
-rw-r--r--external/more_fonts/ExternalPackage_opendyslexic.mk19
-rw-r--r--external/more_fonts/Module_more_fonts.mk2
-rw-r--r--external/more_fonts/UnpackedTarball_opendyslexic.mk14
-rw-r--r--readlicense_oo/license/license.xml6
-rw-r--r--solenv/flatpak-manifest.in6
8 files changed, 53 insertions, 0 deletions
diff --git a/Makefile.fetch b/Makefile.fetch
index 24d6d7b34cca..407d7d1ab985 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -244,6 +244,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 3db9b11f3de0..55a8d77f297d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -991,6 +991,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 d29eaa506cf5..8422246f46ea 100644
--- a/download.lst
+++ b/download.lst
@@ -114,6 +114,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 := b92d7fcb9409f2bcfd23b65ac71647256eb49c429f4fbb1cc870381fc93eb486
+export FONT_OPENDYSLEXIC_TARBALL := opendyslexic-0.910.12-rc2-2019.10.17.zip
export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM := 8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
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 edf233aa8db0..e59583b18afd 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -2641,6 +2641,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 4c7ca2825162..b3ab7552de8d 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -690,6 +690,12 @@
"dest": "external/tarballs",
"dest-filename": "@CUCKOO_TARBALL@"
}
+ {
+ "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": [