tdf#103080 Dont package Open Sans and PT_Serif fonts

Change-Id: Iac1d572f19372465e9cc369454480d9b621bcd66
Reviewed-on: https://gerrit.libreoffice.org/45169Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>

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) \

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 \
 	) \

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.0000W.tar.gz
 export FONT_SOURCECODE_SHA256SUM := 09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f
 export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
 export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61

external/more_fonts/ExternalPackage_opensans.mk

-# -*- 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:

external/more_fonts/ExternalPackage_ptserif.mk

-# -*- 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_ptserif,font_ptserif))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
-	PT_Serif-Web-BoldItalic.ttf \
-	PT_Serif-Web-Bold.ttf \
-	PT_Serif-Web-Italic.ttf \
-	PT_Serif-Web-Regular.ttf \
-))
-
-# vim: set noet sw=4 ts=4:

external/more_fonts/Module_more_fonts.mk

@@ -17,8 +17,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
 	ExternalPackage_liberation \
 	ExternalPackage_liberation_narrow \
 	ExternalPackage_libertineg \
-	ExternalPackage_opensans \
-	ExternalPackage_ptserif \
 	ExternalPackage_sourcecode \
 	ExternalPackage_sourcesans \
 	ExternalPackage_noto \
@@ -30,8 +28,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
 	UnpackedTarball_liberation \
 	UnpackedTarball_liberation_narrow \
 	UnpackedTarball_libertineg \
-	UnpackedTarball_opensans \
-	UnpackedTarball_ptserif \
 	UnpackedTarball_sourcecode \
 	UnpackedTarball_sourcesans \
 	UnpackedTarball_noto \

external/more_fonts/UnpackedTarball_opensans.mk

-# -*- 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_opensans))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,font_opensans,$(FONT_OPENSANS_TARBALL)))
-
-# vim: set noet sw=4 ts=4:

external/more_fonts/UnpackedTarball_ptserif.mk

-# -*- 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_ptserif))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,font_ptserif,$(FONT_PTSERIF_TARBALL)))
-
-# vim: set noet sw=4 ts=4: