[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     3bcb8e2fca5f90deab97d73cd9148fb4152a88e4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 17 21:35:37 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 22 20:48:58 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bcb8e2f

media-libs/harfbuzz: drop 10.4.0-r2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/harfbuzz/Manifest                       |  1 -
 .../files/harfbuzz-10.4.0-meson-freetype.patch     | 87 ---------------------
 media-libs/harfbuzz/harfbuzz-10.4.0-r2.ebuild      | 91 ----------------------
 3 files changed, 179 deletions(-)

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 9d5f488dcc9a..e3b5af2a2373 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,2 @@
-DIST harfbuzz-10.4.0.tar.xz 18120656 BLAKE2B 21a2ed81ead5f06658c6153ad756631aacf5522bf58cdc5a54585cc03b0562c634ecabcd686fa76d2dda3497eb1a7d9e10c771e29da62c5946438d9ed8c46075 SHA512 73e202225aeef6174ebd3b8b226ad9d5afb48c40ecdc1bc26d1bc5f0cf1d832a8ffc2fe5b7ae3b7c8f848552dd57116d407f44120c6813b59dbe9faed0c346dc
 DIST harfbuzz-11.2.1.tar.xz 18057576 BLAKE2B 1c2553a02b4254c06f41a429c498439796e3c307ea2b1325b3ee99a4a87dc817bcc0ceb4ec23f0b1c708e3488249ce5f05913f4ab50fc2a66605b3e238f39d5d SHA512 56d4819f63d6040bff008e64a0d5b597c1cfa105047f7970b1dae2894aeed27a92d0c0780fee0beda53685767d86cb864256d6388cb4439e7d51a7ee717a0bd7
 DIST harfbuzz-11.3.2.tar.xz 18113460 BLAKE2B 6cbe290d86d592f942235272137ae7d4bb5a9ba6dfc2c496fa2395fc09e9f6fd6e900b6dfcd40d57d477b0bd232253eef46951ebce1bd59358c54b4e998bc970 SHA512 d3ba37b55b04863e75f9af80839f0efe9baad2cde3c7334383e313e863bdc1532c8a6e00669ee8d8d6634e8066d0a66119c0a953df427694a1219d002e4644b5

diff --git a/media-libs/harfbuzz/files/harfbuzz-10.4.0-meson-freetype.patch b/media-libs/harfbuzz/files/harfbuzz-10.4.0-meson-freetype.patch
deleted file mode 100644
index fea5b1e99411..000000000000
--- a/media-libs/harfbuzz/files/harfbuzz-10.4.0-meson-freetype.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 5809f47dea83644ed78c2c7884bfea94932e4c94 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Tue, 25 Feb 2025 17:43:41 +0200
-Subject: [PATCH] meson: refactor freetype dependency logic
-
-Simplify and respect -Dfreetype=disabled again.
-
-Bug: https://bugs.gentoo.org/950274
-Fixes: 1ad48fddd08654052da4f8a93609e7f4380d5c42
-See-Also: 604fe807078ce41d0ac7742547e90b17c066709f
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
-(cherry picked from commit 628b868f44acce749adc08ff61f2d9c19c9e2bbe)
----
- meson.build | 46 +++++++++++++++++++---------------------------
- 1 file changed, 19 insertions(+), 27 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 1460c2a9d..ab46197f2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -102,44 +102,36 @@ check_funcs = [
- 
- m_dep = cpp.find_library('m', required: false)
- 
--if meson.version().version_compare('>=0.60.0')
-+# Painful hack to handle multiple dependencies but also respect options
-+if get_option('freetype').disabled()
-+  freetype_dep = dependency('', required: false)
-+else
-   # Sadly, FreeType's versioning schemes are different between pkg-config and CMake
--  # pkg-config: freetype2, cmake: Freetype
-+
-+  # Try pkg-config name
-   freetype_dep = dependency('freetype2',
-                             version: freetype_min_version,
-                             method: 'pkg-config',
-                             required: false,
-                             allow_fallback: false)
-   if not freetype_dep.found()
--    freetype_dep = dependency('FreeType',
-+    # Try cmake name
-+    freetype_dep = dependency('Freetype',
-                               version: freetype_min_version_actual,
-                               method: 'cmake',
--                              required: get_option('freetype'),
--                              default_options: ['harfbuzz=disabled'],
--                              allow_fallback: true)
--  endif
--else
--  # painful hack to handle multiple dependencies but also respect options
--  freetype_opt = get_option('freetype')
--  # we want to handle enabled manually after fallbacks, but also handle disabled normally
--  if freetype_opt.enabled()
--    freetype_opt = false
--  endif
--  # try pkg-config name
--  freetype_dep = dependency('freetype2', version: freetype_min_version, method: 'pkg-config', required: freetype_opt)
--  # when disabled, leave it not-found
--  if not freetype_dep.found() and not get_option('freetype').disabled()
--    # Try cmake name
--    freetype_dep = dependency('Freetype', version: freetype_min_version_actual, method: 'cmake', required: false)
--    # Subproject fallback, `allow_fallback: true` means the fallback will be
--    # tried even if the freetype option is set to `auto`.
-+                              required: false,
-+                              allow_fallback: false)
-+    # Subproject fallback
-     if not freetype_dep.found()
--      freetype_dep = dependency('freetype2',
--                                version: freetype_min_version,
--                                method: 'pkg-config',
-+      freetype_proj = subproject('freetype2',
-+                                version: freetype_min_version_actual,
-                                 required: get_option('freetype'),
--                                default_options: ['harfbuzz=disabled'],
--                                allow_fallback: true)
-+                                default_options: ['harfbuzz=disabled'])
-+      if freetype_proj.found()
-+        freetype_dep = freetype_proj.get_variable('freetype_dep')
-+      else
-+        freetype_dep = dependency('', required: false)
-+      endif
-     endif
-   endif
- endif
--- 
-2.49.0
-

diff --git a/media-libs/harfbuzz/harfbuzz-10.4.0-r2.ebuild b/media-libs/harfbuzz/harfbuzz-10.4.0-r2.ebuild
deleted file mode 100644
index 1b42b1e59c81..000000000000
--- a/media-libs/harfbuzz/harfbuzz-10.4.0-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://harfbuzz.github.io/"
-
-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 ~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}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-PATCHES=( "${FILESDIR}/${P}-meson-freetype.patch" ) # bug 950274
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# bug #790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-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
-}