From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/files/, media-libs/harfbuzz/
Date: Mon, 10 Jul 2023 06:52:16 +0000 (UTC) [thread overview]
Message-ID: <1688971902.5b868f7c8e48151d4beff2044ae3d5318f7bddc5.sam@gentoo> (raw)
commit: 5b868f7c8e48151d4beff2044ae3d5318f7bddc5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 06:51:42 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 06:51:42 2023 +0000
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 <sam <AT> 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 000000000000..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 <behdad@behdad.org>
+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<Ts> (os)...); }
+
+ /* To be called around main operation. */
+- template <typename Type>
++ template <typename Type=char>
+ __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<char>* buf,
+ hb_subset_context_t* c /* OUT */)
+ {
+- c->serializer->start_serialize<TableType> ();
++ 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
next reply other threads:[~2023-07-10 6:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-10 6:52 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-08 17:47 [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/files/, media-libs/harfbuzz/ Andreas Sturmlechner
2022-06-19 9:13 Andreas Sturmlechner
2022-02-22 14:08 Lars Wendler
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=1688971902.5b868f7c8e48151d4beff2044ae3d5318f7bddc5.sam@gentoo \
--to=sam@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