Return-Path: X-Original-To: apmail-openoffice-commits-archive@www.apache.org Delivered-To: apmail-openoffice-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9A98318AC8 for ; Sat, 2 Jan 2016 15:16:25 +0000 (UTC) Received: (qmail 46613 invoked by uid 500); 2 Jan 2016 15:16:25 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 46563 invoked by uid 500); 2 Jan 2016 15:16:25 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 46552 invoked by uid 99); 2 Jan 2016 15:16:25 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Jan 2016 15:16:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 0D02E1804B4 for ; Sat, 2 Jan 2016 15:16:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 7QSEZqEJ9RZZ for ; Sat, 2 Jan 2016 15:16:24 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id 3EFE4204D1 for ; Sat, 2 Jan 2016 15:16:24 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id AA1A4E0428 for ; Sat, 2 Jan 2016 15:16:23 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6D4303A070B for ; Sat, 2 Jan 2016 15:16:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1722634 - /openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp Date: Sat, 02 Jan 2016 15:16:23 -0000 To: commits@openoffice.apache.org From: pfg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160102151623.6D4303A070B@svn01-us-west.apache.org> Author: pfg Date: Sat Jan 2 15:16:22 2016 New Revision: 1722634 URL: http://svn.apache.org/viewvc?rev=1722634&view=rev Log: Rearrange the fonts installation. Disabling the fonts was causing issues with fc_local.conf Modified: openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp Modified: openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp?rev=1722634&r1=1722633&r2=1722634&view=diff ============================================================================== --- openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp (original) +++ openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp Sat Jan 2 15:16:22 2016 @@ -62,9 +62,11 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifC STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold) STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuSerifCondensed-Italic.ttf, DejaVu Serif Condensed Italic) STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic) +#endif // WITH_CATA_FONTS // Google ChromeOS fonts +#ifdef WITH_CATA_FONTS #ifndef WNT @@ -94,6 +96,17 @@ STD_FONT_FILE( gid_File_Fnt_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 +134,3 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookB #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