1 |
commit: da492e33f9ad0d1cf09c4c643737755999fa7425 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 2 03:23:49 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 2 03:27:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da492e33 |
7 |
|
8 |
dev-libs/glib: drop 2.74.2 (broken) |
9 |
|
10 |
Will keep the mask for a little bit for folks who still have it installed |
11 |
as a prompt to upgrade. |
12 |
|
13 |
Bug: https://bugs.gentoo.org/883223 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
dev-libs/glib/Manifest | 1 - |
17 |
dev-libs/glib/glib-2.74.2.ebuild | 287 --------------------------------------- |
18 |
2 files changed, 288 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest |
21 |
index 380c0ca0cf97..3ac46a5a4358 100644 |
22 |
--- a/dev-libs/glib/Manifest |
23 |
+++ b/dev-libs/glib/Manifest |
24 |
@@ -1,4 +1,3 @@ |
25 |
DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638 |
26 |
DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3 |
27 |
-DIST glib-2.74.2.tar.xz 5182312 BLAKE2B 319a8fb793adb7343b77119d7b7839efad6f91b9c7af079f53d54b435067ab12162c4791ca6b8e9b7fd6d269975e9559951cbf80a065072541f407a0d8e2ce74 SHA512 90bb2410f038e47401fc985ff7fe6d1abecec9417254e039ac18e6b0d77e0b8539b975bef84d5f933be8e43c8ceca236bd466622504491e08e71d079d8804895 |
28 |
DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b |
29 |
|
30 |
diff --git a/dev-libs/glib/glib-2.74.2.ebuild b/dev-libs/glib/glib-2.74.2.ebuild |
31 |
deleted file mode 100644 |
32 |
index c62ece284c75..000000000000 |
33 |
--- a/dev-libs/glib/glib-2.74.2.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,287 +0,0 @@ |
36 |
-# Copyright 1999-2022 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=8 |
40 |
-PYTHON_REQ_USE="xml(+)" |
41 |
-PYTHON_COMPAT=( python3_{8..11} ) |
42 |
- |
43 |
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg |
44 |
- |
45 |
-DESCRIPTION="The GLib library of C routines" |
46 |
-HOMEPAGE="https://www.gtk.org/" |
47 |
- |
48 |
-LICENSE="LGPL-2.1+" |
49 |
-SLOT="2" |
50 |
-IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" |
51 |
-RESTRICT="!test? ( test )" |
52 |
-#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 |
53 |
- |
54 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
55 |
- |
56 |
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded |
57 |
-# within ELF binaries on that platform anyway and inspecting ELF binaries from |
58 |
-# other platforms is not that useful so exclude the dependency in this case. |
59 |
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but |
60 |
-# these are used by GIO, which glib[static-libs] consumers don't really seem |
61 |
-# to need at all, thus not imposing the deps for now and once some consumers |
62 |
-# are actually found to static link libgio-2.0.a, we can revisit and either add |
63 |
-# them or just put the (build) deps in that rare consumer instead of recursive |
64 |
-# RDEPEND here (due to lack of recursive DEPEND). |
65 |
-RDEPEND=" |
66 |
- !<dev-util/gdbus-codegen-${PV} |
67 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
68 |
- >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?] |
69 |
- >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] |
70 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
71 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
72 |
- kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) |
73 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
74 |
- xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) |
75 |
- elf? ( virtual/libelf:0= ) |
76 |
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) |
77 |
-" |
78 |
-DEPEND="${RDEPEND}" |
79 |
-# libxml2 used for optional tests that get automatically skipped |
80 |
-BDEPEND=" |
81 |
- app-text/docbook-xsl-stylesheets |
82 |
- dev-libs/libxslt |
83 |
- >=sys-devel/gettext-0.19.8 |
84 |
- gtk-doc? ( >=dev-util/gtk-doc-1.33 |
85 |
- app-text/docbook-xml-dtd:4.2 |
86 |
- app-text/docbook-xml-dtd:4.5 ) |
87 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
88 |
- ${PYTHON_DEPS} |
89 |
- test? ( >=sys-apps/dbus-1.2.14 ) |
90 |
- virtual/pkgconfig |
91 |
-" |
92 |
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen |
93 |
- |
94 |
-PDEPEND=" |
95 |
- dbus? ( gnome-base/dconf ) |
96 |
- mime? ( x11-misc/shared-mime-info ) |
97 |
-" |
98 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
99 |
-# dconf is needed to be able to save settings, bug #498436 |
100 |
- |
101 |
-MULTILIB_CHOST_TOOLS=( |
102 |
- /usr/bin/gio-querymodules$(get_exeext) |
103 |
-) |
104 |
- |
105 |
-PATCHES=( |
106 |
- "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch |
107 |
-) |
108 |
- |
109 |
-pkg_setup() { |
110 |
- if use kernel_linux ; then |
111 |
- CONFIG_CHECK="~INOTIFY_USER" |
112 |
- if use test ; then |
113 |
- CONFIG_CHECK="~IPV6" |
114 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
115 |
- fi |
116 |
- linux-info_pkg_setup |
117 |
- fi |
118 |
- python-any-r1_pkg_setup |
119 |
-} |
120 |
- |
121 |
-src_prepare() { |
122 |
- if use test; then |
123 |
- # TODO: Review the test exclusions, especially now with meson |
124 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
125 |
- if ! has_version dev-util/desktop-file-utils ; then |
126 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
127 |
- ewarn "think on installing it to get these tests run." |
128 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
129 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
130 |
- fi |
131 |
- |
132 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
133 |
- # other), falling back to xterm if one doesn't exist |
134 |
- #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
135 |
- # ewarn "Some tests will be skipped due to missing terminal program" |
136 |
- # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson |
137 |
- # 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 |
138 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
139 |
- # desktop-app-info/launch* might fail similarly |
140 |
- sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die |
141 |
- #fi |
142 |
- |
143 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
144 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
145 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
146 |
- |
147 |
- ewarn "Tests for search-utils have been skipped" |
148 |
- sed -i -e "/search-utils/d" glib/tests/meson.build || die |
149 |
- |
150 |
- # Play nice with network-sandbox, but this approach would defeat the purpose of the test |
151 |
- #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die |
152 |
- else |
153 |
- # Don't build tests, also prevents extra deps, bug #512022 |
154 |
- sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die |
155 |
- fi |
156 |
- |
157 |
- # Don't build fuzzing binaries - not used |
158 |
- sed -i -e '/subdir.*fuzzing/d' meson.build || die |
159 |
- |
160 |
- # gdbus-codegen is a separate package |
161 |
- sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die |
162 |
- |
163 |
- # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon |
164 |
- sed -i -e '/install_dir/d' gio/tests/meson.build || die |
165 |
- |
166 |
- cat > "${T}/glib-test-ld-wrapper" <<-EOF |
167 |
- #!/usr/bin/env sh |
168 |
- exec \${LD:-ld} "\$@" |
169 |
- EOF |
170 |
- chmod a+x "${T}/glib-test-ld-wrapper" || die |
171 |
- sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die |
172 |
- |
173 |
- default |
174 |
- gnome2_environment_reset |
175 |
- # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only |
176 |
-} |
177 |
- |
178 |
-multilib_src_configure() { |
179 |
- if use debug; then |
180 |
- append-cflags -DG_ENABLE_DEBUG |
181 |
- else |
182 |
- append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 |
183 |
- fi |
184 |
- |
185 |
- # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) |
186 |
- #if tc-is-cross-compiler ; then |
187 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
188 |
- # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property |
189 |
- #case ${CHOST} in |
190 |
- #hppa*|metag*) export glib_cv_stack_grows=yes ;; |
191 |
- #*) export glib_cv_stack_grows=no ;; |
192 |
- #esac |
193 |
- #fi |
194 |
- |
195 |
- local emesonargs=( |
196 |
- -Ddefault_library=$(usex static-libs both shared) |
197 |
- $(meson_feature selinux) |
198 |
- $(meson_use xattr) |
199 |
- -Dlibmount=enabled # only used if host_system == 'linux' |
200 |
- -Dman=true |
201 |
- $(meson_use systemtap dtrace) |
202 |
- $(meson_use systemtap) |
203 |
- $(meson_feature sysprof) |
204 |
- $(meson_native_use_bool gtk-doc gtk_doc) |
205 |
- $(meson_use test tests) |
206 |
- -Dinstalled_tests=false |
207 |
- -Dnls=enabled |
208 |
- -Doss_fuzz=disabled |
209 |
- $(meson_native_use_feature elf libelf) |
210 |
- -Dmultiarch=false |
211 |
- ) |
212 |
- meson_src_configure |
213 |
-} |
214 |
- |
215 |
-multilib_src_test() { |
216 |
- export XDG_CONFIG_DIRS=/etc/xdg |
217 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
218 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
219 |
- export LC_TIME=C # bug #411967 |
220 |
- export TZ=UTC |
221 |
- unset GSETTINGS_BACKEND # bug #596380 |
222 |
- python_setup |
223 |
- |
224 |
- # https://bugs.gentoo.org/839807 |
225 |
- local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} |
226 |
- addpredict /usr/b |
227 |
- |
228 |
- # Related test is a bit nitpicking |
229 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
230 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
231 |
- |
232 |
- meson_src_test --timeout-multiplier 2 --no-suite flaky |
233 |
-} |
234 |
- |
235 |
-multilib_src_install() { |
236 |
- meson_src_install |
237 |
- keepdir /usr/$(get_libdir)/gio/modules |
238 |
-} |
239 |
- |
240 |
-multilib_src_install_all() { |
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 |
- for v in ${REPLACING_VERSIONS}; do |
304 |
- if ver_test "$v" "-lt" "2.63.6"; then |
305 |
- ewarn "glib no longer installs the gio-launch-desktop binary. You may need" |
306 |
- ewarn "to restart your session for \"Open With\" dialogs to work." |
307 |
- fi |
308 |
- done |
309 |
-} |
310 |
- |
311 |
-pkg_postrm() { |
312 |
- xdg_pkg_postrm |
313 |
- gnome2_schemas_update |
314 |
- |
315 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
316 |
- multilib_pkg_postrm() { |
317 |
- rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache |
318 |
- } |
319 |
- multilib_foreach_abi multilib_pkg_postrm |
320 |
- rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled |
321 |
- fi |
322 |
-} |