diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 19:45:53 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-27 21:38:15 +0300 |
| commit | 316dfdd917bec6a218f431211d28bf8df6b6fb0f (patch) | |
| tree | 5541073f9851f44c2bd67b4959dc776ee3c3810f /import-layers/yocto-poky/meta/recipes-graphics/pango | |
| parent | 36acd3e888044dea2ac0b2946f15616f968388c9 (diff) | |
| download | openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.tar.xz | |
Yocto 2.5
Move OpenBMC to Yocto 2.5(sumo)
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics/pango')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch | 3 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.14.bb (renamed from import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.6.bb) | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch index 812da21c5..9e1626e9a 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Drop introspection macros from acinclude.m4 They take precendence over our customized macros, and so introspection doesn't work correctly. -Upstream-Status: Pending [review on oe-core list] +Upstream-Status: Backport [upstream 5ccfe0] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- acinclude.m4 | 96 ------------------------------------------------------------ @@ -118,4 +118,3 @@ index 8899c7c..48fd5d8 100644 -]) -- 2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.6.bb b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.14.bb index 31c3d2a65..3bd9c6471 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.6.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.14.bb @@ -17,16 +17,14 @@ SRC_URI += "file://run-ptest \ file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \ " -SRC_URI[archive.md5sum] = "507c6746fbf53fc9d48c577f1e265de3" -SRC_URI[archive.sha256sum] = "ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573" +SRC_URI[archive.md5sum] = "18d7eb8d52e7e445e733c109ddaa7b78" +SRC_URI[archive.sha256sum] = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" -EXTRA_AUTORECONF = "" - EXTRA_OECONF = " \ --disable-debug \ " |