From 870be9524d5a85e6be7803b3f4eae71fd93cb530 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 10 Jul 2023 10:26:59 +0100
Subject: gentoo auto-resync : 10:07:2023 - 10:26:59
---
media-libs/Manifest.gz | Bin 68422 -> 68425 bytes
media-libs/harfbuzz/Manifest | 3 +-
.../files/harfbuzz-8.0.0-arm-cast-align.patch | 31 ++++++
media-libs/harfbuzz/harfbuzz-8.0.0-r1.ebuild | 107 +++++++++++++++++++++
media-libs/harfbuzz/harfbuzz-8.0.0.ebuild | 103 --------------------
5 files changed, 140 insertions(+), 104 deletions(-)
create mode 100644 media-libs/harfbuzz/files/harfbuzz-8.0.0-arm-cast-align.patch
create mode 100644 media-libs/harfbuzz/harfbuzz-8.0.0-r1.ebuild
delete mode 100644 media-libs/harfbuzz/harfbuzz-8.0.0.ebuild
(limited to 'media-libs')
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3ce393f64935..988ee316523b 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index ef1fbd63cd0f..73a0956d457e 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,6 +1,7 @@
+AUX harfbuzz-8.0.0-arm-cast-align.patch 1036 BLAKE2B 37c45c3ac04f021d644820d4b80c61b3cd85c7a0515afe11fb07d6437b86276f4b993f57a6fd1f75e43b18522addb2ba426832c578c107d07c65aeb9679d3f9c SHA512 1a54d8530a25268481bca236d071eaa563890f6adb007e8713769de70d01b40f0eda68f6723d15a452d4337cc678845bb042bfbd5c524cc828bbb9a74b48c075
DIST harfbuzz-7.3.0.tar.xz 18867940 BLAKE2B 7b1f6fb0c4c7483ff7a7c27f613b8579af30a304432e1a4e157aec4344449aed93e68443df1f2bc741be6780a6b2214d54804e2df9a20d83c8256b5f98c7fcda SHA512 e1fb484e4117cedc72bd473ee91b2f6143533fb467ec9a64361f0c7ffd8b5a44ad2ea42daa948a2d5d85297ace4b640fcd24a8291b0d75a1d4ee468c629febe9
DIST harfbuzz-8.0.0.tar.xz 18793316 BLAKE2B b37ef67734af2b0e0f4587fc5e43b3046d669d4fac50c0f2bf9710a9e84384b9a22141999299476d715ce148b33236a42aa0f5d250114f0aef3074f6c401170b SHA512 8f4b72ec5f4fca56162e6d6fd6c60aa68958861ca5683e34a9ed96dd09d203253d5dbbfb2987b161fabda9b3abf61120e928a4dd6e9e9e6b6842294cfdf08402
EBUILD harfbuzz-7.3.0.ebuild 2689 BLAKE2B 0d5961de148f670843dba116990fb1f55efa4c9fc99fb4f228b56daa6e3c336f6d26fb962d5de975e8b3c8520acb46c5db9b16b026b25452cfa5f480a0aa1647 SHA512 44be08a204dd2beaa976f92b22b71f2317bbba0d8277ad48c2047fc02bdb1287a19836b2a04ae88986ec4fb47591cfef834e89ef10b8a8c3caf7fb827c8222f4
-EBUILD harfbuzz-8.0.0.ebuild 2713 BLAKE2B b72f5d07a27e84e98af56ff704a766cd1d19df6984eaf008255e88a9c413c6a3d4a2c0e977f2a522e80e2a064849843a30ad16e34bf07e1b64c5b5dee054374f SHA512 c176dd6d8c448ad34375e5991212896c33ab53c0eb6c983112e99e9f4d79e64fa6ac6c2ae9d51d11089d2c887235f847561dd0f873b206e51b1a1ebad99b1c25
+EBUILD harfbuzz-8.0.0-r1.ebuild 2767 BLAKE2B 7921ffa4911de8325b5d4feada0ea0fd0c758df8493fe49044daee888f2176dd006b1656497b33b3bcaf7930e8c4dcc76c243d93ea95ea567afb24554060e84b SHA512 927c2eebb0e282c6fc754b21e2d9c534852a49a270363ef814860f268aff254894883c31ddba55f7d2200376a925e27269c74b70ea28c6f633327349abbeeb7f
EBUILD harfbuzz-9999.ebuild 2713 BLAKE2B b72f5d07a27e84e98af56ff704a766cd1d19df6984eaf008255e88a9c413c6a3d4a2c0e977f2a522e80e2a064849843a30ad16e34bf07e1b64c5b5dee054374f SHA512 c176dd6d8c448ad34375e5991212896c33ab53c0eb6c983112e99e9f4d79e64fa6ac6c2ae9d51d11089d2c887235f847561dd0f873b206e51b1a1ebad99b1c25
MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70
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-r1.ebuild b/media-libs/harfbuzz/harfbuzz-8.0.0-r1.ebuild
new file mode 100644
index 000000000000..96c18d1d4c46
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-8.0.0-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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
+# 6.0.0 changed libharfbuzz-subset.so ABI
+SLOT="0/6.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:=[${MULTILIB_USEDEP}] )
+ 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}-arm-cast-align.patch
+)
+
+src_prepare() {
+ default
+
+ xdg_environment_reset
+
+ # bug #726120
+ sed -i \
+ -e '/tests\/macos\.tests/d' \
+ test/shape/data/in-house/Makefile.sources \
+ || die
+
+ # bug #790359
+ filter-flags -fexceptions -fthreadsafe-statics
+
+ if ! use debug ; then
+ append-cppflags -DHB_NDEBUG
+ fi
+
+ # bug #762415
+ local pyscript
+ for pyscript in $(find -type f -name "*.py") ; do
+ python_fix_shebang -q "${pyscript}"
+ done
+}
+
+multilib_src_configure() {
+ # harfbuzz-gobject only used for introspection, bug #535852
+ local emesonargs=(
+ -Dcoretext=disabled
+ -Dchafa=disabled
+ -Dwasm=disabled
+
+ $(meson_feature cairo)
+ $(meson_feature glib)
+ $(meson_feature graphite graphite2)
+ $(meson_feature icu)
+ $(meson_feature introspection gobject)
+ $(meson_feature test tests)
+ $(meson_feature truetype freetype)
+
+ $(meson_native_use_feature doc docs)
+ $(meson_native_use_feature introspection)
+ # Breaks building tests..
+ #$(meson_native_use_feature utilities)
+
+ $(meson_use experimental experimental_api)
+ )
+
+ meson_src_configure
+}
+
+multilib_src_test() {
+ # harfbuzz:src / check-static-inits times out on hppa
+ meson_src_test --timeout-multiplier 5
+}
diff --git a/media-libs/harfbuzz/harfbuzz-8.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.0.0.ebuild
deleted file mode 100644
index c114ab1668f9..000000000000
--- a/media-libs/harfbuzz/harfbuzz-8.0.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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
-# 6.0.0 changed libharfbuzz-subset.so ABI
-SLOT="0/6.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:=[${MULTILIB_USEDEP}] )
- 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 )
-"
-
-src_prepare() {
- default
-
- xdg_environment_reset
-
- # bug #726120
- sed -i \
- -e '/tests\/macos\.tests/d' \
- test/shape/data/in-house/Makefile.sources \
- || die
-
- # bug #790359
- filter-flags -fexceptions -fthreadsafe-statics
-
- if ! use debug ; then
- append-cppflags -DHB_NDEBUG
- fi
-
- # bug #762415
- local pyscript
- for pyscript in $(find -type f -name "*.py") ; do
- python_fix_shebang -q "${pyscript}"
- done
-}
-
-multilib_src_configure() {
- # harfbuzz-gobject only used for introspection, bug #535852
- local emesonargs=(
- -Dcoretext=disabled
- -Dchafa=disabled
- -Dwasm=disabled
-
- $(meson_feature cairo)
- $(meson_feature glib)
- $(meson_feature graphite graphite2)
- $(meson_feature icu)
- $(meson_feature introspection gobject)
- $(meson_feature test tests)
- $(meson_feature truetype freetype)
-
- $(meson_native_use_feature doc docs)
- $(meson_native_use_feature introspection)
- # Breaks building tests..
- #$(meson_native_use_feature utilities)
-
- $(meson_use experimental experimental_api)
- )
-
- meson_src_configure
-}
-
-multilib_src_test() {
- # harfbuzz:src / check-static-inits times out on hppa
- meson_src_test --timeout-multiplier 5
-}
--
cgit v1.2.3