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

[GitLab Mirror]

 .gitlab-ci.yml  |    5 ++++-
 doc/Makefile.am |    3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit b03140c14ed71a8b29ae6d5f76f254a2adfc4f22
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Mar 26 14:53:41 2021 +0900

    ci: Update CA cert related thing for Python on Windows

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1a4062..1017fa6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,7 +157,7 @@ meson-mingw-w64-build:
     #   -Dbar=disabled
   before_script:
     # Make sure meson is up to date, so we don't need to rebuild the image with each release
-    - pip3 install -U meson
+    - pip3 install -U meson certifi
   script:
     # For some reason, options are separated by newline instead of space, so we
     # have to replace them first.
@@ -166,6 +166,9 @@ meson-mingw-w64-build:
     # Environment variables substitutions is done by PowerShell before calling
     # cmd.exe, that's why we use $env:FOO instead of %FOO%
     - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
+        SET CERT_PATH=$(python -m certifi) &&
+        SET SSL_CERT_FILE=$(python -m certifi) &&
+        SET REQUESTS_CA_BUNDLE=$(python -m certifi) &&
         meson build $env:MESON_ARGS &&
         ninja -C build &&
         ninja -C build test"
commit 60ce9b695ee9d1ac514a61f562e210d3278ba605
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Mar 25 21:26:12 2021 +0900

    Fix build fail when missing docbook and/or disabling doc-build
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/272

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 401c1b3..a66420c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -218,6 +218,9 @@ dist-local-check-docs-enabled:
 	@true
 else
 htmldoc_DATA += $(srcdir)/$(HTML_DIR)/*
+.fncs.sgml:
+	$(AM_V_GEN) $(RM) $@; \
+	touch -r $< $@
 all-local:
 clean-local:
 dist-local-check-docs-enabled: