diff --git a/Makefile.fetch b/Makefile.fetch index c994acdf707d..caed43c085d5 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -182,7 +182,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_CALADEA_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CARLITO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_DEJAVU_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_GENTIUM_TARBALL) \ $(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) \ diff --git a/Repository.mk b/Repository.mk index fad3c37955e6..c04045e51a75 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1057,7 +1057,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_carlito \ $(if $(MPL_SUBSET),,fonts_culmus) \ fonts_dejavu \ - fonts_gentium \ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ diff --git a/download.lst b/download.lst index 857dff1c4b81..043703f6d4c0 100644 --- a/download.lst +++ b/download.lst @@ -145,11 +145,6 @@ FONT_DEJAVU_TARBALL := 33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zi # three static lines # so that git cherry-pick # will not run into conflicts -FONT_GENTIUM_SHA256SUM := 2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc -FONT_GENTIUM_TARBALL := 1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip -# three static lines -# so that git cherry-pick -# will not run into conflicts FONT_LIBERATION_NARROW_SHA256SUM := 8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3 FONT_LIBERATION_NARROW_TARBALL := liberation-narrow-fonts-ttf-1.07.6.tar.gz FONT_LIBERATION_SHA256SUM := 7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0 diff --git a/external/more_fonts/ExternalPackage_gentium.mk b/external/more_fonts/ExternalPackage_gentium.mk deleted file mode 100644 index aa846271deae..000000000000 --- a/external/more_fonts/ExternalPackage_gentium.mk +++ /dev/null @@ -1,23 +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_gentium,font_gentium)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - GenBasB.ttf \ - GenBasBI.ttf \ - GenBasI.ttf \ - GenBasR.ttf \ - GenBkBasB.ttf \ - GenBkBasBI.ttf \ - GenBkBasI.ttf \ - GenBkBasR.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 cb9cd075d728..bcb97d11ca33 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -16,7 +16,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_carlito \ $(if $(MPL_SUBSET),,ExternalPackage_culmus) \ ExternalPackage_dejavu \ - ExternalPackage_gentium \ ExternalPackage_liberation \ ExternalPackage_liberation_narrow \ ExternalPackage_libertineg \ @@ -50,7 +49,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_carlito \ $(if $(MPL_SUBSET),,UnpackedTarball_culmus) \ UnpackedTarball_dejavu \ - UnpackedTarball_gentium \ UnpackedTarball_liberation \ UnpackedTarball_liberation_narrow \ UnpackedTarball_libertineg \ diff --git a/external/more_fonts/UnpackedTarball_gentium.mk b/external/more_fonts/UnpackedTarball_gentium.mk deleted file mode 100644 index 0827c0e23bfb..000000000000 --- a/external/more_fonts/UnpackedTarball_gentium.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_gentium)) - -$(eval $(call gb_UnpackedTarball_set_tarball,font_gentium,$(FONT_GENTIUM_TARBALL))) - -# vim: set noet sw=4 ts=4: diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index e68b0c54bf0f..a1fad048ff51 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -800,28 +800,28 @@ - Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Tahoma;SansSerif + Arial Unicode MS;Lucida Sans Unicode;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Tahoma;SansSerif - Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Tahoma;SansSerif + Arial Unicode MS;Lucida Sans Unicode;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Tahoma;SansSerif FreeMono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Tahoma;SansSerif + Arial Unicode MS;Lucida Sans Unicode;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Tahoma;SansSerif - Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Tahoma;SansSerif + Arial Unicode MS;Lucida Sans Unicode;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Tahoma;SansSerif - Gentium;Aboriginal Serif;FreeSerif;Luxi Serif;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Serif + Aboriginal Serif;FreeSerif;Luxi Serif;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Serif - Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Tahoma;SansSerif + Arial Unicode MS;Lucida Sans Unicode;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Tahoma;SansSerif - Gentium;Aboriginal Serif;FreeSerif;Luxi Serif;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Serif + Aboriginal Serif;FreeSerif;Luxi Serif;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Serif FreeMono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -830,7 +830,7 @@ FreeMono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Tahoma;SansSerif + Arial Unicode MS;Lucida Sans Unicode;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Tahoma;SansSerif diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index dba51bc0f213..c8c61d1a2465 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -2649,14 +2649,6 @@

Except as contained in this notice, the name of Tavmjong Bah shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from Tavmjong Bah. For further information, contact: tavmjong @ free . fr.

-

Gentium

-

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

-

Copyright (c) 2003-2008 SIL International (http://www.sil.org/), with - Reserved Font Names "Gentium" and "SIL".

-

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

Liberation

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:

diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm index a4184ff112fa..f57838441a2d 100644 --- a/solenv/bin/modules/installer/windows/file.pm +++ b/solenv/bin/modules/installer/windows/file.pm @@ -302,7 +302,6 @@ sub get_file_component_name # $componentname =~ s/_basicidecommands_/_baic_/g; # $componentname =~ s/_genericcommands_/_genc_/g; # $componentname =~ s/_bibliographycommands_/_bibc_/g; - # $componentname =~ s/_gentiumbookbasicbolditalic_/_gbbbi_/g; # $componentname =~ s/_share_/_s_/g; # $componentname =~ s/_extension_/_ext_/g; # $componentname =~ s/_extensions_/_exs_/g; diff --git a/solenv/flatpak-external-tarballs.json.in b/solenv/flatpak-external-tarballs.json.in index d7ce9ebd4285..f05b577f5be2 100644 --- a/solenv/flatpak-external-tarballs.json.in +++ b/solenv/flatpak-external-tarballs.json.in @@ -48,13 +48,6 @@ "dest": "external/tarballs", "dest-filename": "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip" }, - { - "url": "https://dev-www.libreoffice.org/src/@FONT_GENTIUM_TARBALL@", - "sha256": "@FONT_GENTIUM_SHA256SUM@", - "type": "file", - "dest": "external/tarballs", - "dest-filename": "@FONT_GENTIUM_TARBALL@" - }, { "url": "https://dev-www.libreoffice.org/src/@FONT_LIBERATION_NARROW_TARBALL@", "sha256": "@FONT_LIBERATION_NARROW_SHA256SUM@", diff --git a/vcl/qa/cppunit/pdfexport/data/tdf66597-3.odt b/vcl/qa/cppunit/pdfexport/data/tdf66597-3.odt index 6db91fe81bd0..154e26168f7a 100644 Binary files a/vcl/qa/cppunit/pdfexport/data/tdf66597-3.odt and b/vcl/qa/cppunit/pdfexport/data/tdf66597-3.odt differ diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 786b65d80813..8a5c73c6f7c4 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -1947,10 +1947,8 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf66597_2) } /// Test writing ActualText for LTR many to one glyph to Unicode mapping. -// This requires Gentium Basic font, if it is missing the test will fail. CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf66597_3) { -#if HAVE_MORE_FONTS vcl::filter::PDFDocument aDocument; loadFromFile(u"tdf66597-3.odt"); save(TestFilter::PDF_WRITER); @@ -1973,7 +1971,8 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf66597_3) auto pName = dynamic_cast(pObject->Lookup("BaseFont"_ostr)); auto aName = pName->GetValue().copy(7); // skip the subset id - CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected font name", "GentiumBasic"_ostr, aName); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected font name", "NotoSans-Regular"_ostr, + aName); auto pToUnicodeRef = dynamic_cast( pObject->Lookup("ToUnicode"_ostr)); @@ -2036,7 +2035,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf66597_3) CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of ActualText entries does not match!", static_cast(4), nCount); } -#endif } CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105954)