public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/files/, media-libs/harfbuzz/
Date: Tue, 22 Feb 2022 14:08:42 +0000 (UTC)	[thread overview]
Message-ID: <1645538843.c72a13073780ea98361cd36b80cb002058a7b21e.polynomial-c@gentoo> (raw)

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.hilliard1@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


             reply	other threads:[~2022-02-22 14:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-22 14:08 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-19  9:13 [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/files/, media-libs/harfbuzz/ Andreas Sturmlechner
2023-07-10  6:52 Sam James
2025-04-08 17:47 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1645538843.c72a13073780ea98361cd36b80cb002058a7b21e.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox