5 files changed, 25 insertions, 19 deletions

diff --git a/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
deleted file mode 100644
index 17b85f758d..0000000000
--- a/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- fontconfig.pc.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- fontconfig-2.6.0.orig/fontconfig.pc.in
-+++ fontconfig-2.6.0/fontconfig.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
- 
- Name: Fontconfig
- Description: Font configuration and customization library
- Version: @VERSION@
- Libs: -L${libdir} -lfontconfig
--Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
-+Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype
- Cflags: -I${includedir}
diff --git a/meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig b/meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig
index 2993959dbb..2993959dbb 100644
--- a/meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig
+++ b/meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig
diff --git a/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
new file mode 100644
index 0000000000..7fec1e9104
--- /dev/null
+++ b/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
@@ -0,0 +1,13 @@
+---
+ fontconfig.pc.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- fontconfig-2.8.0.orig/fontconfig.pc.in
++++ fontconfig-2.8.0/fontconfig.pc.in
+@@ -7,5 +7,5 @@
+ Description: Font configuration and customization library
+ Version: @VERSION@
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
++Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L{libdir} -lfreetype @ICONV_LIBS@
+ Cflags: -I${includedir}
diff --git a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb b/meta/packages/fontconfig/fontconfig-native_2.8.0.bb
index 03a1bc86c2..03a1bc86c2 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.8.0.bb
diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.8.0.bb
index 4c6df307f4..f83d72cdda 100644
--- a/meta/packages/fontconfig/fontconfig_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig_2.8.0.bb
@@ -1,12 +1,20 @@
-SECTION = "libs"
-LICENSE = "BSD"
 DESCRIPTION = "A library for configuring and customizing font access."
+HOMEPAGE = "http://www.fontconfig.org"
+BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
+
+LICENSE = "MIT-style & MIT & Public Domain"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \
+                    file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \
+                    file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
+
+SECTION = "libs"
+
 DEPENDS = "expat freetype zlib"
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
-           file://fix-pkgconfig.patch;patch=1 \
+           file://fix-pkgconfig.patch \
            file://97_fontconfig"
 
 PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "