1 |
commit: 32a88d9b998dbb1dc950a8e109bb621b96c5fb6b |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 4 19:44:37 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 4 19:55:24 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a88d9b |
7 |
|
8 |
x11-libs/pango: Version bump to 1.50.8 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/836317 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
x11-libs/pango/Manifest | 1 + |
14 |
x11-libs/pango/files/1.50.8-harfbuzz-4.patch | 47 ++++++++++++++ |
15 |
x11-libs/pango/pango-1.50.8.ebuild | 91 ++++++++++++++++++++++++++++ |
16 |
3 files changed, 139 insertions(+) |
17 |
|
18 |
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest |
19 |
index 9b1e65aa3742..63caf519d4f8 100644 |
20 |
--- a/x11-libs/pango/Manifest |
21 |
+++ b/x11-libs/pango/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1 |
24 |
DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc |
25 |
DIST pango-1.50.7.tar.xz 4294752 BLAKE2B 049b7c09f2ec35ca229eadcd146513d2b292fac8c2296a1635f32c1e21a2ff14979c4ce4a88f966d2d85dad55e356f089c09e00062d06373f7d0760871333046 SHA512 4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3 |
26 |
+DIST pango-1.50.8.tar.xz 4298760 BLAKE2B 76531815c5b472823b62e0c7a44d4a6c8cf38d587527cceff46e9e7ad302c53abd5827ed4242db2f754761928632b986517ca2814a1ddb9501b2832bbadb3116 SHA512 81821e5837d5fb78a07ac8f8e360de9a9bf9b2418a3e0654f80ee3dce7f98325ea2483cc7c1d1db4a662886a1244530515d83480f4c3bc0510788a9bbbae2f91 |
27 |
|
28 |
diff --git a/x11-libs/pango/files/1.50.8-harfbuzz-4.patch b/x11-libs/pango/files/1.50.8-harfbuzz-4.patch |
29 |
new file mode 100644 |
30 |
index 000000000000..0fa9c1fb7302 |
31 |
--- /dev/null |
32 |
+++ b/x11-libs/pango/files/1.50.8-harfbuzz-4.patch |
33 |
@@ -0,0 +1,47 @@ |
34 |
+This is a revert of upstream commit 0a576fc822a3 ("Try again to fix ci"). |
35 |
+ |
36 |
+Without the patch, the tests fail on my amd64 system with harfbuzz-4.3.0. |
37 |
+ |
38 |
+diff --git b/tests/layouts/valid-20.layout a/tests/layouts/valid-20.layout |
39 |
+index db692b73..5b2bcf15 100644 |
40 |
+--- b/tests/layouts/valid-20.layout |
41 |
++++ a/tests/layouts/valid-20.layout |
42 |
+@@ -40,7 +40,7 @@ |
43 |
+ "is-wrapped" : false, |
44 |
+ "is-ellipsized" : false, |
45 |
+ "unknown-glyphs" : 0, |
46 |
+- "width" : 67584, |
47 |
++ "width" : 76800, |
48 |
+ "height" : 25600, |
49 |
+ "log-attrs" : [ |
50 |
+ { |
51 |
+@@ -138,7 +138,7 @@ |
52 |
+ "glyphs" : [ |
53 |
+ { |
54 |
+ "glyph" : 244, |
55 |
+- "width" : 15360, |
56 |
++ "width" : 18432, |
57 |
+ "x-offset" : 14764, |
58 |
+ "y-offset" : 3845, |
59 |
+ "is-cluster-start" : true, |
60 |
+@@ -146,7 +146,7 @@ |
61 |
+ }, |
62 |
+ { |
63 |
+ "glyph" : 272, |
64 |
+- "width" : 15360, |
65 |
++ "width" : 18432, |
66 |
+ "x-offset" : 14764, |
67 |
+ "y-offset" : 4280, |
68 |
+ "is-cluster-start" : true, |
69 |
+@@ -154,7 +154,7 @@ |
70 |
+ }, |
71 |
+ { |
72 |
+ "glyph" : 273, |
73 |
+- "width" : 15360, |
74 |
++ "width" : 18432, |
75 |
+ "x-offset" : 14764, |
76 |
+ "y-offset" : 3507, |
77 |
+ "is-cluster-start" : true, |
78 |
+-- |
79 |
+2.35.1 |
80 |
+ |
81 |
|
82 |
diff --git a/x11-libs/pango/pango-1.50.8.ebuild b/x11-libs/pango/pango-1.50.8.ebuild |
83 |
new file mode 100644 |
84 |
index 000000000000..e7b3a6a69198 |
85 |
--- /dev/null |
86 |
+++ b/x11-libs/pango/pango-1.50.8.ebuild |
87 |
@@ -0,0 +1,91 @@ |
88 |
+# Copyright 1999-2022 Gentoo Authors |
89 |
+# Distributed under the terms of the GNU General Public License v2 |
90 |
+ |
91 |
+EAPI=8 |
92 |
+ |
93 |
+inherit flag-o-matic gnome2-utils meson-multilib xdg |
94 |
+ |
95 |
+DESCRIPTION="Internationalized text layout and rendering library" |
96 |
+HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango" |
97 |
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz" |
98 |
+ |
99 |
+LICENSE="LGPL-2+" |
100 |
+SLOT="0" |
101 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
102 |
+ |
103 |
+IUSE="debug +introspection sysprof test X" |
104 |
+RESTRICT="!test? ( test )" |
105 |
+ |
106 |
+RDEPEND=" |
107 |
+ >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}] |
108 |
+ >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}] |
109 |
+ >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] |
110 |
+ >=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}] |
111 |
+ >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}] |
112 |
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] |
113 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) |
114 |
+ X? ( |
115 |
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
116 |
+ >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] |
117 |
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] |
118 |
+ ) |
119 |
+" |
120 |
+DEPEND="${RDEPEND} |
121 |
+ sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) |
122 |
+ X? ( x11-base/xorg-proto ) |
123 |
+" |
124 |
+BDEPEND=" |
125 |
+ dev-util/glib-utils |
126 |
+ sys-apps/help2man |
127 |
+ virtual/pkgconfig |
128 |
+ test? ( media-fonts/cantarell ) |
129 |
+" |
130 |
+ |
131 |
+PATCHES=( |
132 |
+ "${FILESDIR}"/${PV}-harfbuzz-4.patch |
133 |
+) |
134 |
+ |
135 |
+src_prepare() { |
136 |
+ default |
137 |
+ xdg_environment_reset |
138 |
+ gnome2_environment_reset |
139 |
+} |
140 |
+ |
141 |
+multilib_src_configure() { |
142 |
+ if use debug; then |
143 |
+ append-cflags -DPANGO_ENABLE_DEBUG |
144 |
+ else |
145 |
+ append-cflags -DG_DISABLE_CAST_CHECKS |
146 |
+ fi |
147 |
+ |
148 |
+ local emesonargs=( |
149 |
+ # Never use gi-docgen subproject |
150 |
+ --wrap-mode nofallback |
151 |
+ |
152 |
+ -Dgtk_doc=false # we ship pregenerated docs |
153 |
+ $(meson_native_use_feature introspection) |
154 |
+ -Dinstall-tests=false |
155 |
+ -Dfontconfig=enabled |
156 |
+ $(meson_feature sysprof) |
157 |
+ -Dlibthai=disabled |
158 |
+ -Dcairo=enabled |
159 |
+ $(meson_feature X xft) |
160 |
+ -Dfreetype=enabled |
161 |
+ ) |
162 |
+ meson_src_configure |
163 |
+} |
164 |
+ |
165 |
+multilib_src_install_all() { |
166 |
+ insinto /usr/share/gtk-doc/html |
167 |
+ # This will install PangoXft API docs regardless of USE=-X, but this is intentional |
168 |
+ doins -r "${S}"/docs/Pango* |
169 |
+} |
170 |
+ |
171 |
+pkg_postinst() { |
172 |
+ xdg_pkg_postinst |
173 |
+ |
174 |
+ if has_version 'media-libs/freetype[-harfbuzz]' ; then |
175 |
+ ewarn "media-libs/freetype is installed without harfbuzz support. This may" |
176 |
+ ewarn "lead to minor font rendering problems, see bug 712374." |
177 |
+ fi |
178 |
+} |