aboutsummaryrefslogtreecommitdiff
path: root/package/fontconfig
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-06-26 14:04:39 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-06-26 14:04:39 +0000
commit8ba9a9971c7f59e14de76786445b9a9349e4b73e (patch)
tree62522802243e1eb138ea3936c8cc7ad7c8431ce3 /package/fontconfig
parent93d47d9201c9ce3d9658a510862f5f35f6407c5b (diff)
downloadbuildroot-8ba9a9971c7f59e14de76786445b9a9349e4b73e.tar.gz
buildroot-8ba9a9971c7f59e14de76786445b9a9349e4b73e.tar.bz2
fontconfig: bump version
Diffstat (limited to 'package/fontconfig')
-rw-r--r--package/fontconfig/fontconfig-2.4.2-fc-lang.patch33
-rw-r--r--package/fontconfig/fontconfig-2.4.2-host-tools.patch95
-rw-r--r--package/fontconfig/fontconfig.mk11
3 files changed, 3 insertions, 136 deletions
diff --git a/package/fontconfig/fontconfig-2.4.2-fc-lang.patch b/package/fontconfig/fontconfig-2.4.2-fc-lang.patch
deleted file mode 100644
index d4d10db678..0000000000
--- a/package/fontconfig/fontconfig-2.4.2-fc-lang.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- fontconfig-2.4.2/fc-lang/fc-lang.orig.c 2007-02-03 13:39:49.000000000 -0700
-+++ fontconfig-2.4.2/fc-lang/fc-lang.c 2007-02-03 13:46:08.000000000 -0700
-@@ -116,6 +116,20 @@
- return f;
- }
-
-+char* trim(char *s)
-+{
-+ int len = strlen(s);
-+
-+ /* nuke trailing whitespace */
-+ while (len > 0 && (isspace(s[len - 1]) || s[len - 1]=='\n'))
-+ s[--len] = '\0';
-+
-+ /* skip leading whitespace */
-+ s += strspn(s, " \n\r\t\v");
-+
-+ return s;
-+}
-+
- /*
- * build a single charset from a source file
- *
-@@ -142,8 +156,7 @@
- if (!file)
- fatal (line, lineno,
- "invalid syntax, expected: include filename");
-- while (isspace(*file))
-- file++;
-+ file = trim(file);
- f = scanopen (file);
- if (!f)
- fatal (file, 0, "can't open");
diff --git a/package/fontconfig/fontconfig-2.4.2-host-tools.patch b/package/fontconfig/fontconfig-2.4.2-host-tools.patch
deleted file mode 100644
index 7b434adef5..0000000000
--- a/package/fontconfig/fontconfig-2.4.2-host-tools.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- fontconfig-2.4.2/fc-lang/Makefile.am.orig 2007-06-24 07:02:54.000000000 +0200
-+++ fontconfig-2.4.2/fc-lang/Makefile.am 2007-06-24 07:05:14.000000000 +0200
-@@ -23,10 +23,16 @@
- #
-
- CC = @CC_FOR_BUILD@
-+LD = @CC_FOR_BUILD@
-+AM_CPPFLAGS =
-+AM_CFLAGS = @CFLAGS_FOR_BUILD@
-+AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
- EXEEXT = @EXEEXT_FOR_BUILD@
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(AM_CFLAGS)
-+LINK = $(LD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@
-
--INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
-+INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
-
- TMPL=fclang.tmpl.h
- STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
---- fontconfig-2.4.2/fc-case/Makefile.am.orig 2007-06-24 07:02:54.000000000 +0200
-+++ fontconfig-2.4.2/fc-case/Makefile.am 2007-06-24 07:05:14.000000000 +0200
-@@ -23,10 +23,16 @@
- #
-
- CC = @CC_FOR_BUILD@
-+LD = @CC_FOR_BUILD@
-+AM_CPPFLAGS =
-+AM_CFLAGS = @CFLAGS_FOR_BUILD@
-+AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
- EXEEXT = @EXEEXT_FOR_BUILD@
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(AM_CFLAGS)
-+LINK = $(LD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@
-
--INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
-+INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
-
- TMPL=fccase.tmpl.h
- STMPL=${top_srcdir}/fc-case/${TMPL}
---- fontconfig-2.4.2/fc-glyphname/Makefile.am.orig 2007-06-24 07:02:54.000000000 +0200
-+++ fontconfig-2.4.2/fc-glyphname/Makefile.am 2007-06-24 07:05:14.000000000 +0200
-@@ -23,10 +23,16 @@
- #
-
- CC = @CC_FOR_BUILD@
-+LD = @CC_FOR_BUILD@
-+AM_CPPFLAGS =
-+AM_CFLAGS = @CFLAGS_FOR_BUILD@
-+AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
- EXEEXT = @EXEEXT_FOR_BUILD@
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(AM_CFLAGS)
-+LINK = $(LD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@
-
--INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
-+INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
-
- TMPL=fcglyphname.tmpl.h
- STMPL=${top_srcdir}/fc-glyphname/${TMPL}
---- fontconfig-2.4.2/configure.in.orig 2007-06-24 07:02:54.000000000 +0200
-+++ fontconfig-2.4.2/configure.in 2007-06-24 07:02:59.000000000 +0200
-@@ -101,6 +101,8 @@
- AC_MSG_CHECKING([for a C compiler for build tools])
- if test $cross_compiling = yes; then
- AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
-+ AC_SUBST(CFLAGS_FOR_BUILD)
-+ AC_SUBST(LDFLAGS_FOR_BUILD)
- else
- CC_FOR_BUILD=$CC
- fi
---- fontconfig-2.4.2/fc-arch/Makefile.am.orig 2007-06-24 07:02:54.000000000 +0200
-+++ fontconfig-2.4.2/fc-arch/Makefile.am 2007-06-24 07:05:14.000000000 +0200
-@@ -23,10 +23,16 @@
- #
-
- CC = @CC_FOR_BUILD@
-+LD = @CC_FOR_BUILD@
-+AM_CPPFLAGS =
-+AM_CFLAGS = @CFLAGS_FOR_BUILD@
-+AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
- EXEEXT = @EXEEXT_FOR_BUILD@
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(AM_CFLAGS)
-+LINK = $(LD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@
-
--INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
-+INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
-
- TMPL=fcarch.tmpl.h
- STMPL=${top_srcdir}/fc-arch/fcarch.tmpl.h
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index 394bd580a2..d6ac0c2ba1 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -3,7 +3,7 @@
# fontconfig
#
#############################################################
-FONTCONFIG_VERSION = 2.4.2
+FONTCONFIG_VERSION = 2.6.0
FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.gz
FONTCONFIG_SITE = http://fontconfig.org/release
FONTCONFIG_AUTORECONF = NO
@@ -14,17 +14,12 @@ FONTCONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
FONTCONFIG_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) --with-arch=$(GNU_TARGET_NAME) \
- --prefix=/usr --exec-prefix=/usr \
- --bindir=/usr/bin --sbindir=/usr/sbin \
- --libdir=/usr/lib --libexecdir=/usr/lib \
- --sysconfdir=/etc --datadir=/usr/share \
- --localstatedir=/var --includedir=/usr/include \
- --mandir=/usr/man --infodir=/usr/info \
+ --prefix=/usr --sysconfdir=/etc \
--with-freetype-config="$(STAGING_DIR)/usr/bin/freetype-config" \
--with-expat="$(STAGING_DIR)/usr/lib" \
--with-expat-lib=$(STAGING_DIR)/usr/lib \
--with-expat-includes=$(STAGING_DIR)/usr/include \
- --disable-docs
+ --disable-docs
FONTCONFIG_DEPENDENCIES = uclibc freetype expat