You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/10/17 12:37:32 UTC
[openoffice] branch AOO418 updated: Fix build when configured with
--without-fonts (#105)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO418 by this push:
new 7bc7a6c Fix build when configured with --without-fonts (#105)
7bc7a6c is described below
commit 7bc7a6c42cde2f1b14a1451e097a7b6a6ac85de0
Author: DonLewisFreeBSD <tr...@FreeBSD.org>
AuthorDate: Sat Oct 17 05:37:23 2020 -0700
Fix build when configured with --without-fonts (#105)
Packaging breaks when the --without-fonts option is passed to
configure because the fc_local.conf.
This seems to have been caused by a mismerge when cherry picking
commits from AOO42X.
Co-authored-by: Don Lewis <tr...@apache.org>
---
main/scp2/source/ooo/file_font_ooo.scp | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/main/scp2/source/ooo/file_font_ooo.scp b/main/scp2/source/ooo/file_font_ooo.scp
index 87a819b..7024d66 100644
--- a/main/scp2/source/ooo/file_font_ooo.scp
+++ b/main/scp2/source/ooo/file_font_ooo.scp
@@ -94,6 +94,17 @@ STD_FONT_FILE( gid_File_Fnt_Caladea_Bold, Caladea-Bold.ttf, Caladea Bold)
STD_FONT_FILE( gid_File_Fnt_Caladea_Italic, Caladea-Italic.ttf, Caladea Italic)
STD_FONT_FILE( gid_File_Fnt_Caladea_BoldItalic, Caladea-BoldItalic.ttf, Caladea Bold Italic)
+// fontconfig updates to allow proper use of local fonts
+
+#ifdef UNX
+File gid_File_FcLocal_Conf
+ Dir = gid_Dir_Fonts_Truetype;
+ USER_FILE_BODY;
+// Styles = ();
+ Name = "fc_local.conf";
+End
+#endif
+
#endif // WITH_CATA_FONTS
@@ -121,13 +132,3 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium
#endif // WITH_CATB_FONTS
-// fontconfig updates to allow proper use of local fonts
-
-#ifdef UNX
-File gid_File_FcLocal_Conf
- Dir = gid_Dir_Fonts_Truetype;
- USER_FILE_BODY;
-// Styles = ();
- Name = "fc_local.conf";
-End
-#endif