1 |
commit: fac88566301ae04eafc520a42c4fb971cfe9f6be |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 29 18:15:34 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 29 18:15:34 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fac88566 |
7 |
|
8 |
dev-libs/glib: in tree version works |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
|
12 |
dev-libs/glib/Manifest | 5 - |
13 |
.../glib/files/2.56.2-gobject_init_on_demand.patch | 91 ------ |
14 |
...56.2-network-monitor-race-test-iterations.patch | 36 --- |
15 |
.../glib/files/2.56.2-quark_init_on_demand.patch | 50 ---- |
16 |
.../files/glib-2.50.0-external-gdbus-codegen.patch | 93 ------- |
17 |
.../files/glib-2.54.3-external-gdbus-codegen.patch | 86 ------ |
18 |
dev-libs/glib/files/gobject_init_on_demand.patch | 91 ------ |
19 |
dev-libs/glib/files/quark_init_on_demand.patch | 77 ----- |
20 |
dev-libs/glib/glib-2.52.3.ebuild | 305 -------------------- |
21 |
dev-libs/glib/glib-2.54.3-r6.ebuild | 309 --------------------- |
22 |
dev-libs/glib/glib-2.56.2.ebuild | 302 -------------------- |
23 |
dev-libs/glib/metadata.xml | 31 --- |
24 |
12 files changed, 1476 deletions(-) |
25 |
|
26 |
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest |
27 |
deleted file mode 100644 |
28 |
index ff5fb4b..0000000 |
29 |
--- a/dev-libs/glib/Manifest |
30 |
+++ /dev/null |
31 |
@@ -1,5 +0,0 @@ |
32 |
-DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017 |
33 |
-DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942 |
34 |
-DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d |
35 |
-DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4 |
36 |
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 |
37 |
|
38 |
diff --git a/dev-libs/glib/files/2.56.2-gobject_init_on_demand.patch b/dev-libs/glib/files/2.56.2-gobject_init_on_demand.patch |
39 |
deleted file mode 100644 |
40 |
index d8be8e2..0000000 |
41 |
--- a/dev-libs/glib/files/2.56.2-gobject_init_on_demand.patch |
42 |
+++ /dev/null |
43 |
@@ -1,91 +0,0 @@ |
44 |
---- a/gobject/gtype.c |
45 |
-+++ b/gobject/gtype.c |
46 |
-@@ -200,6 +200,9 @@ |
47 |
- static gboolean type_node_is_a_L (TypeNode *node, |
48 |
- TypeNode *iface_node); |
49 |
- |
50 |
-+#if !defined(__GLIBC__) |
51 |
-+static void gobject_init (void); |
52 |
-+#endif |
53 |
- |
54 |
- /* --- enumeration --- */ |
55 |
- |
56 |
-@@ -2623,6 +2626,10 @@ |
57 |
- { |
58 |
- TypeNode *node; |
59 |
- |
60 |
-+ #if !defined(__GLIBC__) |
61 |
-+ gobject_init(); |
62 |
-+ #endif |
63 |
-+ |
64 |
- g_assert_type_system_initialized (); |
65 |
- g_return_val_if_fail (type_id > 0, 0); |
66 |
- g_return_val_if_fail (type_name != NULL, 0); |
67 |
-@@ -2740,6 +2747,10 @@ |
68 |
- TypeNode *pnode, *node; |
69 |
- GType type = 0; |
70 |
- |
71 |
-+ #if !defined(__GLIBC__) |
72 |
-+ gobject_init(); |
73 |
-+ #endif |
74 |
-+ |
75 |
- g_assert_type_system_initialized (); |
76 |
- g_return_val_if_fail (parent_type > 0, 0); |
77 |
- g_return_val_if_fail (type_name != NULL, 0); |
78 |
-@@ -2795,6 +2806,10 @@ |
79 |
- TypeNode *pnode, *node; |
80 |
- GType type; |
81 |
- |
82 |
-+ #if !defined(__GLIBC__) |
83 |
-+ gobject_init(); |
84 |
-+ #endif |
85 |
-+ |
86 |
- g_assert_type_system_initialized (); |
87 |
- g_return_val_if_fail (parent_type > 0, 0); |
88 |
- g_return_val_if_fail (type_name != NULL, 0); |
89 |
-@@ -3309,7 +3324,11 @@ |
90 |
- g_type_name (GType type) |
91 |
- { |
92 |
- TypeNode *node; |
93 |
-- |
94 |
-+ |
95 |
-+ #if !defined(__GLIBC__) |
96 |
-+ gobject_init(); |
97 |
-+ #endif |
98 |
-+ |
99 |
- g_assert_type_system_initialized (); |
100 |
- |
101 |
- node = lookup_type_node_I (type); |
102 |
-@@ -4335,6 +4354,9 @@ |
103 |
- void |
104 |
- g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) |
105 |
- { |
106 |
-+#if !defined(__GLIBC__) |
107 |
-+ gobject_init(); |
108 |
-+#endif |
109 |
- g_assert_type_system_initialized (); |
110 |
- |
111 |
- if (debug_flags) |
112 |
-@@ -4353,6 +4375,9 @@ |
113 |
- void |
114 |
- g_type_init (void) |
115 |
- { |
116 |
-+#if !defined(__GLIBC__) |
117 |
-+ gobject_init(); |
118 |
-+#endif |
119 |
- g_assert_type_system_initialized (); |
120 |
- } |
121 |
- |
122 |
-@@ -4364,6 +4389,12 @@ |
123 |
- TypeNode *node; |
124 |
- GType type; |
125 |
- |
126 |
-+#if !defined(__GLIBC__) |
127 |
-+ static int gobject_initialized = 0; |
128 |
-+ if (gobject_initialized) |
129 |
-+ return; |
130 |
-+ gobject_initialized = 1; |
131 |
-+#endif |
132 |
- /* Ensure GLib is initialized first, see |
133 |
- * https://bugzilla.gnome.org/show_bug.cgi?id=756139 |
134 |
- */ |
135 |
|
136 |
diff --git a/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch b/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch |
137 |
deleted file mode 100644 |
138 |
index 1ddec6d..0000000 |
139 |
--- a/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch |
140 |
+++ /dev/null |
141 |
@@ -1,36 +0,0 @@ |
142 |
-From a90c578952219e740f24d9f2560f54f19ae7e906 Mon Sep 17 00:00:00 2001 |
143 |
-From: Philip Withnall <withnall@××××××××.com> |
144 |
-Date: Wed, 11 Apr 2018 15:45:10 +0100 |
145 |
-Subject: [PATCH] tests: Lower number of iterations in network-monitor-race |
146 |
- |
147 |
-While 333 runs is very likely to reproduce the bug, Milan has previously |
148 |
-reproduced it with as few as 9 runs. Since this test will be run by the |
149 |
-CI machinery quite often, a lower number of runs each CI run will still |
150 |
-probably catch any regressions over time. |
151 |
- |
152 |
-This reduces the total test runtime from 33s to 2s. |
153 |
- |
154 |
-https://bugzilla.gnome.org/show_bug.cgi?id=793727 |
155 |
- |
156 |
-Signed-off-by: Philip Withnall <withnall@××××××××.com> |
157 |
-Reviewed-by: nobody |
158 |
---- |
159 |
- gio/tests/network-monitor-race.c | 2 +- |
160 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
161 |
- |
162 |
-diff --git a/gio/tests/network-monitor-race.c b/gio/tests/network-monitor-race.c |
163 |
-index 4b92c87a5..cadd62cee 100644 |
164 |
---- a/gio/tests/network-monitor-race.c |
165 |
-+++ b/gio/tests/network-monitor-race.c |
166 |
-@@ -18,7 +18,7 @@ |
167 |
- #include <glib/glib.h> |
168 |
- #include <gio/gio.h> |
169 |
- |
170 |
--#define MAX_RUNS 333 |
171 |
-+#define MAX_RUNS 20 |
172 |
- |
173 |
- static gboolean |
174 |
- quit_loop (gpointer user_data) |
175 |
--- |
176 |
-2.17.0 |
177 |
- |
178 |
|
179 |
diff --git a/dev-libs/glib/files/2.56.2-quark_init_on_demand.patch b/dev-libs/glib/files/2.56.2-quark_init_on_demand.patch |
180 |
deleted file mode 100644 |
181 |
index d93f85c..0000000 |
182 |
--- a/dev-libs/glib/files/2.56.2-quark_init_on_demand.patch |
183 |
+++ /dev/null |
184 |
@@ -1,50 +0,0 @@ |
185 |
---- a/glib/gquark.c |
186 |
-+++ b/glib/gquark.c |
187 |
-@@ -57,6 +57,9 @@ |
188 |
- void |
189 |
- g_quark_init (void) |
190 |
- { |
191 |
-+ if (quark_ht) |
192 |
-+ return; |
193 |
-+ |
194 |
- g_assert (quark_seq_id == 0); |
195 |
- quark_ht = g_hash_table_new (g_str_hash, g_str_equal); |
196 |
- quarks = g_new (gchar*, QUARK_BLOCK_SIZE); |
197 |
-@@ -138,6 +141,9 @@ |
198 |
- return 0; |
199 |
- |
200 |
- G_LOCK (quark_global); |
201 |
-+#if !defined(__GLIBC__) |
202 |
-+ g_quark_init (); |
203 |
-+#endif |
204 |
- quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string)); |
205 |
- G_UNLOCK (quark_global); |
206 |
- |
207 |
-@@ -200,6 +206,9 @@ |
208 |
- return 0; |
209 |
- |
210 |
- G_LOCK (quark_global); |
211 |
-+#if !defined(__GLIBC__) |
212 |
-+ g_quark_init (); |
213 |
-+#endif |
214 |
- quark = quark_from_string (string, duplicate); |
215 |
- G_UNLOCK (quark_global); |
216 |
- |
217 |
-@@ -278,6 +287,7 @@ |
218 |
- GQuark quark; |
219 |
- gchar **quarks_new; |
220 |
- |
221 |
-+ g_quark_init (); |
222 |
- if (quark_seq_id % QUARK_BLOCK_SIZE == 0) |
223 |
- { |
224 |
- quarks_new = g_new (gchar*, quark_seq_id + QUARK_BLOCK_SIZE); |
225 |
-@@ -310,6 +320,9 @@ |
226 |
- return NULL; |
227 |
- |
228 |
- G_LOCK (quark_global); |
229 |
-+#if !defined(__GLIBC__) |
230 |
-+ g_quark_init (); |
231 |
-+#endif |
232 |
- quark = quark_from_string (string, duplicate); |
233 |
- result = quarks[quark]; |
234 |
- G_UNLOCK (quark_global); |
235 |
|
236 |
diff --git a/dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch |
237 |
deleted file mode 100644 |
238 |
index 2c942d5..0000000 |
239 |
--- a/dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch |
240 |
+++ /dev/null |
241 |
@@ -1,93 +0,0 @@ |
242 |
-diff --git a/configure.ac b/configure.ac |
243 |
-index e8e7553..216e59d 100644 |
244 |
---- a/configure.ac |
245 |
-+++ b/configure.ac |
246 |
-@@ -385,14 +385,14 @@ AC_SUBST(PERL_PATH) |
247 |
- # option to specify python interpreter to use; this just sets $PYTHON, so that |
248 |
- # we will fallback to reading $PYTHON if --with-python is not given, and |
249 |
- # python.m4 will get the expected input |
250 |
--AC_ARG_WITH(python, |
251 |
-- AS_HELP_STRING([--with-python=PATH], |
252 |
-- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
253 |
-- [PYTHON="$withval"], []) |
254 |
--if test x"$PYTHON" = xyes; then |
255 |
-- AC_MSG_ERROR([--with-python option requires a path or program argument]) |
256 |
--fi |
257 |
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") |
258 |
-+# AC_ARG_WITH(python, |
259 |
-+# AS_HELP_STRING([--with-python=PATH], |
260 |
-+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
261 |
-+# [PYTHON="$withval"], []) |
262 |
-+# if test x"$PYTHON" = xyes; then |
263 |
-+# AC_MSG_ERROR([--with-python option requires a path or program argument]) |
264 |
-+# fi |
265 |
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") |
266 |
- |
267 |
- |
268 |
- dnl *********************** |
269 |
-@@ -3453,7 +3453,6 @@ gobject/glib-mkenums |
270 |
- gobject/tests/Makefile |
271 |
- gthread/Makefile |
272 |
- gio/Makefile |
273 |
--gio/gdbus-2.0/codegen/Makefile |
274 |
- gio/gdbus-2.0/codegen/config.py |
275 |
- gio/gnetworking.h |
276 |
- gio/xdgmime/Makefile |
277 |
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am |
278 |
-index 5741a3e..d38e768 100644 |
279 |
---- a/docs/reference/gio/Makefile.am |
280 |
-+++ b/docs/reference/gio/Makefile.am |
281 |
-@@ -177,7 +177,6 @@ man_MANS += \ |
282 |
- gsettings.1 \ |
283 |
- gresource.1 \ |
284 |
- gdbus.1 \ |
285 |
-- gdbus-codegen.1 \ |
286 |
- gio.1 \ |
287 |
- $(NULL) |
288 |
- |
289 |
-diff --git a/gio/Makefile.am b/gio/Makefile.am |
290 |
-index ffe5ee2..929d1b5 100644 |
291 |
---- a/gio/Makefile.am |
292 |
-+++ b/gio/Makefile.am |
293 |
-@@ -1,6 +1,6 @@ |
294 |
- include $(top_srcdir)/glib.mk |
295 |
- |
296 |
--SUBDIRS = gdbus-2.0/codegen |
297 |
-+SUBDIRS = |
298 |
- |
299 |
- if OS_UNIX |
300 |
- SUBDIRS += xdgmime |
301 |
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
302 |
-index 749267b..f2a8c63 100644 |
303 |
---- a/gio/tests/Makefile.am |
304 |
-+++ b/gio/tests/Makefile.am |
305 |
-@@ -449,10 +449,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica |
306 |
- |
307 |
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h |
308 |
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h |
309 |
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
310 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
311 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
312 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
313 |
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile |
314 |
-+ $(AM_V_GEN) gdbus-codegen \ |
315 |
- --interface-prefix org.project. \ |
316 |
- --generate-c-code gdbus-test-codegen-generated \ |
317 |
- --c-generate-object-manager \ |
318 |
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
319 |
-index 1d0464c..0603d9b 100644 |
320 |
---- a/gio/tests/gdbus-object-manager-example/Makefile.am |
321 |
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
322 |
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ |
323 |
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ |
324 |
- $(NULL) |
325 |
- |
326 |
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
327 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
328 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
329 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
330 |
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile |
331 |
-+ $(AM_V_GEN) gdbus-codegen \ |
332 |
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
333 |
- --c-namespace Example \ |
334 |
- --c-generate-object-manager \ |
335 |
|
336 |
diff --git a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch |
337 |
deleted file mode 100644 |
338 |
index a27966e..0000000 |
339 |
--- a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch |
340 |
+++ /dev/null |
341 |
@@ -1,86 +0,0 @@ |
342 |
-From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001 |
343 |
-From: Sobhan Mohammadpour <sobhan@g.o> |
344 |
-Date: Fri, 23 Feb 2018 15:27:33 +0330 |
345 |
-Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools |
346 |
- |
347 |
---- |
348 |
- configure.ac | 1 - |
349 |
- docs/reference/gio/Makefile.am | 1 - |
350 |
- gio/Makefile.am | 2 +- |
351 |
- gio/tests/Makefile.am | 6 ++---- |
352 |
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- |
353 |
- 5 files changed, 5 insertions(+), 11 deletions(-) |
354 |
- |
355 |
-diff --git a/configure.ac b/configure.ac |
356 |
-index 0457c90..07166c9 100644 |
357 |
---- a/configure.ac |
358 |
-+++ b/configure.ac |
359 |
-@@ -3469,7 +3469,6 @@ gobject/glib-mkenums |
360 |
- gobject/tests/Makefile |
361 |
- gthread/Makefile |
362 |
- gio/Makefile |
363 |
--gio/gdbus-2.0/codegen/Makefile |
364 |
- gio/gdbus-2.0/codegen/config.py |
365 |
- gio/gnetworking.h |
366 |
- gio/xdgmime/Makefile |
367 |
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am |
368 |
-index 5741a3e..d38e768 100644 |
369 |
---- a/docs/reference/gio/Makefile.am |
370 |
-+++ b/docs/reference/gio/Makefile.am |
371 |
-@@ -177,7 +177,6 @@ man_MANS += \ |
372 |
- gsettings.1 \ |
373 |
- gresource.1 \ |
374 |
- gdbus.1 \ |
375 |
-- gdbus-codegen.1 \ |
376 |
- gio.1 \ |
377 |
- $(NULL) |
378 |
- |
379 |
-diff --git a/gio/Makefile.am b/gio/Makefile.am |
380 |
-index b2db995..53d7162 100644 |
381 |
---- a/gio/Makefile.am |
382 |
-+++ b/gio/Makefile.am |
383 |
-@@ -1,6 +1,6 @@ |
384 |
- include $(top_srcdir)/glib.mk |
385 |
- |
386 |
--SUBDIRS = gdbus-2.0/codegen |
387 |
-+SUBDIRS = |
388 |
- |
389 |
- if OS_UNIX |
390 |
- if !OS_COCOA |
391 |
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
392 |
-index acc1da4..7c51eab 100644 |
393 |
---- a/gio/tests/Makefile.am |
394 |
-+++ b/gio/tests/Makefile.am |
395 |
-@@ -460,10 +460,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica |
396 |
- |
397 |
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h |
398 |
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h |
399 |
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
400 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
401 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
402 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
403 |
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile |
404 |
-+ $(AM_V_GEN) gdbus-codegen \ |
405 |
- --interface-prefix org.project. \ |
406 |
- --generate-c-code gdbus-test-codegen-generated \ |
407 |
- --c-generate-object-manager \ |
408 |
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
409 |
-index 1d0464c..f390dca 100644 |
410 |
---- a/gio/tests/gdbus-object-manager-example/Makefile.am |
411 |
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
412 |
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ |
413 |
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ |
414 |
- $(NULL) |
415 |
- |
416 |
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
417 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
418 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
419 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
420 |
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile |
421 |
-+ $(AM_V_GEN) gdbus-codegen \ |
422 |
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
423 |
- --c-namespace Example \ |
424 |
- --c-generate-object-manager \ |
425 |
--- |
426 |
-2.16.1 |
427 |
- |
428 |
|
429 |
diff --git a/dev-libs/glib/files/gobject_init_on_demand.patch b/dev-libs/glib/files/gobject_init_on_demand.patch |
430 |
deleted file mode 100644 |
431 |
index 024e588..0000000 |
432 |
--- a/dev-libs/glib/files/gobject_init_on_demand.patch |
433 |
+++ /dev/null |
434 |
@@ -1,91 +0,0 @@ |
435 |
-Initialize the gobject system on demand, i.e. before it is |
436 |
-expected to be initialized. Do this only once by checking |
437 |
-a local static variable gobject_initialized. |
438 |
- |
439 |
---- a/gobject/gtype.c 2016-08-17 17:20:47.000000000 +0200 |
440 |
-+++ b/gobject/gtype.c 2016-09-01 21:56:31.777406646 +0200 |
441 |
-@@ -209,6 +209,9 @@ |
442 |
- static gboolean type_node_is_a_L (TypeNode *node, |
443 |
- TypeNode *iface_node); |
444 |
- |
445 |
-+#if !defined(__GLIBC__) |
446 |
-+static void gobject_init (void); |
447 |
-+#endif |
448 |
- |
449 |
- /* --- enumeration --- */ |
450 |
- |
451 |
-@@ -2631,7 +2634,10 @@ |
452 |
- GTypeFlags flags) |
453 |
- { |
454 |
- TypeNode *node; |
455 |
-- |
456 |
-+ |
457 |
-+#if !defined(__GLIBC__) |
458 |
-+ gobject_init(); |
459 |
-+#endif |
460 |
- g_assert_type_system_initialized (); |
461 |
- g_return_val_if_fail (type_id > 0, 0); |
462 |
- g_return_val_if_fail (type_name != NULL, 0); |
463 |
-@@ -2749,6 +2755,9 @@ |
464 |
- TypeNode *pnode, *node; |
465 |
- GType type = 0; |
466 |
- |
467 |
-+#if !defined(__GLIBC__) |
468 |
-+ gobject_init(); |
469 |
-+#endif |
470 |
- g_assert_type_system_initialized (); |
471 |
- g_return_val_if_fail (parent_type > 0, 0); |
472 |
- g_return_val_if_fail (type_name != NULL, 0); |
473 |
-@@ -2804,6 +2813,9 @@ |
474 |
- TypeNode *pnode, *node; |
475 |
- GType type; |
476 |
- |
477 |
-+#if !defined(__GLIBC__) |
478 |
-+ gobject_init(); |
479 |
-+#endif |
480 |
- g_assert_type_system_initialized (); |
481 |
- g_return_val_if_fail (parent_type > 0, 0); |
482 |
- g_return_val_if_fail (type_name != NULL, 0); |
483 |
-@@ -3319,6 +3331,9 @@ |
484 |
- { |
485 |
- TypeNode *node; |
486 |
- |
487 |
-+#if !defined(__GLIBC__) |
488 |
-+ gobject_init(); |
489 |
-+#endif |
490 |
- g_assert_type_system_initialized (); |
491 |
- |
492 |
- node = lookup_type_node_I (type); |
493 |
-@@ -4343,6 +4358,9 @@ |
494 |
- void |
495 |
- g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) |
496 |
- { |
497 |
-+#if !defined(__GLIBC__) |
498 |
-+ gobject_init(); |
499 |
-+#endif |
500 |
- g_assert_type_system_initialized (); |
501 |
- |
502 |
- if (debug_flags) |
503 |
-@@ -4361,6 +4379,9 @@ |
504 |
- void |
505 |
- g_type_init (void) |
506 |
- { |
507 |
-+#if !defined(__GLIBC__) |
508 |
-+ gobject_init(); |
509 |
-+#endif |
510 |
- g_assert_type_system_initialized (); |
511 |
- } |
512 |
- |
513 |
-@@ -4372,6 +4393,12 @@ |
514 |
- TypeNode *node; |
515 |
- GType type; |
516 |
- |
517 |
-+#if !defined(__GLIBC__) |
518 |
-+ static int gobject_initialized = 0; |
519 |
-+ if (gobject_initialized) |
520 |
-+ return; |
521 |
-+ gobject_initialized = 1; |
522 |
-+#endif |
523 |
- /* Ensure GLib is initialized first, see |
524 |
- * https://bugzilla.gnome.org/show_bug.cgi?id=756139 |
525 |
- */ |
526 |
|
527 |
diff --git a/dev-libs/glib/files/quark_init_on_demand.patch b/dev-libs/glib/files/quark_init_on_demand.patch |
528 |
deleted file mode 100644 |
529 |
index 4c07fa7..0000000 |
530 |
--- a/dev-libs/glib/files/quark_init_on_demand.patch |
531 |
+++ /dev/null |
532 |
@@ -1,77 +0,0 @@ |
533 |
-musl does not run ctors in the assumed order that glib-2.46 expects. |
534 |
-Call g_quark_init() where it is expected to have been called. |
535 |
- |
536 |
- |
537 |
---- a/glib/gquark.c 2016-08-17 17:20:47.000000000 +0200 |
538 |
-+++ b/glib/gquark.c 2016-08-30 07:49:13.298234757 +0200 |
539 |
-@@ -57,6 +57,9 @@ |
540 |
- void |
541 |
- g_quark_init (void) |
542 |
- { |
543 |
-+ if (quark_ht) |
544 |
-+ return; |
545 |
-+ |
546 |
- g_assert (quark_seq_id == 0); |
547 |
- quark_ht = g_hash_table_new (g_str_hash, g_str_equal); |
548 |
- quarks = g_new (gchar*, QUARK_BLOCK_SIZE); |
549 |
-@@ -138,9 +141,12 @@ |
550 |
- return 0; |
551 |
- |
552 |
- G_LOCK (quark_global); |
553 |
-+#if !defined(__GLIBC__) |
554 |
-+ g_quark_init (); |
555 |
-+#endif |
556 |
- quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string)); |
557 |
- G_UNLOCK (quark_global); |
558 |
- |
559 |
- return quark; |
560 |
- } |
561 |
- |
562 |
-@@ -209,6 +213,9 @@ |
563 |
- return 0; |
564 |
- |
565 |
- G_LOCK (quark_global); |
566 |
-+#if !defined(__GLIBC__) |
567 |
-+ g_quark_init (); |
568 |
-+#endif |
569 |
- quark = quark_from_string (string, TRUE); |
570 |
- G_UNLOCK (quark_global); |
571 |
- |
572 |
-@@ -243,6 +248,9 @@ |
573 |
- return 0; |
574 |
- |
575 |
- G_LOCK (quark_global); |
576 |
-+#if !defined(__GLIBC__) |
577 |
-+ g_quark_init (); |
578 |
-+#endif |
579 |
- quark = quark_from_string (string, FALSE); |
580 |
- G_UNLOCK (quark_global); |
581 |
- |
582 |
-@@ -280,6 +286,7 @@ |
583 |
- GQuark quark; |
584 |
- gchar **quarks_new; |
585 |
- |
586 |
-+ g_quark_init (); |
587 |
- if (quark_seq_id % QUARK_BLOCK_SIZE == 0) |
588 |
- { |
589 |
- quarks_new = g_new (gchar*, quark_seq_id + QUARK_BLOCK_SIZE); |
590 |
-@@ -323,6 +330,9 @@ |
591 |
- return NULL; |
592 |
- |
593 |
- G_LOCK (quark_global); |
594 |
-+#if !defined(__GLIBC__) |
595 |
-+ g_quark_init (); |
596 |
-+#endif |
597 |
- quark = quark_from_string (string, TRUE); |
598 |
- result = quarks[quark]; |
599 |
- G_UNLOCK (quark_global); |
600 |
-@@ -353,6 +361,9 @@ |
601 |
- return NULL; |
602 |
- |
603 |
- G_LOCK (quark_global); |
604 |
-+#if !defined(__GLIBC__) |
605 |
-+ g_quark_init (); |
606 |
-+#endif |
607 |
- quark = quark_from_string (string, FALSE); |
608 |
- result = quarks[quark]; |
609 |
- G_UNLOCK (quark_global); |
610 |
|
611 |
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild |
612 |
deleted file mode 100644 |
613 |
index 29ec14b..0000000 |
614 |
--- a/dev-libs/glib/glib-2.52.3.ebuild |
615 |
+++ /dev/null |
616 |
@@ -1,305 +0,0 @@ |
617 |
-# Copyright 1999-2018 Gentoo Foundation |
618 |
-# Distributed under the terms of the GNU General Public License v2 |
619 |
- |
620 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
621 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
622 |
-# then to be think very closely. |
623 |
- |
624 |
-EAPI=6 |
625 |
-PYTHON_COMPAT=( python2_7 ) |
626 |
-# Completely useless with or without USE static-libs, people need to use |
627 |
-# pkg-config |
628 |
-GNOME2_LA_PUNT="yes" |
629 |
- |
630 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
631 |
- multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx |
632 |
- |
633 |
-DESCRIPTION="The GLib library of C routines" |
634 |
-HOMEPAGE="https://www.gtk.org/" |
635 |
-SRC_URI="${SRC_URI} |
636 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
637 |
- |
638 |
-LICENSE="LGPL-2.1+" |
639 |
-SLOT="2" |
640 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
641 |
-REQUIRED_USE=" |
642 |
- utils? ( ${PYTHON_REQUIRED_USE} ) |
643 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
644 |
-" |
645 |
- |
646 |
-KEYWORDS="amd64 arm arm64 ~mips ppc x86" |
647 |
- |
648 |
-# Added util-linux multilib dependency to have libmount support (which |
649 |
-# is always turned on on linux systems, unless explicitly disabled, but |
650 |
-# this ebuild does not do that anyway) (bug #599586) |
651 |
- |
652 |
-RDEPEND=" |
653 |
- !<dev-util/gdbus-codegen-${PV} |
654 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
655 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
656 |
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
657 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
658 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
659 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
660 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
661 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
662 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
663 |
- utils? ( |
664 |
- ${PYTHON_DEPS} |
665 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
666 |
- virtual/libelf:0= |
667 |
- ) |
668 |
-" |
669 |
-DEPEND="${RDEPEND} |
670 |
- app-text/docbook-xml-dtd:4.1.2 |
671 |
- >=dev-libs/libxslt-1.0 |
672 |
- >=sys-devel/gettext-0.11 |
673 |
- >=dev-util/gtk-doc-am-1.20 |
674 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
675 |
- test? ( |
676 |
- sys-devel/gdb |
677 |
- ${PYTHON_DEPS} |
678 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
679 |
- >=sys-apps/dbus-1.2.14 ) |
680 |
- !<dev-util/gtk-doc-1.15-r2 |
681 |
-" |
682 |
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
683 |
- dbus? ( gnome-base/dconf ) |
684 |
- mime? ( x11-misc/shared-mime-info ) |
685 |
-" |
686 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
687 |
-# dconf is needed to be able to save settings, bug #498436 |
688 |
-# Earlier versions of gvfs do not work with glib |
689 |
- |
690 |
-MULTILIB_CHOST_TOOLS=( |
691 |
- /usr/bin/gio-querymodules$(get_exeext) |
692 |
-) |
693 |
- |
694 |
-pkg_setup() { |
695 |
- if use kernel_linux ; then |
696 |
- CONFIG_CHECK="~INOTIFY_USER" |
697 |
- if use test ; then |
698 |
- CONFIG_CHECK="~IPV6" |
699 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
700 |
- fi |
701 |
- linux-info_pkg_setup |
702 |
- fi |
703 |
-} |
704 |
- |
705 |
-src_prepare() { |
706 |
- |
707 |
- # Fix for MUSL |
708 |
- eapply "${FILESDIR}"/quark_init_on_demand.patch |
709 |
- eapply "${FILESDIR}"/gobject_init_on_demand.patch |
710 |
- |
711 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
712 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
713 |
- |
714 |
- if use test; then |
715 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
716 |
- if ! has_version dev-util/desktop-file-utils ; then |
717 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
718 |
- ewarn "think on installing it to get these tests run." |
719 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
720 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
721 |
- fi |
722 |
- |
723 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
724 |
- # other), falling back to xterm if one doesn't exist |
725 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
726 |
- ewarn "Some tests will be skipped due to missing terminal program" |
727 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
728 |
- fi |
729 |
- |
730 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
731 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
732 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
733 |
- |
734 |
- ewarn "Tests for search-utils have been skipped" |
735 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
736 |
- else |
737 |
- # Don't build tests, also prevents extra deps, bug #512022 |
738 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
739 |
- fi |
740 |
- |
741 |
- # gdbus-codegen is a separate package |
742 |
- eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch |
743 |
- |
744 |
- # Leave python shebang alone - handled by python_replicate_script |
745 |
- # We could call python_setup and give configure a valid --with-python |
746 |
- # arg, but that would mean a build dep on python when USE=utils. |
747 |
- sed -e '/${PYTHON}/d' \ |
748 |
- -i glib/Makefile.{am,in} || die |
749 |
- |
750 |
- # Also needed to prevent cross-compile failures, see bug #267603 |
751 |
- eautoreconf |
752 |
- |
753 |
- gnome2_src_prepare |
754 |
- |
755 |
- epunt_cxx |
756 |
-} |
757 |
- |
758 |
-multilib_src_configure() { |
759 |
- # Avoid circular depend with dev-util/pkgconfig and |
760 |
- # native builds (cross-compiles won't need pkg-config |
761 |
- # in the target ROOT to work here) |
762 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
763 |
- if has_version sys-apps/dbus; then |
764 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
765 |
- export DBUS1_LIBS="-ldbus-1" |
766 |
- fi |
767 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
768 |
- export LIBFFI_LIBS="-lffi" |
769 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
770 |
- export PCRE_LIBS="-lpcre" |
771 |
- fi |
772 |
- |
773 |
- # These configure tests don't work when cross-compiling. |
774 |
- if tc-is-cross-compiler ; then |
775 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
776 |
- case ${CHOST} in |
777 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
778 |
- *) export glib_cv_stack_grows=no ;; |
779 |
- esac |
780 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
781 |
- export glib_cv_uscore=no |
782 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
783 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
784 |
- fi |
785 |
- |
786 |
- local myconf |
787 |
- |
788 |
- case "${CHOST}" in |
789 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
790 |
- *) myconf="${myconf} --with-threads=posix" ;; |
791 |
- esac |
792 |
- |
793 |
- # libelf used only by the gresource bin |
794 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
795 |
- $(usex debug --enable-debug=yes ' ') \ |
796 |
- $(use_enable xattr) \ |
797 |
- $(use_enable fam) \ |
798 |
- $(use_enable kernel_linux libmount) \ |
799 |
- $(use_enable selinux) \ |
800 |
- $(use_enable static-libs static) \ |
801 |
- $(use_enable systemtap dtrace) \ |
802 |
- $(use_enable systemtap systemtap) \ |
803 |
- $(multilib_native_use_enable utils libelf) \ |
804 |
- --disable-compile-warnings \ |
805 |
- --enable-man \ |
806 |
- --with-pcre=system \ |
807 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
808 |
- |
809 |
- if multilib_is_native_abi; then |
810 |
- local d |
811 |
- for d in glib gio gobject; do |
812 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
813 |
- done |
814 |
- fi |
815 |
-} |
816 |
- |
817 |
-multilib_src_test() { |
818 |
- export XDG_CONFIG_DIRS=/etc/xdg |
819 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
820 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
821 |
- export LC_TIME=C # bug #411967 |
822 |
- unset GSETTINGS_BACKEND # bug #596380 |
823 |
- python_setup |
824 |
- |
825 |
- # Related test is a bit nitpicking |
826 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
827 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
828 |
- |
829 |
- # Hardened: gdb needs this, bug #338891 |
830 |
- if host-is-pax ; then |
831 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
832 |
- || die "Hardened adjustment failed" |
833 |
- fi |
834 |
- |
835 |
- # Need X for dbus-launch session X11 initialization |
836 |
- virtx emake check |
837 |
-} |
838 |
- |
839 |
-multilib_src_install() { |
840 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
841 |
- keepdir /usr/$(get_libdir)/gio/modules |
842 |
-} |
843 |
- |
844 |
-multilib_src_install_all() { |
845 |
- einstalldocs |
846 |
- |
847 |
- if use utils ; then |
848 |
- python_replicate_script "${ED}"/usr/bin/gtester-report |
849 |
- else |
850 |
- rm "${ED}usr/bin/gtester-report" |
851 |
- rm "${ED}usr/share/man/man1/gtester-report.1" |
852 |
- fi |
853 |
- |
854 |
- # Do not install charset.alias even if generated, leave it to libiconv |
855 |
- rm -f "${ED}/usr/lib/charset.alias" |
856 |
- |
857 |
- # Don't install gdb python macros, bug 291328 |
858 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
859 |
-} |
860 |
- |
861 |
-pkg_preinst() { |
862 |
- gnome2_pkg_preinst |
863 |
- |
864 |
- # Make gschemas.compiled belong to glib alone |
865 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
866 |
- |
867 |
- if [[ -e ${EROOT}${cache} ]]; then |
868 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
869 |
- else |
870 |
- touch "${ED}"/${cache} || die |
871 |
- fi |
872 |
- |
873 |
- multilib_pkg_preinst() { |
874 |
- # Make giomodule.cache belong to glib alone |
875 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
876 |
- |
877 |
- if [[ -e ${EROOT}${cache} ]]; then |
878 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
879 |
- else |
880 |
- touch "${ED}"/${cache} || die |
881 |
- fi |
882 |
- } |
883 |
- |
884 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
885 |
- # file due to inability to create it and GIO might not look at any of the modules there |
886 |
- if ! tc-is-cross-compiler ; then |
887 |
- multilib_foreach_abi multilib_pkg_preinst |
888 |
- fi |
889 |
-} |
890 |
- |
891 |
-pkg_postinst() { |
892 |
- # force (re)generation of gschemas.compiled |
893 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
894 |
- |
895 |
- gnome2_pkg_postinst |
896 |
- |
897 |
- multilib_pkg_postinst() { |
898 |
- gnome2_giomodule_cache_update \ |
899 |
- || die "Update GIO modules cache failed (for ${ABI})" |
900 |
- } |
901 |
- if ! tc-is-cross-compiler ; then |
902 |
- multilib_foreach_abi multilib_pkg_postinst |
903 |
- else |
904 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
905 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
906 |
- ewarn "your final image for performance reasons and re-run it when packages" |
907 |
- ewarn "installing GIO modules get upgraded or added to the image." |
908 |
- fi |
909 |
-} |
910 |
- |
911 |
-pkg_postrm() { |
912 |
- gnome2_pkg_postrm |
913 |
- |
914 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
915 |
- multilib_pkg_postrm() { |
916 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
917 |
- } |
918 |
- multilib_foreach_abi multilib_pkg_postrm |
919 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
920 |
- fi |
921 |
-} |
922 |
|
923 |
diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild |
924 |
deleted file mode 100644 |
925 |
index 4521ac0..0000000 |
926 |
--- a/dev-libs/glib/glib-2.54.3-r6.ebuild |
927 |
+++ /dev/null |
928 |
@@ -1,309 +0,0 @@ |
929 |
-# Copyright 1999-2018 Gentoo Foundation |
930 |
-# Distributed under the terms of the GNU General Public License v2 |
931 |
- |
932 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
933 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
934 |
-# then to be think very closely. |
935 |
- |
936 |
-EAPI=6 |
937 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
938 |
-# Completely useless with or without USE static-libs, people need to use |
939 |
-# pkg-config |
940 |
-GNOME2_LA_PUNT="yes" |
941 |
- |
942 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
943 |
- multilib multilib-minimal pax-utils python-single-r1 toolchain-funcs versionator virtualx |
944 |
- |
945 |
-DESCRIPTION="The GLib library of C routines" |
946 |
-HOMEPAGE="https://www.gtk.org/" |
947 |
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz |
948 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
949 |
- |
950 |
-LICENSE="LGPL-2.1+" |
951 |
-SLOT="2" |
952 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
953 |
-REQUIRED_USE=" |
954 |
- ${PYTHON_REQUIRED_USE} |
955 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
956 |
-" # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson |
957 |
- |
958 |
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" |
959 |
- |
960 |
-# Added util-linux multilib dependency to have libmount support (which |
961 |
-# is always turned on on linux systems, unless explicitly disabled, but |
962 |
-# this ebuild does not do that anyway) (bug #599586) |
963 |
- |
964 |
-RDEPEND=" |
965 |
- !<dev-util/gdbus-codegen-${PV} |
966 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
967 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
968 |
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
969 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
970 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
971 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
972 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
973 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
974 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
975 |
- ${PYTHON_DEPS} |
976 |
- utils? ( |
977 |
- >=dev-util/gdbus-codegen-${PV} |
978 |
- virtual/libelf:0= |
979 |
- ) |
980 |
-" |
981 |
-DEPEND="${RDEPEND} |
982 |
- app-text/docbook-xml-dtd:4.1.2 |
983 |
- >=dev-libs/libxslt-1.0 |
984 |
- >=sys-devel/gettext-0.11 |
985 |
- >=dev-util/gtk-doc-am-1.20 |
986 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
987 |
- test? ( |
988 |
- sys-devel/gdb |
989 |
- ${PYTHON_DEPS} |
990 |
- >=dev-util/gdbus-codegen-${PV} |
991 |
- >=sys-apps/dbus-1.2.14 ) |
992 |
- !<dev-util/gtk-doc-1.15-r2 |
993 |
-" |
994 |
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
995 |
- dbus? ( gnome-base/dconf ) |
996 |
- mime? ( x11-misc/shared-mime-info ) |
997 |
-" |
998 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
999 |
-# dconf is needed to be able to save settings, bug #498436 |
1000 |
-# Earlier versions of gvfs do not work with glib |
1001 |
- |
1002 |
-MULTILIB_CHOST_TOOLS=( |
1003 |
- /usr/bin/gio-querymodules$(get_exeext) |
1004 |
-) |
1005 |
- |
1006 |
-pkg_setup() { |
1007 |
- if use kernel_linux ; then |
1008 |
- CONFIG_CHECK="~INOTIFY_USER" |
1009 |
- if use test ; then |
1010 |
- CONFIG_CHECK="~IPV6" |
1011 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
1012 |
- fi |
1013 |
- linux-info_pkg_setup |
1014 |
- fi |
1015 |
- # FIXME: Move python deps that are only required at build time of other packages to a split package |
1016 |
- python-single-r1_pkg_setup |
1017 |
-} |
1018 |
- |
1019 |
-src_prepare() { |
1020 |
- |
1021 |
- # Fix for MUSL |
1022 |
- eapply "${FILESDIR}"/quark_init_on_demand.patch |
1023 |
- eapply "${FILESDIR}"/gobject_init_on_demand.patch |
1024 |
- |
1025 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
1026 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
1027 |
- |
1028 |
- if use test; then |
1029 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
1030 |
- if ! has_version dev-util/desktop-file-utils ; then |
1031 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
1032 |
- ewarn "think on installing it to get these tests run." |
1033 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
1034 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
1035 |
- fi |
1036 |
- |
1037 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
1038 |
- # other), falling back to xterm if one doesn't exist |
1039 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
1040 |
- ewarn "Some tests will be skipped due to missing terminal program" |
1041 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
1042 |
- fi |
1043 |
- |
1044 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
1045 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
1046 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
1047 |
- |
1048 |
- ewarn "Tests for search-utils have been skipped" |
1049 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
1050 |
- else |
1051 |
- # Don't build tests, also prevents extra deps, bug #512022 |
1052 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
1053 |
- fi |
1054 |
- |
1055 |
- # gdbus-codegen is a separate package |
1056 |
- eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch |
1057 |
- |
1058 |
- # Upstream glib-2-54 branch; includes fixups for potential libreoffice lockups |
1059 |
- eapply "${WORKDIR}"/patches/ |
1060 |
- |
1061 |
- # Leave gtester-report python shebang alone - handled by python_fix_shebang |
1062 |
- sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die |
1063 |
- |
1064 |
- # Also needed to prevent cross-compile failures, see bug #267603 |
1065 |
- eautoreconf |
1066 |
- |
1067 |
- gnome2_src_prepare |
1068 |
- |
1069 |
- epunt_cxx |
1070 |
-} |
1071 |
- |
1072 |
-multilib_src_configure() { |
1073 |
- # Avoid circular depend with dev-util/pkgconfig and |
1074 |
- # native builds (cross-compiles won't need pkg-config |
1075 |
- # in the target ROOT to work here) |
1076 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
1077 |
- if has_version sys-apps/dbus; then |
1078 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
1079 |
- export DBUS1_LIBS="-ldbus-1" |
1080 |
- fi |
1081 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
1082 |
- export LIBFFI_LIBS="-lffi" |
1083 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
1084 |
- export PCRE_LIBS="-lpcre" |
1085 |
- fi |
1086 |
- |
1087 |
- # These configure tests don't work when cross-compiling. |
1088 |
- if tc-is-cross-compiler ; then |
1089 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
1090 |
- case ${CHOST} in |
1091 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
1092 |
- *) export glib_cv_stack_grows=no ;; |
1093 |
- esac |
1094 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
1095 |
- export glib_cv_uscore=no |
1096 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
1097 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
1098 |
- fi |
1099 |
- |
1100 |
- local myconf |
1101 |
- |
1102 |
- case "${CHOST}" in |
1103 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
1104 |
- *) myconf="${myconf} --with-threads=posix" ;; |
1105 |
- esac |
1106 |
- |
1107 |
- # libelf used only by the gresource bin |
1108 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
1109 |
- $(usex debug --enable-debug=yes ' ') \ |
1110 |
- $(use_enable xattr) \ |
1111 |
- $(use_enable fam) \ |
1112 |
- $(use_enable kernel_linux libmount) \ |
1113 |
- $(use_enable selinux) \ |
1114 |
- $(use_enable static-libs static) \ |
1115 |
- $(use_enable systemtap dtrace) \ |
1116 |
- $(use_enable systemtap systemtap) \ |
1117 |
- $(multilib_native_use_enable utils libelf) \ |
1118 |
- --with-python=${EPYTHON} \ |
1119 |
- --disable-compile-warnings \ |
1120 |
- --enable-man \ |
1121 |
- --with-pcre=system \ |
1122 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
1123 |
- |
1124 |
- if multilib_is_native_abi; then |
1125 |
- local d |
1126 |
- for d in glib gio gobject; do |
1127 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
1128 |
- done |
1129 |
- fi |
1130 |
-} |
1131 |
- |
1132 |
-multilib_src_test() { |
1133 |
- export XDG_CONFIG_DIRS=/etc/xdg |
1134 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
1135 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
1136 |
- export LC_TIME=C # bug #411967 |
1137 |
- unset GSETTINGS_BACKEND # bug #596380 |
1138 |
- python_setup |
1139 |
- |
1140 |
- # Related test is a bit nitpicking |
1141 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1142 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1143 |
- |
1144 |
- # Hardened: gdb needs this, bug #338891 |
1145 |
- if host-is-pax ; then |
1146 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
1147 |
- || die "Hardened adjustment failed" |
1148 |
- fi |
1149 |
- |
1150 |
- # Need X for dbus-launch session X11 initialization |
1151 |
- virtx emake check |
1152 |
-} |
1153 |
- |
1154 |
-multilib_src_install() { |
1155 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
1156 |
- keepdir /usr/$(get_libdir)/gio/modules |
1157 |
-} |
1158 |
- |
1159 |
-multilib_src_install_all() { |
1160 |
- einstalldocs |
1161 |
- |
1162 |
- if use utils ; then |
1163 |
- python_fix_shebang "${ED}"/usr/bin/gtester-report |
1164 |
- else |
1165 |
- # gtester-report is heavily deprecated, so do not install by default - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4 |
1166 |
- rm "${ED}usr/bin/gtester-report" |
1167 |
- rm "${ED}usr/share/man/man1/gtester-report.1" |
1168 |
- fi |
1169 |
- |
1170 |
- # Do not install charset.alias even if generated, leave it to libiconv |
1171 |
- rm -f "${ED}/usr/lib/charset.alias" |
1172 |
- |
1173 |
- # Don't install gdb python macros, bug 291328 |
1174 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
1175 |
-} |
1176 |
- |
1177 |
-pkg_preinst() { |
1178 |
- gnome2_pkg_preinst |
1179 |
- |
1180 |
- # Make gschemas.compiled belong to glib alone |
1181 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
1182 |
- |
1183 |
- if [[ -e ${EROOT}${cache} ]]; then |
1184 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1185 |
- else |
1186 |
- touch "${ED}"/${cache} || die |
1187 |
- fi |
1188 |
- |
1189 |
- multilib_pkg_preinst() { |
1190 |
- # Make giomodule.cache belong to glib alone |
1191 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
1192 |
- |
1193 |
- if [[ -e ${EROOT}${cache} ]]; then |
1194 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1195 |
- else |
1196 |
- touch "${ED}"/${cache} || die |
1197 |
- fi |
1198 |
- } |
1199 |
- |
1200 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
1201 |
- # file due to inability to create it and GIO might not look at any of the modules there |
1202 |
- if ! tc-is-cross-compiler ; then |
1203 |
- multilib_foreach_abi multilib_pkg_preinst |
1204 |
- fi |
1205 |
-} |
1206 |
- |
1207 |
-pkg_postinst() { |
1208 |
- # force (re)generation of gschemas.compiled |
1209 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
1210 |
- |
1211 |
- gnome2_pkg_postinst |
1212 |
- |
1213 |
- multilib_pkg_postinst() { |
1214 |
- gnome2_giomodule_cache_update \ |
1215 |
- || die "Update GIO modules cache failed (for ${ABI})" |
1216 |
- } |
1217 |
- if ! tc-is-cross-compiler ; then |
1218 |
- multilib_foreach_abi multilib_pkg_postinst |
1219 |
- else |
1220 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
1221 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
1222 |
- ewarn "your final image for performance reasons and re-run it when packages" |
1223 |
- ewarn "installing GIO modules get upgraded or added to the image." |
1224 |
- fi |
1225 |
-} |
1226 |
- |
1227 |
-pkg_postrm() { |
1228 |
- gnome2_pkg_postrm |
1229 |
- |
1230 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
1231 |
- multilib_pkg_postrm() { |
1232 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
1233 |
- } |
1234 |
- multilib_foreach_abi multilib_pkg_postrm |
1235 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
1236 |
- fi |
1237 |
-} |
1238 |
|
1239 |
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild |
1240 |
deleted file mode 100644 |
1241 |
index ed88114..0000000 |
1242 |
--- a/dev-libs/glib/glib-2.56.2.ebuild |
1243 |
+++ /dev/null |
1244 |
@@ -1,302 +0,0 @@ |
1245 |
-# Copyright 1999-2018 Gentoo Fondation |
1246 |
-# Distributed under the terms of the GNU General Public License v2 |
1247 |
- |
1248 |
-EAPI=6 |
1249 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
1250 |
-GNOME2_EAUTORECONF=yes |
1251 |
- |
1252 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
1253 |
- multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx |
1254 |
- |
1255 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
1256 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
1257 |
-# then to be think very closely. |
1258 |
- |
1259 |
-DESCRIPTION="The GLib library of C routines" |
1260 |
-HOMEPAGE="https://www.gtk.org/" |
1261 |
-SRC_URI="${SRC_URI} |
1262 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
1263 |
- |
1264 |
-LICENSE="LGPL-2.1+" |
1265 |
-SLOT="2" |
1266 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
1267 |
- |
1268 |
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" |
1269 |
- |
1270 |
-# Added util-linux multilib dependency to have libmount support (which |
1271 |
-# is always turned on on linux systems, unless explicitly disabled, but |
1272 |
-# this ebuild does not do that anyway) (bug #599586) |
1273 |
- |
1274 |
-RDEPEND=" |
1275 |
- !<dev-util/gdbus-codegen-${PV} |
1276 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
1277 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
1278 |
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
1279 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
1280 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
1281 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
1282 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
1283 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
1284 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
1285 |
- utils? ( |
1286 |
- >=dev-util/gdbus-codegen-${PV} |
1287 |
- virtual/libelf:0= |
1288 |
- ) |
1289 |
-" |
1290 |
-DEPEND="${RDEPEND} |
1291 |
- app-text/docbook-xml-dtd:4.1.2 |
1292 |
- >=dev-libs/libxslt-1.0 |
1293 |
- >=sys-devel/gettext-0.11 |
1294 |
- >=dev-util/gtk-doc-am-1.20 |
1295 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
1296 |
- ${PYTHON_DEPS} |
1297 |
- test? ( |
1298 |
- sys-devel/gdb |
1299 |
- >=dev-util/gdbus-codegen-${PV} |
1300 |
- >=sys-apps/dbus-1.2.14 ) |
1301 |
- !<dev-util/gtk-doc-1.15-r2 |
1302 |
-" |
1303 |
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate |
1304 |
-# python depending package, which can be buildtime depended in packages that |
1305 |
-# need these tools, without pulling in python at runtime. |
1306 |
-RDEPEND="${RDEPEND} |
1307 |
- >=dev-util/glib-utils-${PV}" |
1308 |
-PDEPEND=" |
1309 |
- dbus? ( gnome-base/dconf ) |
1310 |
- mime? ( x11-misc/shared-mime-info ) |
1311 |
-" |
1312 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
1313 |
-# dconf is needed to be able to save settings, bug #498436 |
1314 |
- |
1315 |
-MULTILIB_CHOST_TOOLS=( |
1316 |
- /usr/bin/gio-querymodules$(get_exeext) |
1317 |
-) |
1318 |
- |
1319 |
-pkg_setup() { |
1320 |
- if use kernel_linux ; then |
1321 |
- CONFIG_CHECK="~INOTIFY_USER" |
1322 |
- if use test ; then |
1323 |
- CONFIG_CHECK="~IPV6" |
1324 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
1325 |
- fi |
1326 |
- linux-info_pkg_setup |
1327 |
- fi |
1328 |
- python-any-r1_pkg_setup |
1329 |
-} |
1330 |
- |
1331 |
-src_prepare() { |
1332 |
- |
1333 |
- # Musl fix |
1334 |
- eapply "${FILESDIR}/${PV}-quark_init_on_demand.patch" |
1335 |
- eapply "${FILESDIR}/${PV}-gobject_init_on_demand.patch" |
1336 |
- |
1337 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
1338 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
1339 |
- |
1340 |
- if use test; then |
1341 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
1342 |
- if ! has_version dev-util/desktop-file-utils ; then |
1343 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
1344 |
- ewarn "think on installing it to get these tests run." |
1345 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
1346 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
1347 |
- fi |
1348 |
- |
1349 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
1350 |
- # other), falling back to xterm if one doesn't exist |
1351 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
1352 |
- ewarn "Some tests will be skipped due to missing terminal program" |
1353 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
1354 |
- fi |
1355 |
- |
1356 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
1357 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
1358 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
1359 |
- |
1360 |
- ewarn "Tests for search-utils have been skipped" |
1361 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
1362 |
- else |
1363 |
- # Don't build tests, also prevents extra deps, bug #512022 |
1364 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
1365 |
- fi |
1366 |
- |
1367 |
- # Less max runs in network monitor race test to avoid hitting timeout limits |
1368 |
- eapply "${FILESDIR}"/${PV}-network-monitor-race-test-iterations.patch # included in 2.57.1 |
1369 |
- |
1370 |
- # gdbus-codegen is a separate package |
1371 |
- eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch |
1372 |
- |
1373 |
- gnome2_src_prepare |
1374 |
- epunt_cxx |
1375 |
-} |
1376 |
- |
1377 |
-multilib_src_configure() { |
1378 |
- # Avoid circular depend with dev-util/pkgconfig and |
1379 |
- # native builds (cross-compiles won't need pkg-config |
1380 |
- # in the target ROOT to work here) |
1381 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
1382 |
- if has_version sys-apps/dbus; then |
1383 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
1384 |
- export DBUS1_LIBS="-ldbus-1" |
1385 |
- fi |
1386 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
1387 |
- export LIBFFI_LIBS="-lffi" |
1388 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
1389 |
- export PCRE_LIBS="-lpcre" |
1390 |
- fi |
1391 |
- |
1392 |
- # These configure tests don't work when cross-compiling. |
1393 |
- if tc-is-cross-compiler ; then |
1394 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
1395 |
- case ${CHOST} in |
1396 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
1397 |
- *) export glib_cv_stack_grows=no ;; |
1398 |
- esac |
1399 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
1400 |
- export glib_cv_uscore=no |
1401 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
1402 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
1403 |
- fi |
1404 |
- |
1405 |
- local myconf |
1406 |
- |
1407 |
- case "${CHOST}" in |
1408 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
1409 |
- *) myconf="${myconf} --with-threads=posix" ;; |
1410 |
- esac |
1411 |
- |
1412 |
- # libelf used only by the gresource bin |
1413 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
1414 |
- $(usex debug --enable-debug=yes ' ') \ |
1415 |
- $(use_enable xattr) \ |
1416 |
- $(use_enable fam) \ |
1417 |
- $(use_enable kernel_linux libmount) \ |
1418 |
- $(use_enable selinux) \ |
1419 |
- $(use_enable static-libs static) \ |
1420 |
- $(use_enable systemtap dtrace) \ |
1421 |
- $(use_enable systemtap systemtap) \ |
1422 |
- $(multilib_native_use_enable utils libelf) \ |
1423 |
- --with-python=${EPYTHON} \ |
1424 |
- --disable-compile-warnings \ |
1425 |
- --enable-man \ |
1426 |
- --with-pcre=system \ |
1427 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
1428 |
- |
1429 |
- if multilib_is_native_abi; then |
1430 |
- local d |
1431 |
- for d in glib gio gobject; do |
1432 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
1433 |
- done |
1434 |
- fi |
1435 |
-} |
1436 |
- |
1437 |
-multilib_src_test() { |
1438 |
- export XDG_CONFIG_DIRS=/etc/xdg |
1439 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
1440 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
1441 |
- export LC_TIME=C # bug #411967 |
1442 |
- unset GSETTINGS_BACKEND # bug #596380 |
1443 |
- python_setup |
1444 |
- |
1445 |
- # Related test is a bit nitpicking |
1446 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1447 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1448 |
- |
1449 |
- # Hardened: gdb needs this, bug #338891 |
1450 |
- if host-is-pax ; then |
1451 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
1452 |
- || die "Hardened adjustment failed" |
1453 |
- fi |
1454 |
- |
1455 |
- # Need X for dbus-launch session X11 initialization |
1456 |
- virtx emake check |
1457 |
-} |
1458 |
- |
1459 |
-multilib_src_install() { |
1460 |
- emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install |
1461 |
- keepdir /usr/$(get_libdir)/gio/modules |
1462 |
-} |
1463 |
- |
1464 |
-multilib_src_install_all() { |
1465 |
- einstalldocs |
1466 |
- |
1467 |
- # These are installed by dev-util/glib-utils |
1468 |
- # 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 with meson |
1469 |
- rm "${ED}usr/bin/glib-genmarshal" || die |
1470 |
- rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die |
1471 |
- rm "${ED}usr/bin/glib-mkenums" || die |
1472 |
- rm "${ED}usr/share/man/man1/glib-mkenums.1" || die |
1473 |
- rm "${ED}usr/bin/gtester-report" || die |
1474 |
- rm "${ED}usr/share/man/man1/gtester-report.1" || die |
1475 |
- |
1476 |
- # Do not install charset.alias even if generated, leave it to libiconv |
1477 |
- rm -f "${ED}/usr/$(get_libdir)/charset.alias" |
1478 |
- |
1479 |
- # Don't install gdb python macros, bug 291328 |
1480 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
1481 |
- |
1482 |
- # Completely useless with or without USE static-libs, people need to use pkg-config |
1483 |
- find "${ED}" -name '*.la' -delete || die |
1484 |
-} |
1485 |
- |
1486 |
-pkg_preinst() { |
1487 |
- gnome2_pkg_preinst |
1488 |
- |
1489 |
- # Make gschemas.compiled belong to glib alone |
1490 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
1491 |
- |
1492 |
- if [[ -e ${EROOT}${cache} ]]; then |
1493 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1494 |
- else |
1495 |
- touch "${ED}"/${cache} || die |
1496 |
- fi |
1497 |
- |
1498 |
- multilib_pkg_preinst() { |
1499 |
- # Make giomodule.cache belong to glib alone |
1500 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
1501 |
- |
1502 |
- if [[ -e ${EROOT}${cache} ]]; then |
1503 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1504 |
- else |
1505 |
- touch "${ED}"/${cache} || die |
1506 |
- fi |
1507 |
- } |
1508 |
- |
1509 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
1510 |
- # file due to inability to create it and GIO might not look at any of the modules there |
1511 |
- if ! tc-is-cross-compiler ; then |
1512 |
- multilib_foreach_abi multilib_pkg_preinst |
1513 |
- fi |
1514 |
-} |
1515 |
- |
1516 |
-pkg_postinst() { |
1517 |
- # force (re)generation of gschemas.compiled |
1518 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
1519 |
- |
1520 |
- gnome2_pkg_postinst |
1521 |
- |
1522 |
- multilib_pkg_postinst() { |
1523 |
- gnome2_giomodule_cache_update \ |
1524 |
- || die "Update GIO modules cache failed (for ${ABI})" |
1525 |
- } |
1526 |
- if ! tc-is-cross-compiler ; then |
1527 |
- multilib_foreach_abi multilib_pkg_postinst |
1528 |
- else |
1529 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
1530 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
1531 |
- ewarn "your final image for performance reasons and re-run it when packages" |
1532 |
- ewarn "installing GIO modules get upgraded or added to the image." |
1533 |
- fi |
1534 |
-} |
1535 |
- |
1536 |
-pkg_postrm() { |
1537 |
- gnome2_pkg_postrm |
1538 |
- |
1539 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
1540 |
- multilib_pkg_postrm() { |
1541 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
1542 |
- } |
1543 |
- multilib_foreach_abi multilib_pkg_postrm |
1544 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
1545 |
- fi |
1546 |
-} |
1547 |
|
1548 |
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml |
1549 |
deleted file mode 100644 |
1550 |
index b88cceb..0000000 |
1551 |
--- a/dev-libs/glib/metadata.xml |
1552 |
+++ /dev/null |
1553 |
@@ -1,31 +0,0 @@ |
1554 |
-<?xml version="1.0" encoding="UTF-8"?> |
1555 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1556 |
-<pkgmetadata> |
1557 |
- <maintainer type="project"> |
1558 |
- <email>gnome@g.o</email> |
1559 |
- <name>Gentoo GNOME Desktop</name> |
1560 |
- </maintainer> |
1561 |
- <use> |
1562 |
- <flag name="dbus"> |
1563 |
- Enable dependencies required by glib libraries |
1564 |
- using dbus service to manage settings saving |
1565 |
- </flag> |
1566 |
- <flag name="mime"> |
1567 |
- Pull in shared MIME database that many glib-based |
1568 |
- applications require at runtime to detect or open files. Warning: |
1569 |
- do not disable this flag unless installing on a headless server. |
1570 |
- </flag> |
1571 |
- <flag name="systemtap"> |
1572 |
- Build support for profiling and tracing using |
1573 |
- <pkg>dev-util/systemtap</pkg> |
1574 |
- </flag> |
1575 |
- <flag name="utils"> |
1576 |
- Install gtester-report utility to generate test |
1577 |
- report files for your software; build gresource utility with |
1578 |
- ELF support. |
1579 |
- </flag> |
1580 |
- </use> |
1581 |
- <upstream> |
1582 |
- <remote-id type="cpe">cpe:/a:gnome:glib</remote-id> |
1583 |
- </upstream> |
1584 |
-</pkgmetadata> |