[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 f69ae64c7ed3cf21eb48ccb43d4bedcaf77fa984
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Mar 26 15:07:50 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Mar 26 16:55:41 2019 +0100

    Do not include Culmus fonts (GPLv2) into MPL subset
    
    Change-Id: I8de0e8e91d785d51b65ce884caddcc05d86bd47d
    Reviewed-on: https://gerrit.libreoffice.org/69756
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk
index 023e21361d39..57bf4548783a 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
 	ExternalPackage_amiri \
 	ExternalPackage_caladea \
 	ExternalPackage_carlito \
-	ExternalPackage_culmus \
+	$(if $(MPL_SUBSET),,ExternalPackage_culmus) \
 	ExternalPackage_dejavu \
 	ExternalPackage_gentium \
 	ExternalPackage_kacst \
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
 	UnpackedTarball_amiri \
 	UnpackedTarball_caladea \
 	UnpackedTarball_carlito \
-	UnpackedTarball_culmus \
+	$(if $(MPL_SUBSET),,UnpackedTarball_culmus) \
 	UnpackedTarball_dejavu \
 	UnpackedTarball_gentium \
 	UnpackedTarball_kacst \