[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch readlicense_oo/license Repository.mk solenv/flatpak-manifest.in sw/qa sw/source vcl/qa
Makefile.fetch|1 Repository.mk |1 download.lst |5 external/more_fonts/ExternalPackage_sourcesans.mk | 27 -- external/more_fonts/Module_more_fonts.mk |2 - external/more_fonts/UnpackedTarball_sourcesans.mk | 14 --- readlicense_oo/license/license.xml|9 --- solenv/flatpak-manifest.in|7 - sw/qa/uitest/data/metadata.odt|binary sw/source/uibase/sidebar/ThemePanel.cxx |4 +-- vcl/qa/cppunit/pdfexport/data/tdf148442.odt |binary 11 files changed, 2 insertions(+), 68 deletions(-) New commits: commit 5d42f4403d4e51f33ad8f2ce9efbed542978b521 Author: Khaled Hosny AuthorDate: Mon Dec 5 12:09:38 2022 +0200 Commit: خالد حسني CommitDate: Sat Dec 31 19:34:37 2022 + tdf#136604: Remove Source Sans Pro fonts Templates using the fonts are left unchanged. Change-Id: I5ed21155ddd5038eb91f6ad6bcbd7f27f2478638 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143665 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/Makefile.fetch b/Makefile.fetch index 053cb3190a49..c8c5c91941f2 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -177,7 +177,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index d6db83c47873..ff20165796a5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1052,7 +1052,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_libre_hebrew \ fonts_noto \ fonts_reem \ - fonts_sourcesans \ fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index 5eed30c442ec..6cfc19a0573b 100644 --- a/download.lst +++ b/download.lst @@ -153,11 +153,6 @@ FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-201 # three static lines # so that git cherry-pick # will not run into conflicts -FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61 -FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz -# three static lines -# so that git cherry-pick -# will not run into conflicts FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz # three static lines diff --git a/external/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk deleted file mode 100644 index cd7ac29e92af.. --- a/external/more_fonts/ExternalPackage_sourcesans.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -*- 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_sourcesans,font_sourcesans)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - SourceSansPro-BlackIt.ttf \ - SourceSansPro-Black.ttf \ - SourceSansPro-BoldIt.ttf \ - SourceSansPro-Bold.ttf \ - SourceSansPro-ExtraLightIt.ttf \ - SourceSansPro-ExtraLight.ttf \ - SourceSansPro-It.ttf \ - SourceSansPro-LightIt.ttf \ - SourceSansPro-Light.ttf \ - SourceSansPro-Regular.ttf \ - SourceSansPro-SemiboldIt.ttf \ - SourceSansPro-Semibold.ttf \ -)) - -# 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 b97f71ac5c64..001e9bcc2d03 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_liberation_narrow \ ExternalPackage_libertineg \ ExternalPackage_libre_hebrew \ - ExternalPackage_sourcesans \ ExternalPackage_noto \ ExternalPackage_reem \ ExternalPackage_scheherazade \ @@ -36,7 +35,6 @@ $(eval $(call gb_Module_add_targets,more
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch readlicense_oo/license Repository.mk solenv/flatpak-manifest.in vcl/qa
Makefile.fetch |1 - Repository.mk|1 - download.lst |2 -- external/more_fonts/ExternalPackage_kacst.mk | 17 - external/more_fonts/Module_more_fonts.mk |2 -- external/more_fonts/UnpackedTarball_kacst.mk | 14 -- readlicense_oo/license/license.xml |6 -- solenv/flatpak-manifest.in |7 --- vcl/qa/cppunit/complextext.cxx |2 +- vcl/qa/cppunit/text.cxx |2 +- 10 files changed, 2 insertions(+), 52 deletions(-) New commits: commit 6d6a2343b1d45695f3ea02818d317a022a7b259f Author: Khaled Hosny AuthorDate: Mon Dec 5 01:01:10 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Mon Dec 5 08:26:29 2022 + tdf#152376: Remove Kacst Book and Kacst Office fonts Change-Id: I979e01ee6cab26431a6e54094c59ea28e886019a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143647 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/Makefile.fetch b/Makefile.fetch index 07454893d700..053cb3190a49 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -183,7 +183,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index bc51c5c1be5d..56d8b2d28b84 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1040,7 +1040,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ $(if $(MPL_SUBSET),,fonts_culmus) \ fonts_dejavu \ fonts_gentium \ - $(if $(MPL_SUBSET),,fonts_kacst) \ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ diff --git a/download.lst b/download.lst index c0f41e15ee4d..6cea1bbeaed2 100644 --- a/download.lst +++ b/download.lst @@ -78,8 +78,6 @@ export FONT_ALEF_SHA256SUM := b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f export FONT_ALEF_TARBALL := alef-1.001.tar.gz export FONT_AMIRI_SHA256SUM := 926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30 export FONT_AMIRI_TARBALL := Amiri-1.000.zip -export FONT_KACST_SHA256SUM := dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 -export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz export FONT_REEM_SHA256SUM := c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413 export FONT_REEM_TARBALL := ReemKufi-1.2.zip export FONT_SCHEHERAZADE_SHA256SUM := 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5 diff --git a/external/more_fonts/ExternalPackage_kacst.mk b/external/more_fonts/ExternalPackage_kacst.mk deleted file mode 100644 index 909ed0b3.. --- a/external/more_fonts/ExternalPackage_kacst.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -*- 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_kacst,font_kacst)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_kacst,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - KacstBook.ttf \ - KacstOffice.ttf \ -)) - -# 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 233d890c6097..b97f71ac5c64 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ $(if $(MPL_SUBSET),,ExternalPackage_culmus) \ ExternalPackage_dejavu \ ExternalPackage_gentium \ - $(if $(MPL_SUBSET),,ExternalPackage_kacst) \ ExternalPackage_liberation \ ExternalPackage_liberation_narrow \ ExternalPackage_libertineg \ @@ -33,7 +32,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ $(if $(MPL_SUBSET),,UnpackedTarball_culmus) \ UnpackedTarball_dejavu \ UnpackedTarball_gentium \ - $(if $(MPL_SUBSET),,UnpackedTarball_kacst) \ UnpackedTarball_liberation \ UnpackedTarball_liberation_narrow \ UnpackedTarball_libertineg \ diff --git a/external/more_fonts/UnpackedTarball_kacst.mk b/external/more
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch readlicense_oo/license Repository.mk solenv/flatpak-manifest.in sw/source
Makefile.fetch |2 - Repository.mk |2 - download.lst |4 -- external/more_fonts/ExternalPackage_sourcecode.mk | 29 - external/more_fonts/ExternalPackage_sourceserif.mk | 27 --- external/more_fonts/Module_more_fonts.mk |4 -- external/more_fonts/UnpackedTarball_sourcecode.mk | 14 -- external/more_fonts/UnpackedTarball_sourceserif.mk | 14 -- readlicense_oo/license/license.xml | 18 - solenv/flatpak-manifest.in | 14 -- sw/source/uibase/sidebar/ThemePanel.cxx|4 +- 11 files changed, 2 insertions(+), 130 deletions(-) New commits: commit 05eb5e487455dfaa0947c704c2ae06544d1f9253 Author: Khaled Hosny AuthorDate: Mon Dec 5 00:30:03 2022 +0200 Commit: خالد حسني CommitDate: Mon Dec 5 06:46:44 2022 + tdf#136604: Remove Source Serif Pro and Source Code Pro fonts Kept Source Sans Pro for now because it is used in some styles and using also weights that not supported by other fonts we bundle (e.g. light). Change-Id: I2eb9c6a2951e0c39e7021a5c90ed549d03f4a4e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143645 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/Makefile.fetch b/Makefile.fetch index be1f988adf2a..07454893d700 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -177,9 +177,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_SOURCESERIF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 15a75405ee23..bc51c5c1be5d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1047,9 +1047,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_libre_hebrew \ fonts_noto \ fonts_reem \ - fonts_sourcecode \ fonts_sourcesans \ - fonts_sourceserif \ fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index 754c42a57f7c..c0f41e15ee4d 100644 --- a/download.lst +++ b/download.lst @@ -66,12 +66,8 @@ export FONT_LIBERATION_SHA256SUM := 26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d4 export FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.1.4.tar.gz export FONT_LINLIBERTINEG_SHA256SUM := 54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5 export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip -export FONT_SOURCECODE_SHA256SUM := 09466dce8765f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f -export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61 export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz -export FONT_SOURCESERIF_SHA256SUM := 826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3 -export FONT_SOURCESERIF_TARBALL := source-serif-pro-3.000R.tar.gz export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz export FONT_CULMUS_SHA256SUM := c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05 diff --git a/external/more_fonts/ExternalPackage_sourcecode.mk b/external/more_fonts/ExternalPackage_sourcecode.mk deleted file mode 100644 index 5f1d7f7c5b31.. --- a/external/more_fonts/ExternalPackage_sourcecode.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- 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_sourcecode,font_sourcecode)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - SourceCodePro-BlackIt.ttf \ - SourceCodePro-Black.ttf \ - Sou
[Libreoffice-commits] core.git: download.lst external/more_fonts
download.lst |4 ++-- external/more_fonts/ExternalPackage_amiri.mk |6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 402d331a0e75a340a3b01cf12b5a61a3266c50fe Author: Khaled Hosny AuthorDate: Sat Dec 3 22:14:58 2022 +0200 Commit: خالد حسني CommitDate: Sun Dec 4 07:03:23 2022 + more_fonts: Update Amiri to version 1.000 Change-Id: I98961ed79cdf98449048e8d83e17e97222e71660 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143620 Reviewed-by: خالد حسني Tested-by: خالد حسني diff --git a/download.lst b/download.lst index 7a2905e2f8ff..754c42a57f7c 100644 --- a/download.lst +++ b/download.lst @@ -80,8 +80,8 @@ export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725 export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz export FONT_ALEF_SHA256SUM := b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 export FONT_ALEF_TARBALL := alef-1.001.tar.gz -export FONT_AMIRI_SHA256SUM := 9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7 -export FONT_AMIRI_TARBALL := Amiri-0.117.zip +export FONT_AMIRI_SHA256SUM := 926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30 +export FONT_AMIRI_TARBALL := Amiri-1.000.zip export FONT_KACST_SHA256SUM := dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz export FONT_REEM_SHA256SUM := c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413 diff --git a/external/more_fonts/ExternalPackage_amiri.mk b/external/more_fonts/ExternalPackage_amiri.mk index d938b8cf7542..96aa3a1b1a33 100644 --- a/external/more_fonts/ExternalPackage_amiri.mk +++ b/external/more_fonts/ExternalPackage_amiri.mk @@ -10,11 +10,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_amiri,font_amiri)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_amiri,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Amiri-Regular.ttf \ Amiri-Bold.ttf \ - Amiri-BoldSlanted.ttf \ + Amiri-Italic.ttf \ + Amiri-BoldItalic.ttf \ AmiriQuran.ttf \ - Amiri-Regular.ttf \ - Amiri-Slanted.ttf \ )) # vim: set noet sw=4 ts=4:
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch officecfg/registry readlicense_oo/license Repository.mk solenv/flatpak-manifest.in vcl/unx
Makefile.fetch |1 Repository.mk |1 download.lst |2 external/more_fonts/ExternalPackage_EmojiOne_Color.mk | 16 - external/more_fonts/Module_more_fonts.mk |2 external/more_fonts/UnpackedTarball_EmojiOne_Color.mk | 14 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 readlicense_oo/license/license.xml | 39 - solenv/flatpak-manifest.in |7 -- vcl/unx/generic/fontmanager/fontconfig.cxx |2 10 files changed, 2 insertions(+), 84 deletions(-) New commits: commit 694f8eb1f79ff28a45682c77d7bb88ad9197025b Author: Khaled Hosny AuthorDate: Mon Sep 26 15:55:51 2022 +0200 Commit: خالد حسني CommitDate: Tue Sep 27 11:30:44 2022 +0200 tdf#144348: Remove EmojiOne Color font The EmojiFont setting is now a comma-separated list of the three common color emoji fonts, it should fallback to the next font if the first is missing. Change-Id: I7aa134f914ab829704e9b707f511f166a81a0089 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140623 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/Makefile.fetch b/Makefile.fetch index cb76c9f08883..be1f988adf2a 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -180,7 +180,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESERIF_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index ef2de04e7874..7e8d3c2ede18 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1044,7 +1044,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_carlito \ $(if $(MPL_SUBSET),,fonts_culmus) \ fonts_dejavu \ - fonts_emojione_color \ fonts_gentium \ $(if $(MPL_SUBSET),,fonts_kacst) \ fonts_liberation \ diff --git a/download.lst b/download.lst index 9650caa66ed7..728dbeeb96f9 100644 --- a/download.lst +++ b/download.lst @@ -72,8 +72,6 @@ export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FONT_SOURCESERIF_SHA256SUM := 826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3 export FONT_SOURCESERIF_TARBALL := source-serif-pro-3.000R.tar.gz -export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 -export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz export FONT_CULMUS_SHA256SUM := c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05 diff --git a/external/more_fonts/ExternalPackage_EmojiOne_Color.mk b/external/more_fonts/ExternalPackage_EmojiOne_Color.mk deleted file mode 100644 index 76cdb668487f.. --- a/external/more_fonts/ExternalPackage_EmojiOne_Color.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- 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_emojione_color,font_emojione_color)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_emojione_color,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - EmojiOneColor-SVGinOT.ttf \ -)) - -# 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 c6e56c5b90b7..0d4ae72cf14d 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_noto \ ExternalPackage_reem \ ExternalPackage_scheherazade \ - ExternalPackage_EmojiOne_Color \ UnpackedTarball_alef \ UnpackedTarball_amiri \ UnpackedTarball_caladea \ @@ -47,7 +46,6 @@ $(eval $(call gb_Module_add_targets,more_fo
[Libreoffice-commits] core.git: download.lst external/more_fonts solenv/flatpak-manifest.in
download.lst |4 ++-- external/more_fonts/ExternalPackage_culmus.mk |8 solenv/flatpak-manifest.in|6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit c9c6b0d75bcbb6ff3343502a19fb3448d361d335 Author: Heiko Tietze AuthorDate: Tue Apr 27 13:50:10 2021 +0200 Commit: Heiko Tietze CommitDate: Wed Apr 28 08:20:34 2021 +0200 Resolves tdf#141553 - Update David CLM font Culmus font 0.131 updated to 0.133 Change-Id: Icd79dbef8dc350362ea4c4a7ed2ff05a1b95a1a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114738 Reviewed-by: Hossein Reviewed-by: Heiko Tietze Tested-by: Jenkins diff --git a/download.lst b/download.lst index 1319f95a8325..a09fd86cc0ca 100644 --- a/download.lst +++ b/download.lst @@ -80,8 +80,8 @@ export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz -export FONT_CULMUS_SHA256SUM := dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b -export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz +export FONT_CULMUS_SHA256SUM := c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05 +export FONT_CULMUS_TARBALL := culmus-0.133.tar.gz export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz export FONT_ALEF_SHA256SUM := b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 diff --git a/external/more_fonts/ExternalPackage_culmus.mk b/external/more_fonts/ExternalPackage_culmus.mk index ecbd7f70ec07..f7a537e8055b 100644 --- a/external/more_fonts/ExternalPackage_culmus.mk +++ b/external/more_fonts/ExternalPackage_culmus.mk @@ -10,10 +10,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_culmus,font_culmus)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_culmus,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - DavidCLM-Bold.ttf \ - DavidCLM-BoldItalic.ttf \ - DavidCLM-Medium.ttf \ - DavidCLM-MediumItalic.ttf \ + DavidCLM-Bold.otf \ + DavidCLM-BoldItalic.otf \ + DavidCLM-Medium.otf \ + DavidCLM-MediumItalic.otf \ FrankRuehlCLM-Bold.ttf \ FrankRuehlCLM-BoldOblique.ttf \ FrankRuehlCLM-Medium.ttf \ diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 48a8d0589900..89cb974b9686 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -447,10 +447,10 @@ "dest-filename": "external/tarballs/Amiri-0.111.zip" }, { -"url": "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";, -"sha256": "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b", +"url": "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz";, +"sha256": "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05", "type": "file", -"dest-filename": "external/tarballs/culmus-0.131.tar.gz" +"dest-filename": "external/tarballs/culmus-0.133.tar.gz" }, { "url": "https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz";, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk solenv/flatpak-manifest.in
Makefile.fetch |1 Repository.mk |1 download.lst |2 + external/more_fonts/ExternalPackage_sourceserif.mk | 27 + external/more_fonts/Module_more_fonts.mk |2 + external/more_fonts/UnpackedTarball_sourceserif.mk | 14 ++ solenv/flatpak-manifest.in |6 7 files changed, 53 insertions(+) New commits: commit 3ff21b52de4047a03c4fcd82daff8aff588aebc3 Author: heiko tietze AuthorDate: Thu Aug 23 13:54:53 2018 +0200 Commit: Heiko Tietze CommitDate: Mon Sep 3 09:04:46 2018 +0200 tdf#79022 - Please bundle Source Serif Pro Source Serif added Change-Id: Ibbdbd2556852e7c4e19357d332990646aec7a43d Reviewed-on: https://gerrit.libreoffice.org/59498 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/Makefile.fetch b/Makefile.fetch index 59aadccaffe3..3f8250a98cb0 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -177,6 +177,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_SOURCESERIF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 56174af8ef07..5f62c277b33d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -982,6 +982,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_reem \ fonts_sourcecode \ fonts_sourcesans \ + fonts_sourceserif \ fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index 3532e2be3aa3..ac11b65846f6 100644 --- a/download.lst +++ b/download.lst @@ -66,6 +66,8 @@ export FONT_SOURCECODE_SHA256SUM := 09466dce8765f189acd8358c60c6736dcd95f042 export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61 export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz +export FONT_SOURCESERIF_SHA256SUM := 10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb +export FONT_SOURCESERIF_TARBALL := source-serif-font-2.007R.tar.gz export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 diff --git a/external/more_fonts/ExternalPackage_sourceserif.mk b/external/more_fonts/ExternalPackage_sourceserif.mk new file mode 100644 index ..6a5272bbaa7a --- /dev/null +++ b/external/more_fonts/ExternalPackage_sourceserif.mk @@ -0,0 +1,27 @@ +# -*- 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_sourceserif,font_sourceserif)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourceserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + SourceSerifPro-BoldIt.ttf \ + SourceSerifPro-ExtraLight.ttf \ + SourceSerifPro-Light.ttf \ + SourceSerifPro-Semibold.ttf \ + SourceSerifPro-BlackIt.ttf \ + SourceSerifPro-Bold.ttf \ + SourceSerifPro-It.ttf \ + SourceSerifPro-Regular.ttf \ + SourceSerifPro-Black.ttf \ + SourceSerifPro-ExtraLightIt.ttf \ + SourceSerifPro-LightIt.ttf \ + SourceSerifPro-SemiboldIt.ttf \ +)) + +# 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 c6944cb6264e..c3d5631ae689 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_libre_hebrew \ ExternalPackage_sourcecode \ ExternalPackage_sourcesans \ + ExternalPackage_sourceserif \ ExternalPackage_noto \ ExternalPackage_reem \ ExternalPackage_scheherazade \ @@ -42,6 +43,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_li
[Libreoffice-commits] core.git: download.lst external/more_fonts
download.lst|4 ++-- external/more_fonts/ExternalPackage_reem.mk |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit b6b18aa3fdb419fd7461242c6cc3128544e576fd Author: Khaled Hosny Date: Thu Apr 26 12:10:21 2018 +0200 Update Reem Kufi font to version 0.7 Change-Id: I4424bc58a3f225f204e0934f7a30ff57106e668e Reviewed-on: https://gerrit.libreoffice.org/53500 Tested-by: Jenkins Reviewed-by: Khaled Hosny diff --git a/download.lst b/download.lst index 0fa8763fdeae..e61ba6be9fae 100644 --- a/download.lst +++ b/download.lst @@ -80,8 +80,8 @@ export FONT_AMIRI_SHA256SUM := 1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817 export FONT_AMIRI_TARBALL := Amiri-0.111.zip export FONT_KACST_SHA256SUM := dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz -export FONT_REEM_SHA256SUM := 4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b -export FONT_REEM_TARBALL := ReemKufi-0.6.tar.gz +export FONT_REEM_SHA256SUM := f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f +export FONT_REEM_TARBALL := ReemKufi-0.7.zip export FONT_SCHEHERAZADE_SHA256SUM := 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5 export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac diff --git a/external/more_fonts/ExternalPackage_reem.mk b/external/more_fonts/ExternalPackage_reem.mk index b90d4c0ed86e..9a40652b55cc 100644 --- a/external/more_fonts/ExternalPackage_reem.mk +++ b/external/more_fonts/ExternalPackage_reem.mk @@ -10,7 +10,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_reem,font_reem)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_reem,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - ReemKufi-Regular.ttf \ + ttf/ReemKufi-Regular.ttf \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts solenv/flatpak-manifest.in
download.lst |4 ++-- external/more_fonts/ExternalPackage_amiri.mk | 10 +- solenv/flatpak-manifest.in |6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) New commits: commit a3c9d29cdb8d83ce060b5ddc96ef1463ea32350c Author: Andras Timar Date: Sat Mar 31 12:54:55 2018 +0200 tdf#115226 Update bundled Amiri to 0.111 Change-Id: I4f07943ccd27c1c58e32c0513befe72ae0839b93 Reviewed-on: https://gerrit.libreoffice.org/52184 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/download.lst b/download.lst index 5225f03d7148..354c39285f43 100644 --- a/download.lst +++ b/download.lst @@ -76,8 +76,8 @@ export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725 export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz export FONT_ALEF_SHA256SUM := b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 export FONT_ALEF_TARBALL := alef-1.001.tar.gz -export FONT_AMIRI_SHA256SUM := 97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6 -export FONT_AMIRI_TARBALL := amiri-0.109.zip +export FONT_AMIRI_SHA256SUM := 1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166 +export FONT_AMIRI_TARBALL := Amiri-0.111.zip export FONT_KACST_SHA256SUM := dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz export FONT_REEM_SHA256SUM := 4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b diff --git a/external/more_fonts/ExternalPackage_amiri.mk b/external/more_fonts/ExternalPackage_amiri.mk index ccf5f1c94c8a..d938b8cf7542 100644 --- a/external/more_fonts/ExternalPackage_amiri.mk +++ b/external/more_fonts/ExternalPackage_amiri.mk @@ -10,11 +10,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_amiri,font_amiri)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_amiri,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - amiri-bold.ttf \ - amiri-boldslanted.ttf \ - amiri-quran.ttf \ - amiri-regular.ttf \ - amiri-slanted.ttf \ + Amiri-Bold.ttf \ + Amiri-BoldSlanted.ttf \ + AmiriQuran.ttf \ + Amiri-Regular.ttf \ + Amiri-Slanted.ttf \ )) # vim: set noet sw=4 ts=4: diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index b74158a64fbf..594f99dd8646 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -433,10 +433,10 @@ "dest-filename": "external/tarballs/alef-1.001.tar.gz" }, { -"url": "https://dev-www.libreoffice.org/src/amiri-0.109.zip";, -"sha256": "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6", +"url": "https://dev-www.libreoffice.org/src/Amiri-0.111.zip";, +"sha256": "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166", "type": "file", -"dest-filename": "external/tarballs/amiri-0.109.zip" +"dest-filename": "external/tarballs/Amiri-0.111.zip" }, { "url": "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |4 Repository.mk |4 download.lst|8 external/more_fonts/ExternalPackage_amiri.mk| 20 external/more_fonts/ExternalPackage_kacst.mk| 17 + external/more_fonts/ExternalPackage_reem.mk | 16 external/more_fonts/ExternalPackage_scheherazade.mk | 17 + external/more_fonts/Module_more_fonts.mk|8 external/more_fonts/UnpackedTarball_amiri.mk| 14 ++ external/more_fonts/UnpackedTarball_kacst.mk| 14 ++ external/more_fonts/UnpackedTarball_reem.mk | 14 ++ external/more_fonts/UnpackedTarball_scheherazade.mk | 14 ++ 12 files changed, 150 insertions(+) New commits: commit 4eaeb8058d75d03e782d37b430b68890aa374f2c Author: Yousuf Philips Date: Thu Dec 21 18:57:02 2017 +0400 tdf#113532 Add Arabic fonts into default installation Includes these fonts * Amiri * KACSTOffice, KACSTBook * Reem Kufi * Scheherazade Change-Id: I2071c4c379b2dc88a205e2c284ae0a65cfdc76c9 Reviewed-on: https://gerrit.libreoffice.org/46624 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/Makefile.fetch b/Makefile.fetch index 33558239eeb8..42a8ca8684f9 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -180,6 +180,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index cc540ef4139e..29a6dbc05a3d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -956,19 +956,23 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ postprocess_fontconfig) \ $(call gb_Helper_optional,MORE_FONTS,\ fonts_alef \ + fonts_amiri \ fonts_caladea \ fonts_carlito \ fonts_culmus \ fonts_dejavu \ fonts_emojione_color \ fonts_gentium \ + fonts_kacst \ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ fonts_libre_hebrew \ fonts_noto \ + fonts_reem \ fonts_sourcecode \ fonts_sourcesans \ + fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index 21c99fe3082b..81d48e94c356 100644 --- a/download.lst +++ b/download.lst @@ -76,6 +76,14 @@ export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725 export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz export FONT_ALEF_SHA256SUM := b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 export FONT_ALEF_TARBALL := alef-1.001.tar.gz +export FONT_AMIRI_SHA256SUM := 97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6 +export FONT_AMIRI_TARBALL := amiri-0.109.zip +export FONT_KACST_SHA256SUM := dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 +export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz +export FONT_REEM_SHA256SUM := 4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b +export FONT_REEM_TARBALL := ReemKufi-0.6.tar.gz +export FONT_SCHEHERAZADE_SHA256SUM := 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5 +export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.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_amiri.mk b/external/more_fonts/ExternalPackage_amiri.mk new file mode 100644 index ..ccf5f1c94c8a --- /dev/null +++ b/external/more_fonts/ExternalPackage_amiri.mk @@ -0,0 +1,20 @@ +# -*- 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 c
[Libreoffice-commits] core.git: download.lst external/more_fonts
download.lst|4 ++-- external/more_fonts/ExternalPackage_noto.mk | 18 ++ 2 files changed, 20 insertions(+), 2 deletions(-) New commits: commit e45e2c4897933f14c90a65fa74d0ad2a0b620ede Author: Yousuf Philips Date: Sat Dec 16 16:18:18 2017 +0400 tdf#103080 October 2017 update to Noto fonts In addition to updates to the already bundled fonts, Condensed and Light weights of English Noto Sans and Noto Serif have been added, as well as the addition of the Noto Sans Arabic Change-Id: I72bd7815d678fb4723692eb90d352d012ffe035e Reviewed-on: https://gerrit.libreoffice.org/46596 Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/download.lst b/download.lst index 358fbdad747c..21c99fe3082b 100644 --- a/download.lst +++ b/download.lst @@ -68,8 +68,8 @@ export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz -export FONT_NOTO_SHA256SUM := 8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8 -export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz +export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 +export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz export FONT_CULMUS_SHA256SUM := dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk index adbb88fd4f6d..dd52ac956265 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -15,10 +15,20 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoMono-Regular.ttf \ NotoNaskhArabic-Bold.ttf \ NotoNaskhArabic-Regular.ttf \ + NotoNaskhArabicUI-Bold.ttf \ + NotoNaskhArabicUI-Regular.ttf \ + NotoSansArabic-Bold.ttf \ + NotoSansArabic-Regular.ttf \ + NotoSansArabicUI-Bold.ttf \ + NotoSansArabicUI-Regular.ttf \ NotoSansArmenian-Bold.ttf \ NotoSansArmenian-Regular.ttf \ NotoSans-Bold.ttf \ NotoSans-BoldItalic.ttf \ + NotoSans-Condensed.ttf \ + NotoSans-CondensedBold.ttf \ + NotoSans-CondensedBoldItalic.ttf \ + NotoSans-CondensedItalic.ttf \ NotoSansGeorgian-Bold.ttf \ NotoSansGeorgian-Regular.ttf \ NotoSansHebrew-Bold.ttf \ @@ -26,12 +36,18 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSans-Italic.ttf \ NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ + NotoSans-Light.ttf \ + NotoSans-LightItalic.ttf \ NotoSansLisu-Regular.ttf \ NotoSans-Regular.ttf \ NotoSerifArmenian-Bold.ttf \ NotoSerifArmenian-Regular.ttf \ NotoSerif-Bold.ttf \ NotoSerif-BoldItalic.ttf \ + NotoSerif-Condensed.ttf \ + NotoSerif-CondensedBold.ttf \ + NotoSerif-CondensedBoldItalic.ttf \ + NotoSerif-CondensedItalic.ttf \ NotoSerifGeorgian-Bold.ttf \ NotoSerifGeorgian-Regular.ttf \ NotoSerifHebrew-Bold.ttf \ @@ -39,6 +55,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSerif-Italic.ttf \ NotoSerifLao-Bold.ttf \ NotoSerifLao-Regular.ttf \ + NotoSerif-Light.ttf \ + NotoSerif-LightItalic.ttf \ NotoSerif-Regular.ttf \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |3 + Repository.mk |3 + download.lst|6 +++ external/more_fonts/ExternalPackage_alef.mk | 17 ++ external/more_fonts/ExternalPackage_culmus.mk | 33 external/more_fonts/ExternalPackage_libre_hebrew.mk | 25 +++ external/more_fonts/Module_more_fonts.mk|6 +++ external/more_fonts/UnpackedTarball_alef.mk | 14 external/more_fonts/UnpackedTarball_culmus.mk | 14 external/more_fonts/UnpackedTarball_libre_hebrew.mk | 14 10 files changed, 135 insertions(+) New commits: commit 4099b7628405e0ad16844eb59a916aa56ffa76ad Author: Yousuf Philips Date: Sat Dec 16 16:55:46 2017 +0400 tdf#113538 Add Hebrew fonts into default installation Includes these fonts * Alef * David CLM * David Libre * Frank Ruehl CLM * Frank Ruhl Hofshi * Miriam CLM * Miriam Libre * Miriam Mono CLM * Nachlieli CLM * Rubik Change-Id: Ib16a30c1f5b8fae372b3f9fc3f6de8a3be55bc85 Reviewed-on: https://gerrit.libreoffice.org/45101 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips Tested-by: Jenkins diff --git a/Makefile.fetch b/Makefile.fetch index e3095eee699f..33558239eeb8 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -177,6 +177,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 9d27eb4cf4ab..ef2b12a9bc0f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -955,14 +955,17 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ $(if $(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)), \ postprocess_fontconfig) \ $(call gb_Helper_optional,MORE_FONTS,\ + fonts_alef \ fonts_caladea \ fonts_carlito \ + fonts_culmus \ fonts_dejavu \ fonts_emojione_color \ fonts_gentium \ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ + fonts_libre_hebrew \ fonts_noto \ fonts_sourcecode \ fonts_sourcesans \ diff --git a/download.lst b/download.lst index e318dec4625c..358fbdad747c 100644 --- a/download.lst +++ b/download.lst @@ -70,6 +70,12 @@ export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz export FONT_NOTO_SHA256SUM := 8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8 export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz +export FONT_CULMUS_SHA256SUM := dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b +export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz +export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a +export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz +export FONT_ALEF_SHA256SUM := b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 +export FONT_ALEF_TARBALL := alef-1.001.tar.gz export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz export FREETYPE_SHA256SUM := e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 diff --git a/external/more_fonts/ExternalPackage_alef.mk b/external/more_fonts/ExternalPackage_alef.mk new file mode 100644 index ..f41aca483ef3 --- /dev/null +++ b/external/more_fonts/ExternalPackage_alef.mk @@ -0,0 +1,17 @@ +# -*- 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_alef,font_alef)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_alef,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Alef-Bold.ttf \ + Alef-Regular.ttf
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |2 -- Repository.mk |2 -- download.lst|4 external/more_fonts/ExternalPackage_opensans.mk | 19 --- external/more_fonts/ExternalPackage_ptserif.mk | 19 --- external/more_fonts/Module_more_fonts.mk|4 external/more_fonts/UnpackedTarball_opensans.mk | 14 -- external/more_fonts/UnpackedTarball_ptserif.mk | 14 -- 8 files changed, 78 deletions(-) New commits: commit 0ce173b50fd12342979cf3f8f9b2d92267552060 Author: Yousuf Philips Date: Wed Dec 6 16:15:35 2017 +0400 tdf#103080 Dont package Open Sans and PT_Serif fonts Change-Id: Iac1d572f19372465e9cc369454480d9b621bcd66 Reviewed-on: https://gerrit.libreoffice.org/45169 Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/Makefile.fetch b/Makefile.fetch index 3944ac75c7b2..e3095eee699f 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -173,8 +173,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_OPENSANS_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_PTSERIF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index eb0365b0034a..9d27eb4cf4ab 100644 --- a/Repository.mk +++ b/Repository.mk @@ -964,8 +964,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_liberation_narrow \ fonts_libertineg \ fonts_noto \ - fonts_opensans \ - fonts_ptserif \ fonts_sourcecode \ fonts_sourcesans \ ) \ diff --git a/download.lst b/download.lst index 120e5211eb8c..e318dec4625c 100644 --- a/download.lst +++ b/download.lst @@ -62,10 +62,6 @@ export FONT_LIBERATION_SHA256SUM := 7890278a6cd17873c57d9cd785c2d230d9abdea837e9 export FONT_LIBERATION_TARBALL := 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz export FONT_LINLIBERTINEG_SHA256SUM := 54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5 export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip -export FONT_OPENSANS_SHA256SUM := cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8 -export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz -export FONT_PTSERIF_SHA256SUM := 6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa -export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz export FONT_SOURCECODE_SHA256SUM := 09466dce8765f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61 diff --git a/external/more_fonts/ExternalPackage_opensans.mk b/external/more_fonts/ExternalPackage_opensans.mk deleted file mode 100644 index adbf9230304f.. --- a/external/more_fonts/ExternalPackage_opensans.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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_opensans,font_opensans)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - OpenSans-BoldItalic.ttf \ - OpenSans-Bold.ttf \ - OpenSans-Italic.ttf \ - OpenSans-Regular.ttf \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_ptserif.mk b/external/more_fonts/ExternalPackage_ptserif.mk deleted file mode 100644 index 41dedfc8e486.. --- a/external/more_fonts/ExternalPackage_ptserif.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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 $(ca
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |1 Repository.mk |1 download.lst|2 + external/more_fonts/ExternalPackage_noto.mk | 45 external/more_fonts/Module_more_fonts.mk|2 + external/more_fonts/UnpackedTarball_noto.mk | 14 6 files changed, 65 insertions(+) New commits: commit b97e713e76c88141d26f6e19a74db80a105cb911 Author: Yousuf Philips Date: Tue Oct 31 21:48:27 2017 +0400 tdf#103080 Add Noto fonts into default installation Includes the regular, italic, bold and bold italic for * Noto Sans, Noto Serif Includes the regular and bold for * Noto Kufi Arabic, Noto Naskh Arabic * Noto Sans Armenian, Noto Serif Armenian * Noto Sans Georgian, Noto Serif Georgian * Noto Sans Hebrew, Noto Serif Hebrew * Noto Sans Lao, Noto Serif Lao Includes the regular and bold for * Noto Mono * Noto Sans Lisu Change-Id: I2a423b7cac031e2e899df22ad902bd09d1da250d Reviewed-on: https://gerrit.libreoffice.org/44128 Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/Makefile.fetch b/Makefile.fetch index 17780cb2fd4c..3944ac75c7b2 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -178,6 +178,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 7fbc1343ccf6..77608e4790af 100644 --- a/Repository.mk +++ b/Repository.mk @@ -954,6 +954,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ + fonts_noto \ fonts_opensans \ fonts_ptserif \ fonts_sourcecode \ diff --git a/download.lst b/download.lst index 80f5c2cc5650..8dc80d3af2a6 100644 --- a/download.lst +++ b/download.lst @@ -72,6 +72,8 @@ export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz +export FONT_NOTO_SHA256SUM := 8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8 +export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz export FREETYPE_SHA256SUM := e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk new file mode 100644 index ..adbb88fd4f6d --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -0,0 +1,45 @@ +# -*- 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_noto,font_noto)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoKufiArabic-Bold.ttf \ + NotoKufiArabic-Regular.ttf \ + NotoMono-Regular.ttf \ + NotoNaskhArabic-Bold.ttf \ + NotoNaskhArabic-Regular.ttf \ + NotoSansArmenian-Bold.ttf \ + NotoSansArmenian-Regular.ttf \ + NotoSans-Bold.ttf \ + NotoSans-BoldItalic.ttf \ + NotoSansGeorgian-Bold.ttf \ + NotoSansGeorgian-Regular.ttf \ + NotoSansHebrew-Bold.ttf \ + NotoSansHebrew-Regular.ttf \ + NotoSans-Italic.ttf \ + NotoSansLao-Bold.ttf \ + NotoSansLao-Regular.ttf \ + NotoSansLisu-Regular.ttf \ + NotoSans-Regular.ttf \ + NotoSerifArmenian-Bold.ttf \ + NotoSerifArmenian-Regular.ttf \ + NotoSerif-Bold.ttf \ + NotoSerif-BoldItalic.ttf \ + NotoSerifGeorgian-Bold.ttf \ + NotoSerifGeorgian-Regular.ttf \ + NotoSerifHebrew-Bold.ttf \ + NotoSerifHebrew-Regular.ttf \ + NotoSerif-Italic.ttf \ + NotoSerifLao-Bold.tt
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch scp2/source
Makefile.fetch |1 - download.lst |1 - external/more_fonts/ExternalPackage_NotoEmoji.mk | 16 external/more_fonts/Module_more_fonts.mk |2 -- external/more_fonts/UnpackedTarball_NotoEmoji.mk | 14 -- scp2/source/ooo/file_font_ooo.scp|3 --- scp2/source/ooo/module_hidden_ooo.scp|1 - 7 files changed, 38 deletions(-) New commits: commit 4e1336ca349506d9e4c413f63ef18535eea7c2a7 Author: Akshay Deep Date: Wed Nov 30 05:13:43 2016 +0530 Remove Noto Emoji font Conflicts: Makefile.fetch download.lst external/more_fonts/Module_more_fonts.mk scp2/source/ooo/file_font_ooo.scp scp2/source/ooo/module_hidden_ooo.scp Change-Id: Ic43807cde11fff21d78bece6874783ba154655a2 Reviewed-on: https://gerrit.libreoffice.org/31390 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/Makefile.fetch b/Makefile.fetch index a292099..3e21be3 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -178,7 +178,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MORE_FONTS,FONT_PTSERIF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_NOTOEMOJI_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ diff --git a/download.lst b/download.lst index d20827e..3e3313b 100644 --- a/download.lst +++ b/download.lst @@ -49,7 +49,6 @@ export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font- export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz -export FONT_NOTOEMOJI_TARBALL := 61f45f3d6cb7f874aecbe6cdc8ba26a2-NotoEmoji-unhinted.tar.gz export FONT_EMOJIONE_COLOR_MD5SUM := 919389b307ee8696288ea3b8210ab974 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7 diff --git a/external/more_fonts/ExternalPackage_NotoEmoji.mk b/external/more_fonts/ExternalPackage_NotoEmoji.mk deleted file mode 100644 index 2540ab3..000 --- a/external/more_fonts/ExternalPackage_NotoEmoji.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- 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_notoemoji,font_notoemoji)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_notoemoji,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - NotoEmoji-Regular.ttf \ -)) - -# 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 452d91b..f584a8f 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_ptserif \ ExternalPackage_sourcecode \ ExternalPackage_sourcesans \ - ExternalPackage_NotoEmoji \ ExternalPackage_EmojiOne_Color \ UnpackedTarball_caladea \ UnpackedTarball_carlito \ @@ -35,7 +34,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_ptserif \ UnpackedTarball_sourcecode \ UnpackedTarball_sourcesans \ - UnpackedTarball_NotoEmoji \ UnpackedTarball_EmojiOne_Color \ )) diff --git a/external/more_fonts/UnpackedTarball_NotoEmoji.mk b/external/more_fonts/UnpackedTarball_NotoEmoji.mk deleted file mode 100644 index 0c773b6..000 --- a/external/more_fonts/UnpackedTarball_NotoEmoji.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- 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_notoemoji)) - -$(eval $(call gb_UnpackedTarball_set_tarball,font_notoemoji,$(FONT_NOTOEMOJI_TARBALL))) - -# vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_font
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch officecfg/registry scp2/source
Makefile.fetch |1 download.lst |2 + external/more_fonts/ExternalPackage_EmojiOne_Color.mk | 16 + external/more_fonts/Module_more_fonts.mk |2 + external/more_fonts/UnpackedTarball_EmojiOne_Color.mk | 14 +++ officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 - scp2/source/ooo/file_font_ooo.scp |3 ++ scp2/source/ooo/module_hidden_ooo.scp |1 8 files changed, 40 insertions(+), 1 deletion(-) New commits: commit 9e422bc19144ce3f0645e49450428802eab1abba Author: Akshay Deep Date: Sat Nov 26 02:26:30 2016 +0530 EMOJI CONTROL: Add EmojiOne font for Emoji Support Noto Emoji does not provide glyphs for all emojis in the toolbar Change-Id: If3f3ea6e12f0b8824cb95e3db78c3c7aced4de8b Reviewed-on: https://gerrit.libreoffice.org/31215 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/Makefile.fetch b/Makefile.fetch index c552289..a292099 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -179,6 +179,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTOEMOJI_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,MYSQLCPPCONN,MYSQLCPPCONN_TARBALL) \ diff --git a/download.lst b/download.lst index 08bace6..d20827e 100644 --- a/download.lst +++ b/download.lst @@ -50,6 +50,8 @@ export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1. export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FONT_NOTOEMOJI_TARBALL := 61f45f3d6cb7f874aecbe6cdc8ba26a2-NotoEmoji-unhinted.tar.gz +export FONT_EMOJIONE_COLOR_MD5SUM := 919389b307ee8696288ea3b8210ab974 +export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7 export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 diff --git a/external/more_fonts/ExternalPackage_EmojiOne_Color.mk b/external/more_fonts/ExternalPackage_EmojiOne_Color.mk new file mode 100644 index 000..76cdb66 --- /dev/null +++ b/external/more_fonts/ExternalPackage_EmojiOne_Color.mk @@ -0,0 +1,16 @@ +# -*- 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_emojione_color,font_emojione_color)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_emojione_color,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + EmojiOneColor-SVGinOT.ttf \ +)) + +# 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 54bb9b9..452d91b 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_sourcecode \ ExternalPackage_sourcesans \ ExternalPackage_NotoEmoji \ + ExternalPackage_EmojiOne_Color \ UnpackedTarball_caladea \ UnpackedTarball_carlito \ UnpackedTarball_dejavu \ @@ -35,6 +36,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_sourcecode \ UnpackedTarball_sourcesans \ UnpackedTarball_NotoEmoji \ + UnpackedTarball_EmojiOne_Color \ )) # vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_EmojiOne_Color.mk b/external/more_fonts/UnpackedTarball_EmojiOne_Color.mk new file mode 100644 index 000..d931c77 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_EmojiOne_Color.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_emojione_color)) + +$(eval $(call gb_UnpackedTarball_s
[Libreoffice-commits] core.git: download.lst external/more_fonts
download.lst |2 +- external/more_fonts/ExternalPackage_sourcecode.mk | 12 2 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 956db071966dd9a7319503118c28de58015e0fca Author: Andras Timar Date: Sun Sep 11 14:00:50 2016 +0200 tdf#101949 update Source Code Pro fonts to 2.030 and 1.050 Change-Id: Ic314f2b970ea96ec1eb027979723985138638cdb Reviewed-on: https://gerrit.libreoffice.org/28818 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/download.lst b/download.lst index cb1e87e..b17c09f 100644 --- a/download.lst +++ b/download.lst @@ -47,7 +47,7 @@ export FONT_LIBERATION_TARBALL := 5c781723a0d9ed6188960defba8e91cf-liberation-fo export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz -export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz +export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FONT_NOTOEMOJI_TARBALL := 61f45f3d6cb7f874aecbe6cdc8ba26a2-NotoEmoji-unhinted.tar.gz export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7 diff --git a/external/more_fonts/ExternalPackage_sourcecode.mk b/external/more_fonts/ExternalPackage_sourcecode.mk index 6160e56..5f1d7f7 100644 --- a/external/more_fonts/ExternalPackage_sourcecode.mk +++ b/external/more_fonts/ExternalPackage_sourcecode.mk @@ -10,8 +10,20 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + SourceCodePro-BlackIt.ttf \ + SourceCodePro-Black.ttf \ + SourceCodePro-BoldIt.ttf \ SourceCodePro-Bold.ttf \ + SourceCodePro-ExtraLightIt.ttf \ + SourceCodePro-ExtraLight.ttf \ + SourceCodePro-It.ttf \ + SourceCodePro-LightIt.ttf \ + SourceCodePro-Light.ttf \ + SourceCodePro-MediumIt.ttf \ + SourceCodePro-Medium.ttf \ SourceCodePro-Regular.ttf \ + SourceCodePro-SemiboldIt.ttf \ + SourceCodePro-Semibold.ttf \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts
download.lst |2 +- external/more_fonts/ExternalPackage_dejavu.mk |1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit d83925c38b809ce4c7a40cd8f839364d57a390dd Author: Andras Timar Date: Fri Sep 9 17:44:38 2016 +0200 DejaVu fonts version 2.37 Change-Id: I86ed4ce1683e572c497dd5170f2e15b8bb20d501 Reviewed-on: https://gerrit.libreoffice.org/28778 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/download.lst b/download.lst index 55057f6..0b49a58 100644 --- a/download.lst +++ b/download.lst @@ -40,7 +40,7 @@ export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_TARBALL := 77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz export FONT_CALADEA_TARBALL := 368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz export FONT_CARLITO_TARBALL := c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz -export FONT_DEJAVU_TARBALL := 7b28beb2f2de912b3a616ccfc7ceda34-dejavu-fonts-ttf-2.36.zip +export FONT_DEJAVU_TARBALL := 33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip export FONT_GENTIUM_TARBALL := 1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip export FONT_LIBERATION_NARROW_TARBALL := 134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz export FONT_LIBERATION_TARBALL := 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz diff --git a/external/more_fonts/ExternalPackage_dejavu.mk b/external/more_fonts/ExternalPackage_dejavu.mk index 22e7f6c4..981875c 100644 --- a/external/more_fonts/ExternalPackage_dejavu.mk +++ b/external/more_fonts/ExternalPackage_dejavu.mk @@ -10,6 +10,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + ttf/DejaVuMathTeXGyre.ttf \ ttf/DejaVuSans-Bold.ttf \ ttf/DejaVuSans-BoldOblique.ttf \ ttf/DejaVuSans-ExtraLight.ttf \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch scp2/source
Makefile.fetch |1 + download.lst |1 + external/more_fonts/ExternalPackage_NotoEmoji.mk | 16 external/more_fonts/Module_more_fonts.mk |2 ++ external/more_fonts/UnpackedTarball_NotoEmoji.mk | 14 ++ scp2/source/ooo/file_font_ooo.scp|3 +++ scp2/source/ooo/module_hidden_ooo.scp|1 + 7 files changed, 38 insertions(+) New commits: commit ecb096841a1d7b4d468ba111df4ebafc13134c8e Author: Akshay Deep Date: Thu Jun 30 15:59:58 2016 +0530 Add Noto Emoji font for emoji support Change-Id: I57cc123ec5e1f90967e82a60fdea792974054f86 Reviewed-on: https://gerrit.libreoffice.org/26800 Reviewed-by: Michael Meeks Tested-by: Jenkins diff --git a/Makefile.fetch b/Makefile.fetch index e78ad98..6b4e05e 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -178,6 +178,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MORE_FONTS,FONT_PTSERIF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTOEMOJI_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,MYSQLCPPCONN,MYSQLCPPCONN_TARBALL) \ diff --git a/download.lst b/download.lst index 90b2dec..e810b37 100644 --- a/download.lst +++ b/download.lst @@ -51,6 +51,7 @@ export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font- export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz +export FONT_NOTOEMOJI_TARBALL := 61f45f3d6cb7f874aecbe6cdc8ba26a2-NotoEmoji-unhinted.tar.gz export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7 export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 diff --git a/external/more_fonts/ExternalPackage_NotoEmoji.mk b/external/more_fonts/ExternalPackage_NotoEmoji.mk new file mode 100644 index 000..2540ab3 --- /dev/null +++ b/external/more_fonts/ExternalPackage_NotoEmoji.mk @@ -0,0 +1,16 @@ +# -*- 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_notoemoji,font_notoemoji)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_notoemoji,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoEmoji-Regular.ttf \ +)) + +# 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 3f4a653..54bb9b9 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_ptserif \ ExternalPackage_sourcecode \ ExternalPackage_sourcesans \ + ExternalPackage_NotoEmoji \ UnpackedTarball_caladea \ UnpackedTarball_carlito \ UnpackedTarball_dejavu \ @@ -33,6 +34,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_ptserif \ UnpackedTarball_sourcecode \ UnpackedTarball_sourcesans \ + UnpackedTarball_NotoEmoji \ )) # vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_NotoEmoji.mk b/external/more_fonts/UnpackedTarball_NotoEmoji.mk new file mode 100644 index 000..0c773b6 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_NotoEmoji.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_notoemoji)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_notoemoji,$(FONT_NOTOEMOJI_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 3ff8daa..5475b8d 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -62,6 +62,9 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
[Libreoffice-commits] core.git: download.lst external/more_fonts
download.lst |2 +- external/more_fonts/ExternalPackage_sourcesans.mk | 12 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) New commits: commit e842914ae3ec6109e889cfc4d0387192a68d2907 Author: Andras Timar Date: Thu Jul 10 09:45:39 2014 +0200 fdo#81095 update our copy of Source Sans Pro Change-Id: Ifea8069b9d499cb7b23575786350446e85771eb6 diff --git a/download.lst b/download.lst index 944f751..61ef420 100644 --- a/download.lst +++ b/download.lst @@ -50,7 +50,7 @@ export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLiberti export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz -export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz +export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FREEHAND_MD5SUM := 5f029fef73e42a2c2ae4524a7513f97d export FREEHAND_TARBALL := libfreehand-0.1.0.tar.bz2 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 diff --git a/external/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk index 45f21d6..cd7ac29 100644 --- a/external/more_fonts/ExternalPackage_sourcesans.mk +++ b/external/more_fonts/ExternalPackage_sourcesans.mk @@ -10,10 +10,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - SourceSansPro-BoldItalic.ttf \ + SourceSansPro-BlackIt.ttf \ + SourceSansPro-Black.ttf \ + SourceSansPro-BoldIt.ttf \ SourceSansPro-Bold.ttf \ - SourceSansPro-Italic.ttf \ + SourceSansPro-ExtraLightIt.ttf \ + SourceSansPro-ExtraLight.ttf \ + SourceSansPro-It.ttf \ + SourceSansPro-LightIt.ttf \ + SourceSansPro-Light.ttf \ SourceSansPro-Regular.ttf \ + SourceSansPro-SemiboldIt.ttf \ + SourceSansPro-Semibold.ttf \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits