From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E64615808B for ; Tue, 22 Feb 2022 14:08:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85AD4E0B93; Tue, 22 Feb 2022 14:08:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66649E0B93 for ; Tue, 22 Feb 2022 14:08:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 60C713436FC for ; Tue, 22 Feb 2022 14:08:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C38342EB for ; Tue, 22 Feb 2022 14:08:42 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1645538843.c72a13073780ea98361cd36b80cb002058a7b21e.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/files/, media-libs/harfbuzz/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild media-libs/harfbuzz/harfbuzz-3.4.0.ebuild X-VCS-Directories: media-libs/harfbuzz/files/ media-libs/harfbuzz/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c72a13073780ea98361cd36b80cb002058a7b21e X-VCS-Branch: master Date: Tue, 22 Feb 2022 14:08:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9eb9fd30-ecb2-48be-ad5e-b573b34222fa X-Archives-Hash: cea1ece8cb75430c95d770564b887afc commit: c72a13073780ea98361cd36b80cb002058a7b21e Author: Lars Wendler gentoo org> AuthorDate: Tue Feb 22 14:07:23 2022 +0000 Commit: Lars Wendler gentoo 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 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 +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