[PATCH 0/1] fontconfig: update to 2.12.6

public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed

* [PATCH 0/1] fontconfig: update to 2.12.6
@ 2017-11-19  9:16 Marcel Lorenz
  2017-11-19  9:16 ` [PATCH 1/1] " Marcel Lorenz
  0 siblings, 1 reply; 2+ messages in thread
From: Marcel Lorenz @ 2017-11-19  9:16 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 360 bytes --]

This patch updates fontconfig to 2.12.6 and add a local.conf file
to reactivate the font auto hinter used for font drawing on the
rrdtool graphs.

This is necessary after freetype 2.7 update. The text are now
correct aligned on the pixel grid.

This is based on:
https://wiki.archlinux.org/index.php/Font_configuration/Examples

Greetings,
Marcel

-- 
2.14.2

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH 1/1] fontconfig: update to 2.12.6
  2017-11-19  9:16 [PATCH 0/1] fontconfig: update to 2.12.6 Marcel Lorenz
@ 2017-11-19  9:16 ` Marcel Lorenz
  0 siblings, 0 replies; 2+ messages in thread
From: Marcel Lorenz @ 2017-11-19  9:16 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 28021 bytes --]

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
 config/fontconfig/51-local.conf    |  16 ++
 config/rootfiles/common/fontconfig | 425 +------------------------------------
 lfs/fontconfig                     |  31 ++-
 3 files changed, 44 insertions(+), 428 deletions(-)
 create mode 100644 config/fontconfig/51-local.conf

diff --git a/config/fontconfig/51-local.conf b/config/fontconfig/51-local.conf
new file mode 100644
index 000000000..eeb46bd03
--- /dev/null
+++ b/config/fontconfig/51-local.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+	IPFire fontconfig local.conf file to reactivate font auto hinter for rrdtool graphs
+	https://wiki.archlinux.org/index.php/Font_configuration/Examples
+ --> 
+  <match target="font">
+    <edit mode="assign" name="autohint"> <bool>true</bool></edit>
+    <edit mode="assign" name="hintstyle"> <const>hintslight</const></edit>
+    <edit mode="assign" name="lcdfilter"> <const>lcddefault</const></edit>
+    <edit mode="assign" name="antialias"> <bool>true</bool></edit>
+    <!-- for bolder text uncomment next line -->      
+    <!-- <edit mode="assign" name="rgba">      <const>rgb</const></edit> -->
+  </match>
+</fontconfig>
diff --git a/config/rootfiles/common/fontconfig b/config/rootfiles/common/fontconfig
index e567d6df3..d22d1fc7f 100644
--- a/config/rootfiles/common/fontconfig
+++ b/config/rootfiles/common/fontconfig
@@ -4,12 +4,13 @@ etc/fonts/conf.d/10-hinting-slight.conf
 etc/fonts/conf.d/10-scale-bitmap-fonts.conf
 etc/fonts/conf.d/20-unhint-small-vera.conf
 etc/fonts/conf.d/30-metric-aliases.conf
-etc/fonts/conf.d/30-urw-aliases.conf
 etc/fonts/conf.d/40-nonlatin.conf
+etc/fonts/conf.d/45-generic.conf
 etc/fonts/conf.d/45-latin.conf
 etc/fonts/conf.d/49-sansserif.conf
 etc/fonts/conf.d/50-user.conf
 etc/fonts/conf.d/51-local.conf
+etc/fonts/conf.d/60-generic.conf
 etc/fonts/conf.d/60-latin.conf
 etc/fonts/conf.d/65-fonts-persian.conf
 etc/fonts/conf.d/65-nonlatin.conf
@@ -33,219 +34,10 @@ usr/bin/fc-validate
 #usr/lib/libfontconfig.la
 #usr/lib/libfontconfig.so
 usr/lib/libfontconfig.so.1
-usr/lib/libfontconfig.so.1.9.2
+usr/lib/libfontconfig.so.1.10.1
 #usr/lib/pkgconfig/fontconfig.pc
-#usr/share/doc/fontconfig
-#usr/share/doc/fontconfig/fontconfig-devel
-#usr/share/doc/fontconfig/fontconfig-devel.pdf
-#usr/share/doc/fontconfig/fontconfig-devel.txt
-#usr/share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcatomicdeletenew.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcatomicdestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcatomiclock.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcatomicnewfile.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcatomicorigfile.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcatomicreplaceorig.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcatomicunlock.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcblanksadd.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcblankscreate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcblanksdestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcblanksismember.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccachecopyset.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccachecreatetagfile.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccachedir.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccachenumfont.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccachenumsubdir.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccachesubdir.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetaddchar.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcopy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcount.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcoverage.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcreate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetdelchar.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetdestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetequal.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsethaschar.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersect.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersectcount.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetissubset.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetmerge.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetnew.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetnextpage.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtract.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtractcount.html
-#usr/share/doc/fontconfig/fontconfig-devel/fccharsetunion.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontadddir.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontaddfile.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontclear.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigbuildfonts.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigcreate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigdestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigenablehome.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigfilename.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetblanks.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcache.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcachedirs.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigdirs.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigfiles.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcurrent.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfontdirs.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfonts.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetsysroot.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfighome.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigparseandload.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigreference.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetcurrent.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetrescaninterval.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetsysroot.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitute.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdefaultsubstitute.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheclean.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheload.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheloadfile.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheread.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdircacherescan.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheunlink.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheunload.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdircachevalid.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdirsave.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcdirscan.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfileisdir.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfilescan.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfini.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontlist.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontmatch.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontrenderprepare.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetadd.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetcreate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetdestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetlist.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetmatch.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetprint.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetsort.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetsortdestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfontsort.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharindex.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharset.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequery.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequeryface.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcgetdefaultlangs.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcgetlangs.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcgetversion.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcinit.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcinitbringuptodate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfig.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfigandfonts.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcinitreinitialize.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcislower.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcisupper.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclanggetcharset.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangnormalize.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetadd.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcompare.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcontains.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcopy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcreate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetdel.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetdestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetequal.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetgetlangs.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsethash.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsethaslang.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetsubtract.html
-#usr/share/doc/fontconfig/fontconfig-devel/fclangsetunion.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixcopy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixequal.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixinit.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixmultiply.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixrotate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixscale.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixshear.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcnameconstant.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcnamegetconstant.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcnamegetobjecttype.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcnameparse.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterconstants.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterobjecttypes.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcnameunparse.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterconstants.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterobjecttypes.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetadd.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetbuild.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetcreate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetdestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternadd-type.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternadd.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternaddweak.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternbuild.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatterncreate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatterndel.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatterndestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternduplicate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternequal.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternequalsubset.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternfilter.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternformat.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternget-type.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternget.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternhash.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternprint.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternreference.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcpatternremove.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcrangecopy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcrangecreatedouble.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcrangecreateinteger.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcrangedestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcrangegetdouble.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrbasename.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrcmp.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrcmpignorecase.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrcopy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrcopyfilename.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrdirname.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrdowncase.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrfree.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistcreate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistdone.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistfirst.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistnext.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrplus.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetadd.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetaddfilename.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetcreate.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetdel.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetdestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetequal.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetmember.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrstr.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcstrstrignorecase.html
-#usr/share/doc/fontconfig/fontconfig-devel/fctolower.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcucs4toutf8.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcutf16len.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcutf16toucs4.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcutf8len.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcutf8toucs4.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcvaluedestroy.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcvalueequal.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcvalueprint.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcvaluesave.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcweightfromopentype.html
-#usr/share/doc/fontconfig/fontconfig-devel/fcweighttoopentype.html
-#usr/share/doc/fontconfig/fontconfig-devel/ln12.html
-#usr/share/doc/fontconfig/fontconfig-devel/t1.html
-#usr/share/doc/fontconfig/fontconfig-devel/x102.html
-#usr/share/doc/fontconfig/fontconfig-devel/x19.html
-#usr/share/doc/fontconfig/fontconfig-devel/x31.html
-#usr/share/doc/fontconfig/fontconfig-user.html
-#usr/share/doc/fontconfig/fontconfig-user.pdf
-#usr/share/doc/fontconfig/fontconfig-user.txt
 #usr/share/fontconfig
-#usr/share/fontconfig/conf.avail
+usr/share/fontconfig/conf.avail
 #usr/share/fontconfig/conf.avail/10-autohint.conf
 #usr/share/fontconfig/conf.avail/10-hinting-full.conf
 #usr/share/fontconfig/conf.avail/10-hinting-medium.conf
@@ -266,10 +58,12 @@ usr/lib/libfontconfig.so.1.9.2
 #usr/share/fontconfig/conf.avail/30-metric-aliases.conf
 #usr/share/fontconfig/conf.avail/30-urw-aliases.conf
 #usr/share/fontconfig/conf.avail/40-nonlatin.conf
+#usr/share/fontconfig/conf.avail/45-generic.conf
 #usr/share/fontconfig/conf.avail/45-latin.conf
 #usr/share/fontconfig/conf.avail/49-sansserif.conf
 #usr/share/fontconfig/conf.avail/50-user.conf
 #usr/share/fontconfig/conf.avail/51-local.conf
+#usr/share/fontconfig/conf.avail/60-generic.conf
 #usr/share/fontconfig/conf.avail/60-latin.conf
 #usr/share/fontconfig/conf.avail/65-fonts-persian.conf
 #usr/share/fontconfig/conf.avail/65-khmer.conf
@@ -279,214 +73,7 @@ usr/lib/libfontconfig.so.1.9.2
 #usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf
 #usr/share/fontconfig/conf.avail/80-delicious.conf
 #usr/share/fontconfig/conf.avail/90-synthetic.conf
-#usr/share/man/man1/fc-cache.1
-#usr/share/man/man1/fc-cat.1
-#usr/share/man/man1/fc-list.1
-#usr/share/man/man1/fc-match.1
-#usr/share/man/man1/fc-pattern.1
-#usr/share/man/man1/fc-query.1
-#usr/share/man/man1/fc-scan.1
-#usr/share/man/man1/fc-validate.1
-#usr/share/man/man3/FcAtomicCreate.3
-#usr/share/man/man3/FcAtomicDeleteNew.3
-#usr/share/man/man3/FcAtomicDestroy.3
-#usr/share/man/man3/FcAtomicLock.3
-#usr/share/man/man3/FcAtomicNewFile.3
-#usr/share/man/man3/FcAtomicOrigFile.3
-#usr/share/man/man3/FcAtomicReplaceOrig.3
-#usr/share/man/man3/FcAtomicUnlock.3
-#usr/share/man/man3/FcBlanksAdd.3
-#usr/share/man/man3/FcBlanksCreate.3
-#usr/share/man/man3/FcBlanksDestroy.3
-#usr/share/man/man3/FcBlanksIsMember.3
-#usr/share/man/man3/FcCacheCopySet.3
-#usr/share/man/man3/FcCacheCreateTagFile.3
-#usr/share/man/man3/FcCacheDir.3
-#usr/share/man/man3/FcCacheNumFont.3
-#usr/share/man/man3/FcCacheNumSubdir.3
-#usr/share/man/man3/FcCacheSubdir.3
-#usr/share/man/man3/FcCharSetAddChar.3
-#usr/share/man/man3/FcCharSetCopy.3
-#usr/share/man/man3/FcCharSetCount.3
-#usr/share/man/man3/FcCharSetCoverage.3
-#usr/share/man/man3/FcCharSetCreate.3
-#usr/share/man/man3/FcCharSetDelChar.3
-#usr/share/man/man3/FcCharSetDestroy.3
-#usr/share/man/man3/FcCharSetEqual.3
-#usr/share/man/man3/FcCharSetFirstPage.3
-#usr/share/man/man3/FcCharSetHasChar.3
-#usr/share/man/man3/FcCharSetIntersect.3
-#usr/share/man/man3/FcCharSetIntersectCount.3
-#usr/share/man/man3/FcCharSetIsSubset.3
-#usr/share/man/man3/FcCharSetMerge.3
-#usr/share/man/man3/FcCharSetNew.3
-#usr/share/man/man3/FcCharSetNextPage.3
-#usr/share/man/man3/FcCharSetSubtract.3
-#usr/share/man/man3/FcCharSetSubtractCount.3
-#usr/share/man/man3/FcCharSetUnion.3
-#usr/share/man/man3/FcConfigAppFontAddDir.3
-#usr/share/man/man3/FcConfigAppFontAddFile.3
-#usr/share/man/man3/FcConfigAppFontClear.3
-#usr/share/man/man3/FcConfigBuildFonts.3
-#usr/share/man/man3/FcConfigCreate.3
-#usr/share/man/man3/FcConfigDestroy.3
-#usr/share/man/man3/FcConfigEnableHome.3
-#usr/share/man/man3/FcConfigFilename.3
-#usr/share/man/man3/FcConfigGetBlanks.3
-#usr/share/man/man3/FcConfigGetCache.3
-#usr/share/man/man3/FcConfigGetCacheDirs.3
-#usr/share/man/man3/FcConfigGetConfigDirs.3
-#usr/share/man/man3/FcConfigGetConfigFiles.3
-#usr/share/man/man3/FcConfigGetCurrent.3
-#usr/share/man/man3/FcConfigGetFontDirs.3
-#usr/share/man/man3/FcConfigGetFonts.3
-#usr/share/man/man3/FcConfigGetRescanInterval.3
-#usr/share/man/man3/FcConfigGetSysRoot.3
-#usr/share/man/man3/FcConfigHome.3
-#usr/share/man/man3/FcConfigParseAndLoad.3
-#usr/share/man/man3/FcConfigReference.3
-#usr/share/man/man3/FcConfigSetCurrent.3
-#usr/share/man/man3/FcConfigSetRescanInterval.3
-#usr/share/man/man3/FcConfigSetSysRoot.3
-#usr/share/man/man3/FcConfigSubstitute.3
-#usr/share/man/man3/FcConfigSubstituteWithPat.3
-#usr/share/man/man3/FcConfigUptoDate.3
-#usr/share/man/man3/FcDefaultSubstitute.3
-#usr/share/man/man3/FcDirCacheClean.3
-#usr/share/man/man3/FcDirCacheLoad.3
-#usr/share/man/man3/FcDirCacheLoadFile.3
-#usr/share/man/man3/FcDirCacheRead.3
-#usr/share/man/man3/FcDirCacheRescan.3
-#usr/share/man/man3/FcDirCacheUnlink.3
-#usr/share/man/man3/FcDirCacheUnload.3
-#usr/share/man/man3/FcDirCacheValid.3
-#usr/share/man/man3/FcDirSave.3
-#usr/share/man/man3/FcDirScan.3
-#usr/share/man/man3/FcFileIsDir.3
-#usr/share/man/man3/FcFileScan.3
-#usr/share/man/man3/FcFini.3
-#usr/share/man/man3/FcFontList.3
-#usr/share/man/man3/FcFontMatch.3
-#usr/share/man/man3/FcFontRenderPrepare.3
-#usr/share/man/man3/FcFontSetAdd.3
-#usr/share/man/man3/FcFontSetCreate.3
-#usr/share/man/man3/FcFontSetDestroy.3
-#usr/share/man/man3/FcFontSetList.3
-#usr/share/man/man3/FcFontSetMatch.3
-#usr/share/man/man3/FcFontSetPrint.3
-#usr/share/man/man3/FcFontSetSort.3
-#usr/share/man/man3/FcFontSetSortDestroy.3
-#usr/share/man/man3/FcFontSort.3
-#usr/share/man/man3/FcFreeTypeCharIndex.3
-#usr/share/man/man3/FcFreeTypeCharSet.3
-#usr/share/man/man3/FcFreeTypeCharSetAndSpacing.3
-#usr/share/man/man3/FcFreeTypeQuery.3
-#usr/share/man/man3/FcFreeTypeQueryFace.3
-#usr/share/man/man3/FcGetDefaultLangs.3
-#usr/share/man/man3/FcGetLangs.3
-#usr/share/man/man3/FcGetVersion.3
-#usr/share/man/man3/FcInit.3
-#usr/share/man/man3/FcInitBringUptoDate.3
-#usr/share/man/man3/FcInitLoadConfig.3
-#usr/share/man/man3/FcInitLoadConfigAndFonts.3
-#usr/share/man/man3/FcInitReinitialize.3
-#usr/share/man/man3/FcIsLower.3
-#usr/share/man/man3/FcIsUpper.3
-#usr/share/man/man3/FcLangGetCharSet.3
-#usr/share/man/man3/FcLangNormalize.3
-#usr/share/man/man3/FcLangSetAdd.3
-#usr/share/man/man3/FcLangSetCompare.3
-#usr/share/man/man3/FcLangSetContains.3
-#usr/share/man/man3/FcLangSetCopy.3
-#usr/share/man/man3/FcLangSetCreate.3
-#usr/share/man/man3/FcLangSetDel.3
-#usr/share/man/man3/FcLangSetDestroy.3
-#usr/share/man/man3/FcLangSetEqual.3
-#usr/share/man/man3/FcLangSetGetLangs.3
-#usr/share/man/man3/FcLangSetHasLang.3
-#usr/share/man/man3/FcLangSetHash.3
-#usr/share/man/man3/FcLangSetSubtract.3
-#usr/share/man/man3/FcLangSetUnion.3
-#usr/share/man/man3/FcMatrixCopy.3
-#usr/share/man/man3/FcMatrixEqual.3
-#usr/share/man/man3/FcMatrixInit.3
-#usr/share/man/man3/FcMatrixMultiply.3
-#usr/share/man/man3/FcMatrixRotate.3
-#usr/share/man/man3/FcMatrixScale.3
-#usr/share/man/man3/FcMatrixShear.3
-#usr/share/man/man3/FcNameConstant.3
-#usr/share/man/man3/FcNameGetConstant.3
-#usr/share/man/man3/FcNameGetObjectType.3
-#usr/share/man/man3/FcNameParse.3
-#usr/share/man/man3/FcNameRegisterConstants.3
-#usr/share/man/man3/FcNameRegisterObjectTypes.3
-#usr/share/man/man3/FcNameUnparse.3
-#usr/share/man/man3/FcNameUnregisterConstants.3
-#usr/share/man/man3/FcNameUnregisterObjectTypes.3
-#usr/share/man/man3/FcObjectSetAdd.3
-#usr/share/man/man3/FcObjectSetBuild.3
-#usr/share/man/man3/FcObjectSetCreate.3
-#usr/share/man/man3/FcObjectSetDestroy.3
-#usr/share/man/man3/FcPatternAdd-Type.3
-#usr/share/man/man3/FcPatternAdd.3
-#usr/share/man/man3/FcPatternAddWeak.3
-#usr/share/man/man3/FcPatternBuild.3
-#usr/share/man/man3/FcPatternCreate.3
-#usr/share/man/man3/FcPatternDel.3
-#usr/share/man/man3/FcPatternDestroy.3
-#usr/share/man/man3/FcPatternDuplicate.3
-#usr/share/man/man3/FcPatternEqual.3
-#usr/share/man/man3/FcPatternEqualSubset.3
-#usr/share/man/man3/FcPatternFilter.3
-#usr/share/man/man3/FcPatternFormat.3
-#usr/share/man/man3/FcPatternGet-Type.3
-#usr/share/man/man3/FcPatternGet.3
-#usr/share/man/man3/FcPatternHash.3
-#usr/share/man/man3/FcPatternPrint.3
-#usr/share/man/man3/FcPatternReference.3
-#usr/share/man/man3/FcPatternRemove.3
-#usr/share/man/man3/FcRangeCopy.3
-#usr/share/man/man3/FcRangeCreateDouble.3
-#usr/share/man/man3/FcRangeCreateInteger.3
-#usr/share/man/man3/FcRangeDestroy.3
-#usr/share/man/man3/FcRangeGetDouble.3
-#usr/share/man/man3/FcStrBasename.3
-#usr/share/man/man3/FcStrCmp.3
-#usr/share/man/man3/FcStrCmpIgnoreCase.3
-#usr/share/man/man3/FcStrCopy.3
-#usr/share/man/man3/FcStrCopyFilename.3
-#usr/share/man/man3/FcStrDirname.3
-#usr/share/man/man3/FcStrDowncase.3
-#usr/share/man/man3/FcStrFree.3
-#usr/share/man/man3/FcStrListCreate.3
-#usr/share/man/man3/FcStrListDone.3
-#usr/share/man/man3/FcStrListFirst.3
-#usr/share/man/man3/FcStrListNext.3
-#usr/share/man/man3/FcStrPlus.3
-#usr/share/man/man3/FcStrSetAdd.3
-#usr/share/man/man3/FcStrSetAddFilename.3
-#usr/share/man/man3/FcStrSetCreate.3
-#usr/share/man/man3/FcStrSetDel.3
-#usr/share/man/man3/FcStrSetDestroy.3
-#usr/share/man/man3/FcStrSetEqual.3
-#usr/share/man/man3/FcStrSetMember.3
-#usr/share/man/man3/FcStrStr.3
-#usr/share/man/man3/FcStrStrIgnoreCase.3
-#usr/share/man/man3/FcToLower.3
-#usr/share/man/man3/FcUcs4ToUtf8.3
-#usr/share/man/man3/FcUtf16Len.3
-#usr/share/man/man3/FcUtf16ToUcs4.3
-#usr/share/man/man3/FcUtf8Len.3
-#usr/share/man/man3/FcUtf8ToUcs4.3
-#usr/share/man/man3/FcValueDestroy.3
-#usr/share/man/man3/FcValueEqual.3
-#usr/share/man/man3/FcValuePrint.3
-#usr/share/man/man3/FcValueSave.3
-#usr/share/man/man3/FcWeightFromOpenType.3
-#usr/share/man/man3/FcWeightToOpenType.3
-#usr/share/man/man5/fonts-conf.5
 #usr/share/xml
 #usr/share/xml/fontconfig
 usr/share/xml/fontconfig/fonts.dtd
 var/cache/fontconfig
-var/cache/fontconfig/CACHEDIR.TAG
diff --git a/lfs/fontconfig b/lfs/fontconfig
index fbf7b44f6..9267649b4 100644
--- a/lfs/fontconfig
+++ b/lfs/fontconfig
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2017  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.12.1
+VER        = 2.12.6
 
 THISAPP    = fontconfig-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ce55e525c37147eee14cc2de6cc09f6c
+$(DL_FILE)_MD5 = 733f5e2371ca77b69707bd7b30cc2163
 
 install : $(TARGET)
 
@@ -69,11 +69,24 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-		--localstatedir=/var
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+			--sysconfdir=/etc \
+			--localstatedir=/var \
+			--disable-docs \
+			--without-x \
+			--with-libpng \
+			--disable-gtk-doc \
+			--disable-man \
+			--docdir=/usr/share/doc/fontconfig-${VER}
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
+	# install local.conf file to reactivate font auto hinter for rrdtool graphs
+	# this is necessary after freetype 2.7 update
+	install -v -m644 $(DIR_SRC)/config/fontconfig/51-local.conf /usr/share/fontconfig/conf.avail
+
+	# clear fontconfig cache to prevent check rootfile message
+	rm -rf /var/cache/fontconfig/*
 	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
+	@$(POSTBUILD)
\ No newline at end of file
-- 
2.14.2


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-11-19  9:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-19  9:16 [PATCH 0/1] fontconfig: update to 2.12.6 Marcel Lorenz
2017-11-19  9:16 ` [PATCH 1/1] " Marcel Lorenz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox