Commit 7b8df926 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

fontconfig: bump to version 2.11.0 



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 32a5f503

package/fontconfig/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ config BR2_PACKAGE_FONTCONFIG 
	select BR2_PACKAGE_FREETYPE

	select BR2_PACKAGE_EXPAT

	help

	  a library for font customization and configuration.

	  Fontconfig is a library for configuring and customizing font access.



	  http://www.fontconfig.org/

package/fontconfig/fontconfig-2.6.0-parallel-compilation-fix.patch

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
---

 fc-case/Makefile.am |    4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)



Index: fontconfig-2.6.0/fc-case/Makefile.am

===================================================================

--- fontconfig-2.6.0.orig/fc-case/Makefile.am

+++ fontconfig-2.6.0/fc-case/Makefile.am

@@ -36,6 +36,8 @@

 

 noinst_MANS=fc-case.man

 

+noinst_HEADERS=$(TARG)

+

 fc_case_SRCS= \

 	fc-case.c \

 	fccaseint.h \

@@ -52,7 +54,7 @@

 

 ALIAS_FILES = fcalias.h fcaliastail.h

 

-BUILT_SOURCES = $(ALIAS_FILES) $(TARG)

+BUILT_SOURCES = $(ALIAS_FILES)

 

 $(ALIAS_FILES): 

 	touch $(ALIAS_FILES)

package/fontconfig/fontconfig-2.6.0-use_for_build.patch

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
diff -Naur fontconfig-2.6.0.orig/doc/Makefile.am fontconfig-2.6.0/doc/Makefile.am

--- fontconfig-2.6.0.orig/doc/Makefile.am	2007-11-06 01:05:37.000000000 +0100

+++ fontconfig-2.6.0/doc/Makefile.am	2010-05-22 00:03:00.000000000 +0200

@@ -21,9 +21,10 @@

 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

 # PERFORMANCE OF THIS SOFTWARE.

 

-CC = @CC_FOR_BUILD@

 EXEEXT = @EXEEXT_FOR_BUILD@

-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

+		      $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)

+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@

 

 DOC_SRC = $(srcdir)

 DOC_MODULE = fontconfig

diff -Naur fontconfig-2.6.0.orig/fc-arch/Makefile.am fontconfig-2.6.0/fc-arch/Makefile.am

--- fontconfig-2.6.0.orig/fc-arch/Makefile.am	2008-01-02 17:44:39.000000000 +0100

+++ fontconfig-2.6.0/fc-arch/Makefile.am	2010-05-21 23:59:18.000000000 +0200

@@ -22,9 +22,10 @@

 # PERFORMANCE OF THIS SOFTWARE.

 #

 

-CC = @CC_FOR_BUILD@

 EXEEXT = @EXEEXT_FOR_BUILD@

-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

+	$(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)

+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@

 

 INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)

 

diff -Naur fontconfig-2.6.0.orig/fc-case/Makefile.am fontconfig-2.6.0/fc-case/Makefile.am

--- fontconfig-2.6.0.orig/fc-case/Makefile.am	2010-05-21 23:55:02.000000000 +0200

+++ fontconfig-2.6.0/fc-case/Makefile.am	2010-05-22 00:04:09.000000000 +0200

@@ -22,9 +22,10 @@

 # PERFORMANCE OF THIS SOFTWARE.

 #

 

-CC = @CC_FOR_BUILD@

 EXEEXT = @EXEEXT_FOR_BUILD@

-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

+		      $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)

+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@

 

 INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)

 

diff -Naur fontconfig-2.6.0.orig/fc-glyphname/Makefile.am fontconfig-2.6.0/fc-glyphname/Makefile.am

--- fontconfig-2.6.0.orig/fc-glyphname/Makefile.am	2008-01-02 17:44:39.000000000 +0100

+++ fontconfig-2.6.0/fc-glyphname/Makefile.am	2010-05-22 00:04:54.000000000 +0200

@@ -22,9 +22,10 @@

 # PERFORMANCE OF THIS SOFTWARE.

 #

 

-CC = @CC_FOR_BUILD@

 EXEEXT = @EXEEXT_FOR_BUILD@

-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

+		      $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)

+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@

 

 INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)

 

diff -Naur fontconfig-2.6.0.orig/fc-lang/Makefile.am fontconfig-2.6.0/fc-lang/Makefile.am

--- fontconfig-2.6.0.orig/fc-lang/Makefile.am	2008-01-02 17:44:39.000000000 +0100

+++ fontconfig-2.6.0/fc-lang/Makefile.am	2010-05-22 00:05:44.000000000 +0200

@@ -22,9 +22,10 @@

 # PERFORMANCE OF THIS SOFTWARE.

 #

 

-CC = @CC_FOR_BUILD@

 EXEEXT = @EXEEXT_FOR_BUILD@

-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

+		      $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)

+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@

 

 INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)

package/fontconfig/fontconfig.mk

+3 −11
Original line number Diff line number Diff line
@@ -4,25 +4,17 @@ 
#

################################################################################



FONTCONFIG_VERSION = 2.6.0

FONTCONFIG_VERSION = 2.11.0

FONTCONFIG_SITE = http://fontconfig.org/release

FONTCONFIG_INSTALL_STAGING = YES

FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf

FONTCONFIG_LICENSE = fontconfig license

FONTCONFIG_LICENSE_FILES = COPYING

FONTCONFIG_AUTORECONF = YES

FONTCONFIG_INSTALL_STAGING = YES

# This package does not like using the target cflags for some reason.

FONTCONFIG_CONF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/freetype2"



FONTCONFIG_CONF_OPT = --with-arch=$(GNU_TARGET_NAME) \

		--with-freetype-config="$(STAGING_DIR)/usr/bin/freetype-config" \

		--with-cache-dir=/var/cache/fontconfig \

		--with-expat="$(STAGING_DIR)/usr/lib" \

		--with-expat-lib=$(STAGING_DIR)/usr/lib \

		--with-expat-includes=$(STAGING_DIR)/usr/include \

		--disable-docs



FONTCONFIG_DEPENDENCIES = freetype expat



HOST_FONTCONFIG_CONF_OPT = \

		--disable-static