summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch16
-rw-r--r--meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch15
-rw-r--r--meta/packages/fontconfig/fontconfig-native_2.6.0.bb (renamed from meta/packages/fontconfig/fontconfig-native_2.4.2.bb)0
-rw-r--r--meta/packages/fontconfig/fontconfig_2.6.0.bb (renamed from meta/packages/fontconfig/fontconfig_2.4.2.bb)4
4 files changed, 16 insertions, 19 deletions
diff --git a/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch b/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch
deleted file mode 100644
index feea1b36a8..0000000000
--- a/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Libtool 2.2.2 requires this is used with AC_SUBST
2
3RP - 14/4/08
4
5Index: fontconfig-2.4.2/configure.in
6===================================================================
7--- fontconfig-2.4.2.orig/configure.in 2008-04-15 00:20:54.000000000 +0100
8+++ fontconfig-2.4.2/configure.in 2008-04-14 14:37:40.000000000 +0100
9@@ -46,6 +46,7 @@
10 AC_SUBST(LT_CURRENT)
11 AC_SUBST(LT_REVISION)
12 LT_AGE=2
13+AC_SUBST(LT_AGE)
14
15 LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
16 AC_SUBST(LT_VERSION_INFO)
diff --git a/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
new file mode 100644
index 0000000000..17b85f758d
--- /dev/null
+++ b/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
@@ -0,0 +1,15 @@
1---
2 fontconfig.pc.in | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5--- fontconfig-2.6.0.orig/fontconfig.pc.in
6+++ fontconfig-2.6.0/fontconfig.pc.in
7@@ -5,7 +5,7 @@ includedir=@includedir@
8
9 Name: Fontconfig
10 Description: Font configuration and customization library
11 Version: @VERSION@
12 Libs: -L${libdir} -lfontconfig
13-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
14+Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype
15 Cflags: -I${includedir}
diff --git a/meta/packages/fontconfig/fontconfig-native_2.4.2.bb b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
index 541b74634c..541b74634c 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.4.2.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
diff --git a/meta/packages/fontconfig/fontconfig_2.4.2.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb
index b974e99c76..b7f1f5aaa7 100644
--- a/meta/packages/fontconfig/fontconfig_2.4.2.bb
+++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb
@@ -4,9 +4,7 @@ DESCRIPTION = "A library for configuring and customizing font access."
4DEPENDS = "expat freetype zlib" 4DEPENDS = "expat freetype zlib"
5 5
6SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ 6SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
7 file://configure_fix.patch;patch=1" 7 file://fix-pkgconfig.patch;patch=1"
8
9PR = "r10"
10 8
11PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " 9PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
12FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" 10FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"