[Libreoffice-commits] core.git: external/more_fonts
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Wed Mar 27 07:38:30 UTC 2019
external/more_fonts/Module_more_fonts.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 168686ebb24bffd03f6a56e70510df7d0711f427
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Mar 26 23:02:31 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 27 08:38:03 2019 +0100
Do not include KACST fonts (GPLv2) into MPL subset
Change-Id: I0ed447dcbafb605f81c6b8c34fa2a1e5ec4bd9b8
Reviewed-on: https://gerrit.libreoffice.org/69777
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk
index c514b0d3d249..c6e56c5b90b7 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
$(if $(MPL_SUBSET),,ExternalPackage_culmus) \
ExternalPackage_dejavu \
ExternalPackage_gentium \
- ExternalPackage_kacst \
+ $(if $(MPL_SUBSET),,ExternalPackage_kacst) \
ExternalPackage_liberation \
ExternalPackage_liberation_narrow \
ExternalPackage_libertineg \
@@ -36,7 +36,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
$(if $(MPL_SUBSET),,UnpackedTarball_culmus) \
UnpackedTarball_dejavu \
UnpackedTarball_gentium \
- UnpackedTarball_kacst \
+ $(if $(MPL_SUBSET),,UnpackedTarball_kacst) \
UnpackedTarball_liberation \
UnpackedTarball_liberation_narrow \
UnpackedTarball_libertineg \
More information about the Libreoffice-commits
mailing list