commit: c72a13073780ea98361cd36b80cb002058a7b21e Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Feb 22 14:07:23 2022 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Feb 22 14:07:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c72a1307
media-libs/harfbuzz: Revbump to handle multiple element ICU DEFS Closes: https://bugs.gentoo.org/833891 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> .../files/harfbuzz-3.4.0-multiple_icu_defs.patch | 24 ++++++++++++++++++++++ ...fbuzz-3.4.0.ebuild => harfbuzz-3.4.0-r1.ebuild} | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch b/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch new file mode 100644 index 000000000000..64aebcfc03f1 --- /dev/null +++ b/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch @@ -0,0 +1,24 @@ +From 256dcde149737246a04cfc0fe388cb91acb65522 Mon Sep 17 00:00:00 2001 +From: James Hilliard <james.hillia...@gmail.com> +Date: Mon, 21 Feb 2022 00:07:03 -0700 +Subject: [PATCH] [meson] handle multiple element ICU DEFS + +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index e22859a265..27cd3daa97 100644 +--- a/meson.build ++++ b/meson.build +@@ -105,8 +105,8 @@ else + endif + + if icu_dep.found() and icu_dep.type_name() == 'pkgconfig' +- icu_defs = icu_dep.get_variable(pkgconfig: 'DEFS', default_value: '') +- if icu_defs != '' ++ icu_defs = icu_dep.get_variable(pkgconfig: 'DEFS', default_value: '').split() ++ if icu_defs.length() > 0 + add_project_arguments(icu_defs, language: ['c', 'cpp']) + endif + endif diff --git a/media-libs/harfbuzz/harfbuzz-3.4.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild similarity index 97% rename from media-libs/harfbuzz/harfbuzz-3.4.0.ebuild rename to media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild index 9322b2928b1c..8a1d1b1f669e 100644 --- a/media-libs/harfbuzz/harfbuzz-3.4.0.ebuild +++ b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild @@ -45,6 +45,10 @@ BDEPEND=" introspection? ( dev-util/glib-utils ) " +PATCHES=( + "${FILESDIR}/${P}-multiple_icu_defs.patch" #833891 +) + pkg_setup() { python-any-r1_pkg_setup if ! use debug ; then
