commit: 66a80a1268ba88af9f7888e747e3fee88b34e47b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Sep 3 17:50:50 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Sep 4 13:28:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a80a12
media-libs/harfbuzz: drop 7.3.0, 8.0.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/harfbuzz/Manifest | 2 - .../files/harfbuzz-8.0.0-arm-cast-align.patch | 31 ------ media-libs/harfbuzz/harfbuzz-7.3.0.ebuild | 102 -------------------- media-libs/harfbuzz/harfbuzz-8.0.0-r1.ebuild | 107 --------------------- 4 files changed, 242 deletions(-) diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index dd1265aea6f4..825569f0edcd 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,4 +1,2 @@ -DIST harfbuzz-7.3.0.tar.xz 18867940 BLAKE2B 7b1f6fb0c4c7483ff7a7c27f613b8579af30a304432e1a4e157aec4344449aed93e68443df1f2bc741be6780a6b2214d54804e2df9a20d83c8256b5f98c7fcda SHA512 e1fb484e4117cedc72bd473ee91b2f6143533fb467ec9a64361f0c7ffd8b5a44ad2ea42daa948a2d5d85297ace4b640fcd24a8291b0d75a1d4ee468c629febe9 -DIST harfbuzz-8.0.0.tar.xz 18793316 BLAKE2B b37ef67734af2b0e0f4587fc5e43b3046d669d4fac50c0f2bf9710a9e84384b9a22141999299476d715ce148b33236a42aa0f5d250114f0aef3074f6c401170b SHA512 8f4b72ec5f4fca56162e6d6fd6c60aa68958861ca5683e34a9ed96dd09d203253d5dbbfb2987b161fabda9b3abf61120e928a4dd6e9e9e6b6842294cfdf08402 DIST harfbuzz-8.0.1.tar.xz 18792332 BLAKE2B e69305e5cddee2f9a928ab38b6904cc3e6fbafb319ad268047178667639a2a361576051a9a6443352b51adca47bb8998ca5c533afe12eac456c3170e171c1839 SHA512 e1292f059b07a5aa2f3fbf345b893209cac895c461b4abf30b8b76bcd03c79dd09f911450293403070e1a0bb08496a7f37693ba5a62a9d423dd6ba55e744444d DIST harfbuzz-8.1.1.tar.xz 18820088 BLAKE2B 341603e50aec5294eb16fb431975304ee9badce5588d726c5ccbcf9e38878581c4bbf2e09f27c3d401da52c93121702f220cd207792448af66a9f23830df9114 SHA512 74416c6cf78751721112fe551a47600b9b85d6865f38b155c0e432e757a175ac127baeeaa16bfe6d62510e00f9def8950f0c836545d1847a924b478c51e43b0c 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 deleted file mode 100644 index c83336ce3fd0..000000000000 --- a/media-libs/harfbuzz/files/harfbuzz-8.0.0-arm-cast-align.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/harfbuzz/harfbuzz/commit/db3aeeb547c1a2cad46ea03e162593d22f700cb4 - -From db3aeeb547c1a2cad46ea03e162593d22f700cb4 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <beh...@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-7.3.0.ebuild b/media-libs/harfbuzz/harfbuzz-7.3.0.ebuild deleted file mode 100644 index 9ea00f65f775..000000000000 --- a/media-libs/harfbuzz/harfbuzz-7.3.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -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" - - $(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-r1.ebuild b/media-libs/harfbuzz/harfbuzz-8.0.0-r1.ebuild deleted file mode 100644 index 96c18d1d4c46..000000000000 --- a/media-libs/harfbuzz/harfbuzz-8.0.0-r1.ebuild +++ /dev/null @@ -1,107 +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 ) -" - -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 -}
