Signed-off-by: Richard Purdie <[email protected]> --- .../fontconfig/fontconfig/revert-static-pkgconfig.patch | 8 ++++++++ .../{fontconfig_2.18.1.bb => fontconfig_2.18.2.bb} | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) rename meta/recipes-graphics/fontconfig/{fontconfig_2.18.1.bb => fontconfig_2.18.2.bb} (96%)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch index 30d6423037d..4337da724f6 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch +++ b/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch @@ -1,3 +1,8 @@ +From 1de775180219a57c85a0cdcc62fc6482ef8e581e Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 23 Apr 2015 20:35:32 -0700 +Subject: [PATCH] fontconfig: Fix pkgconfig file generation to not have + Revert part of http://cgit.freedesktop.org/fontconfig/commit/fontconfig.pc.in?id=338ffe6b886ad4ba86ff471cb59c4a5e5ffbe408 We really dont do static linking so its not going to cause issues for us but as such this is harming us by adding absolute paths into -I options into fontconfig.pc which is them prepended with sysroot when read back by cross pkg-config and @@ -7,6 +12,9 @@ gently refuses and rightly so. Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj <[email protected]> +--- + fontconfig.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fontconfig.pc.in b/fontconfig.pc.in index 61b35fb..5bc9bab 100644 diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.18.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.18.2.bb similarity index 96% rename from meta/recipes-graphics/fontconfig/fontconfig_2.18.1.bb rename to meta/recipes-graphics/fontconfig/fontconfig_2.18.2.bb index 76b26527387..d2b6050081d 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.18.1.bb +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.18.2.bb @@ -23,7 +23,7 @@ DEPENDS = "expat freetype zlib gperf-native util-linux" SRC_URI = "https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PV}/fontconfig-${PV}.tar.xz \ file://revert-static-pkgconfig.patch \ " -SRC_URI[sha256sum] = "2300f3dbfa7253b3a44f4feecdbc8dfa45dde5dc2cfb71fceaf31f394cb41031" +SRC_URI[sha256sum] = "cf8e6576ef0484c15079bdaf77cd9c51c464df5365814ada4d3ee7331ea31eb5" UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/tags"; UPSTREAM_CHECK_REGEX = "releases/(?P<pver>.+)"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#240710): https://lists.openembedded.org/g/openembedded-core/message/240710 Mute This Topic: https://lists.openembedded.org/mt/120220628/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
