[Libreoffice-commits] core.git: Repository.mk

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Thu Apr 4 06:16:48 UTC 2019


 Repository.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit db02265eee005ab3c13be052c0cf9901a95c9b58
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Apr 3 20:47:25 2019 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Apr 4 08:16:25 2019 +0200

    Fix MPLv2 subset packaging
    
    Change-Id: I08dc751589375102b5772e61bbe267f8c26c2fd2
    Reviewed-on: https://gerrit.libreoffice.org/70222
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/Repository.mk b/Repository.mk
index 20ba9b0697c1..a2967791e9bb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -977,11 +977,11 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
 		fonts_amiri \
 		fonts_caladea \
 		fonts_carlito \
-		fonts_culmus \
+		$(if $(MPL_SUBSET),,fonts_culmus) \
 		fonts_dejavu \
 		fonts_emojione_color \
 		fonts_gentium \
-		fonts_kacst \
+		$(if $(MPL_SUBSET),,fonts_kacst) \
 		fonts_liberation \
 		fonts_liberation_narrow \
 		fonts_libertineg \


More information about the Libreoffice-commits mailing list