Summary: | fonts.conf.in update for Windows cross-compiling | ||
---|---|---|---|
Product: | fontconfig | Reporter: | Jehan <jehan> |
Component: | conf | Assignee: | Akira TAGOH <akira> |
Status: | RESOLVED FIXED | QA Contact: | Behdad Esfahbod <freedesktop> |
Severity: | normal | ||
Priority: | medium | CC: | akira, drawoc, fontconfig-bugs |
Version: | unspecified | ||
Hardware: | Other | ||
OS: | Windows (All) | ||
Whiteboard: | |||
i915 platform: | i915 features: | ||
Attachments: | Do not ignore missing default conf.d/ |
Description
Jehan
2013-09-26 07:12:08 UTC
Guess does this work? diff --git a/Makefile.am b/Makefile.am index d310b4b..2b949e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,12 +90,14 @@ $(srcdir)/ChangeLog: .PHONY: ChangeLog +FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR)) + fonts.conf: fonts.conf.in Makefile sed \ -e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \ -e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \ -e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \ - -e 's,@CONFIGDIR\@,$(CONFIGDIR),g' \ + -e 's,@CONFIGDIR\@,$(FC_CONFIGDIR),g' \ -e 's,@PACKAGE\@,$(PACKAGE),g' \ -e 's,@VERSION\@,$(VERSION),g' \ $(srcdir)/$@.in > $@.tmp && \ Created attachment 86781 [details] [review] Do not ignore missing default conf.d/ Hi Akira, yes I just tested on master, your change looks good. Could I suggest an additional patch to this change? See the included patch. Basically I propose to just replace ignore_missing="yes" on the include by ignore_missing="no". For user-set include, one is free to ignore missing configuration (or to update the default ones). But for the default configuration, I think most users expects them to work out of the box. Consequently we should warn the user if for some reason the default conf.d/ was broken. I hope that makes sense. :-) So I'd propose this patch + your proposed Makefile.am patch would improve default configuration. Thanks! Well, I don't have strong opinion on that but I suppose reading configurations from conf.d is totally optional. that's why it has ignore_missing="yes" there. Please file a separate bug for that and/or ask for that on the list. Anyway, I've committed that fix into master and closing this. Thanks for testing. |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.