1 |
commit: 907edffad76af3e4f581fdcc1675ac8a43d5afe3 |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 29 01:00:09 2020 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 29 01:00:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=907edffa |
7 |
|
8 |
dev-libs/glib: sync current stable to tree |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
12 |
|
13 |
dev-libs/glib/Manifest | 3 +- |
14 |
dev-libs/glib/glib-2.60.7-r2.ebuild | 283 --------------------- |
15 |
.../{glib-2.60.6.ebuild => glib-2.62.6.ebuild} | 10 +- |
16 |
3 files changed, 4 insertions(+), 292 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest |
19 |
index b26aefc..f4bcefc 100644 |
20 |
--- a/dev-libs/glib/Manifest |
21 |
+++ b/dev-libs/glib/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9 |
24 |
-DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a |
25 |
+DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5 |
26 |
|
27 |
diff --git a/dev-libs/glib/glib-2.60.7-r2.ebuild b/dev-libs/glib/glib-2.60.7-r2.ebuild |
28 |
deleted file mode 100644 |
29 |
index 986947b..0000000 |
30 |
--- a/dev-libs/glib/glib-2.60.7-r2.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,283 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
38 |
- |
39 |
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg |
40 |
- |
41 |
-DESCRIPTION="The GLib library of C routines" |
42 |
-HOMEPAGE="https://www.gtk.org/" |
43 |
- |
44 |
-LICENSE="LGPL-2.1+" |
45 |
-SLOT="2" |
46 |
-IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr" |
47 |
-RESTRICT="!test? ( test )" |
48 |
- |
49 |
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" |
50 |
- |
51 |
-# * libelf isn't strictly necessary, but makes gresource tool more useful, and |
52 |
-# the check is automagic in gio/meson.build. gresource is not a multilib tool |
53 |
-# right now, thus it doesn't matter if non-native ABI libelf exists or not |
54 |
-# (non-native binary is overwritten, it doesn't matter if libelf was linked to). |
55 |
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but |
56 |
-# these are used by GIO, which glib[static-libs] consumers don't really seem |
57 |
-# to need at all, thus not imposing the deps for now and once some consumers |
58 |
-# are actually found to static link libgio-2.0.a, we can revisit and either add |
59 |
-# them or just put the (build) deps in that rare consumer instead of recursive |
60 |
-# RDEPEND here (due to lack of recursive DEPEND). |
61 |
-RDEPEND=" |
62 |
- !<dev-util/gdbus-codegen-${PV} |
63 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
64 |
- >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] |
65 |
- >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] |
66 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
67 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
68 |
- kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) |
69 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
70 |
- xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) |
71 |
- virtual/libelf:0= |
72 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
73 |
-" |
74 |
-DEPEND="${RDEPEND}" |
75 |
-# libxml2 used for optional tests that get automatically skipped |
76 |
-BDEPEND=" |
77 |
- app-text/docbook-xsl-stylesheets |
78 |
- dev-libs/libxslt |
79 |
- >=sys-devel/gettext-0.19.8 |
80 |
- gtk-doc? ( >=dev-util/gtk-doc-1.20 |
81 |
- app-text/docbook-xml-dtd:4.2 |
82 |
- app-text/docbook-xml-dtd:4.5 ) |
83 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
84 |
- ${PYTHON_DEPS} |
85 |
- test? ( >=sys-apps/dbus-1.2.14 ) |
86 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
87 |
-" |
88 |
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen |
89 |
- |
90 |
-PDEPEND=" |
91 |
- dbus? ( gnome-base/dconf ) |
92 |
- mime? ( x11-misc/shared-mime-info ) |
93 |
-" |
94 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
95 |
-# dconf is needed to be able to save settings, bug #498436 |
96 |
- |
97 |
-MULTILIB_CHOST_TOOLS=( |
98 |
- /usr/bin/gio-querymodules$(get_exeext) |
99 |
-) |
100 |
- |
101 |
-pkg_setup() { |
102 |
- if use kernel_linux ; then |
103 |
- CONFIG_CHECK="~INOTIFY_USER" |
104 |
- if use test ; then |
105 |
- CONFIG_CHECK="~IPV6" |
106 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
107 |
- fi |
108 |
- linux-info_pkg_setup |
109 |
- fi |
110 |
- python-any-r1_pkg_setup |
111 |
-} |
112 |
- |
113 |
-src_prepare() { |
114 |
- eapply "${FILESDIR}"/${PV}-gdbus-fixes.patch #700538, included in 2.62.3+ |
115 |
- eapply "${FILESDIR}"/CVE-2020-6750.patch |
116 |
- # Musl fix |
117 |
- eapply "${FILESDIR}/2.56.2-quark_init_on_demand.patch" |
118 |
- eapply "${FILESDIR}/2.56.2-gobject_init_on_demand.patch" |
119 |
- |
120 |
- if use test; then |
121 |
- # TODO: Review the test exclusions, especially now with meson |
122 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
123 |
- if ! has_version dev-util/desktop-file-utils ; then |
124 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
125 |
- ewarn "think on installing it to get these tests run." |
126 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
127 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
128 |
- fi |
129 |
- |
130 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
131 |
- # other), falling back to xterm if one doesn't exist |
132 |
- #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
133 |
- # ewarn "Some tests will be skipped due to missing terminal program" |
134 |
- # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson |
135 |
- # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails |
136 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
137 |
- # desktop-app-info/launch* might fail similarly |
138 |
- sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die |
139 |
- #fi |
140 |
- |
141 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
142 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
143 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
144 |
- |
145 |
- ewarn "Tests for search-utils have been skipped" |
146 |
- sed -i -e "/search-utils/d" glib/tests/meson.build || die |
147 |
- |
148 |
- # Play nice with network-sandbox, but this approach would defeat the purpose of the test |
149 |
- #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die |
150 |
- else |
151 |
- # Don't build tests, also prevents extra deps, bug #512022 |
152 |
- sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die |
153 |
- fi |
154 |
- |
155 |
- # Don't build fuzzing binaries - not used |
156 |
- sed -i -e '/subdir.*fuzzing/d' meson.build || die |
157 |
- |
158 |
- # gdbus-codegen is a separate package |
159 |
- sed -i -e 's/install.*true/install : false/g' gio/gdbus-2.0/codegen/meson.build || die |
160 |
- # Older than meson-0.50 doesn't know about install kwarg for configure_file; for that we need to remove the install_dir kwarg. |
161 |
- # Upstream will remove the install kwarg in a future version to require only meson-0.49.2 or newer, at which point the |
162 |
- # install_dir removal only should be kept. |
163 |
- sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die |
164 |
- |
165 |
- # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon |
166 |
- sed -i -e '/install_dir/d' gio/tests/meson.build || die |
167 |
- |
168 |
- cat > "${T}/glib-test-ld-wrapper" <<-EOF |
169 |
- #!/usr/bin/env sh |
170 |
- exec \${LD:-ld} "\$@" |
171 |
- EOF |
172 |
- chmod a+x "${T}/glib-test-ld-wrapper" || die |
173 |
- sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die |
174 |
- |
175 |
- xdg_src_prepare |
176 |
- gnome2_environment_reset |
177 |
- # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only |
178 |
-} |
179 |
- |
180 |
-multilib_src_configure() { |
181 |
- if use debug; then |
182 |
- append-cflags -DG_ENABLE_DEBUG |
183 |
- else |
184 |
- append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 |
185 |
- fi |
186 |
- |
187 |
- # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) |
188 |
- #if tc-is-cross-compiler ; then |
189 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
190 |
- # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property |
191 |
- #case ${CHOST} in |
192 |
- #hppa*|metag*) export glib_cv_stack_grows=yes ;; |
193 |
- #*) export glib_cv_stack_grows=no ;; |
194 |
- #esac |
195 |
- #fi |
196 |
- |
197 |
- local emesonargs=( |
198 |
- -Ddefault_library=$(usex static-libs both shared) |
199 |
- $(meson_feature selinux) |
200 |
- $(meson_use xattr) |
201 |
- -Dlibmount=true # only used if host_system == 'linux' |
202 |
- -Dinternal_pcre=false |
203 |
- -Dman=true |
204 |
- $(meson_use systemtap dtrace) |
205 |
- $(meson_use systemtap) |
206 |
- -Dgtk_doc=$(multilib_native_usex gtk-doc true false) |
207 |
- $(meson_use fam) |
208 |
- -Dinstalled_tests=false |
209 |
- -Dnls=enabled |
210 |
- ) |
211 |
- meson_src_configure |
212 |
-} |
213 |
- |
214 |
-multilib_src_compile() { |
215 |
- meson_src_compile |
216 |
-} |
217 |
- |
218 |
-multilib_src_test() { |
219 |
- export XDG_CONFIG_DIRS=/etc/xdg |
220 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
221 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
222 |
- export LC_TIME=C # bug #411967 |
223 |
- unset GSETTINGS_BACKEND # bug #596380 |
224 |
- python_setup |
225 |
- |
226 |
- # Related test is a bit nitpicking |
227 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
228 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
229 |
- |
230 |
- meson_src_test --timeout-multiplier 2 --no-suite flaky |
231 |
-} |
232 |
- |
233 |
-multilib_src_install() { |
234 |
- meson_src_install |
235 |
- keepdir /usr/$(get_libdir)/gio/modules |
236 |
-} |
237 |
- |
238 |
-multilib_src_install_all() { |
239 |
- einstalldocs |
240 |
- |
241 |
- # These are installed by dev-util/glib-utils |
242 |
- # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson |
243 |
- rm "${ED}/usr/bin/glib-genmarshal" || die |
244 |
- rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die |
245 |
- rm "${ED}/usr/bin/glib-mkenums" || die |
246 |
- rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die |
247 |
- rm "${ED}/usr/bin/gtester-report" || die |
248 |
- rm "${ED}/usr/share/man/man1/gtester-report.1" || die |
249 |
- # gdbus-codegen manpage installed by dev-util/gdbus-codegen |
250 |
- rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die |
251 |
-} |
252 |
- |
253 |
-pkg_preinst() { |
254 |
- xdg_pkg_preinst |
255 |
- |
256 |
- # Make gschemas.compiled belong to glib alone |
257 |
- local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" |
258 |
- |
259 |
- if [[ -e ${EROOT}${cache} ]]; then |
260 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
261 |
- else |
262 |
- touch "${ED}"${cache} || die |
263 |
- fi |
264 |
- |
265 |
- multilib_pkg_preinst() { |
266 |
- # Make giomodule.cache belong to glib alone |
267 |
- local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" |
268 |
- |
269 |
- if [[ -e ${EROOT}${cache} ]]; then |
270 |
- cp "${EROOT}"${cache} "${ED}"${cache} || die |
271 |
- else |
272 |
- touch "${ED}"${cache} || die |
273 |
- fi |
274 |
- } |
275 |
- |
276 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
277 |
- # file due to inability to create it and GIO might not look at any of the modules there |
278 |
- if ! tc-is-cross-compiler ; then |
279 |
- multilib_foreach_abi multilib_pkg_preinst |
280 |
- fi |
281 |
-} |
282 |
- |
283 |
-pkg_postinst() { |
284 |
- xdg_pkg_postinst |
285 |
- # glib installs no schemas itself, but we force update for fresh install in case |
286 |
- # something has dropped in a schemas file without direct glib dep; and for upgrades |
287 |
- # in case the compiled schema format could have changed |
288 |
- gnome2_schemas_update |
289 |
- |
290 |
- multilib_pkg_postinst() { |
291 |
- gnome2_giomodule_cache_update \ |
292 |
- || die "Update GIO modules cache failed (for ${ABI})" |
293 |
- } |
294 |
- if ! tc-is-cross-compiler ; then |
295 |
- multilib_foreach_abi multilib_pkg_postinst |
296 |
- else |
297 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
298 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
299 |
- ewarn "your final image for performance reasons and re-run it when packages" |
300 |
- ewarn "installing GIO modules get upgraded or added to the image." |
301 |
- fi |
302 |
-} |
303 |
- |
304 |
-pkg_postrm() { |
305 |
- xdg_pkg_postrm |
306 |
- gnome2_schemas_update |
307 |
- |
308 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
309 |
- multilib_pkg_postrm() { |
310 |
- rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache |
311 |
- } |
312 |
- multilib_foreach_abi multilib_pkg_postrm |
313 |
- rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled |
314 |
- fi |
315 |
-} |
316 |
|
317 |
diff --git a/dev-libs/glib/glib-2.60.6.ebuild b/dev-libs/glib/glib-2.62.6.ebuild |
318 |
similarity index 95% |
319 |
rename from dev-libs/glib/glib-2.60.6.ebuild |
320 |
rename to dev-libs/glib/glib-2.62.6.ebuild |
321 |
index dc77804..6a574e0 100644 |
322 |
--- a/dev-libs/glib/glib-2.60.6.ebuild |
323 |
+++ b/dev-libs/glib/glib-2.62.6.ebuild |
324 |
@@ -2,7 +2,7 @@ |
325 |
# Distributed under the terms of the GNU General Public License v2 |
326 |
|
327 |
EAPI=7 |
328 |
-PYTHON_COMPAT=( python{3_5,3_6,3_7} ) |
329 |
+PYTHON_COMPAT=( python{3_6,3_7} ) |
330 |
|
331 |
inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg |
332 |
|
333 |
@@ -51,7 +51,7 @@ BDEPEND=" |
334 |
systemtap? ( >=dev-util/systemtap-1.3 ) |
335 |
${PYTHON_DEPS} |
336 |
test? ( >=sys-apps/dbus-1.2.14 ) |
337 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
338 |
+ virtual/pkgconfig |
339 |
" |
340 |
# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen |
341 |
|
342 |
@@ -79,7 +79,6 @@ pkg_setup() { |
343 |
} |
344 |
|
345 |
src_prepare() { |
346 |
- |
347 |
# Musl fix |
348 |
eapply "${FILESDIR}/2.56.2-quark_init_on_demand.patch" |
349 |
eapply "${FILESDIR}/2.56.2-gobject_init_on_demand.patch" |
350 |
@@ -123,10 +122,6 @@ src_prepare() { |
351 |
sed -i -e '/subdir.*fuzzing/d' meson.build || die |
352 |
|
353 |
# gdbus-codegen is a separate package |
354 |
- sed -i -e 's/install.*true/install : false/g' gio/gdbus-2.0/codegen/meson.build || die |
355 |
- # Older than meson-0.50 doesn't know about install kwarg for configure_file; for that we need to remove the install_dir kwarg. |
356 |
- # Upstream will remove the install kwarg in a future version to require only meson-0.49.2 or newer, at which point the |
357 |
- # install_dir removal only should be kept. |
358 |
sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die |
359 |
|
360 |
# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon |
361 |
@@ -174,6 +169,7 @@ multilib_src_configure() { |
362 |
$(meson_use fam) |
363 |
-Dinstalled_tests=false |
364 |
-Dnls=enabled |
365 |
+ -Doss_fuzz=disabled |
366 |
) |
367 |
meson_src_configure |
368 |
} |