X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ffontconfig;h=01ac3bb692e5aad0e6366b686ce25ba8ceb038a0;hp=6f0850be75c1153924ec4cf44860d504ad0322c1;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=5114bcb3cdee18bdb30b71e9e0df2b559b561273

diff --git a/lfs/fontconfig b/lfs/fontconfig
index 6f0850be75..01ac3bb692 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-2018  IPFire Team  <info@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,7 +24,7 @@
 
 include Config
 
-VER        = 2.5.91
+VER        = 2.12.1
 
 THISAPP    = fontconfig-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ff5536b58e91a034ed18e7d53e04a689
+$(DL_FILE)_MD5 = ce55e525c37147eee14cc2de6cc09f6c
 
 install : $(TARGET)
 
@@ -70,7 +70,9 @@ $(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) && ./configure --prefix=/usr --sysconfdir=/etc
+	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
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)