[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/files/, media-libs/harfbuzz/
commit: 5b868f7c8e48151d4beff2044ae3d5318f7bddc5
Author: Sam James gentoo org>
AuthorDate: Mon Jul 10 06:51:42 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 10 06:51:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b868f7c
media-libs/harfbuzz: backport -Wcast-align fix for arm
While it's supposed to error out on ARM, it was still wrong before.
Signed-off-by: Sam James gentoo.org>
.../files/harfbuzz-8.0.0-arm-cast-align.patch | 31 ++
...fbuzz-8.0.0.ebuild => harfbuzz-8.0.0-r1.ebuild} | 4 +++
2 files changed, 35 insertions(+)
diff --git a/media-libs/harfbuzz/files/harfbuzz-8.0.0-arm-cast-align.patch
b/media-libs/harfbuzz/files/harfbuzz-8.0.0-arm-cast-align.patch
new file mode 100644
index ..c83336ce3fd0
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-8.0.0-arm-cast-align.patch
@@ -0,0 +1,31 @@
+https://github.com/harfbuzz/harfbuzz/commit/db3aeeb547c1a2cad46ea03e162593d22f700cb4
+
+From db3aeeb547c1a2cad46ea03e162593d22f700cb4 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod
+Date: Sun, 9 Jul 2023 12:32:49 -0600
+Subject: [PATCH] [subset] Fix cast-align issue
+
+Fixes https://github.com/harfbuzz/harfbuzz/issues/4316
+--- a/src/hb-serialize.hh
b/src/hb-serialize.hh
+@@ -266,7 +266,7 @@ struct hb_serialize_context_t
+ propagate_error (std::forward (os)...); }
+
+ /* To be called around main operation. */
+- template
++ template
+ __attribute__((returns_nonnull))
+ Type *start_serialize ()
+ {
+--- a/src/hb-subset.cc
b/src/hb-subset.cc
+@@ -273,7 +273,7 @@ _try_subset (const TableType *table,
+ hb_vector_t* buf,
+ hb_subset_context_t* c /* OUT */)
+ {
+- c->serializer->start_serialize ();
++ c->serializer->start_serialize ();
+ if (c->serializer->in_error ()) return false;
+
+ bool needed = table->subset (c);
+
diff --git a/media-libs/harfbuzz/harfbuzz-8.0.0.ebuild
b/media-libs/harfbuzz/harfbuzz-8.0.0-r1.ebuild
similarity index 98%
rename from media-libs/harfbuzz/harfbuzz-8.0.0.ebuild
rename to media-libs/harfbuzz/harfbuzz-8.0.0-r1.ebuild
index c114ab1668f9..96c18d1d4c46 100644
--- a/media-libs/harfbuzz/harfbuzz-8.0.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-8.0.0-r1.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
introspection? ( dev-util/glib-utils )
"
+PATCHES=(
+ "${FILESDIR}"/${P}-arm-cast-align.patch
+)
+
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/files/, media-libs/harfbuzz/
commit: ca832cc3ef5e6a07dc4dcc9f4c2f691cd82bb61a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jun 19 07:03:30 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jun 19 09:12:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca832cc3
media-libs/harfbuzz: Drop 3.4.0-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/harfbuzz/Manifest | 1 -
.../files/harfbuzz-3.4.0-multiple_icu_defs.patch | 24 -
media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild | 102 -
3 files changed, 127 deletions(-)
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index b78b79d22cde..868b6c512064 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,2 @@
-DIST harfbuzz-3.4.0.tar.gz 29043149 BLAKE2B
7b779149b34353ebb85143f74e9efdd8f8ba3616cd192df63ae43aa86f3f08d9a4104554f1f43624824549cf957625e496a307470dd1a9599e492cbf490ab1f3
SHA512
c0b3802fc084cb781acb717f07ca7811685e6834d97ae1a2f13ddc68ce0a31d672cb92e1192705c6d5ed870cb735f5d37150f7bf661b95d806a9d8f362520c01
DIST harfbuzz-4.2.1.tar.gz 29096419 BLAKE2B
eb523c2e3c956559e2445bd12719b14c244cfdedd239041afec71a17912e489adb94c0b6fe148c60ae9e908cc3e740752de2a33a255c123ef937debe6008d78b
SHA512
de14b673f6bd03d561c45f94e9bda44ee41897a643ab8837493260a83b1eb1f1ca0fe105c1bee241f2ecd6ab869dbccf3ffba8e2c4ee9a3a1fca4e1c6c7ca4f3
DIST harfbuzz-4.3.0.tar.gz 29200217 BLAKE2B
dfe5e3b47e3d89a5ad7c6eaf6d274027a0eb05d1994b922d3124c97270f34353384c0161d8815fb2e379e82c8bdf046843902ba53db38daa4348e99d99255900
SHA512
bccf7cfb06ac18a9a9bf465c30dbfb51d73762a6667b3a069a85f9f597e6d27858e9e39a36cce12e23ec5b002b9e572638bf00c76bdea66545ae67a2bb7915f4
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
deleted file mode 100644
index 64aebcfc03f1..
--- a/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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-r1.ebuild
b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
deleted file mode 100644
index 7966387b760c..
--- a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz;
-
-if [[ ${PV} = ]] ; then
- EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git;
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-# 0.9.18 introduced the harfbuzz-icu split; bug #472416
-# 3.0.0 dropped some unstable APIs; bug #813705
-SLOT="0/3.0.0"
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test
+truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
- cairo? ( x11-libs/cairo:= )
- glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
- graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.34:= )
- truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-libs/gobject-introspection-common-1.34
-"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- doc? ( dev-util/gtk-doc )
- introspection? ( dev-util/glib-utils )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-multiple_icu_defs.patch" #833891
-)
-
-pkg_setup() {
- python-any-r1_pkg_setup
- if ! use debug ; then
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/files/, media-libs/harfbuzz/
commit: c72a13073780ea98361cd36b80cb002058a7b21e
Author: Lars Wendler gentoo org>
AuthorDate: Tue Feb 22 14:07:23 2022 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Feb 22 14:07:23 2022 +
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 ..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
