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 <kha...@aliftype.com>
AuthorDate: Mon Dec 5 01:01:10 2022 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Dec 5 08:26:29 2022 +0000
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 <fit...@ubuntu.com>
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 909ed11110b3..000000000000
--- 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_fonts/UnpackedTarball_kacst.mk
deleted file mode 100644
index 7972da8d3e8f..000000000000
--- a/external/more_fonts/UnpackedTarball_kacst.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_kacst))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,font_kacst,$(FONT_KACST_TARBALL)))
-
-# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index f5d933ceb9f1..56c4b65411da 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -2516,12 +2516,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>
- <div class="no_mpl_subset">
- <h2>KACST</h2>
- <p>KACST fonts are free fonts donated by King Abdulaziz City For
Science And Technology (KACST) under GPL.</p>
- <p>KACST holds the copyright of the included Arabic font which is
donated under GPL by KACST.</p>
- <p><a href="#a__GPL_version_2">Jump to GPL Version 2</a></p>
- </div>
<h2>Liberation</h2>
<p>The following software may be included in this product: Liberation
fonts. Use of any of this software is
governed by the terms of the license below:</p>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 8b2426ecebca..60f6bf8c87cc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -494,13 +494,6 @@
"dest": "external/tarballs",
"dest-filename": "@FONT_SCHEHERAZADE_TARBALL@"
},
- {
- "url":
"https://dev-www.libreoffice.org/src/@FONT_KACST_TARBALL@";,
- "sha256": "@FONT_KACST_SHA256SUM@",
- "type": "file",
- "dest": "external/tarballs",
- "dest-filename": "@FONT_KACST_TARBALL@"
- },
{
"url": "https://dev-www.libreoffice.org/src/@BSH_TARBALL@";,
"sha256": "@BSH_SHA256SUM@",
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 1e82a70e9546..daf70a1c589d 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -183,7 +183,7 @@ void VclComplexTextTest::testCaching()
// Just something basic, no font fallback.
testCachedGlyphs( "test", "Dejavu Sans" );
// This font does not have latin characters, will need fallback.
- testCachedGlyphs( "test", "KacstBook" );
+ testCachedGlyphs( "test", "Noto Kufi Arabic" );
}
static void testCachedGlyphsSubstring( const OUString& aText, const OUString&
aFontName, bool rtl )
diff --git a/vcl/qa/cppunit/text.cxx b/vcl/qa/cppunit/text.cxx
index ee7ab8cd5859..69365f98a00e 100644
--- a/vcl/qa/cppunit/text.cxx
+++ b/vcl/qa/cppunit/text.cxx
@@ -552,7 +552,7 @@ void VclTextTest::testImplLayoutArgsRightAlign()
void VclTextTest::testImplLayoutArgs_PrepareFallback_precalculatedglyphs()
{
// this font has no Cyrillic characters and thus needs fallback
- const vcl::Font aFont("KacstBook", Size(0, 36));
+ const vcl::Font aFont("Amiri", Size(0, 36));
ScopedVclPtrInstance<VirtualDevice> pVirDev;
pVirDev->SetFont(aFont);
