commit: ec65883ba7e22af63ab2b4e02765d06e7c3269de
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 05:51:48 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 05:54:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec65883b
media-libs/harfbuzz: add 7.1.0
It's easier to add Cairo as multilib given I'm not really convinced Harfbuzz
is something you can properly split up & I don't think you can easily regulate
what multilib consumers are actually using, given the history of the APIs
Harfbuzz consumers tend to use (i.e. everything, even the experimental stuff).
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/harfbuzz/Manifest | 1 +
.../{harfbuzz-9999.ebuild => harfbuzz-7.1.0.ebuild} | 15 ++++++---------
media-libs/harfbuzz/harfbuzz-9999.ebuild | 15 ++++++---------
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index e9c95a33092e..33d8d7e21344 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,2 +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
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild
b/media-libs/harfbuzz/harfbuzz-7.1.0.ebuild
similarity index 95%
copy from media-libs/harfbuzz/harfbuzz-9999.ebuild
copy to media-libs/harfbuzz/harfbuzz-7.1.0.ebuild
index bf572ed0f6ee..9019f3ca2e97 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-7.1.0.ebuild
@@ -29,7 +29,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="introspection? ( glib )"
RDEPEND="
- cairo? ( x11-libs/cairo:= )
+ 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}] )
@@ -46,13 +46,6 @@ BDEPEND="
introspection? ( dev-util/glib-utils )
"
-pkg_setup() {
- python-any-r1_pkg_setup
- if ! use debug ; then
- append-cppflags -DHB_NDEBUG
- fi
-}
-
src_prepare() {
default
@@ -67,6 +60,10 @@ src_prepare() {
# 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
@@ -80,6 +77,7 @@ multilib_src_configure() {
-Dcoretext="disabled"
-Dchafa="disabled"
+ $(meson_feature cairo)
$(meson_feature glib)
$(meson_feature graphite graphite2)
$(meson_feature icu)
@@ -87,7 +85,6 @@ multilib_src_configure() {
$(meson_feature test tests)
$(meson_feature truetype freetype)
- $(meson_native_use_feature cairo)
$(meson_native_use_feature doc docs)
$(meson_native_use_feature introspection)
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild
b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index bf572ed0f6ee..9019f3ca2e97 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -29,7 +29,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="introspection? ( glib )"
RDEPEND="
- cairo? ( x11-libs/cairo:= )
+ 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}] )
@@ -46,13 +46,6 @@ BDEPEND="
introspection? ( dev-util/glib-utils )
"
-pkg_setup() {
- python-any-r1_pkg_setup
- if ! use debug ; then
- append-cppflags -DHB_NDEBUG
- fi
-}
-
src_prepare() {
default
@@ -67,6 +60,10 @@ src_prepare() {
# 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
@@ -80,6 +77,7 @@ multilib_src_configure() {
-Dcoretext="disabled"
-Dchafa="disabled"
+ $(meson_feature cairo)
$(meson_feature glib)
$(meson_feature graphite graphite2)
$(meson_feature icu)
@@ -87,7 +85,6 @@ multilib_src_configure() {
$(meson_feature test tests)
$(meson_feature truetype freetype)
- $(meson_native_use_feature cairo)
$(meson_native_use_feature doc docs)
$(meson_native_use_feature introspection)
