ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#171533: drop obsolete bundled Scheherazade font

Browse Source 
I had to replace "scheherazade" with "Noto Naskh Arabic", which
is a similar font, in vcl/source/font/PhysicalFontCollection.cxx
in order to avoid the following assert in gerrit_linux_clang_dbgutil
(not reproduced locally):

[_RUN_____] testBtlrCellChinese::TestBody
WPSDocument::isFileFormatSupported()
warn:sal.file:2772196:2772196:sal/osl/unx/file_misc.cxx:397: Invalid directory URL
warn:basic:2772196:2772196:basic/source/uno/namecont.cxx:949: Cannot access extensions!
warn:sal.file:2772196:2772196:sal/osl/unx/file_misc.cxx:397: Invalid directory URL
warn:basic:2772196:2772196:basic/source/uno/namecont.cxx:949: Cannot access extensions!
cppunittester: /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/vcl/source/gdi/impglyphitem.cxx:318: void checkGlyphsEqual(const SalLayoutGlyphs &, const SalLayoutGlyphs &): Assertion `l1 == l2' failed.

Change-Id: I26cd80cee639cf0e17d7e71c3abdc49bf984de9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202933
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2026-09-18 14:05:39 +02:00
parent 388360bb07
commit ef1c7a1cb5
9 changed files with 1 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.fetch
-1
View File
@@ -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) \
Repository.mk
-1
View File
@@ -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 \
) \
))
download.lst
-5
View File
@@ -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
external/more_fonts/ExternalPackage_scheherazade.mk
Vendored
-17
View File
@@ -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:
external/more_fonts/Module_more_fonts.mk
Vendored
-2
View File
@@ -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:
external/more_fonts/UnpackedTarball_scheherazade.mk
Vendored
-14
View File
@@ -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:
readlicense_oo/license/license.xml
-8
View File
@@ -2839,14 +2839,6 @@
<p>This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below,
and is also available with a FAQ at: <a href="http://scripts.sil.org/OFL">http://scripts.sil.org/OFL</a></p>
<p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p>
<h2>Scheherazade</h2>
<p>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:</p>
<p>Copyright (c) 1994-2015, SIL International (http://www.sil.org/).</p>
<p>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:
<a href="http://scripts.sil.org/OFL">http://scripts.sil.org/OFL</a></p>
<p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p>
</div>
<div class="DICTIONARIES">
<hr />
solenv/flatpak-external-tarballs.json.in
-7
View File
@@ -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@",
vcl/source/font/PhysicalFontCollection.cxx
+1 -1
View File
@@ -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", "",