CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fontconfig: update to 2.13.1

Browse Source 
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>
This commit is contained in:
Oleksandr Kravchuk 2019-04-06 15:36:20 +02:00 committed by Richard Purdie
parent 8a2435b3e0
commit 6fcfe38482
4 changed files with 12 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch
View File

@ -1,33 +0,0 @@
From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Mon, 24 Dec 2018 11:03:58 +0800
Subject: [PATCH] src/fccache.c: Fix define for HAVE_POSIX_FADVISE
Otherwise, there would be build errors in the following 2 cases:
* define HAVE_POSIX_FADVISE
Or:
* undef HAVE_POSIX_FADVISE
Upstream-Status: Backport [https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/586e35450e9ca7c1dc647ceb9d75ac8ed08c5c16]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
fccache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fccache.c b/src/fccache.c
index 6f3c68a..85cc4b4 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -700,7 +700,7 @@ FcDirCacheMapFd (FcConfig *config, int fd, struct stat *fd_stat, struct stat *di
{
#if defined(HAVE_MMAP) || defined(__CYGWIN__)
cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
-#if (HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
+#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
#endif
if (cache == MAP_FAILED)
--
2.7.4

28
meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch
View File

@ -1,28 +0,0 @@
From a163c81ac430cdc292add200f3e6a0c048be4d7e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 11 Oct 2017 17:40:09 +0300
Subject: [PATCH] src/fcxml.c: avoid double free() of filename
It's also freed after bail1, so no need to do it here.
Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=103221]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
src/fcxml.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/fcxml.c b/src/fcxml.c
index 19ce96a..edb6054 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -3398,7 +3398,6 @@ FcConfigParseAndLoad (FcConfig *config,
fd = FcOpen ((char *) filename, O_RDONLY);
if (fd == -1) {
- FcStrFree (filename);
goto bail1;
}
--
2.14.1

12
meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
View File

@ -8,13 +8,13 @@ gently refuses and rightly so.
Upstream-Status: Inappropriate [OE-Specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: fontconfig-2.11.93/fontconfig.pc.in
===================================================================
--- fontconfig-2.11.93.orig/fontconfig.pc.in
+++ fontconfig-2.11.93/fontconfig.pc.in
diff --git a/fontconfig.pc.in b/fontconfig.pc.in
index 61b35fb..5bc9bab 100644
--- a/fontconfig.pc.in
+++ b/fontconfig.pc.in
@@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@
Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@
Libs: -L${libdir} -lfontconfig
Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@
-Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@
Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@
-Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@
+Cflags: -I${includedir}

13
meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb → meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb
View File

@ -14,20 +14,18 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
LICENSE = "MIT-style & MIT & PD"
LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
file://src/fccache.c;beginline=1367;endline=1382;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
file://src/fccache.c;beginline=1671;endline=1686;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
SECTION = "libs"
DEPENDS = "expat freetype zlib gperf-native"
DEPENDS = "expat freetype zlib gperf-native util-linux"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://revert-static-pkgconfig.patch \
file://0001-src-fcxml.c-avoid-double-free-of-filename.patch \
file://0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch \
"
SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb"
SRC_URI[sha256sum] = "064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334"
SRC_URI[md5sum] = "690c6cb840a92fa8908cdf462d19ec66"
SRC_URI[sha256sum] = "9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f"
UPSTREAM_CHECK_REGEX = "fontconfig-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
@ -50,6 +48,7 @@ do_install_append_class-nativesdk() {
PACKAGES =+ "fontconfig-utils"
FILES_${PN} =+ "${datadir}/xml/*"
FILES_${PN}-dev += "${datadir}/gettext/*"
FILES_fontconfig-utils = "${bindir}/* ${libexecdir}/*"
# Work around past breakage in debian.bbclass
@ -58,7 +57,7 @@ RREPLACES_fontconfig-utils = "libfontconfig-utils"
RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
DEBIAN_NOAUTONAME_fontconfig-utils = "1"
inherit autotools pkgconfig relative_symlinks
inherit autotools pkgconfig relative_symlinks gettext
FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"