summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2019-04-06 15:36:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-12 14:05:38 +0100
commit6fcfe3848246bd36021c3329701b83fb994a01fd (patch)
tree072bc99b66cc21b6ac889c443aca00c802d7ffde
parent8a2435b3e0c22c73752071181c7d9b6a1a29207e (diff)
downloadpoky-6fcfe3848246bd36021c3329701b83fb994a01fd.tar.gz
fontconfig: update to 2.13.1
Removed patches were upstreammed. License position in fccache.c was changed since code segment was moved in the file. Package requires uuid, therefore dependency on util-linux was added. inherit gettext was added to fix: ...%s required but not in DEPENDS for file %s. Missing inherit gettext? (From OE-Core rev: a03936d1bfd01afa320e289e3ba6e7a24979f196) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch33
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch28
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch12
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb (renamed from meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb)13
4 files changed, 12 insertions, 74 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch
deleted file mode 100644
index d9bce212f6..0000000000
--- a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 24 Dec 2018 11:03:58 +0800
4Subject: [PATCH] src/fccache.c: Fix define for HAVE_POSIX_FADVISE
5
6Otherwise, there would be build errors in the following 2 cases:
7* define HAVE_POSIX_FADVISE
8Or:
9* undef HAVE_POSIX_FADVISE
10
11Upstream-Status: Backport [https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/586e35450e9ca7c1dc647ceb9d75ac8ed08c5c16]
12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14---
15 fccache.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/fccache.c b/src/fccache.c
19index 6f3c68a..85cc4b4 100644
20--- a/src/fccache.c
21+++ b/src/fccache.c
22@@ -700,7 +700,7 @@ FcDirCacheMapFd (FcConfig *config, int fd, struct stat *fd_stat, struct stat *di
23 {
24 #if defined(HAVE_MMAP) || defined(__CYGWIN__)
25 cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
26-#if (HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
27+#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
28 posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
29 #endif
30 if (cache == MAP_FAILED)
31--
322.7.4
33
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch
deleted file mode 100644
index 3ca9fde967..0000000000
--- a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From a163c81ac430cdc292add200f3e6a0c048be4d7e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 11 Oct 2017 17:40:09 +0300
4Subject: [PATCH] src/fcxml.c: avoid double free() of filename
5
6It's also freed after bail1, so no need to do it here.
7
8Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=103221]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 src/fcxml.c | 1 -
12 1 file changed, 1 deletion(-)
13
14diff --git a/src/fcxml.c b/src/fcxml.c
15index 19ce96a..edb6054 100644
16--- a/src/fcxml.c
17+++ b/src/fcxml.c
18@@ -3398,7 +3398,6 @@ FcConfigParseAndLoad (FcConfig *config,
19
20 fd = FcOpen ((char *) filename, O_RDONLY);
21 if (fd == -1) {
22- FcStrFree (filename);
23 goto bail1;
24 }
25
26--
272.14.1
28
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
index fca1e65946..30d6423037 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
@@ -8,13 +8,13 @@ gently refuses and rightly so.
8Upstream-Status: Inappropriate [OE-Specific] 8Upstream-Status: Inappropriate [OE-Specific]
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 10
11Index: fontconfig-2.11.93/fontconfig.pc.in 11diff --git a/fontconfig.pc.in b/fontconfig.pc.in
12=================================================================== 12index 61b35fb..5bc9bab 100644
13--- fontconfig-2.11.93.orig/fontconfig.pc.in 13--- a/fontconfig.pc.in
14+++ fontconfig-2.11.93/fontconfig.pc.in 14+++ b/fontconfig.pc.in
15@@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@ 15@@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@
16 Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@ 16 Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@
17 Libs: -L${libdir} -lfontconfig 17 Libs: -L${libdir} -lfontconfig
18 Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@ 18 Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@
19-Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@ 19-Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@
20+Cflags: -I${includedir} 20+Cflags: -I${includedir}
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb
index 8fa739de24..d0da419ce0 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb
@@ -14,20 +14,18 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
14LICENSE = "MIT-style & MIT & PD" 14LICENSE = "MIT-style & MIT & PD"
15LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \ 15LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
16 file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \ 16 file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
17 file://src/fccache.c;beginline=1367;endline=1382;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" 17 file://src/fccache.c;beginline=1671;endline=1686;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
18 18
19SECTION = "libs" 19SECTION = "libs"
20 20
21DEPENDS = "expat freetype zlib gperf-native" 21DEPENDS = "expat freetype zlib gperf-native util-linux"
22 22
23SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ 23SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
24 file://revert-static-pkgconfig.patch \ 24 file://revert-static-pkgconfig.patch \
25 file://0001-src-fcxml.c-avoid-double-free-of-filename.patch \
26 file://0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch \
27 " 25 "
28 26
29SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb" 27SRC_URI[md5sum] = "690c6cb840a92fa8908cdf462d19ec66"
30SRC_URI[sha256sum] = "064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334" 28SRC_URI[sha256sum] = "9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f"
31 29
32UPSTREAM_CHECK_REGEX = "fontconfig-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" 30UPSTREAM_CHECK_REGEX = "fontconfig-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
33 31
@@ -50,6 +48,7 @@ do_install_append_class-nativesdk() {
50 48
51PACKAGES =+ "fontconfig-utils" 49PACKAGES =+ "fontconfig-utils"
52FILES_${PN} =+ "${datadir}/xml/*" 50FILES_${PN} =+ "${datadir}/xml/*"
51FILES_${PN}-dev += "${datadir}/gettext/*"
53FILES_fontconfig-utils = "${bindir}/* ${libexecdir}/*" 52FILES_fontconfig-utils = "${bindir}/* ${libexecdir}/*"
54 53
55# Work around past breakage in debian.bbclass 54# Work around past breakage in debian.bbclass
@@ -58,7 +57,7 @@ RREPLACES_fontconfig-utils = "libfontconfig-utils"
58RCONFLICTS_fontconfig-utils = "libfontconfig-utils" 57RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
59DEBIAN_NOAUTONAME_fontconfig-utils = "1" 58DEBIAN_NOAUTONAME_fontconfig-utils = "1"
60 59
61inherit autotools pkgconfig relative_symlinks 60inherit autotools pkgconfig relative_symlinks gettext
62 61
63FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" 62FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
64 63