[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/
commit: 66a80a1268ba88af9f7888e747e3fee88b34e47b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Sep 3 17:50:50 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Sep 4 13:28:38 2023 +
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 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
7b1f6fb0c4c7483ff7a7c27f613b8579af30a304432e1a4e157aec439aed93e68443df1f2bc741be6780a6b2214d54804e2df9a20d83c8256b5f98c7fcda
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
e1292f059b07a5aa2f3fbf345b893209cac895c461b4abf30b8b76bcd03c79dd09f911450293403070e1a0bb08496a7f37693ba5a62a9d423dd6ba55e74d
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..
--- 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
-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-7.3.0.ebuild
b/media-libs/harfbuzz/harfbuzz-7.3.0.ebuild
deleted file mode 100644
index 9ea00f65f775..
--- 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} = ]] ; 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? (
[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/
commit: a7f050bbcecb34d25f4fe76a954ff99348af562f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 10 08:56:25 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 10 09:38:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f050bb
media-libs/harfbuzz: drop 6.0.0, 7.2.0
Bug: https://bugs.gentoo.org/905310
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/harfbuzz/Manifest | 2 -
.../harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch | 26 --
media-libs/harfbuzz/harfbuzz-6.0.0.ebuild | 102 -
media-libs/harfbuzz/harfbuzz-7.2.0.ebuild | 97
4 files changed, 227 deletions(-)
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index b8d2ea36a988..f9d25fc7bcf9 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1 @@
-DIST harfbuzz-6.0.0.tar.xz 18952524 BLAKE2B
bb08f90cf9540a076ec2fe5498658a0e5f963537ebd98fce271af9070d0fc7178346bf56c600720d433c9e3a403f67ec3ac898abeb1da12697ad22980ecf5204
SHA512
66f8484586b1b334479d739df1d1107172715ce1d2a3c0105375174fa3e201fd69ceb1543c10d6db49b012912e823befc701f00621f7b5f68036eced80d36f65
-DIST harfbuzz-7.2.0.tar.xz 18716956 BLAKE2B
247746d6a0f132a0d6b0c461d9e96a4fe76bc08bca4d05b28a034de60afee8e049d798fdf3962b892b33424245d8f00a63d6068b034e80ad9d7733180e8533c1
SHA512
c32ae887fa13da332a5baa387fc472e501f5f682dcbdf5f038a25a18a75948a1313a94612ee44beae169fb1ddd66b883e7a2d236d0ad5b81476b5c4d3cb2
DIST harfbuzz-7.3.0.tar.xz 18867940 BLAKE2B
7b1f6fb0c4c7483ff7a7c27f613b8579af30a304432e1a4e157aec439aed93e68443df1f2bc741be6780a6b2214d54804e2df9a20d83c8256b5f98c7fcda
SHA512
e1fb484e4117cedc72bd473ee91b2f6143533fb467ec9a64361f0c7ffd8b5a44ad2ea42daa948a2d5d85297ace4b640fcd24a8291b0d75a1d4ee468c629febe9
diff --git a/media-libs/harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch
b/media-libs/harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch
deleted file mode 100644
index 59536b173f21..
--- a/media-libs/harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/harfbuzz/harfbuzz/commit/7dfa672dac958bdbc7703ab0920e167eaa126754
-
-From 7dfa672dac958bdbc7703ab0920e167eaa126754 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich
-Date: Mon, 16 Jan 2023 19:49:53 +
-Subject: [PATCH] test/threads/hb-subset-threads.cc: add missing
- include
-
-This week's `gcc-13` snapshot cleaned further up it's standard headers
-and exposed missing declaration as a build failure:
-
-../test/threads/hb-subset-threads.cc: In function 'void
test_operation(operation_t, const char*, const test_input_t&)':
-../test/threads/hb-subset-threads.cc:127:3: error: 'printf' was not
declared in this scope
-
-../test/threads/hb-subset-threads.cc: In function 'int main(int, char**)':
-../test/threads/hb-subset-threads.cc:157:19: error: 'atoi' was not
declared in this scope
a/test/threads/hb-subset-threads.cc
-+++ b/test/threads/hb-subset-threads.cc
-@@ -1,4 +1,6 @@
- #include
-+#include
-+#include
- #include
- #include
- #include
-
diff --git a/media-libs/harfbuzz/harfbuzz-6.0.0.ebuild
b/media-libs/harfbuzz/harfbuzz-6.0.0.ebuild
deleted file mode 100644
index ffb3ccc3dada..
--- a/media-libs/harfbuzz/harfbuzz-6.0.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} = ]] ; 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 ~arm64-macos ~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:= )
- 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}
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/
commit: 7139c7761a2bb3eff099fc4595e4ddb3a842579c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 29 21:26:13 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 30 17:16:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7139c776
media-libs/harfbuzz: drop 5.3.1-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/harfbuzz/Manifest | 1 -
.../files/harfbuzz-5.3.1-meson-freetype-icu.patch | 120 -
media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild | 104 --
3 files changed, 225 deletions(-)
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 798c9068dfaa..0d2f9da5d263 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,4 +1,3 @@
-DIST harfbuzz-5.3.1.tar.xz 17874260 BLAKE2B
e4d3926daca4f5c95441a9b99e10acd4b95bf365f56934a2bbb8b35955e8457a90a13b0ad3223d8350012373216083e910f517b34c0dffb09fb218a1f8e9ca48
SHA512
6b0aef2b7445f4a71c324b545414114507d8077dc186366f25140dcd3bedeee67868cfc65c0eef59ed950381a4c101a541900be4995f645377c11754b027b501
DIST harfbuzz-6.0.0.tar.xz 18952524 BLAKE2B
bb08f90cf9540a076ec2fe5498658a0e5f963537ebd98fce271af9070d0fc7178346bf56c600720d433c9e3a403f67ec3ac898abeb1da12697ad22980ecf5204
SHA512
66f8484586b1b334479d739df1d1107172715ce1d2a3c0105375174fa3e201fd69ceb1543c10d6db49b012912e823befc701f00621f7b5f68036eced80d36f65
DIST harfbuzz-7.1.0.tar.xz 18655864 BLAKE2B
e152ca15db53b6130cff039f039ee7f95134eac297c434941e7aa9b66e8925275de213680769cd8170ab28785985f3d288af23444087ca35f2861f17018a5943
SHA512
2f15bf14f927263c34201dba067ffac84133610121c58843c566d6f271f30f1dce44832a65bceb83828e25e9dd1a1d2a1610c5dbe2bef3ddbcecd7b5bcab8714
DIST harfbuzz-7.2.0.tar.xz 18716956 BLAKE2B
247746d6a0f132a0d6b0c461d9e96a4fe76bc08bca4d05b28a034de60afee8e049d798fdf3962b892b33424245d8f00a63d6068b034e80ad9d7733180e8533c1
SHA512
c32ae887fa13da332a5baa387fc472e501f5f682dcbdf5f038a25a18a75948a1313a94612ee44beae169fb1ddd66b883e7a2d236d0ad5b81476b5c4d3cb2
diff --git a/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
b/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
deleted file mode 100644
index 3e0a7beece9c..
--- a/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://bugs.gentoo.org/880479
-https://bugs.gentoo.org/880405
-https://github.com/harfbuzz/harfbuzz/pull/3870
-
-From 2c14943fb06ffd6de4e270454501ff5d305ede6e Mon Sep 17 00:00:00 2001
-From: Eli Schwartz
-Date: Tue, 8 Nov 2022 16:24:08 -0500
-Subject: [PATCH] meson: fix regression in detecting freetype2/icu-uc when
- explicitly disabled
-
-In #3811 / commit 53a194aa3f5f7de0b40e879e41fcbe0de6e9fefe a broken and
-half-implemented approach to kind of sort of handling the detection of
-both pkg-config and cmake names for dependencies, was implemented. It
-just checked for both versions with required: false, but when the build
-was configured with *disabled* options, it was still found because it
-was treated as auto.
-
-Really, the problem here is trying to outsmart Meson, which handles a
-lot of edge cases correctly. But it's possible, albeit very wordy, to
-manually implement Meson's internal logic via if/else fallbacks. Do so
-here.
a/meson.build
-+++ b/meson.build
-@@ -83,20 +83,35 @@ check_funcs = [
-
- m_dep = cpp.find_library('m', required: false)
-
--
--# Try pkgconfig name
--freetype_dep = dependency('freetype2', required: false)
--if not freetype_dep.found()
-- # Try cmake name
-- freetype_dep = dependency('freetype', required: false)
--endif
--if not freetype_dep.found()
-- # Subproject fallback, `allow_fallback: true` means the fallback will be
-- # tried even if the freetype option is set to `auto`.
-- freetype_dep = dependency('freetype2',
-+if meson.version().version_compare('>=0.60.0')
-+ # pkg-config: freetype2, cmake: Freetype
-+ freetype_dep = dependency('freetype2', 'Freetype',
- required: get_option('freetype'),
- default_options: ['harfbuzz=disabled'],
- allow_fallback: true)
-+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', 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', method: 'cmake', required: false)
-+# Subproject fallback, `allow_fallback: true` means the fallback will be
-+# tried even if the freetype option is set to `auto`.
-+if
[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/
commit: 57e3faad7b621b4c532b10ce11adf29a49154d1b
Author: Sam James gentoo org>
AuthorDate: Thu Jan 26 07:18:13 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 26 07:18:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e3faad
media-libs/harfbuzz: fix build w/ gcc 13
Signed-off-by: Sam James gentoo.org>
.../harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch | 26 ++
media-libs/harfbuzz/harfbuzz-6.0.0.ebuild | 4
2 files changed, 30 insertions(+)
diff --git a/media-libs/harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch
b/media-libs/harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch
new file mode 100644
index ..59536b173f21
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch
@@ -0,0 +1,26 @@
+https://github.com/harfbuzz/harfbuzz/commit/7dfa672dac958bdbc7703ab0920e167eaa126754
+
+From 7dfa672dac958bdbc7703ab0920e167eaa126754 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich
+Date: Mon, 16 Jan 2023 19:49:53 +
+Subject: [PATCH] test/threads/hb-subset-threads.cc: add missing
+ include
+
+This week's `gcc-13` snapshot cleaned further up it's standard headers
+and exposed missing declaration as a build failure:
+
+../test/threads/hb-subset-threads.cc: In function 'void
test_operation(operation_t, const char*, const test_input_t&)':
+../test/threads/hb-subset-threads.cc:127:3: error: 'printf' was not
declared in this scope
+
+../test/threads/hb-subset-threads.cc: In function 'int main(int, char**)':
+../test/threads/hb-subset-threads.cc:157:19: error: 'atoi' was not
declared in this scope
+--- a/test/threads/hb-subset-threads.cc
b/test/threads/hb-subset-threads.cc
+@@ -1,4 +1,6 @@
+ #include
++#include
++#include
+ #include
+ #include
+ #include
+
diff --git a/media-libs/harfbuzz/harfbuzz-6.0.0.ebuild
b/media-libs/harfbuzz/harfbuzz-6.0.0.ebuild
index 6b4d0b8c3c11..9f5fab0d08ae 100644
--- a/media-libs/harfbuzz/harfbuzz-6.0.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-6.0.0.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
introspection? ( dev-util/glib-utils )
"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-13.patch
+)
+
pkg_setup() {
python-any-r1_pkg_setup
if ! use debug ; then
[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/
commit: 9e5d8576d295164bc6dc9873e68ed94fd46968cf
Author: Sam James gentoo org>
AuthorDate: Thu Nov 10 05:13:32 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 10 05:14:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5d8576
media-libs/harfbuzz: backport fix for icu/freetype detection
Bug: https://bugs.gentoo.org/830966
Closes: https://bugs.gentoo.org/880405
Closes: https://bugs.gentoo.org/880479
Thanks-to: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
.../files/harfbuzz-5.3.1-meson-freetype-icu.patch | 120 +
media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild | 104 ++
2 files changed, 224 insertions(+)
diff --git a/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
b/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
new file mode 100644
index ..3e0a7beece9c
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
@@ -0,0 +1,120 @@
+https://bugs.gentoo.org/880479
+https://bugs.gentoo.org/880405
+https://github.com/harfbuzz/harfbuzz/pull/3870
+
+From 2c14943fb06ffd6de4e270454501ff5d305ede6e Mon Sep 17 00:00:00 2001
+From: Eli Schwartz
+Date: Tue, 8 Nov 2022 16:24:08 -0500
+Subject: [PATCH] meson: fix regression in detecting freetype2/icu-uc when
+ explicitly disabled
+
+In #3811 / commit 53a194aa3f5f7de0b40e879e41fcbe0de6e9fefe a broken and
+half-implemented approach to kind of sort of handling the detection of
+both pkg-config and cmake names for dependencies, was implemented. It
+just checked for both versions with required: false, but when the build
+was configured with *disabled* options, it was still found because it
+was treated as auto.
+
+Really, the problem here is trying to outsmart Meson, which handles a
+lot of edge cases correctly. But it's possible, albeit very wordy, to
+manually implement Meson's internal logic via if/else fallbacks. Do so
+here.
+--- a/meson.build
b/meson.build
+@@ -83,20 +83,35 @@ check_funcs = [
+
+ m_dep = cpp.find_library('m', required: false)
+
+-
+-# Try pkgconfig name
+-freetype_dep = dependency('freetype2', required: false)
+-if not freetype_dep.found()
+- # Try cmake name
+- freetype_dep = dependency('freetype', required: false)
+-endif
+-if not freetype_dep.found()
+- # Subproject fallback, `allow_fallback: true` means the fallback will be
+- # tried even if the freetype option is set to `auto`.
+- freetype_dep = dependency('freetype2',
++if meson.version().version_compare('>=0.60.0')
++ # pkg-config: freetype2, cmake: Freetype
++ freetype_dep = dependency('freetype2', 'Freetype',
+ required: get_option('freetype'),
+ default_options: ['harfbuzz=disabled'],
+ allow_fallback: true)
++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', 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', method: 'cmake', required: false)
++# Subproject fallback, `allow_fallback: true` means the fallback will be
++# tried even if the freetype option is set to `auto`.
++if not freetype_dep.found()
++ freetype_dep = dependency('freetype2',
++method: 'pkg-config',
++required: get_option('freetype'),
++default_options: ['harfbuzz=disabled'],
++allow_fallback: true)
++endif
++ endif
+ endif
+
+ glib_dep = dependency('glib-2.0', required: get_option('glib'))
+@@ -104,18 +119,36 @@ gobject_dep = dependency('gobject-2.0', required:
get_option('gobject'))
+ graphite2_dep = dependency('graphite2', required: get_option('graphite2'))
+ graphite_dep = dependency('graphite2', required: get_option('graphite'))
+
+-# Try pkgconfig name
+-icu_dep = dependency('icu-uc', required: false)
+-if not icu_dep.found()
+- # Try cmake name
+- icu_dep = dependency('ICU',
+- required: false,
+- components: 'uc',
+- method: 'cmake')
+-endif
+-if not icu_dep.found()
+- # Subproject fallback if icu option is enabled
+- icu_dep = dependency('icu-uc', required: get_option('icu'))
++if meson.version().version_compare('>=0.60.0')
++ # pkg-config: icu-uc, cmake: ICU but with components
++ icu_dep = dependency('icu-uc', 'ICU',
++components: 'uc',
++required: get_option('icu'),
++
[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/
commit: 5e2c1c13fa388533d075554da87d3641019aa739
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Nov 9 15:49:20 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Nov 9 15:49:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2c1c13
media-libs/harfbuzz: fux current stable against gcc-9
Fix build failure on gcc-9. It's a slightly less invasive
version of upstream's commit 2dce85ed06a8cc7ca
("[icu] Remove HB_ICU_STMT (#1993)")
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch | 14 ++
media-libs/harfbuzz/harfbuzz-2.6.1.ebuild| 4
2 files changed, 18 insertions(+)
diff --git a/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch
b/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch
new file mode 100644
index 000..c16fedd6d9d
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch
@@ -0,0 +1,14 @@
+Fix build failure on gcc-9. It's a slightly less invasive
+version of upstream's commit 2dce85ed06a8cc7ca
+("[icu] Remove HB_ICU_STMT (#1993)")
+--- a/src/hb-icu.cc
b/src/hb-icu.cc
+@@ -53,7 +53,7 @@
+
+ /* ICU doesn't do-while(0) around their statements. Ugh!
+ * https://unicode-org.atlassian.net/browse/CLDR-13027 */
+-#define HB_ICU_STMT(S) do { S } while (0)
++#define HB_ICU_STMT(S) do { S; } while (0)
+
+ hb_script_t
+ hb_icu_script_to_script (UScriptCode script)
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
index d8eb3a9c894..87e7095493c 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
@@ -48,6 +48,10 @@ if [[ ${PV} = ]] ; then
"
fi
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-9.patch
+)
+
pkg_setup() {
use test && python-any-r1_pkg_setup
if ! use debug ; then
[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/
commit: ee8c4575ac629d9211dd570809b4efb213be2ecf
Author: Lars Wendler gentoo org>
AuthorDate: Mon Dec 10 09:10:46 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Dec 10 09:10:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8c4575
media-libs/harfbuzz: Removed old.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
media-libs/harfbuzz/Manifest | 1 -
.../harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch | 22
media-libs/harfbuzz/harfbuzz-1.7.6.ebuild | 116 -
3 files changed, 139 deletions(-)
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 36e1b26f12e..3dc22c7aa77 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,4 +1,3 @@
-DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B
0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a
SHA512
259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B
c844a623de5c2be7b6fb4a2cf0d38e689a6e639e25ece971646963acbdb10be05b82c4faea33688b1a3edfda4c3fe45b97e5ef87d7ca6d9776268b43ef23a7ee
SHA512
4cb605c47617dd06d4a2e8ae01e44969f5addacee47ef5212442645c6229298d5080f85b0aca6a2fbedfd2007c679acad6a4b3e9389df1b3a6232bf6ef961577
DIST harfbuzz-2.1.3.tar.bz2 4429069 BLAKE2B
d00b5e4f83e9e4b8032cd4f0a8c00d3f88176118458026de69a68f1932bf437358dcd0ecea89f40a4f610816b1709f3b0784c9a619141fa459297754d934f42d
SHA512
9bf5f7b857424037a3b3ea5c286e6ba8440c265fa663cf6b6c22cc08d36d84badfed8bdc46816ad982fc810677ebecccdb669ea98a021207e1858c8c355dbf19
DIST harfbuzz-2.2.0.tar.bz2 4506619 BLAKE2B
e2ff32f4490e408a7f67b4e1dd12f266e31a8b58f4960643be45ac9574ce20da8f26e0d7261a9710114621b7f6928df030fa30c3a7672ab5e2b9d1b5c0369d2d
SHA512
5e8f35c0d7634afc6f623a91d56bfde46b2a1030d439e5dec196001d49a58e409a1bf66c7f9c15a04e030dab4fe2fe2c928061839b1e985459d4f8379b8a0818
diff --git a/media-libs/harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch
b/media-libs/harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch
deleted file mode 100644
index a9187561849..000
--- a/media-libs/harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 93b03119da8674a3eddb7879857e9f17fa16fd2a Mon Sep 17 00:00:00 2001
-From: violet-sippial <38817272+violet-sipp...@users.noreply.github.com>
-Date: Sat, 28 Apr 2018 20:29:13 +0200
-Subject: [PATCH] [subset] Do not compare ttx progress output in the tests
-
-Suppress progress messages of ttx. This avoids comparing this output to the
reference file which lets the test fail.
- test/subset/run-tests.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/subset/run-tests.py b/test/subset/run-tests.py
-index 0b119fee6..1cd1a19f6 100755
a/test/subset/run-tests.py
-+++ b/test/subset/run-tests.py
-@@ -80,6 +80,7 @@ def run_test(test, should_check_ots):
- def run_ttx(file):
- print ("ttx %s" % file)
- cli_args = ["ttx",
-+ "-q",
- "-o-",
- file]
- return cmd(cli_args)
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
deleted file mode 100644
index 8db52ea298e..000
--- a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic libtool ltprune multilib-minimal 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://anongit.freedesktop.org/git/harfbuzz.git;
- inherit git-r3 autotools
-else
-
SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
~x86-macos ~x64-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs
test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
- cairo? ( x11-libs/cairo:= )
- fontconfig? ( media-libs/fontconfig:1.0[${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-util/gtk-doc-am
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/
commit: 2a59cd049fe2ba0787bc77a63df0490bf91b406d
Author: Lars Wendler gentoo org>
AuthorDate: Thu May 3 11:05:36 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu May 3 11:06:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a59cd04
media-libs/harfbuzz: Fixed test failure.
Closes: https://bugs.gentoo.org/654194
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch | 22 ++
media-libs/harfbuzz/harfbuzz-1.7.6.ebuild | 4
2 files changed, 26 insertions(+)
diff --git a/media-libs/harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch
b/media-libs/harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch
new file mode 100644
index 000..a9187561849
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch
@@ -0,0 +1,22 @@
+From 93b03119da8674a3eddb7879857e9f17fa16fd2a Mon Sep 17 00:00:00 2001
+From: violet-sippial <38817272+violet-sipp...@users.noreply.github.com>
+Date: Sat, 28 Apr 2018 20:29:13 +0200
+Subject: [PATCH] [subset] Do not compare ttx progress output in the tests
+
+Suppress progress messages of ttx. This avoids comparing this output to the
reference file which lets the test fail.
+---
+ test/subset/run-tests.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/subset/run-tests.py b/test/subset/run-tests.py
+index 0b119fee6..1cd1a19f6 100755
+--- a/test/subset/run-tests.py
b/test/subset/run-tests.py
+@@ -80,6 +80,7 @@ def run_test(test, should_check_ots):
+ def run_ttx(file):
+ print ("ttx %s" % file)
+ cli_args = ["ttx",
++ "-q",
+ "-o-",
+ file]
+ return cmd(cli_args)
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
index 652f9591f8d..47bad82a254 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
@@ -47,6 +47,10 @@ if [[ ${PV} = ]] ; then
"
fi
+PATCHES=(
+ "${FILESDIR}/${P}-test_fixup.patch"
+)
+
pkg_setup() {
use test && python-any-r1_pkg_setup
if ! use debug ; then
