Rebased ref, commits from common ancestor:
commit 74181e6b89e16eeaec9f48024775c10835c36f1b
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Apr 3 20:47:25 2019 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 3 23:00:46 2019 +0200
Fix MPLv2 subset packaging
Change-Id: I08dc751589375102b5772e61bbe267f8c26c2fd2
Reviewed-on: https://gerrit.libreoffice.org/70221
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/Repository.mk b/Repository.mk
index 1cdbb6cb3ea2..ca4b1031131c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -966,11 +966,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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
