[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - external/more_fonts

[Andras Timar (via logerrit)]

 external/more_fonts/Module_more_fonts.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e1e29426576af9f709ec2e1753c280a32c3a49bc
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: Tue Mar 26 23:14:58 2019 +0100

    Do not include KACST fonts (GPLv2) into MPL subset
    
    Change-Id: I0ed447dcbafb605f81c6b8c34fa2a1e5ec4bd9b8

diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk
index 57bf4548783a..d708414f494e 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_karla \
 	ExternalPackage_liberation \
 	ExternalPackage_liberation_narrow \
@@ -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_karla \
 	UnpackedTarball_liberation \
 	UnpackedTarball_liberation_narrow \