fontconfig: update to 2.13.1

[ipfire-2.x.git] / lfs / fontconfig

diff --git a/lfs/fontconfig b/lfs/fontconfig
index 01ac3bb692e5aad0e6366b686ce25ba8ceb038a0..cb3f55de4bbce872fc6d40619328624375124af7 100644 (file)
--- a/lfs/fontconfig
+++ b/lfs/fontconfig
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.12.1
+VER        = 2.13.1
 
 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 = 36cdea1058ef13cbbfdabe6cb019dc1c
 
 install : $(TARGET)
 
@@ -69,10 +69,13 @@ $(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) && rm -vf src/fcobjshash.h
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --sysconfdir=/etc \
+               --localstatedir=/var \
+               --disable-docs
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)