7 files changed, 76 insertions, 95 deletions
diff --git a/meta/packages/fontconfig/files/local.conf b/meta/packages/fontconfig/files/local.conf
deleted file mode 100644
index ddd7cf9d03..0000000000
--- a/meta/packages/fontconfig/files/local.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/local.conf file for local customizations -->
-<fontconfig>
-<!-- Enable sub-pixel rendering -->
-	<match target="font">
-		<test qual="all" name="rgba">
-			<const>unknown</const>
-		</test>
-		<edit name="rgba" mode="assign"><const>rgb</const></edit>
-	</match>
-</fontconfig>
diff --git a/meta/packages/fontconfig/files/stop-fc-cache.patch b/meta/packages/fontconfig/files/stop-fc-cache.patch
deleted file mode 100644
index 7b549118f9..0000000000
--- a/meta/packages/fontconfig/files/stop-fc-cache.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- fontconfig-2.2.95/Makefile.am.old	2006-02-07 01:01:01.000000000 +0000
-+++ fontconfig-2.2.95/Makefile.am	2006-02-07 01:01:15.000000000 +0000
-@@ -50,4 +50,4 @@
- 	  echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \
- 	  $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
- 	fi; fi; fi
--	if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
-+#	if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
diff --git a/meta/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch b/meta/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch
deleted file mode 100644
index 1afd9324ff..0000000000
--- a/meta/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- fontconfig/fc-glyphname/Makefile.am~	2004-04-14 17:06:35.000000000 +0100
-+++ fontconfig/fc-glyphname/Makefile.am	2004-05-15 11:41:35.000000000 +0100
-@@ -27,6 +27,7 @@
- TMPL=fcglyphname.tmpl.h
- STMPL=${top_srcdir}/fc-glyphname/${TMPL}
- TARG=fcglyphname.h
-+FC_GLYPHNAME=./fc-glyphname
- 
- noinst_PROGRAMS=fc-glyphname
- 
-@@ -41,7 +42,7 @@
- 
- $(TARG): $(STMPL) fc-glyphname $(SGLYPHNAME)
- 	rm -f $(TARG)
--	./fc-glyphname $(SGLYPHNAME) < $(STMPL) > $(TARG)
-+	$(FC_GLYPHNAME) $(SGLYPHNAME) < $(STMPL) > $(TARG)
- 
- CLEANFILES=$(TARG)
- 
diff --git a/meta/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch b/meta/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch
deleted file mode 100644
index d08242a377..0000000000
--- a/meta/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- fontconfig/fc-lang/Makefile.am~	2004-04-14 17:06:36.000000000 +0100
-+++ fontconfig/fc-lang/Makefile.am	2004-05-15 11:22:44.000000000 +0100
-@@ -27,6 +27,7 @@
- TMPL=fclang.tmpl.h
- STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
- TARG=fclang.h
-+FC_LANG=./fc-lang
- 
- noinst_PROGRAMS=fc-lang
- 
-@@ -40,6 +41,6 @@
- 
- $(TARG):$(ORTH) fc-lang $(STMPL)
- 	rm -f $(TARG)
--	./fc-lang -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
-+	$(FC_LANG) -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
- 
- CLEANFILES=$(TARG)
diff --git a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb b/meta/packages/fontconfig/fontconfig-native_2.4.2.bb
index 69caf6cf73..541b74634c 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.4.2.bb
@@ -4,10 +4,9 @@ require fontconfig_${PV}.bb
 inherit native
 DEPENDS = "freetype-native expat-native zlib-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
-SRC_URI += " file://stop-fc-cache.patch;patch=1"
 
 EXTRA_OEMAKE = ""
-EXTRA_OECONF += "--with-freetype-config=${STAGING_BINDIR}/freetype-config"
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
 
 do_stage () {
 	oe_runmake install
diff --git a/meta/packages/fontconfig/fontconfig_2.2.95.bb b/meta/packages/fontconfig/fontconfig_2.2.95.bb
deleted file mode 100644
index b3a61e727c..0000000000
--- a/meta/packages/fontconfig/fontconfig_2.2.95.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SECTION = "libs"
-LICENSE = "BSD"
-DESCRIPTION = "A library for configuring and customizing font access."
-DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
-
-SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
-           file://fc-glyphname.patch;patch=1 \
-           file://fc-lang.patch;patch=1 \
-	   file://local.conf"
-PR = "r2"
-
-PACKAGES =+ "fontconfig-utils "
-FILES_fontconfig-utils = "${bindir}/*"
-
-PKG_fontconfig-utils=fontconfig-utils
-
-S = "${WORKDIR}/fontconfig-${PV}"
-
-inherit autotools pkgconfig
-
-export HASDOCBOOK="no"
-
-EXTRA_OECONF = " --disable-docs "
-EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
-
-do_stage () {
-	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/fontconfig
-	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
-}
-
-do_install () {
-	autotools_do_install
-	install -m 0644 ${WORKDIR}/local.conf ${D}${sysconfdir}/fonts/local.conf
-}
-
diff --git a/meta/packages/fontconfig/fontconfig_2.4.2.bb b/meta/packages/fontconfig/fontconfig_2.4.2.bb
new file mode 100644
index 0000000000..098939324a
--- /dev/null
+++ b/meta/packages/fontconfig/fontconfig_2.4.2.bb
@@ -0,0 +1,75 @@
+SECTION = "libs"
+LICENSE = "BSD"
+DESCRIPTION = "A library for configuring and customizing font access."
+DEPENDS = "expat freetype freetype-native zlib"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz"
+
+PR = "r0"
+
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
+
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+inherit autotools pkgconfig
+
+export HASDOCBOOK="no"
+
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+fontconfig_do_unpack() {
+       chmod -R u+rw ${S}
+}
+
+python do_unpack () {
+       bb.build.exec_func('base_do_unpack', d)
+       bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+do_stage () {
+	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/fontconfig
+	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+BUILD_CFLAGS += " -I${STAGING_DIR}/${BUILD_SYS}/include/freetype2"
+
+do_configure_append () {
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+
+}
+
+do_install () {
+	autotools_do_install
+}
+