summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/fribidi
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2019-10-07 14:11:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-15 14:11:08 +0100
commit79297c6041342f4cb67131d08368a103d9791a9a (patch)
treef4d42da9da30c1d1df9e0ed34161aaec5d3907f4 /meta/recipes-support/fribidi
parent88cbc6b620752b896fc6723815c7fff90d84b8f4 (diff)
downloadopenembedded-core-79297c6041342f4cb67131d08368a103d9791a9a.tar.gz
openembedded-core-79297c6041342f4cb67131d08368a103d9791a9a.tar.bz2
openembedded-core-79297c6041342f4cb67131d08368a103d9791a9a.zip
fribidi:upgrade 1.0.5 -> 1.0.7
-fribidi/meson.patch Removed since this is included in 1.0.7. Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/fribidi')
-rw-r--r--meta/recipes-support/fribidi/fribidi/meson.patch44
-rw-r--r--meta/recipes-support/fribidi/fribidi_1.0.7.bb (renamed from meta/recipes-support/fribidi/fribidi_1.0.5.bb)6
2 files changed, 3 insertions, 47 deletions
diff --git a/meta/recipes-support/fribidi/fribidi/meson.patch b/meta/recipes-support/fribidi/fribidi/meson.patch
deleted file mode 100644
index 8b3c4a991e..0000000000
--- a/meta/recipes-support/fribidi/fribidi/meson.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From f5feb6c599adb52f24656f8589868039b0d14272 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 7 Sep 2018 20:57:11 +0200
-Subject: [PATCH] Build generator executables natively
-
-They are run during the build and not installed in the end. Without
-this one gets the following error from meson: "ERROR: Can not use
-target gen-unicode-version as a generator because it is cross-built
-and no exe wrapper is defined. You might want to set it to native
-instead."
-
-Closes #87.
-
----
- gen.tab/meson.build | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/gen.tab/meson.build b/gen.tab/meson.build
-index 6006d98..8c21e98 100644
---- a/gen.tab/meson.build
-+++ b/gen.tab/meson.build
-@@ -33,7 +33,8 @@ gen_unicode_version = executable('gen-unicode-version',
- 'gen-unicode-version.c',
- include_directories: incs,
- c_args: native_args,
-- install: false)
-+ install: false,
-+ native: true)
-
- fribidi_unicode_version_h = custom_target('fribidi-unicode-version.h',
- input: files('unidata/ReadMe.txt', 'unidata/BidiMirroring.txt'),
-@@ -67,7 +68,8 @@ foreach tab : tabs
- gen_prog_src, 'packtab.c',
- include_directories: incs,
- c_args: native_args,
-- install: false)
-+ install: false,
-+ native: true)
-
- tab_inc_file = custom_target(gen_prog_name,
- input: gen_prog_inputs,
diff --git a/meta/recipes-support/fribidi/fribidi_1.0.5.bb b/meta/recipes-support/fribidi/fribidi_1.0.7.bb
index 63b2da649c..6738884016 100644
--- a/meta/recipes-support/fribidi/fribidi_1.0.5.bb
+++ b/meta/recipes-support/fribidi/fribidi_1.0.7.bb
@@ -4,9 +4,9 @@ LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \
- file://meson.patch"
-SRC_URI[md5sum] = "0f97f65038545340316ec0f4bd53df0b"
-SRC_URI[sha256sum] = "6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce"
+ "
+SRC_URI[md5sum] = "4c020b0f5136dd012ee00f1e1122f6aa"
+SRC_URI[sha256sum] = "5ab5f21e9f2fc57b4b40f8ea8f14dba78a5cc46d9cf94bc5e00a58e6886a935d"
UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"