Makefile.fetch | 3 ++
download.lst | 15 ++++++++++
external/more_fonts/ExternalPackage_noto.mk | 24 ----------------
external/more_fonts/ExternalPackage_noto_sans.mk | 19 ++++++++++++
external/more_fonts/ExternalPackage_noto_sans_arabic.mk | 17 +++++++++++
external/more_fonts/ExternalPackage_noto_serif.mk | 19 ++++++++++++
external/more_fonts/Module_more_fonts.mk | 6 ++++
external/more_fonts/UnpackedTarball_noto_sans.mk | 14 +++++++++
external/more_fonts/UnpackedTarball_noto_sans_arabic.mk | 14 +++++++++
external/more_fonts/UnpackedTarball_noto_serif.mk | 14 +++++++++
svgio/qa/cppunit/SvgImportTest.cxx | 24 ++++++++++++++++
svgio/qa/cppunit/data/tdf97710.svg | 8 +++++
svgio/source/svgreader/svgstyleattributes.cxx | 3 --
13 files changed, 154 insertions(+), 26 deletions(-)
New commits:
commit 9998c242c6c2ece5f240db2f6ffdf04e7ca7cbb4
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Sep 26 11:47:19 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Sep 26 21:53:36 2023 +0200
tdf#124591: Update Noto Sans Arabic to v2.010
from:
https://github.com/notofonts/arabic/releases/tag/NotoSansArabic-v2.010
Change-Id: Icb4a2932c84884180eed7f391ecd7285311299b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157270
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/Makefile.fetch b/Makefile.fetch
index 829323fa8496..efb24f1b1280 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -182,6 +182,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_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) \
diff --git a/download.lst b/download.lst
index 4aec2aed751b..1de6ee0cb02c 100644
--- a/download.lst
+++ b/download.lst
@@ -172,6 +172,11 @@ FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.012.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
+FONT_NOTO_SANS_ARABIC_SHA256SUM :=
a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2
+FONT_NOTO_SANS_ARABIC_TARBALL := NotoSansArabic-v2.010.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_CULMUS_SHA256SUM :=
c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
FONT_CULMUS_TARBALL := culmus-0.133.tar.gz
# three static lines
diff --git a/external/more_fonts/ExternalPackage_noto.mk
b/external/more_fonts/ExternalPackage_noto.mk
index 1b66ef631857..14af61b6221a 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -17,10 +17,6 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
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 \
NotoSansGeorgian-Bold.ttf \
diff --git a/external/more_fonts/ExternalPackage_noto_sans_arabic.mk
b/external/more_fonts/ExternalPackage_noto_sans_arabic.mk
new file mode 100644
index 000000000000..259167b72673
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto_sans_arabic.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_noto,font_noto_sans_arabic))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSansArabic/full/ttf/NotoSansArabic-Bold.ttf \
+ NotoSansArabic/full/ttf/NotoSansArabic-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 9114dd7ae7b5..335a2bc6c3af 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_libre_hebrew \
ExternalPackage_noto \
ExternalPackage_noto_sans \
+ ExternalPackage_noto_sans_arabic \
ExternalPackage_noto_serif \
ExternalPackage_reem \
ExternalPackage_scheherazade \
@@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_libre_hebrew \
UnpackedTarball_noto \
UnpackedTarball_noto_sans \
+ UnpackedTarball_noto_sans_arabic \
UnpackedTarball_noto_serif \
UnpackedTarball_reem \
UnpackedTarball_scheherazade \
diff --git a/external/more_fonts/UnpackedTarball_noto_sans_arabic.mk
b/external/more_fonts/UnpackedTarball_noto_sans_arabic.mk
new file mode 100644
index 000000000000..b5c4e9f9ed4b
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_noto_sans_arabic.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_noto_sans_arabic))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_noto_sans_arabic,$(FONT_NOTO_SANS_ARABIC_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
commit ee9b13668cf955d2f3ad927f26bf3e1910779047
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Sep 26 16:51:17 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Sep 26 21:53:32 2023 +0200
tdf#97710: do not create nonzero conform for polyline
Change-Id: Ib9d4e957b83ad84b79ae4ade5c6be3ab3d9d8028
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157286
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx
b/svgio/qa/cppunit/SvgImportTest.cxx
index b337418dbdec..fcd76f12bd1f 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -1450,6 +1450,30 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf101237)
assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line",
"width", "5");
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf97710)
+{
+ Primitive2DSequence aSequence =
parseSvg(u"/svgio/qa/cppunit/data/tdf97710.svg");
+ CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength()));
+
+ drawinglayer::Primitive2dXmlDump dumper;
+ xmlDocUniquePtr pDocument =
dumper.dumpAndParse(Primitive2DContainer(aSequence));
+
+ CPPUNIT_ASSERT (pDocument);
+
+ assertXPath(pDocument, "/primitive2D/transform/mask/polypolygoncolor[1]",
"color", "#000000");
+
+ // Without the fix in place, this test would have failed with
+ // - Expected: 100
+ // - Actual : 0
+ assertXPath(pDocument,
"/primitive2D/transform/mask/polypolygoncolor[1]/polypolygon", "width", "100");
+ assertXPath(pDocument,
"/primitive2D/transform/mask/polypolygoncolor[1]/polypolygon", "height", "100");
+ assertXPath(pDocument, "/primitive2D/transform/mask/polypolygoncolor[2]",
"color", "#008000");
+ assertXPath(pDocument,
"/primitive2D/transform/mask/polypolygoncolor[2]/polypolygon", "width", "100");
+ assertXPath(pDocument,
"/primitive2D/transform/mask/polypolygoncolor[2]/polypolygon", "height", "100");
+ assertXPath(pDocument,
"/primitive2D/transform/mask/polypolygonstroke/line", "color", "#000000");
+ assertXPath(pDocument,
"/primitive2D/transform/mask/polypolygonstroke/line", "width", "1");
+}
+
CPPUNIT_TEST_FIXTURE(Test, testTdf94765)
{
Primitive2DSequence aSequenceTdf94765 =
parseSvg(u"/svgio/qa/cppunit/data/tdf94765.svg");
diff --git a/svgio/qa/cppunit/data/tdf97710.svg
b/svgio/qa/cppunit/data/tdf97710.svg
new file mode 100644
index 000000000000..bbd9a91a9b8e
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf97710.svg
@@ -0,0 +1,8 @@
+<svg viewBox="0 0 200 100" xmlns="http://www.w3.org/2000/svg";>
+ <!-- Example of a polyline with the default fill -->
+ <polyline points="0,100 50,25 50,75 100,0" />
+
+ <!-- Example of the same polyline shape with stroke and no fill -->
+ <polyline points="100,100 150,25 150,75 200,0" fill="green" stroke="black" />
+</svg>
+
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx
b/svgio/source/svgreader/svgstyleattributes.cxx
index 4ed60d297e4f..869b071dade7 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1127,8 +1127,7 @@ namespace svgio::svgreader
// create fill
basegfx::B2DPolyPolygon aPath(rPath);
- if(SVGToken::Path == mrOwner.getType() || SVGToken::Polygon ==
mrOwner.getType()
- || SVGToken::Polyline == mrOwner.getType())
+ if(SVGToken::Path == mrOwner.getType() || SVGToken::Polygon ==
mrOwner.getType())
{
if(FillRule::evenodd != getClipRule() && FillRule::evenodd
!= getFillRule())
{
commit 96aba2de78ffa641f6c0c898b99158715b2f2703
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Sep 26 11:30:54 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Sep 26 21:53:30 2023 +0200
tdf#124591: Update Noto Serif to v2.012
from:
https://github.com/notofonts/latin-greek-cyrillic/releases/tag/NotoSerif-v2.012
Change-Id: I769f162c3fb7256fd6aba4e666cb91fbc3b12131
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157269
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/Makefile.fetch b/Makefile.fetch
index 5b0fc14c49ce..829323fa8496 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -181,6 +181,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_NOTO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_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) \
diff --git a/download.lst b/download.lst
index 9b702e5d5332..4aec2aed751b 100644
--- a/download.lst
+++ b/download.lst
@@ -167,6 +167,11 @@ FONT_NOTO_SANS_TARBALL := NotoSans-v2.012.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
+FONT_NOTO_SERIF_SHA256SUM :=
3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a
+FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.012.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_CULMUS_SHA256SUM :=
c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
FONT_CULMUS_TARBALL := culmus-0.133.tar.gz
# three static lines
diff --git a/external/more_fonts/ExternalPackage_noto.mk
b/external/more_fonts/ExternalPackage_noto.mk
index 20e5ff06b95a..1b66ef631857 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -32,22 +32,12 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSansLisu-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 \
NotoSerifHebrew-Regular.ttf \
- NotoSerif-Italic.ttf \
NotoSerifLao-Bold.ttf \
NotoSerifLao-Regular.ttf \
- NotoSerif-Light.ttf \
- NotoSerif-LightItalic.ttf \
- NotoSerif-Regular.ttf \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/ExternalPackage_noto_serif.mk
b/external/more_fonts/ExternalPackage_noto_serif.mk
new file mode 100644
index 000000000000..4aca936d87dd
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto_serif.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_noto,font_noto_serif))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSerif/hinted/ttf/NotoSerif-Bold.ttf \
+ NotoSerif/hinted/ttf/NotoSerif-BoldItalic.ttf \
+ NotoSerif/hinted/ttf/NotoSerif-Italic.ttf \
+ NotoSerif/hinted/ttf/NotoSerif-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 0e0349976eb1..9114dd7ae7b5 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_libre_hebrew \
ExternalPackage_noto \
ExternalPackage_noto_sans \
+ ExternalPackage_noto_serif \
ExternalPackage_reem \
ExternalPackage_scheherazade \
UnpackedTarball_alef \
@@ -38,6 +39,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_libre_hebrew \
UnpackedTarball_noto \
UnpackedTarball_noto_sans \
+ UnpackedTarball_noto_serif \
UnpackedTarball_reem \
UnpackedTarball_scheherazade \
))
diff --git a/external/more_fonts/UnpackedTarball_noto_serif.mk
b/external/more_fonts/UnpackedTarball_noto_serif.mk
new file mode 100644
index 000000000000..d60fb9b5f00d
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_noto_serif.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_noto_serif))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_noto_serif,$(FONT_NOTO_SERIF_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
commit 69943f33bf219558d6b219f0eaeda1e25e487b05
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Sep 26 11:24:31 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Sep 26 21:53:24 2023 +0200
tdf#124591: Update Noto Sans to v2.012
from:
https://github.com/notofonts/latin-greek-cyrillic/releases/tag/NotoSans-v2.012
Change-Id: Icdd604614a97071c0ff703eb9fe2468137826489
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157268
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/Makefile.fetch b/Makefile.fetch
index 6640b0ade985..5b0fc14c49ce 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -180,6 +180,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_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) \
diff --git a/download.lst b/download.lst
index a046718e0151..9b702e5d5332 100644
--- a/download.lst
+++ b/download.lst
@@ -162,6 +162,11 @@ FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
+FONT_NOTO_SANS_SHA256SUM :=
efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293
+FONT_NOTO_SANS_TARBALL := NotoSans-v2.012.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_CULMUS_SHA256SUM :=
c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
FONT_CULMUS_TARBALL := culmus-0.133.tar.gz
# three static lines
diff --git a/external/more_fonts/ExternalPackage_noto.mk
b/external/more_fonts/ExternalPackage_noto.mk
index dd52ac956265..20e5ff06b95a 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -23,23 +23,13 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
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 \
NotoSansHebrew-Regular.ttf \
- 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 \
diff --git a/external/more_fonts/ExternalPackage_noto_sans.mk
b/external/more_fonts/ExternalPackage_noto_sans.mk
new file mode 100644
index 000000000000..57d13415e88e
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto_sans.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_noto,font_noto_sans))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSans/full/ttf/NotoSans-Bold.ttf \
+ NotoSans/full/ttf/NotoSans-BoldItalic.ttf \
+ NotoSans/full/ttf/NotoSans-Italic.ttf \
+ NotoSans/full/ttf/NotoSans-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 001e9bcc2d03..0e0349976eb1 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_libertineg \
ExternalPackage_libre_hebrew \
ExternalPackage_noto \
+ ExternalPackage_noto_sans \
ExternalPackage_reem \
ExternalPackage_scheherazade \
UnpackedTarball_alef \
@@ -36,6 +37,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_libertineg \
UnpackedTarball_libre_hebrew \
UnpackedTarball_noto \
+ UnpackedTarball_noto_sans \
UnpackedTarball_reem \
UnpackedTarball_scheherazade \
))
diff --git a/external/more_fonts/UnpackedTarball_noto_sans.mk
b/external/more_fonts/UnpackedTarball_noto_sans.mk
new file mode 100644
index 000000000000..f09189dbe185
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_noto_sans.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_noto_sans))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_noto_sans,$(FONT_NOTO_SANS_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
