diff --git a/Makefile.fetch b/Makefile.fetch index 04d38de2172c..370e8bbb8dba 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -206,7 +206,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \ $(call fetch_Optional,MESON,MESON_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index f9002d087c2a..d7b5fa525e0b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1080,7 +1080,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_noto_serif_hebrew \ fonts_noto_serif_lao \ fonts_reem \ - fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index d6e1b2f82bfc..c166c62e0d52 100644 --- a/download.lst +++ b/download.lst @@ -257,11 +257,6 @@ FONT_REEM_TARBALL := ReemKufi-2.0.zip # three static lines # so that git cherry-pick # will not run into conflicts -FONT_SCHEHERAZADE_SHA256SUM := 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5 -FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip -# three static lines -# so that git cherry-pick -# will not run into conflicts FREEHAND_SHA256SUM := 350b10d24a76d7e8c8ae98b74c2d432a2c8ddec08935d09856d20b695a35e600 FREEHAND_TARBALL := libfreehand-0.1.4.tar.xz # three static lines diff --git a/external/more_fonts/ExternalPackage_scheherazade.mk b/external/more_fonts/ExternalPackage_scheherazade.mk deleted file mode 100644 index 8bf269e8910e..000000000000 --- a/external/more_fonts/ExternalPackage_scheherazade.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_scheherazade,font_scheherazade)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_scheherazade,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - Scheherazade-Bold.ttf \ - Scheherazade-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 01d56fb12cb3..f1a8d63be649 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_noto_serif_hebrew \ ExternalPackage_noto_serif_lao \ ExternalPackage_reem \ - ExternalPackage_scheherazade \ UnpackedTarball_alef \ UnpackedTarball_amiri \ UnpackedTarball_caladea \ @@ -61,7 +60,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_noto_serif_hebrew \ UnpackedTarball_noto_serif_lao \ UnpackedTarball_reem \ - UnpackedTarball_scheherazade \ )) # vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_scheherazade.mk b/external/more_fonts/UnpackedTarball_scheherazade.mk deleted file mode 100644 index b5b6f368f402..000000000000 --- a/external/more_fonts/UnpackedTarball_scheherazade.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_scheherazade)) - -$(eval $(call gb_UnpackedTarball_set_tarball,font_scheherazade,$(FONT_SCHEHERAZADE_TARBALL))) - -# vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 405d8a213c35..2cc802746941 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -2839,14 +2839,6 @@

This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL

Jump to SIL Open Font License, Version 1.1

-

Scheherazade

-

The following software may be included in this product: Scheherazade fonts. Use of any of this software is - governed by the terms of the license below:

-

Copyright (c) 1994-2015, SIL International (http://www.sil.org/).

-

This Font Software is licensed under the SIL Open Font License, Version 1.1, with Reserved Font Names - "Scheherazade" and "SIL". This license is copied below, and is also available with a FAQ at: - http://scripts.sil.org/OFL

-

Jump to SIL Open Font License, Version 1.1


diff --git a/solenv/flatpak-external-tarballs.json.in b/solenv/flatpak-external-tarballs.json.in index 6c3e938ddb36..efd6226dc0e3 100644 --- a/solenv/flatpak-external-tarballs.json.in +++ b/solenv/flatpak-external-tarballs.json.in @@ -496,13 +496,6 @@ "dest": "external/tarballs", "dest-filename": "@FONT_LIBRE_HEBREW_TARBALL@" }, - { - "url": "https://dev-www.libreoffice.org/src/@FONT_SCHEHERAZADE_TARBALL@", - "sha256": "@FONT_SCHEHERAZADE_SHA256SUM@", - "type": "file", - "dest": "external/tarballs", - "dest-filename": "@FONT_SCHEHERAZADE_TARBALL@" - }, { "url": "https://dev-www.libreoffice.org/src/@BSH_TARBALL@", "sha256": "@BSH_SHA256SUM@", diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index b3ebaf03a1ad..abd4a3002c4a 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -123,8 +123,8 @@ void PhysicalFontCollection::ImplInitGenericGlyphFallback() const "shree", "mangal", "", "raavi", "shruti", "tunga", "", "latha", "gautami", "kartika", "vrinda", "", - "shayyalmt", "naskmt", "scheherazade", "", "david", "nachlieli", "lucidagrande", "", + "shayyalmt", "naskmt", "Noto Naskh Arabic", "", "norasi", "angsanaupc", "", "khmerossystem", "", "muktinarrow", "",