| 1 |
commit: 0aa556416160e9ad6bafd733a64789627f36f1b2 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 1 20:40:54 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 1 20:41:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa55641 |
| 7 |
|
| 8 |
x11-libs/pango: Do NOT depend on freetype[harfbuzz,png] anymore |
| 9 |
|
| 10 |
This caused ugly circular dependencies between harfbuzz and freetype |
| 11 |
on just about every initial installation. Minor font rendering issues |
| 12 |
accompanied by a warning are an acceptable tradeoff. |
| 13 |
|
| 14 |
Discussed in detail in releng team |
| 15 |
|
| 16 |
Bug: https://bugs.gentoo.org/712374 |
| 17 |
Bug: https://bugs.gentoo.org/717380 |
| 18 |
Bug: https://bugs.gentoo.org/813504 |
| 19 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 20 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 21 |
|
| 22 |
.../pango/{pango-1.48.10.ebuild => pango-1.48.10-r1.ebuild} | 11 ++++++++++- |
| 23 |
.../pango/{pango-1.48.7-r1.ebuild => pango-1.48.7-r2.ebuild} | 11 ++++++++++- |
| 24 |
2 files changed, 20 insertions(+), 2 deletions(-) |
| 25 |
|
| 26 |
diff --git a/x11-libs/pango/pango-1.48.10.ebuild b/x11-libs/pango/pango-1.48.10-r1.ebuild |
| 27 |
similarity index 87% |
| 28 |
rename from x11-libs/pango/pango-1.48.10.ebuild |
| 29 |
rename to x11-libs/pango/pango-1.48.10-r1.ebuild |
| 30 |
index 0c88d226201..9eb3d082e26 100644 |
| 31 |
--- a/x11-libs/pango/pango-1.48.10.ebuild |
| 32 |
+++ b/x11-libs/pango/pango-1.48.10-r1.ebuild |
| 33 |
@@ -21,7 +21,7 @@ RDEPEND=" |
| 34 |
>=media-libs/harfbuzz-2.2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] |
| 35 |
>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}] |
| 36 |
>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}] |
| 37 |
- >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}] |
| 38 |
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] |
| 39 |
introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) |
| 40 |
X? ( |
| 41 |
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
| 42 |
@@ -73,3 +73,12 @@ multilib_src_install_all() { |
| 43 |
# This will install PangoXft API docs regardless of USE=-X, but this is intentional |
| 44 |
doins -r "${S}"/docs/Pango* |
| 45 |
} |
| 46 |
+ |
| 47 |
+pkg_postinst() { |
| 48 |
+ xdg_pkg_postinst |
| 49 |
+ |
| 50 |
+ if has_version 'media-libs/freetype[-harfbuzz]' ; then |
| 51 |
+ ewarn "media-libs/freetype is installed without harfbuzz support. This may" |
| 52 |
+ ewarn "lead to minor font rendering problems, see bug 712374." |
| 53 |
+ fi |
| 54 |
+} |
| 55 |
|
| 56 |
diff --git a/x11-libs/pango/pango-1.48.7-r1.ebuild b/x11-libs/pango/pango-1.48.7-r2.ebuild |
| 57 |
similarity index 86% |
| 58 |
rename from x11-libs/pango/pango-1.48.7-r1.ebuild |
| 59 |
rename to x11-libs/pango/pango-1.48.7-r2.ebuild |
| 60 |
index aef9e1d9db1..cc225cce0cd 100644 |
| 61 |
--- a/x11-libs/pango/pango-1.48.7-r1.ebuild |
| 62 |
+++ b/x11-libs/pango/pango-1.48.7-r2.ebuild |
| 63 |
@@ -21,7 +21,7 @@ RDEPEND=" |
| 64 |
>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] |
| 65 |
>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}] |
| 66 |
>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}] |
| 67 |
- >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}] |
| 68 |
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] |
| 69 |
introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) |
| 70 |
X? ( |
| 71 |
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
| 72 |
@@ -73,3 +73,12 @@ multilib_src_install_all() { |
| 73 |
# This will install PangoXft API docs regardless of USE=-X, but this is intentional |
| 74 |
doins -r "${S}"/docs/Pango* |
| 75 |
} |
| 76 |
+ |
| 77 |
+pkg_postinst() { |
| 78 |
+ xdg_pkg_postinst |
| 79 |
+ |
| 80 |
+ if has_version 'media-libs/freetype[-harfbuzz]' ; then |
| 81 |
+ ewarn "media-libs/freetype is installed without harfbuzz support. This may" |
| 82 |
+ ewarn "lead to minor font rendering problems, see bug 712374." |
| 83 |
+ fi |
| 84 |
+} |
Archives