[Fontconfig] fontconfig: Branch 'master' - 2 commits

[GitLab Mirror]

 fc-match/fc-match.sgml |   26 ++++++++++++++++++++++++++
 src/meson.build        |   13 +++++++------
 2 files changed, 33 insertions(+), 6 deletions(-)

New commits:
commit 3fa85f033decbe98d9f654f622a356f73f2a8e14
Author: Akira TAGOH <akira at tagoh.org>
Date:   Sat Nov 28 09:50:09 2020 +0900

    Add examples section in fc-match(1)
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/233

diff --git a/fc-match/fc-match.sgml b/fc-match/fc-match.sgml
index c33fea9..ffc50c5 100644
--- a/fc-match/fc-match.sgml
+++ b/fc-match/fc-match.sgml
@@ -194,6 +194,32 @@ output is requested.</para>
     </variablelist>
   </refsect1>
 
+  <refsect1>
+    <title>EXAMPLES</title>
+
+    <variablelist>
+      <varlistentry>
+	<term>fc-match sans</term>
+	<listitem><para>Display the best matching font categorized into sans-serif generic family, filtered by current locale</para></listitem>
+      </varlistentry>
+    </variablelist>
+
+    <variablelist>
+      <varlistentry>
+	<term>fc-match sans:lang=en</term>
+	<listitem><para>Display the best matching font categorized into sans-serif generic family, filtered by English language</para></listitem>
+      </varlistentry>
+    </variablelist>
+
+    <variablelist>
+      <varlistentry>
+	<term>fc-match sans:lang=en:weight=bold</term>
+	<listitem><para>Display the best matching font categorized into sans-serif generic family, filtered by English language and weight is bold.</para></listitem>
+      </varlistentry>
+    </variablelist>
+
+  </refsect1>
+  
   <refsect1>
     <title>SEE ALSO</title>
 
commit 89f7bcac086e0134f01cc94ed770d67ff2f44bc5
Author: Chun-wei Fan <fanchunwei at src.gnome.org>
Date:   Tue Sep 29 14:04:30 2020 +0800

    meson: Don't use .def files for Visual Studio builds
    
    Instead, when building with Visual Studio-style compilers, define 'FcPublic' as
    appropriate so that symbols will be exported without the need to maintain a
    .def file.

diff --git a/src/meson.build b/src/meson.build
index 5af3818..f2a4861 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -57,17 +57,18 @@ fcobjshash_h = custom_target('fcobjshash.h',
   command: [gperf, '--pic', '-m', '100', '@INPUT@', '--output-file', '@OUTPUT@']
 )
 
-# write def file with exports for windows
-cdata_def = configuration_data()
-cdata_def.set('DEF_VERSION', defversion)
-fontconfig_def = configure_file(input: 'fontconfig.def.in', output: 'fontconfig.def', configuration: cdata_def)
+# Define FcPublic appropriately for exports on windows
+fc_extra_c_args = []
+
+if cc.get_argument_syntax() == 'msvc'
+  fc_extra_c_args += '-DFcPublic=__declspec(dllexport)'
+endif
 
 libfontconfig = library('fontconfig',
   fc_sources, alias_headers, ft_alias_headers, fclang_h, fccase_h, fcobjshash_h,
-  c_args: c_args,
+  c_args: c_args + fc_extra_c_args,
   include_directories: incbase,
   dependencies: deps,
-  vs_module_defs: fontconfig_def,
   install: true,
   soversion: soversion,
   version: libversion,