paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 19:29:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enable fcl-pdf for BSD and solaris OSes

Browse Source
This commit is contained in:
Pierre Muller 2023-10-30 15:57:36 +01:00
parent 98c11c2365
commit e657d6a07d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/fcl-pdf/fpmake.pp
View File

@ -34,7 +34,7 @@ begin
P.Dependencies.Add('fcl-xml');
P.Dependencies.Add('paszlib');
P.Dependencies.add('winunits-base',AllWindowsOSes-[wince]);
P.Dependencies.add('libfontconfig',[linux] + AllBSDOses);
P.Dependencies.add('libfontconfig',[linux, solaris] + AllBSDOses);
P.Version:='3.3.1';
T:=P.Targets.AddUnit('src/fpttfencodings.pp');
T:=P.Targets.AddUnit('src/fpparsettf.pp');

8
packages/fcl-pdf/src/fpttf.pp
View File

@ -179,7 +179,7 @@ uses
,WinApi.Activex
,System.Registry
{$endif}
{$if (defined(LINUX) or defined(BSD)) and not defined(DARWIN)}
{$if (defined(LINUX) or defined(SOLARIS) or defined(BSD)) and not defined(DARWIN)}
, Api.Libfontconfig
, UnixApi.types
{$endif}
@ -193,7 +193,7 @@ uses
,Windows, // for SHGetFolderPath API call used by gTTFontCache.ReadStandardFonts() method
Shlobj, activex, registry
{$endif}
{$if (defined(LINUX) or defined(BSD)) and not defined(DARWIN)}
{$if (defined(LINUX) or defined(SOLARIS) or defined(BSD)) and not defined(DARWIN)}
, libfontconfig, unixtype
{$ifend}
;
@ -630,7 +630,7 @@ procedure TFPFontCacheList.ReadStandardFonts;
cFontsConf = '/usr/local/etc/fonts/fonts.conf';
{$endif}
{ Use same default for Linux and other BSD non-Darwin systems. }
{$if (defined(linux) or (defined(bsd) and not(defined(darwin)) and not defined(HasFontsConf)))}
{$if (defined(linux) or defined(solaris) or (defined(bsd) and not(defined(darwin)) and not defined(HasFontsConf)))}
{$define HasFontsConf}
const
cFontsConf = '/etc/fonts/fonts.conf';
@ -876,7 +876,7 @@ begin
end;
end;
{$if (defined(LINUX) or defined(BSD)) and not defined(DARWIN)}
{$if (defined(LINUX) or defined(SOLARIS) or defined(BSD)) and not defined(DARWIN)}
//https://stackoverflow.com/questions/10542832/how-to-use-fontconfig-to-get-font-list-c-c
class function TFontMapper.find(const family, style: string; list: TStrings): boolean;