X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ffontconfig;h=fbf7b44f681d08a13c1f6bfc08644c7114ab2d9b;hp=6f0850be75c1153924ec4cf44860d504ad0322c1;hb=8f6e4eaff74ea1c90815ede2663ed2561508a56f;hpb=92d75b2ed53e72427beab0dbda8f06577d42e4c5

diff --git a/lfs/fontconfig b/lfs/fontconfig
index 6f0850be75..fbf7b44f68 100644
--- a/lfs/fontconfig
+++ b/lfs/fontconfig
@@ -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)