1 |
commit: 128463212343f82d6a77f307f81d154872969027 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 26 04:47:43 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 26 04:47:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=12846321 |
7 |
|
8 |
dev-libs/glib: drop old, cleanup keywords |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
dev-libs/glib/Manifest | 5 - |
14 |
...56.2-network-monitor-race-test-iterations.patch | 36 --- |
15 |
dev-libs/glib/files/2.58.3-CVE-2019-12450.patch | 53 ---- |
16 |
.../glib/files/2.58.3-gdbusmessage-limit-fix.patch | 120 -------- |
17 |
.../files/glib-2.54.3-external-gdbus-codegen.patch | 86 ------ |
18 |
.../files/glib-2.58.2-external-gdbus-codegen.patch | 124 -------- |
19 |
.../glib/files/glib-2.58.2-gvariant-test-fix.patch | 96 ------- |
20 |
dev-libs/glib/glib-2.56.2.ebuild | 302 ------------------- |
21 |
dev-libs/glib/glib-2.56.4.ebuild | 305 -------------------- |
22 |
dev-libs/glib/glib-2.58.2.ebuild | 318 -------------------- |
23 |
dev-libs/glib/glib-2.58.3-r1.ebuild | 320 --------------------- |
24 |
dev-libs/glib/glib-2.58.3.ebuild | 315 -------------------- |
25 |
dev-libs/glib/glib-2.60.6.ebuild | 4 +- |
26 |
13 files changed, 2 insertions(+), 2082 deletions(-) |
27 |
|
28 |
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest |
29 |
index 1fd2300..ec53fc2 100644 |
30 |
--- a/dev-libs/glib/Manifest |
31 |
+++ b/dev-libs/glib/Manifest |
32 |
@@ -1,6 +1 @@ |
33 |
-DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4 |
34 |
-DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0 |
35 |
-DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a |
36 |
-DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce |
37 |
DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9 |
38 |
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 |
39 |
|
40 |
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 |
41 |
deleted file mode 100644 |
42 |
index 1ddec6d..0000000 |
43 |
--- a/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch |
44 |
+++ /dev/null |
45 |
@@ -1,36 +0,0 @@ |
46 |
-From a90c578952219e740f24d9f2560f54f19ae7e906 Mon Sep 17 00:00:00 2001 |
47 |
-From: Philip Withnall <withnall@××××××××.com> |
48 |
-Date: Wed, 11 Apr 2018 15:45:10 +0100 |
49 |
-Subject: [PATCH] tests: Lower number of iterations in network-monitor-race |
50 |
- |
51 |
-While 333 runs is very likely to reproduce the bug, Milan has previously |
52 |
-reproduced it with as few as 9 runs. Since this test will be run by the |
53 |
-CI machinery quite often, a lower number of runs each CI run will still |
54 |
-probably catch any regressions over time. |
55 |
- |
56 |
-This reduces the total test runtime from 33s to 2s. |
57 |
- |
58 |
-https://bugzilla.gnome.org/show_bug.cgi?id=793727 |
59 |
- |
60 |
-Signed-off-by: Philip Withnall <withnall@××××××××.com> |
61 |
-Reviewed-by: nobody |
62 |
---- |
63 |
- gio/tests/network-monitor-race.c | 2 +- |
64 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
65 |
- |
66 |
-diff --git a/gio/tests/network-monitor-race.c b/gio/tests/network-monitor-race.c |
67 |
-index 4b92c87a5..cadd62cee 100644 |
68 |
---- a/gio/tests/network-monitor-race.c |
69 |
-+++ b/gio/tests/network-monitor-race.c |
70 |
-@@ -18,7 +18,7 @@ |
71 |
- #include <glib/glib.h> |
72 |
- #include <gio/gio.h> |
73 |
- |
74 |
--#define MAX_RUNS 333 |
75 |
-+#define MAX_RUNS 20 |
76 |
- |
77 |
- static gboolean |
78 |
- quit_loop (gpointer user_data) |
79 |
--- |
80 |
-2.17.0 |
81 |
- |
82 |
|
83 |
diff --git a/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch b/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch |
84 |
deleted file mode 100644 |
85 |
index 949ac56..0000000 |
86 |
--- a/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch |
87 |
+++ /dev/null |
88 |
@@ -1,53 +0,0 @@ |
89 |
-From e6b769819d63d2b24b251dbc9f902fe6fd614da3 Mon Sep 17 00:00:00 2001 |
90 |
-From: Ondrej Holy <oholy@××××××.com> |
91 |
-Date: Thu, 23 May 2019 10:41:53 +0200 |
92 |
-Subject: [PATCH] gfile: Limit access to files when copying |
93 |
- |
94 |
-file_copy_fallback creates new files with default permissions and |
95 |
-set the correct permissions after the operation is finished. This |
96 |
-might cause that the files can be accessible by more users during |
97 |
-the operation than expected. Use G_FILE_CREATE_PRIVATE for the new |
98 |
-files to limit access to those files. |
99 |
---- |
100 |
- gio/gfile.c | 11 ++++++----- |
101 |
- 1 file changed, 6 insertions(+), 5 deletions(-) |
102 |
- |
103 |
-diff --git a/gio/gfile.c b/gio/gfile.c |
104 |
-index 1cc69166a..13b435480 100644 |
105 |
---- a/gio/gfile.c |
106 |
-+++ b/gio/gfile.c |
107 |
-@@ -3284,12 +3284,12 @@ file_copy_fallback (GFile *source, |
108 |
- out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)), |
109 |
- FALSE, NULL, |
110 |
- flags & G_FILE_COPY_BACKUP, |
111 |
-- G_FILE_CREATE_REPLACE_DESTINATION, |
112 |
-- info, |
113 |
-+ G_FILE_CREATE_REPLACE_DESTINATION | |
114 |
-+ G_FILE_CREATE_PRIVATE, info, |
115 |
- cancellable, error); |
116 |
- else |
117 |
- out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)), |
118 |
-- FALSE, 0, info, |
119 |
-+ FALSE, G_FILE_CREATE_PRIVATE, info, |
120 |
- cancellable, error); |
121 |
- } |
122 |
- else if (flags & G_FILE_COPY_OVERWRITE) |
123 |
-@@ -3297,12 +3297,13 @@ file_copy_fallback (GFile *source, |
124 |
- out = (GOutputStream *)g_file_replace (destination, |
125 |
- NULL, |
126 |
- flags & G_FILE_COPY_BACKUP, |
127 |
-- G_FILE_CREATE_REPLACE_DESTINATION, |
128 |
-+ G_FILE_CREATE_REPLACE_DESTINATION | |
129 |
-+ G_FILE_CREATE_PRIVATE, |
130 |
- cancellable, error); |
131 |
- } |
132 |
- else |
133 |
- { |
134 |
-- out = (GOutputStream *)g_file_create (destination, 0, cancellable, error); |
135 |
-+ out = (GOutputStream *)g_file_create (destination, G_FILE_CREATE_PRIVATE, cancellable, error); |
136 |
- } |
137 |
- |
138 |
- if (!out) |
139 |
--- |
140 |
-2.20.1 |
141 |
- |
142 |
|
143 |
diff --git a/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch b/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch |
144 |
deleted file mode 100644 |
145 |
index 0828132..0000000 |
146 |
--- a/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch |
147 |
+++ /dev/null |
148 |
@@ -1,120 +0,0 @@ |
149 |
-From 2d655ef8954695cabf9e99cc61411de2bb4cb847 Mon Sep 17 00:00:00 2001 |
150 |
-From: Philip Withnall <withnall@××××××××.com> |
151 |
-Date: Mon, 28 Jan 2019 14:36:42 +0000 |
152 |
-Subject: [PATCH] gdbusmessage: Fix check on upper limit of message size |
153 |
- |
154 |
-There was a typo in the figure checked against. Add a unit test. |
155 |
- |
156 |
-Signed-off-by: Philip Withnall <withnall@××××××××.com> |
157 |
- |
158 |
-https://gitlab.gnome.org/GNOME/glib/issues/1642 |
159 |
---- |
160 |
- gio/gdbusmessage.c | 2 +- |
161 |
- gio/tests/gdbus-message.c | 72 ++++++++++++++++++++++++++++++++++++++- |
162 |
- 2 files changed, 72 insertions(+), 2 deletions(-) |
163 |
- |
164 |
-diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c |
165 |
-index 169e6fd15..2ad51f888 100644 |
166 |
---- a/gio/gdbusmessage.c |
167 |
-+++ b/gio/gdbusmessage.c |
168 |
-@@ -1984,7 +1984,7 @@ g_dbus_message_bytes_needed (guchar *blob, |
169 |
- "Unable to determine message blob length - given blob is malformed"); |
170 |
- } |
171 |
- |
172 |
-- if (ret > (2<<27)) |
173 |
-+ if (ret > (1<<27)) |
174 |
- { |
175 |
- g_set_error (error, |
176 |
- G_IO_ERROR, |
177 |
-diff --git a/gio/tests/gdbus-message.c b/gio/tests/gdbus-message.c |
178 |
-index 88a9c5d86..74e0f712e 100644 |
179 |
---- a/gio/tests/gdbus-message.c |
180 |
-+++ b/gio/tests/gdbus-message.c |
181 |
-@@ -141,6 +141,74 @@ message_copy (void) |
182 |
- |
183 |
- /* ---------------------------------------------------------------------------------------------------- */ |
184 |
- |
185 |
-+/* Test g_dbus_message_bytes_needed() returns correct results for a variety of |
186 |
-+ * arbitrary binary inputs.*/ |
187 |
-+static void |
188 |
-+message_bytes_needed (void) |
189 |
-+{ |
190 |
-+ const struct |
191 |
-+ { |
192 |
-+ const guint8 blob[16]; |
193 |
-+ gssize expected_bytes_needed; |
194 |
-+ } |
195 |
-+ vectors[] = |
196 |
-+ { |
197 |
-+ /* Little endian with header rounding */ |
198 |
-+ { { 'l', 0, 0, 1, /* endianness, message type, flags, protocol version */ |
199 |
-+ 50, 0, 0, 0, /* body length */ |
200 |
-+ 1, 0, 0, 0, /* message serial */ |
201 |
-+ 7, 0, 0, 0 /* header length */}, 74 }, |
202 |
-+ /* Little endian without header rounding */ |
203 |
-+ { { 'l', 0, 0, 1, /* endianness, message type, flags, protocol version */ |
204 |
-+ 50, 0, 0, 0, /* body length */ |
205 |
-+ 1, 0, 0, 0, /* message serial */ |
206 |
-+ 8, 0, 0, 0 /* header length */}, 74 }, |
207 |
-+ /* Big endian with header rounding */ |
208 |
-+ { { 'B', 0, 0, 1, /* endianness, message type, flags, protocol version */ |
209 |
-+ 0, 0, 0, 50, /* body length */ |
210 |
-+ 0, 0, 0, 1, /* message serial */ |
211 |
-+ 0, 0, 0, 7 /* header length */}, 74 }, |
212 |
-+ /* Big endian without header rounding */ |
213 |
-+ { { 'B', 0, 0, 1, /* endianness, message type, flags, protocol version */ |
214 |
-+ 0, 0, 0, 50, /* body length */ |
215 |
-+ 0, 0, 0, 1, /* message serial */ |
216 |
-+ 0, 0, 0, 8 /* header length */}, 74 }, |
217 |
-+ /* Invalid endianness */ |
218 |
-+ { { '!', 0, 0, 1, /* endianness, message type, flags, protocol version */ |
219 |
-+ 0, 0, 0, 50, /* body length */ |
220 |
-+ 0, 0, 0, 1, /* message serial */ |
221 |
-+ 0, 0, 0, 8 /* header length */}, -1 }, |
222 |
-+ /* Oversized */ |
223 |
-+ { { 'l', 0, 0, 1, /* endianness, message type, flags, protocol version */ |
224 |
-+ 0, 0, 0, 0x08, /* body length (128MiB) */ |
225 |
-+ 1, 0, 0, 0, /* message serial */ |
226 |
-+ 7, 0, 0, 0 /* header length */}, -1 }, |
227 |
-+ }; |
228 |
-+ gsize i; |
229 |
-+ |
230 |
-+ for (i = 0; i < G_N_ELEMENTS (vectors); i++) |
231 |
-+ { |
232 |
-+ gssize bytes_needed; |
233 |
-+ GError *local_error = NULL; |
234 |
-+ |
235 |
-+ g_test_message ("Vector: %" G_GSIZE_FORMAT, i); |
236 |
-+ |
237 |
-+ bytes_needed = g_dbus_message_bytes_needed ((guchar *) vectors[i].blob, |
238 |
-+ G_N_ELEMENTS (vectors[i].blob), |
239 |
-+ &local_error); |
240 |
-+ |
241 |
-+ if (vectors[i].expected_bytes_needed < 0) |
242 |
-+ g_assert_error (local_error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT); |
243 |
-+ else |
244 |
-+ g_assert_no_error (local_error); |
245 |
-+ g_assert_cmpint (bytes_needed, ==, vectors[i].expected_bytes_needed); |
246 |
-+ |
247 |
-+ g_clear_error (&local_error); |
248 |
-+ } |
249 |
-+} |
250 |
-+ |
251 |
-+/* ---------------------------------------------------------------------------------------------------- */ |
252 |
-+ |
253 |
- int |
254 |
- main (int argc, |
255 |
- char *argv[]) |
256 |
-@@ -151,6 +219,8 @@ main (int argc, |
257 |
- |
258 |
- g_test_add_func ("/gdbus/message/lock", message_lock); |
259 |
- g_test_add_func ("/gdbus/message/copy", message_copy); |
260 |
-- return g_test_run(); |
261 |
-+ g_test_add_func ("/gdbus/message/bytes-needed", message_bytes_needed); |
262 |
-+ |
263 |
-+ return g_test_run (); |
264 |
- } |
265 |
- |
266 |
--- |
267 |
-2.20.1 |
268 |
- |
269 |
|
270 |
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 |
271 |
deleted file mode 100644 |
272 |
index a27966e..0000000 |
273 |
--- a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch |
274 |
+++ /dev/null |
275 |
@@ -1,86 +0,0 @@ |
276 |
-From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001 |
277 |
-From: Sobhan Mohammadpour <sobhan@g.o> |
278 |
-Date: Fri, 23 Feb 2018 15:27:33 +0330 |
279 |
-Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools |
280 |
- |
281 |
---- |
282 |
- configure.ac | 1 - |
283 |
- docs/reference/gio/Makefile.am | 1 - |
284 |
- gio/Makefile.am | 2 +- |
285 |
- gio/tests/Makefile.am | 6 ++---- |
286 |
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- |
287 |
- 5 files changed, 5 insertions(+), 11 deletions(-) |
288 |
- |
289 |
-diff --git a/configure.ac b/configure.ac |
290 |
-index 0457c90..07166c9 100644 |
291 |
---- a/configure.ac |
292 |
-+++ b/configure.ac |
293 |
-@@ -3469,7 +3469,6 @@ gobject/glib-mkenums |
294 |
- gobject/tests/Makefile |
295 |
- gthread/Makefile |
296 |
- gio/Makefile |
297 |
--gio/gdbus-2.0/codegen/Makefile |
298 |
- gio/gdbus-2.0/codegen/config.py |
299 |
- gio/gnetworking.h |
300 |
- gio/xdgmime/Makefile |
301 |
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am |
302 |
-index 5741a3e..d38e768 100644 |
303 |
---- a/docs/reference/gio/Makefile.am |
304 |
-+++ b/docs/reference/gio/Makefile.am |
305 |
-@@ -177,7 +177,6 @@ man_MANS += \ |
306 |
- gsettings.1 \ |
307 |
- gresource.1 \ |
308 |
- gdbus.1 \ |
309 |
-- gdbus-codegen.1 \ |
310 |
- gio.1 \ |
311 |
- $(NULL) |
312 |
- |
313 |
-diff --git a/gio/Makefile.am b/gio/Makefile.am |
314 |
-index b2db995..53d7162 100644 |
315 |
---- a/gio/Makefile.am |
316 |
-+++ b/gio/Makefile.am |
317 |
-@@ -1,6 +1,6 @@ |
318 |
- include $(top_srcdir)/glib.mk |
319 |
- |
320 |
--SUBDIRS = gdbus-2.0/codegen |
321 |
-+SUBDIRS = |
322 |
- |
323 |
- if OS_UNIX |
324 |
- if !OS_COCOA |
325 |
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
326 |
-index acc1da4..7c51eab 100644 |
327 |
---- a/gio/tests/Makefile.am |
328 |
-+++ b/gio/tests/Makefile.am |
329 |
-@@ -460,10 +460,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica |
330 |
- |
331 |
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h |
332 |
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h |
333 |
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
334 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
335 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
336 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
337 |
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile |
338 |
-+ $(AM_V_GEN) gdbus-codegen \ |
339 |
- --interface-prefix org.project. \ |
340 |
- --generate-c-code gdbus-test-codegen-generated \ |
341 |
- --c-generate-object-manager \ |
342 |
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
343 |
-index 1d0464c..f390dca 100644 |
344 |
---- a/gio/tests/gdbus-object-manager-example/Makefile.am |
345 |
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
346 |
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ |
347 |
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ |
348 |
- $(NULL) |
349 |
- |
350 |
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
351 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
352 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
353 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
354 |
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile |
355 |
-+ $(AM_V_GEN) gdbus-codegen \ |
356 |
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
357 |
- --c-namespace Example \ |
358 |
- --c-generate-object-manager \ |
359 |
--- |
360 |
-2.16.1 |
361 |
- |
362 |
|
363 |
diff --git a/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch |
364 |
deleted file mode 100644 |
365 |
index 7615dbb..0000000 |
366 |
--- a/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch |
367 |
+++ /dev/null |
368 |
@@ -1,124 +0,0 @@ |
369 |
-From 69da419c33c24a05126d21fb3098139d30ba9093 Mon Sep 17 00:00:00 2001 |
370 |
-From: Mart Raudsepp <leio@g.o> |
371 |
-Date: Wed, 19 Dec 2018 14:01:43 +0200 |
372 |
-Subject: [PATCH] build: don't build gdbus-codegen and rely on external |
373 |
- gdbus-codegen for tests |
374 |
- |
375 |
---- |
376 |
- configure.ac | 1 - |
377 |
- docs/reference/gio/Makefile.am | 1 - |
378 |
- gio/Makefile.am | 2 +- |
379 |
- gio/tests/Makefile.am | 22 ++++++------------- |
380 |
- .../gdbus-object-manager-example/Makefile.am | 6 ++--- |
381 |
- 5 files changed, 10 insertions(+), 22 deletions(-) |
382 |
- |
383 |
-diff --git a/configure.ac b/configure.ac |
384 |
-index 4b15b69b8..9187a12bb 100644 |
385 |
---- a/configure.ac |
386 |
-+++ b/configure.ac |
387 |
-@@ -3481,7 +3481,6 @@ gobject/glib-mkenums |
388 |
- gobject/tests/Makefile |
389 |
- gthread/Makefile |
390 |
- gio/Makefile |
391 |
--gio/gdbus-2.0/codegen/Makefile |
392 |
- gio/gdbus-2.0/codegen/config.py |
393 |
- gio/gnetworking.h |
394 |
- gio/xdgmime/Makefile |
395 |
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am |
396 |
-index 08093e8a0..9ce11f824 100644 |
397 |
---- a/docs/reference/gio/Makefile.am |
398 |
-+++ b/docs/reference/gio/Makefile.am |
399 |
-@@ -212,7 +212,6 @@ man_MANS += \ |
400 |
- gsettings.1 \ |
401 |
- gresource.1 \ |
402 |
- gdbus.1 \ |
403 |
-- gdbus-codegen.1 \ |
404 |
- gio.1 \ |
405 |
- $(NULL) |
406 |
- |
407 |
-diff --git a/gio/Makefile.am b/gio/Makefile.am |
408 |
-index 05b20cdef..ed5d7d4cb 100644 |
409 |
---- a/gio/Makefile.am |
410 |
-+++ b/gio/Makefile.am |
411 |
-@@ -1,6 +1,6 @@ |
412 |
- include $(top_srcdir)/glib.mk |
413 |
- |
414 |
--SUBDIRS = gdbus-2.0/codegen |
415 |
-+SUBDIRS = |
416 |
- |
417 |
- if OS_UNIX |
418 |
- SUBDIRS += xdgmime |
419 |
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
420 |
-index c4e7a9257..4b538b1e9 100644 |
421 |
---- a/gio/tests/Makefile.am |
422 |
-+++ b/gio/tests/Makefile.am |
423 |
-@@ -253,9 +253,7 @@ gdbus-daemon-impl.c: $(top_srcdir)/gio/gdbusdaemon.c |
424 |
- # These files are only generated on Windows builds inside GIO, |
425 |
- # but we want them on non-Windows builds for the tests |
426 |
- gdbus-daemon-generated.h gdbus-daemon-generated.c: $(top_srcdir)/gio/dbus-daemon.xml $(GDBUS_PYTHON_DEPS) |
427 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
428 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
429 |
-- $(PYTHON) $(top_srcdir)/gio/gdbus-2.0/codegen/gdbus-codegen.in \ |
430 |
-+ $(AM_V_GEN) gdbus-codegen \ |
431 |
- --interface-prefix org. \ |
432 |
- --generate-c-code gdbus-daemon-generated \ |
433 |
- --c-namespace _G \ |
434 |
-@@ -494,10 +492,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica |
435 |
- |
436 |
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h gdbus-test-codegen-generated-interface-info.c gdbus-test-codegen-generated-interface-info.h |
437 |
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h gdbus-test-codegen-generated-interface-info.h |
438 |
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
439 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
440 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
441 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
442 |
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile |
443 |
-+ $(AM_V_GEN) gdbus-codegen \ |
444 |
- --interface-prefix org.project. \ |
445 |
- --generate-c-code gdbus-test-codegen-generated \ |
446 |
- --c-generate-object-manager \ |
447 |
-@@ -516,10 +512,8 @@ gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gd |
448 |
- $(NULL) |
449 |
- gdbus-test-codegen-generated.c: gdbus-test-codegen-generated.h |
450 |
- @: # Generated as side-effect of .h |
451 |
--gdbus-test-codegen-generated-interface-info.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
452 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
453 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
454 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
455 |
-+gdbus-test-codegen-generated-interface-info.h: test-codegen.xml Makefile |
456 |
-+ $(AM_V_GEN) gdbus-codegen \ |
457 |
- --interface-info-header \ |
458 |
- --annotate "org.project.Bar" Key1 Value1 \ |
459 |
- --annotate "org.project.Bar" org.gtk.GDBus.Internal Value2 \ |
460 |
-@@ -532,10 +526,8 @@ gdbus-test-codegen-generated-interface-info.h: test-codegen.xml Makefile $(top_b |
461 |
- --output $@ \ |
462 |
- $(srcdir)/test-codegen.xml \ |
463 |
- $(NULL) |
464 |
--gdbus-test-codegen-generated-interface-info.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
465 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
466 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
467 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
468 |
-+gdbus-test-codegen-generated-interface-info.c: test-codegen.xml Makefile |
469 |
-+ $(AM_V_GEN) gdbus-codegen \ |
470 |
- --interface-info-body \ |
471 |
- --annotate "org.project.Bar" Key1 Value1 \ |
472 |
- --annotate "org.project.Bar" org.gtk.GDBus.Internal Value2 \ |
473 |
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
474 |
-index 1d0464c5c..0603d9b0a 100644 |
475 |
---- a/gio/tests/gdbus-object-manager-example/Makefile.am |
476 |
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
477 |
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ |
478 |
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ |
479 |
- $(NULL) |
480 |
- |
481 |
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
482 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
483 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
484 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
485 |
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile |
486 |
-+ $(AM_V_GEN) gdbus-codegen \ |
487 |
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
488 |
- --c-namespace Example \ |
489 |
- --c-generate-object-manager \ |
490 |
--- |
491 |
-2.17.0 |
492 |
- |
493 |
|
494 |
diff --git a/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch b/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch |
495 |
deleted file mode 100644 |
496 |
index 0bd3a85..0000000 |
497 |
--- a/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch |
498 |
+++ /dev/null |
499 |
@@ -1,96 +0,0 @@ |
500 |
-From 8a028c250a82b667562efcfdf51d35506383adbb Mon Sep 17 00:00:00 2001 |
501 |
-From: Mart Raudsepp <leio@g.o> |
502 |
-Date: Wed, 19 Dec 2018 16:22:21 +0200 |
503 |
-Subject: [PATCH] tests: Allocate gvariant data from the heap to guarantee |
504 |
- alignment |
505 |
- |
506 |
-On glib-2-58 branch we don't have !455, thus we need aligned data |
507 |
-for the gvariant tests to not fail on i686. |
508 |
- |
509 |
-Fixes #1626 |
510 |
---- |
511 |
- glib/tests/gvariant.c | 15 ++++++++++++--- |
512 |
- 1 file changed, 12 insertions(+), 3 deletions(-) |
513 |
- |
514 |
-diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c |
515 |
-index 8047ef5e8..5ca7b964e 100644 |
516 |
---- a/glib/tests/gvariant.c |
517 |
-+++ b/glib/tests/gvariant.c |
518 |
-@@ -4770,6 +4770,7 @@ test_stack_dict_init (void) |
519 |
- static void |
520 |
- test_normal_checking_tuples (void) |
521 |
- { |
522 |
-+ gpointer aligned_data; |
523 |
- const guint8 data[] = { |
524 |
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, |
525 |
- 'a', '(', 'a', 'o', 'a', 'o', 'a', 'a', 'o', 'a', 'a', 'o', ')' |
526 |
-@@ -4778,13 +4779,15 @@ test_normal_checking_tuples (void) |
527 |
- GVariant *variant = NULL; |
528 |
- GVariant *normal_variant = NULL; |
529 |
- |
530 |
-- variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size, |
531 |
-+ aligned_data = g_memdup (data, size); /* guarantee alignment */ |
532 |
-+ variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size, |
533 |
- FALSE, NULL, NULL); |
534 |
- g_assert_nonnull (variant); |
535 |
- |
536 |
- normal_variant = g_variant_get_normal_form (variant); |
537 |
- g_assert_nonnull (normal_variant); |
538 |
- |
539 |
-+ g_free (aligned_data); |
540 |
- g_variant_unref (normal_variant); |
541 |
- g_variant_unref (variant); |
542 |
- } |
543 |
-@@ -4896,6 +4899,7 @@ test_recursion_limits_array_in_variant (void) |
544 |
- static void |
545 |
- test_normal_checking_array_offsets (void) |
546 |
- { |
547 |
-+ gpointer aligned_data; |
548 |
- const guint8 data[] = { |
549 |
- 0x07, 0xe5, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, |
550 |
- 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'g', |
551 |
-@@ -4904,13 +4908,15 @@ test_normal_checking_array_offsets (void) |
552 |
- GVariant *variant = NULL; |
553 |
- GVariant *normal_variant = NULL; |
554 |
- |
555 |
-- variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size, |
556 |
-+ aligned_data = g_memdup (data, size); /* guarantee alignment */ |
557 |
-+ variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size, |
558 |
- FALSE, NULL, NULL); |
559 |
- g_assert_nonnull (variant); |
560 |
- |
561 |
- normal_variant = g_variant_get_normal_form (variant); |
562 |
- g_assert_nonnull (normal_variant); |
563 |
- |
564 |
-+ g_free (aligned_data); |
565 |
- g_variant_unref (normal_variant); |
566 |
- g_variant_unref (variant); |
567 |
- } |
568 |
-@@ -4944,6 +4950,7 @@ test_normal_checking_tuple_offsets (void) |
569 |
- static void |
570 |
- test_normal_checking_empty_object_path (void) |
571 |
- { |
572 |
-+ gpointer aligned_data; |
573 |
- const guint8 data[] = { |
574 |
- 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, |
575 |
- '(', 'h', '(', 'a', 'i', 'a', 'b', 'i', 'o', ')', ')', |
576 |
-@@ -4952,13 +4959,15 @@ test_normal_checking_empty_object_path (void) |
577 |
- GVariant *variant = NULL; |
578 |
- GVariant *normal_variant = NULL; |
579 |
- |
580 |
-- variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size, |
581 |
-+ aligned_data = g_memdup (data, size); /* guarantee alignment */ |
582 |
-+ variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size, |
583 |
- FALSE, NULL, NULL); |
584 |
- g_assert_nonnull (variant); |
585 |
- |
586 |
- normal_variant = g_variant_get_normal_form (variant); |
587 |
- g_assert_nonnull (normal_variant); |
588 |
- |
589 |
-+ g_free (aligned_data); |
590 |
- g_variant_unref (normal_variant); |
591 |
- g_variant_unref (variant); |
592 |
- } |
593 |
--- |
594 |
-2.17.0 |
595 |
- |
596 |
|
597 |
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild |
598 |
deleted file mode 100644 |
599 |
index ea020cc..0000000 |
600 |
--- a/dev-libs/glib/glib-2.56.2.ebuild |
601 |
+++ /dev/null |
602 |
@@ -1,302 +0,0 @@ |
603 |
-# Copyright 1999-2018 Gentoo Fondation |
604 |
-# Distributed under the terms of the GNU General Public License v2 |
605 |
- |
606 |
-EAPI=6 |
607 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
608 |
-GNOME2_EAUTORECONF=yes |
609 |
- |
610 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
611 |
- multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx |
612 |
- |
613 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
614 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
615 |
-# then to be think very closely. |
616 |
- |
617 |
-DESCRIPTION="The GLib library of C routines" |
618 |
-HOMEPAGE="https://www.gtk.org/" |
619 |
-SRC_URI="${SRC_URI} |
620 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
621 |
- |
622 |
-LICENSE="LGPL-2.1+" |
623 |
-SLOT="2" |
624 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
625 |
- |
626 |
-KEYWORDS="amd64 arm arm64 ~mips ppc x86" |
627 |
- |
628 |
-# Added util-linux multilib dependency to have libmount support (which |
629 |
-# is always turned on on linux systems, unless explicitly disabled, but |
630 |
-# this ebuild does not do that anyway) (bug #599586) |
631 |
- |
632 |
-RDEPEND=" |
633 |
- !<dev-util/gdbus-codegen-${PV} |
634 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
635 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
636 |
- >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] |
637 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
638 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
639 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
640 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
641 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
642 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
643 |
- utils? ( |
644 |
- >=dev-util/gdbus-codegen-${PV} |
645 |
- virtual/libelf:0= |
646 |
- ) |
647 |
-" |
648 |
-DEPEND="${RDEPEND} |
649 |
- app-text/docbook-xml-dtd:4.1.2 |
650 |
- >=dev-libs/libxslt-1.0 |
651 |
- >=sys-devel/gettext-0.11 |
652 |
- >=dev-util/gtk-doc-am-1.20 |
653 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
654 |
- ${PYTHON_DEPS} |
655 |
- test? ( |
656 |
- sys-devel/gdb |
657 |
- >=dev-util/gdbus-codegen-${PV} |
658 |
- >=sys-apps/dbus-1.2.14 ) |
659 |
- !<dev-util/gtk-doc-1.15-r2 |
660 |
-" |
661 |
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate |
662 |
-# python depending package, which can be buildtime depended in packages that |
663 |
-# need these tools, without pulling in python at runtime. |
664 |
-RDEPEND="${RDEPEND} |
665 |
- >=dev-util/glib-utils-${PV}" |
666 |
-PDEPEND=" |
667 |
- dbus? ( gnome-base/dconf ) |
668 |
- mime? ( x11-misc/shared-mime-info ) |
669 |
-" |
670 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
671 |
-# dconf is needed to be able to save settings, bug #498436 |
672 |
- |
673 |
-MULTILIB_CHOST_TOOLS=( |
674 |
- /usr/bin/gio-querymodules$(get_exeext) |
675 |
-) |
676 |
- |
677 |
-pkg_setup() { |
678 |
- if use kernel_linux ; then |
679 |
- CONFIG_CHECK="~INOTIFY_USER" |
680 |
- if use test ; then |
681 |
- CONFIG_CHECK="~IPV6" |
682 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
683 |
- fi |
684 |
- linux-info_pkg_setup |
685 |
- fi |
686 |
- python-any-r1_pkg_setup |
687 |
-} |
688 |
- |
689 |
-src_prepare() { |
690 |
- |
691 |
- # Musl fix |
692 |
- eapply "${FILESDIR}/${PV}-quark_init_on_demand.patch" |
693 |
- eapply "${FILESDIR}/${PV}-gobject_init_on_demand.patch" |
694 |
- |
695 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
696 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
697 |
- |
698 |
- if use test; then |
699 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
700 |
- if ! has_version dev-util/desktop-file-utils ; then |
701 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
702 |
- ewarn "think on installing it to get these tests run." |
703 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
704 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
705 |
- fi |
706 |
- |
707 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
708 |
- # other), falling back to xterm if one doesn't exist |
709 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
710 |
- ewarn "Some tests will be skipped due to missing terminal program" |
711 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
712 |
- fi |
713 |
- |
714 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
715 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
716 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
717 |
- |
718 |
- ewarn "Tests for search-utils have been skipped" |
719 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
720 |
- else |
721 |
- # Don't build tests, also prevents extra deps, bug #512022 |
722 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
723 |
- fi |
724 |
- |
725 |
- # Less max runs in network monitor race test to avoid hitting timeout limits |
726 |
- eapply "${FILESDIR}"/${PV}-network-monitor-race-test-iterations.patch # included in 2.57.1 |
727 |
- |
728 |
- # gdbus-codegen is a separate package |
729 |
- eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch |
730 |
- |
731 |
- gnome2_src_prepare |
732 |
- epunt_cxx |
733 |
-} |
734 |
- |
735 |
-multilib_src_configure() { |
736 |
- # Avoid circular depend with dev-util/pkgconfig and |
737 |
- # native builds (cross-compiles won't need pkg-config |
738 |
- # in the target ROOT to work here) |
739 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
740 |
- if has_version sys-apps/dbus; then |
741 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
742 |
- export DBUS1_LIBS="-ldbus-1" |
743 |
- fi |
744 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
745 |
- export LIBFFI_LIBS="-lffi" |
746 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
747 |
- export PCRE_LIBS="-lpcre" |
748 |
- fi |
749 |
- |
750 |
- # These configure tests don't work when cross-compiling. |
751 |
- if tc-is-cross-compiler ; then |
752 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
753 |
- case ${CHOST} in |
754 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
755 |
- *) export glib_cv_stack_grows=no ;; |
756 |
- esac |
757 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
758 |
- export glib_cv_uscore=no |
759 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
760 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
761 |
- fi |
762 |
- |
763 |
- local myconf |
764 |
- |
765 |
- case "${CHOST}" in |
766 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
767 |
- *) myconf="${myconf} --with-threads=posix" ;; |
768 |
- esac |
769 |
- |
770 |
- # libelf used only by the gresource bin |
771 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
772 |
- $(usex debug --enable-debug=yes ' ') \ |
773 |
- $(use_enable xattr) \ |
774 |
- $(use_enable fam) \ |
775 |
- $(use_enable kernel_linux libmount) \ |
776 |
- $(use_enable selinux) \ |
777 |
- $(use_enable static-libs static) \ |
778 |
- $(use_enable systemtap dtrace) \ |
779 |
- $(use_enable systemtap systemtap) \ |
780 |
- $(multilib_native_use_enable utils libelf) \ |
781 |
- --with-python=${EPYTHON} \ |
782 |
- --disable-compile-warnings \ |
783 |
- --enable-man \ |
784 |
- --with-pcre=system \ |
785 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
786 |
- |
787 |
- if multilib_is_native_abi; then |
788 |
- local d |
789 |
- for d in glib gio gobject; do |
790 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
791 |
- done |
792 |
- fi |
793 |
-} |
794 |
- |
795 |
-multilib_src_test() { |
796 |
- export XDG_CONFIG_DIRS=/etc/xdg |
797 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
798 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
799 |
- export LC_TIME=C # bug #411967 |
800 |
- unset GSETTINGS_BACKEND # bug #596380 |
801 |
- python_setup |
802 |
- |
803 |
- # Related test is a bit nitpicking |
804 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
805 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
806 |
- |
807 |
- # Hardened: gdb needs this, bug #338891 |
808 |
- if host-is-pax ; then |
809 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
810 |
- || die "Hardened adjustment failed" |
811 |
- fi |
812 |
- |
813 |
- # Need X for dbus-launch session X11 initialization |
814 |
- virtx emake check |
815 |
-} |
816 |
- |
817 |
-multilib_src_install() { |
818 |
- emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install |
819 |
- keepdir /usr/$(get_libdir)/gio/modules |
820 |
-} |
821 |
- |
822 |
-multilib_src_install_all() { |
823 |
- einstalldocs |
824 |
- |
825 |
- # These are installed by dev-util/glib-utils |
826 |
- # 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 |
827 |
- rm "${ED}usr/bin/glib-genmarshal" || die |
828 |
- rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die |
829 |
- rm "${ED}usr/bin/glib-mkenums" || die |
830 |
- rm "${ED}usr/share/man/man1/glib-mkenums.1" || die |
831 |
- rm "${ED}usr/bin/gtester-report" || die |
832 |
- rm "${ED}usr/share/man/man1/gtester-report.1" || die |
833 |
- |
834 |
- # Do not install charset.alias even if generated, leave it to libiconv |
835 |
- rm -f "${ED}/usr/$(get_libdir)/charset.alias" |
836 |
- |
837 |
- # Don't install gdb python macros, bug 291328 |
838 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
839 |
- |
840 |
- # Completely useless with or without USE static-libs, people need to use pkg-config |
841 |
- find "${ED}" -name '*.la' -delete || die |
842 |
-} |
843 |
- |
844 |
-pkg_preinst() { |
845 |
- gnome2_pkg_preinst |
846 |
- |
847 |
- # Make gschemas.compiled belong to glib alone |
848 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
849 |
- |
850 |
- if [[ -e ${EROOT}${cache} ]]; then |
851 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
852 |
- else |
853 |
- touch "${ED}"/${cache} || die |
854 |
- fi |
855 |
- |
856 |
- multilib_pkg_preinst() { |
857 |
- # Make giomodule.cache belong to glib alone |
858 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
859 |
- |
860 |
- if [[ -e ${EROOT}${cache} ]]; then |
861 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
862 |
- else |
863 |
- touch "${ED}"/${cache} || die |
864 |
- fi |
865 |
- } |
866 |
- |
867 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
868 |
- # file due to inability to create it and GIO might not look at any of the modules there |
869 |
- if ! tc-is-cross-compiler ; then |
870 |
- multilib_foreach_abi multilib_pkg_preinst |
871 |
- fi |
872 |
-} |
873 |
- |
874 |
-pkg_postinst() { |
875 |
- # force (re)generation of gschemas.compiled |
876 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
877 |
- |
878 |
- gnome2_pkg_postinst |
879 |
- |
880 |
- multilib_pkg_postinst() { |
881 |
- gnome2_giomodule_cache_update \ |
882 |
- || die "Update GIO modules cache failed (for ${ABI})" |
883 |
- } |
884 |
- if ! tc-is-cross-compiler ; then |
885 |
- multilib_foreach_abi multilib_pkg_postinst |
886 |
- else |
887 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
888 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
889 |
- ewarn "your final image for performance reasons and re-run it when packages" |
890 |
- ewarn "installing GIO modules get upgraded or added to the image." |
891 |
- fi |
892 |
-} |
893 |
- |
894 |
-pkg_postrm() { |
895 |
- gnome2_pkg_postrm |
896 |
- |
897 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
898 |
- multilib_pkg_postrm() { |
899 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
900 |
- } |
901 |
- multilib_foreach_abi multilib_pkg_postrm |
902 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
903 |
- fi |
904 |
-} |
905 |
|
906 |
diff --git a/dev-libs/glib/glib-2.56.4.ebuild b/dev-libs/glib/glib-2.56.4.ebuild |
907 |
deleted file mode 100644 |
908 |
index b19a501..0000000 |
909 |
--- a/dev-libs/glib/glib-2.56.4.ebuild |
910 |
+++ /dev/null |
911 |
@@ -1,305 +0,0 @@ |
912 |
-# Copyright 1999-2019 Gentoo Authors |
913 |
-# Distributed under the terms of the GNU General Public License v2 |
914 |
- |
915 |
-EAPI=6 |
916 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
917 |
-GNOME2_EAUTORECONF=yes |
918 |
- |
919 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
920 |
- multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx |
921 |
- |
922 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
923 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
924 |
-# then to be think very closely. |
925 |
- |
926 |
-DESCRIPTION="The GLib library of C routines" |
927 |
-HOMEPAGE="https://www.gtk.org/" |
928 |
-SRC_URI="${SRC_URI} |
929 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
930 |
- |
931 |
-LICENSE="LGPL-2.1+" |
932 |
-SLOT="2" |
933 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
934 |
- |
935 |
-KEYWORDS="amd64 arm ~arm64 ~mips ppc x86" |
936 |
- |
937 |
-# Added util-linux multilib dependency to have libmount support (which |
938 |
-# is always turned on on linux systems, unless explicitly disabled, but |
939 |
-# this ebuild does not do that anyway) (bug #599586) |
940 |
- |
941 |
-RDEPEND=" |
942 |
- !<dev-util/gdbus-codegen-${PV} |
943 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
944 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
945 |
- >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] |
946 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
947 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
948 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
949 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
950 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
951 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
952 |
- utils? ( |
953 |
- >=dev-util/gdbus-codegen-${PV} |
954 |
- virtual/libelf:0= |
955 |
- ) |
956 |
-" |
957 |
-DEPEND="${RDEPEND} |
958 |
- app-text/docbook-xml-dtd:4.1.2 |
959 |
- >=dev-libs/libxslt-1.0 |
960 |
- >=sys-devel/gettext-0.11 |
961 |
- >=dev-util/gtk-doc-am-1.20 |
962 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
963 |
- ${PYTHON_DEPS} |
964 |
- test? ( |
965 |
- sys-devel/gdb |
966 |
- >=dev-util/gdbus-codegen-${PV} |
967 |
- >=sys-apps/dbus-1.2.14 ) |
968 |
- !<dev-util/gtk-doc-1.15-r2 |
969 |
-" |
970 |
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate |
971 |
-# python depending package, which can be buildtime depended in packages that |
972 |
-# need these tools, without pulling in python at runtime. |
973 |
-RDEPEND="${RDEPEND} |
974 |
- >=dev-util/glib-utils-${PV}" |
975 |
-PDEPEND=" |
976 |
- dbus? ( gnome-base/dconf ) |
977 |
- mime? ( x11-misc/shared-mime-info ) |
978 |
-" |
979 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
980 |
-# dconf is needed to be able to save settings, bug #498436 |
981 |
- |
982 |
-MULTILIB_CHOST_TOOLS=( |
983 |
- /usr/bin/gio-querymodules$(get_exeext) |
984 |
-) |
985 |
- |
986 |
-pkg_setup() { |
987 |
- if use kernel_linux ; then |
988 |
- CONFIG_CHECK="~INOTIFY_USER" |
989 |
- if use test ; then |
990 |
- CONFIG_CHECK="~IPV6" |
991 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
992 |
- fi |
993 |
- linux-info_pkg_setup |
994 |
- fi |
995 |
- python-any-r1_pkg_setup |
996 |
-} |
997 |
- |
998 |
-src_prepare() { |
999 |
- |
1000 |
- # Musl fix |
1001 |
- eapply "${FILESDIR}/2.56.2-quark_init_on_demand.patch" |
1002 |
- eapply "${FILESDIR}/2.56.2-gobject_init_on_demand.patch" |
1003 |
- |
1004 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
1005 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
1006 |
- |
1007 |
- if use test; then |
1008 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
1009 |
- if ! has_version dev-util/desktop-file-utils ; then |
1010 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
1011 |
- ewarn "think on installing it to get these tests run." |
1012 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
1013 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
1014 |
- fi |
1015 |
- |
1016 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
1017 |
- # other), falling back to xterm if one doesn't exist |
1018 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
1019 |
- ewarn "Some tests will be skipped due to missing terminal program" |
1020 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
1021 |
- fi |
1022 |
- |
1023 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
1024 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
1025 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
1026 |
- |
1027 |
- ewarn "Tests for search-utils have been skipped" |
1028 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
1029 |
- else |
1030 |
- # Don't build tests, also prevents extra deps, bug #512022 |
1031 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
1032 |
- fi |
1033 |
- |
1034 |
- # Less max runs in network monitor race test to avoid hitting timeout limits |
1035 |
- eapply "${FILESDIR}"/2.56.2-network-monitor-race-test-iterations.patch # included in 2.57.1 |
1036 |
- |
1037 |
- # https://gitlab.gnome.org/GNOME/glib/issues/1626 |
1038 |
- eapply "${FILESDIR}"/${PN}-2.58.2-gvariant-test-fix.patch |
1039 |
- |
1040 |
- # gdbus-codegen is a separate package |
1041 |
- eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch |
1042 |
- |
1043 |
- gnome2_src_prepare |
1044 |
- epunt_cxx |
1045 |
-} |
1046 |
- |
1047 |
-multilib_src_configure() { |
1048 |
- # Avoid circular depend with dev-util/pkgconfig and |
1049 |
- # native builds (cross-compiles won't need pkg-config |
1050 |
- # in the target ROOT to work here) |
1051 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
1052 |
- if has_version sys-apps/dbus; then |
1053 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
1054 |
- export DBUS1_LIBS="-ldbus-1" |
1055 |
- fi |
1056 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
1057 |
- export LIBFFI_LIBS="-lffi" |
1058 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
1059 |
- export PCRE_LIBS="-lpcre" |
1060 |
- fi |
1061 |
- |
1062 |
- # These configure tests don't work when cross-compiling. |
1063 |
- if tc-is-cross-compiler ; then |
1064 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
1065 |
- case ${CHOST} in |
1066 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
1067 |
- *) export glib_cv_stack_grows=no ;; |
1068 |
- esac |
1069 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
1070 |
- export glib_cv_uscore=no |
1071 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
1072 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
1073 |
- fi |
1074 |
- |
1075 |
- local myconf |
1076 |
- |
1077 |
- case "${CHOST}" in |
1078 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
1079 |
- *) myconf="${myconf} --with-threads=posix" ;; |
1080 |
- esac |
1081 |
- |
1082 |
- # libelf used only by the gresource bin |
1083 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
1084 |
- $(usex debug --enable-debug=yes ' ') \ |
1085 |
- $(use_enable xattr) \ |
1086 |
- $(use_enable fam) \ |
1087 |
- $(use_enable kernel_linux libmount) \ |
1088 |
- $(use_enable selinux) \ |
1089 |
- $(use_enable static-libs static) \ |
1090 |
- $(use_enable systemtap dtrace) \ |
1091 |
- $(use_enable systemtap systemtap) \ |
1092 |
- $(multilib_native_use_enable utils libelf) \ |
1093 |
- --with-python=${EPYTHON} \ |
1094 |
- --disable-compile-warnings \ |
1095 |
- --enable-man \ |
1096 |
- --with-pcre=system \ |
1097 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
1098 |
- |
1099 |
- if multilib_is_native_abi; then |
1100 |
- local d |
1101 |
- for d in glib gio gobject; do |
1102 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
1103 |
- done |
1104 |
- fi |
1105 |
-} |
1106 |
- |
1107 |
-multilib_src_test() { |
1108 |
- export XDG_CONFIG_DIRS=/etc/xdg |
1109 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
1110 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
1111 |
- export LC_TIME=C # bug #411967 |
1112 |
- unset GSETTINGS_BACKEND # bug #596380 |
1113 |
- python_setup |
1114 |
- |
1115 |
- # Related test is a bit nitpicking |
1116 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1117 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1118 |
- |
1119 |
- # Hardened: gdb needs this, bug #338891 |
1120 |
- if host-is-pax ; then |
1121 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
1122 |
- || die "Hardened adjustment failed" |
1123 |
- fi |
1124 |
- |
1125 |
- # Need X for dbus-launch session X11 initialization |
1126 |
- virtx emake check |
1127 |
-} |
1128 |
- |
1129 |
-multilib_src_install() { |
1130 |
- emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install |
1131 |
- keepdir /usr/$(get_libdir)/gio/modules |
1132 |
-} |
1133 |
- |
1134 |
-multilib_src_install_all() { |
1135 |
- einstalldocs |
1136 |
- |
1137 |
- # These are installed by dev-util/glib-utils |
1138 |
- # 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 |
1139 |
- rm "${ED}usr/bin/glib-genmarshal" || die |
1140 |
- rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die |
1141 |
- rm "${ED}usr/bin/glib-mkenums" || die |
1142 |
- rm "${ED}usr/share/man/man1/glib-mkenums.1" || die |
1143 |
- rm "${ED}usr/bin/gtester-report" || die |
1144 |
- rm "${ED}usr/share/man/man1/gtester-report.1" || die |
1145 |
- |
1146 |
- # Do not install charset.alias even if generated, leave it to libiconv |
1147 |
- rm -f "${ED}/usr/$(get_libdir)/charset.alias" |
1148 |
- |
1149 |
- # Don't install gdb python macros, bug 291328 |
1150 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
1151 |
- |
1152 |
- # Completely useless with or without USE static-libs, people need to use pkg-config |
1153 |
- find "${ED}" -name '*.la' -delete || die |
1154 |
-} |
1155 |
- |
1156 |
-pkg_preinst() { |
1157 |
- gnome2_pkg_preinst |
1158 |
- |
1159 |
- # Make gschemas.compiled belong to glib alone |
1160 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
1161 |
- |
1162 |
- if [[ -e ${EROOT}${cache} ]]; then |
1163 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1164 |
- else |
1165 |
- touch "${ED}"/${cache} || die |
1166 |
- fi |
1167 |
- |
1168 |
- multilib_pkg_preinst() { |
1169 |
- # Make giomodule.cache belong to glib alone |
1170 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
1171 |
- |
1172 |
- if [[ -e ${EROOT}${cache} ]]; then |
1173 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1174 |
- else |
1175 |
- touch "${ED}"/${cache} || die |
1176 |
- fi |
1177 |
- } |
1178 |
- |
1179 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
1180 |
- # file due to inability to create it and GIO might not look at any of the modules there |
1181 |
- if ! tc-is-cross-compiler ; then |
1182 |
- multilib_foreach_abi multilib_pkg_preinst |
1183 |
- fi |
1184 |
-} |
1185 |
- |
1186 |
-pkg_postinst() { |
1187 |
- # force (re)generation of gschemas.compiled |
1188 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
1189 |
- |
1190 |
- gnome2_pkg_postinst |
1191 |
- |
1192 |
- multilib_pkg_postinst() { |
1193 |
- gnome2_giomodule_cache_update \ |
1194 |
- || die "Update GIO modules cache failed (for ${ABI})" |
1195 |
- } |
1196 |
- if ! tc-is-cross-compiler ; then |
1197 |
- multilib_foreach_abi multilib_pkg_postinst |
1198 |
- else |
1199 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
1200 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
1201 |
- ewarn "your final image for performance reasons and re-run it when packages" |
1202 |
- ewarn "installing GIO modules get upgraded or added to the image." |
1203 |
- fi |
1204 |
-} |
1205 |
- |
1206 |
-pkg_postrm() { |
1207 |
- gnome2_pkg_postrm |
1208 |
- |
1209 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
1210 |
- multilib_pkg_postrm() { |
1211 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
1212 |
- } |
1213 |
- multilib_foreach_abi multilib_pkg_postrm |
1214 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
1215 |
- fi |
1216 |
-} |
1217 |
|
1218 |
diff --git a/dev-libs/glib/glib-2.58.2.ebuild b/dev-libs/glib/glib-2.58.2.ebuild |
1219 |
deleted file mode 100644 |
1220 |
index 92535b5..0000000 |
1221 |
--- a/dev-libs/glib/glib-2.58.2.ebuild |
1222 |
+++ /dev/null |
1223 |
@@ -1,318 +0,0 @@ |
1224 |
-# Copyright 1999-2018 Gentoo Authors |
1225 |
-# Distributed under the terms of the GNU General Public License v2 |
1226 |
- |
1227 |
-EAPI=6 |
1228 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
1229 |
-GNOME2_EAUTORECONF=yes |
1230 |
- |
1231 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
1232 |
- multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx |
1233 |
- |
1234 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
1235 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
1236 |
-# then to be think very closely. |
1237 |
- |
1238 |
-DESCRIPTION="The GLib library of C routines" |
1239 |
-HOMEPAGE="https://www.gtk.org/" |
1240 |
-SRC_URI="${SRC_URI} |
1241 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
1242 |
- |
1243 |
-LICENSE="LGPL-2.1+" |
1244 |
-SLOT="2" |
1245 |
-IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr" |
1246 |
- |
1247 |
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" |
1248 |
- |
1249 |
-# Added util-linux multilib dependency to have libmount support (which |
1250 |
-# is always turned on on linux systems, unless explicitly disabled, but |
1251 |
-# this ebuild does not do that anyway) (bug #599586) |
1252 |
- |
1253 |
-RDEPEND=" |
1254 |
- !<dev-util/gdbus-codegen-${PV} |
1255 |
- >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] |
1256 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
1257 |
- >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] |
1258 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
1259 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
1260 |
- kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) |
1261 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
1262 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
1263 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
1264 |
- utils? ( |
1265 |
- >=dev-util/gdbus-codegen-${PV} |
1266 |
- virtual/libelf:0= |
1267 |
- ) |
1268 |
-" |
1269 |
-DEPEND="${RDEPEND} |
1270 |
- app-text/docbook-xml-dtd:4.1.2 |
1271 |
- app-text/docbook-xsl-stylesheets |
1272 |
- >=dev-libs/libxslt-1.0 |
1273 |
- >=sys-devel/gettext-0.11 |
1274 |
- gtk-doc? ( >=dev-util/gtk-doc-1.20 ) |
1275 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
1276 |
- ${PYTHON_DEPS} |
1277 |
- test? ( |
1278 |
- sys-devel/gdb |
1279 |
- >=dev-util/gdbus-codegen-${PV} |
1280 |
- >=sys-apps/dbus-1.2.14 ) |
1281 |
-" |
1282 |
-# configure.ac has gtk-doc-am stuff behind m4_ifdef, so we don't need a gtk-doc-am build dep |
1283 |
- |
1284 |
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate |
1285 |
-# python depending package, which can be buildtime depended in packages that |
1286 |
-# need these tools, without pulling in python at runtime. |
1287 |
-RDEPEND="${RDEPEND} |
1288 |
- >=dev-util/glib-utils-${PV}" |
1289 |
-PDEPEND=" |
1290 |
- dbus? ( gnome-base/dconf ) |
1291 |
- mime? ( x11-misc/shared-mime-info ) |
1292 |
-" |
1293 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
1294 |
-# dconf is needed to be able to save settings, bug #498436 |
1295 |
- |
1296 |
-MULTILIB_CHOST_TOOLS=( |
1297 |
- /usr/bin/gio-querymodules$(get_exeext) |
1298 |
-) |
1299 |
- |
1300 |
-pkg_setup() { |
1301 |
- if use kernel_linux ; then |
1302 |
- CONFIG_CHECK="~INOTIFY_USER" |
1303 |
- if use test ; then |
1304 |
- CONFIG_CHECK="~IPV6" |
1305 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
1306 |
- fi |
1307 |
- linux-info_pkg_setup |
1308 |
- fi |
1309 |
- python-any-r1_pkg_setup |
1310 |
-} |
1311 |
- |
1312 |
-src_prepare() { |
1313 |
- |
1314 |
- # Musl fix |
1315 |
- eapply "${FILESDIR}/2.56.2-quark_init_on_demand.patch" |
1316 |
- eapply "${FILESDIR}/2.56.2-gobject_init_on_demand.patch" |
1317 |
- |
1318 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
1319 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
1320 |
- |
1321 |
- if use test; then |
1322 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
1323 |
- if ! has_version dev-util/desktop-file-utils ; then |
1324 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
1325 |
- ewarn "think on installing it to get these tests run." |
1326 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
1327 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
1328 |
- fi |
1329 |
- |
1330 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
1331 |
- # other), falling back to xterm if one doesn't exist |
1332 |
- #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
1333 |
- # ewarn "Some tests will be skipped due to missing terminal program" |
1334 |
- # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson |
1335 |
- # 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 |
1336 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
1337 |
- # desktop-app-info/launch* might fail similarly |
1338 |
- sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die |
1339 |
- #fi |
1340 |
- |
1341 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
1342 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
1343 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
1344 |
- |
1345 |
- ewarn "Tests for search-utils have been skipped" |
1346 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
1347 |
- else |
1348 |
- # Don't build tests, also prevents extra deps, bug #512022 |
1349 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
1350 |
- fi |
1351 |
- |
1352 |
- # gdbus-codegen is a separate package |
1353 |
- eapply "${FILESDIR}"/${PN}-2.58.2-external-gdbus-codegen.patch |
1354 |
- |
1355 |
- # https://gitlab.gnome.org/GNOME/glib/issues/1626 |
1356 |
- eapply "${FILESDIR}"/${P}-gvariant-test-fix.patch |
1357 |
- |
1358 |
- # Tarball doesn't come with gtk-doc.make and we can't unconditionally depend on dev-util/gtk-doc due |
1359 |
- # to circular deps during bootstramp. If actually not building gtk-doc, an almost empty file will do |
1360 |
- # fine as well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is |
1361 |
- # installed, eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy. |
1362 |
- cat > gtk-doc.make << EOF |
1363 |
-EXTRA_DIST = |
1364 |
-CLEANFILES = |
1365 |
-EOF |
1366 |
- |
1367 |
- gnome2_src_prepare |
1368 |
- epunt_cxx |
1369 |
-} |
1370 |
- |
1371 |
-multilib_src_configure() { |
1372 |
- # Avoid circular depend with dev-util/pkgconfig and |
1373 |
- # native builds (cross-compiles won't need pkg-config |
1374 |
- # in the target ROOT to work here) |
1375 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
1376 |
- if has_version sys-apps/dbus; then |
1377 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
1378 |
- export DBUS1_LIBS="-ldbus-1" |
1379 |
- fi |
1380 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
1381 |
- export LIBFFI_LIBS="-lffi" |
1382 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
1383 |
- export PCRE_LIBS="-lpcre" |
1384 |
- fi |
1385 |
- |
1386 |
- # These configure tests don't work when cross-compiling. |
1387 |
- if tc-is-cross-compiler ; then |
1388 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
1389 |
- case ${CHOST} in |
1390 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
1391 |
- *) export glib_cv_stack_grows=no ;; |
1392 |
- esac |
1393 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
1394 |
- export glib_cv_uscore=no |
1395 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
1396 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
1397 |
- fi |
1398 |
- |
1399 |
- local myconf |
1400 |
- |
1401 |
- case "${CHOST}" in |
1402 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
1403 |
- *) myconf="${myconf} --with-threads=posix" ;; |
1404 |
- esac |
1405 |
- |
1406 |
- # libelf used only by the gresource bin |
1407 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
1408 |
- $(usex debug --enable-debug=yes ' ') \ |
1409 |
- $(use_enable xattr) \ |
1410 |
- $(use_enable fam) \ |
1411 |
- $(multilib_native_use_enable gtk-doc) \ |
1412 |
- $(use_enable kernel_linux libmount) \ |
1413 |
- $(use_enable selinux) \ |
1414 |
- $(use_enable static-libs static) \ |
1415 |
- $(use_enable systemtap dtrace) \ |
1416 |
- $(use_enable systemtap systemtap) \ |
1417 |
- $(multilib_native_use_enable utils libelf) \ |
1418 |
- --with-python=${EPYTHON} \ |
1419 |
- --disable-compile-warnings \ |
1420 |
- --enable-man \ |
1421 |
- --with-pcre=system \ |
1422 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
1423 |
- |
1424 |
- if multilib_is_native_abi; then |
1425 |
- local d |
1426 |
- for d in glib gio gobject; do |
1427 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
1428 |
- done |
1429 |
- fi |
1430 |
-} |
1431 |
- |
1432 |
-multilib_src_test() { |
1433 |
- export XDG_CONFIG_DIRS=/etc/xdg |
1434 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
1435 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
1436 |
- export LC_TIME=C # bug #411967 |
1437 |
- unset GSETTINGS_BACKEND # bug #596380 |
1438 |
- python_setup |
1439 |
- |
1440 |
- # Related test is a bit nitpicking |
1441 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1442 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1443 |
- |
1444 |
- # Hardened: gdb needs this, bug #338891 |
1445 |
- if host-is-pax ; then |
1446 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
1447 |
- || die "Hardened adjustment failed" |
1448 |
- fi |
1449 |
- |
1450 |
- # Need X for dbus-launch session X11 initialization |
1451 |
- virtx emake check |
1452 |
-} |
1453 |
- |
1454 |
-multilib_src_install() { |
1455 |
- emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install |
1456 |
- keepdir /usr/$(get_libdir)/gio/modules |
1457 |
-} |
1458 |
- |
1459 |
-multilib_src_install_all() { |
1460 |
- einstalldocs |
1461 |
- |
1462 |
- # These are installed by dev-util/glib-utils |
1463 |
- # 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 |
1464 |
- rm "${ED}usr/bin/glib-genmarshal" || die |
1465 |
- rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die |
1466 |
- rm "${ED}usr/bin/glib-mkenums" || die |
1467 |
- rm "${ED}usr/share/man/man1/glib-mkenums.1" || die |
1468 |
- rm "${ED}usr/bin/gtester-report" || die |
1469 |
- rm "${ED}usr/share/man/man1/gtester-report.1" || die |
1470 |
- |
1471 |
- # Do not install charset.alias even if generated, leave it to libiconv |
1472 |
- rm -f "${ED}/usr/$(get_libdir)/charset.alias" |
1473 |
- |
1474 |
- # Don't install gdb python macros, bug 291328 |
1475 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
1476 |
- |
1477 |
- # Completely useless with or without USE static-libs, people need to use pkg-config |
1478 |
- find "${ED}" -name '*.la' -delete || die |
1479 |
-} |
1480 |
- |
1481 |
-pkg_preinst() { |
1482 |
- gnome2_pkg_preinst |
1483 |
- |
1484 |
- # Make gschemas.compiled belong to glib alone |
1485 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
1486 |
- |
1487 |
- if [[ -e ${EROOT}${cache} ]]; then |
1488 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1489 |
- else |
1490 |
- touch "${ED}"/${cache} || die |
1491 |
- fi |
1492 |
- |
1493 |
- multilib_pkg_preinst() { |
1494 |
- # Make giomodule.cache belong to glib alone |
1495 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
1496 |
- |
1497 |
- if [[ -e ${EROOT}${cache} ]]; then |
1498 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1499 |
- else |
1500 |
- touch "${ED}"/${cache} || die |
1501 |
- fi |
1502 |
- } |
1503 |
- |
1504 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
1505 |
- # file due to inability to create it and GIO might not look at any of the modules there |
1506 |
- if ! tc-is-cross-compiler ; then |
1507 |
- multilib_foreach_abi multilib_pkg_preinst |
1508 |
- fi |
1509 |
-} |
1510 |
- |
1511 |
-pkg_postinst() { |
1512 |
- # force (re)generation of gschemas.compiled |
1513 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
1514 |
- |
1515 |
- gnome2_pkg_postinst |
1516 |
- |
1517 |
- multilib_pkg_postinst() { |
1518 |
- gnome2_giomodule_cache_update \ |
1519 |
- || die "Update GIO modules cache failed (for ${ABI})" |
1520 |
- } |
1521 |
- if ! tc-is-cross-compiler ; then |
1522 |
- multilib_foreach_abi multilib_pkg_postinst |
1523 |
- else |
1524 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
1525 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
1526 |
- ewarn "your final image for performance reasons and re-run it when packages" |
1527 |
- ewarn "installing GIO modules get upgraded or added to the image." |
1528 |
- fi |
1529 |
-} |
1530 |
- |
1531 |
-pkg_postrm() { |
1532 |
- gnome2_pkg_postrm |
1533 |
- |
1534 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
1535 |
- multilib_pkg_postrm() { |
1536 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
1537 |
- } |
1538 |
- multilib_foreach_abi multilib_pkg_postrm |
1539 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
1540 |
- fi |
1541 |
-} |
1542 |
|
1543 |
diff --git a/dev-libs/glib/glib-2.58.3-r1.ebuild b/dev-libs/glib/glib-2.58.3-r1.ebuild |
1544 |
deleted file mode 100644 |
1545 |
index cb0cf13..0000000 |
1546 |
--- a/dev-libs/glib/glib-2.58.3-r1.ebuild |
1547 |
+++ /dev/null |
1548 |
@@ -1,320 +0,0 @@ |
1549 |
-# Copyright 1999-2018 Gentoo Authors |
1550 |
-# Distributed under the terms of the GNU General Public License v2 |
1551 |
- |
1552 |
-EAPI=6 |
1553 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
1554 |
-GNOME2_EAUTORECONF=yes |
1555 |
- |
1556 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
1557 |
- multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx |
1558 |
- |
1559 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
1560 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
1561 |
-# then to be think very closely. |
1562 |
- |
1563 |
-DESCRIPTION="The GLib library of C routines" |
1564 |
-HOMEPAGE="https://www.gtk.org/" |
1565 |
-SRC_URI="${SRC_URI} |
1566 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
1567 |
- |
1568 |
-LICENSE="LGPL-2.1+" |
1569 |
-SLOT="2" |
1570 |
-IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr" |
1571 |
- |
1572 |
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc x86" |
1573 |
- |
1574 |
-# Added util-linux multilib dependency to have libmount support (which |
1575 |
-# is always turned on on linux systems, unless explicitly disabled, but |
1576 |
-# this ebuild does not do that anyway) (bug #599586) |
1577 |
- |
1578 |
-RDEPEND=" |
1579 |
- !<dev-util/gdbus-codegen-${PV} |
1580 |
- >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] |
1581 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
1582 |
- >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] |
1583 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
1584 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
1585 |
- kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) |
1586 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
1587 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
1588 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
1589 |
- utils? ( |
1590 |
- >=dev-util/gdbus-codegen-${PV} |
1591 |
- virtual/libelf:0= |
1592 |
- ) |
1593 |
-" |
1594 |
-DEPEND="${RDEPEND} |
1595 |
- app-text/docbook-xml-dtd:4.1.2 |
1596 |
- app-text/docbook-xsl-stylesheets |
1597 |
- >=dev-libs/libxslt-1.0 |
1598 |
- >=sys-devel/gettext-0.11 |
1599 |
- gtk-doc? ( >=dev-util/gtk-doc-1.20 ) |
1600 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
1601 |
- ${PYTHON_DEPS} |
1602 |
- test? ( |
1603 |
- sys-devel/gdb |
1604 |
- >=dev-util/gdbus-codegen-${PV} |
1605 |
- >=sys-apps/dbus-1.2.14 ) |
1606 |
-" |
1607 |
-# configure.ac has gtk-doc-am stuff behind m4_ifdef, so we don't need a gtk-doc-am build dep |
1608 |
- |
1609 |
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate |
1610 |
-# python depending package, which can be buildtime depended in packages that |
1611 |
-# need these tools, without pulling in python at runtime. |
1612 |
-RDEPEND="${RDEPEND} |
1613 |
- >=dev-util/glib-utils-${PV}" |
1614 |
-PDEPEND=" |
1615 |
- dbus? ( gnome-base/dconf ) |
1616 |
- mime? ( x11-misc/shared-mime-info ) |
1617 |
-" |
1618 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
1619 |
-# dconf is needed to be able to save settings, bug #498436 |
1620 |
- |
1621 |
-MULTILIB_CHOST_TOOLS=( |
1622 |
- /usr/bin/gio-querymodules$(get_exeext) |
1623 |
-) |
1624 |
- |
1625 |
-pkg_setup() { |
1626 |
- if use kernel_linux ; then |
1627 |
- CONFIG_CHECK="~INOTIFY_USER" |
1628 |
- if use test ; then |
1629 |
- CONFIG_CHECK="~IPV6" |
1630 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
1631 |
- fi |
1632 |
- linux-info_pkg_setup |
1633 |
- fi |
1634 |
- python-any-r1_pkg_setup |
1635 |
-} |
1636 |
- |
1637 |
-src_prepare() { |
1638 |
- |
1639 |
- # Musl fix |
1640 |
- eapply "${FILESDIR}/2.56.2-quark_init_on_demand.patch" |
1641 |
- eapply "${FILESDIR}/2.56.2-gobject_init_on_demand.patch" |
1642 |
- |
1643 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
1644 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
1645 |
- |
1646 |
- if use test; then |
1647 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
1648 |
- if ! has_version dev-util/desktop-file-utils ; then |
1649 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
1650 |
- ewarn "think on installing it to get these tests run." |
1651 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
1652 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
1653 |
- fi |
1654 |
- |
1655 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
1656 |
- # other), falling back to xterm if one doesn't exist |
1657 |
- #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
1658 |
- # ewarn "Some tests will be skipped due to missing terminal program" |
1659 |
- # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson |
1660 |
- # 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 |
1661 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
1662 |
- # desktop-app-info/launch* might fail similarly |
1663 |
- sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die |
1664 |
- #fi |
1665 |
- |
1666 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
1667 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
1668 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
1669 |
- |
1670 |
- ewarn "Tests for search-utils have been skipped" |
1671 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
1672 |
- else |
1673 |
- # Don't build tests, also prevents extra deps, bug #512022 |
1674 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
1675 |
- fi |
1676 |
- |
1677 |
- # gdbus-codegen is a separate package |
1678 |
- eapply "${FILESDIR}"/${PN}-2.58.2-external-gdbus-codegen.patch |
1679 |
- |
1680 |
- # gdbus message upper limit check fix from glib-2-58 |
1681 |
- eapply "${FILESDIR}"/${PV}-gdbusmessage-limit-fix.patch |
1682 |
- # gfile copy fallback security fix (wrong permissions at start) |
1683 |
- eapply "${FILESDIR}"/${PV}-CVE-2019-12450.patch |
1684 |
- |
1685 |
- # Tarball doesn't come with gtk-doc.make and we can't unconditionally depend on dev-util/gtk-doc due |
1686 |
- # to circular deps during bootstramp. If actually not building gtk-doc, an almost empty file will do |
1687 |
- # fine as well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is |
1688 |
- # installed, eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy. |
1689 |
- cat > gtk-doc.make << EOF |
1690 |
-EXTRA_DIST = |
1691 |
-CLEANFILES = |
1692 |
-EOF |
1693 |
- |
1694 |
- gnome2_src_prepare |
1695 |
- epunt_cxx |
1696 |
-} |
1697 |
- |
1698 |
-multilib_src_configure() { |
1699 |
- # Avoid circular depend with dev-util/pkgconfig and |
1700 |
- # native builds (cross-compiles won't need pkg-config |
1701 |
- # in the target ROOT to work here) |
1702 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
1703 |
- if has_version sys-apps/dbus; then |
1704 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
1705 |
- export DBUS1_LIBS="-ldbus-1" |
1706 |
- fi |
1707 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
1708 |
- export LIBFFI_LIBS="-lffi" |
1709 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
1710 |
- export PCRE_LIBS="-lpcre" |
1711 |
- fi |
1712 |
- |
1713 |
- # These configure tests don't work when cross-compiling. |
1714 |
- if tc-is-cross-compiler ; then |
1715 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
1716 |
- case ${CHOST} in |
1717 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
1718 |
- *) export glib_cv_stack_grows=no ;; |
1719 |
- esac |
1720 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
1721 |
- export glib_cv_uscore=no |
1722 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
1723 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
1724 |
- fi |
1725 |
- |
1726 |
- local myconf |
1727 |
- |
1728 |
- case "${CHOST}" in |
1729 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
1730 |
- *) myconf="${myconf} --with-threads=posix" ;; |
1731 |
- esac |
1732 |
- |
1733 |
- # libelf used only by the gresource bin |
1734 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
1735 |
- $(usex debug --enable-debug=yes ' ') \ |
1736 |
- $(use_enable xattr) \ |
1737 |
- $(use_enable fam) \ |
1738 |
- $(multilib_native_use_enable gtk-doc) \ |
1739 |
- $(use_enable kernel_linux libmount) \ |
1740 |
- $(use_enable selinux) \ |
1741 |
- $(use_enable static-libs static) \ |
1742 |
- $(use_enable systemtap dtrace) \ |
1743 |
- $(use_enable systemtap systemtap) \ |
1744 |
- $(multilib_native_use_enable utils libelf) \ |
1745 |
- --with-python=${EPYTHON} \ |
1746 |
- --disable-compile-warnings \ |
1747 |
- --enable-man \ |
1748 |
- --with-pcre=system \ |
1749 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
1750 |
- |
1751 |
- if multilib_is_native_abi; then |
1752 |
- local d |
1753 |
- for d in glib gio gobject; do |
1754 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
1755 |
- done |
1756 |
- fi |
1757 |
-} |
1758 |
- |
1759 |
-multilib_src_test() { |
1760 |
- export XDG_CONFIG_DIRS=/etc/xdg |
1761 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
1762 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
1763 |
- export LC_TIME=C # bug #411967 |
1764 |
- unset GSETTINGS_BACKEND # bug #596380 |
1765 |
- python_setup |
1766 |
- |
1767 |
- # Related test is a bit nitpicking |
1768 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1769 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1770 |
- |
1771 |
- # Hardened: gdb needs this, bug #338891 |
1772 |
- if host-is-pax ; then |
1773 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
1774 |
- || die "Hardened adjustment failed" |
1775 |
- fi |
1776 |
- |
1777 |
- # Need X for dbus-launch session X11 initialization |
1778 |
- virtx emake check |
1779 |
-} |
1780 |
- |
1781 |
-multilib_src_install() { |
1782 |
- emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install |
1783 |
- keepdir /usr/$(get_libdir)/gio/modules |
1784 |
-} |
1785 |
- |
1786 |
-multilib_src_install_all() { |
1787 |
- einstalldocs |
1788 |
- |
1789 |
- # These are installed by dev-util/glib-utils |
1790 |
- # 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 |
1791 |
- rm "${ED}usr/bin/glib-genmarshal" || die |
1792 |
- rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die |
1793 |
- rm "${ED}usr/bin/glib-mkenums" || die |
1794 |
- rm "${ED}usr/share/man/man1/glib-mkenums.1" || die |
1795 |
- rm "${ED}usr/bin/gtester-report" || die |
1796 |
- rm "${ED}usr/share/man/man1/gtester-report.1" || die |
1797 |
- |
1798 |
- # Do not install charset.alias even if generated, leave it to libiconv |
1799 |
- rm -f "${ED}/usr/$(get_libdir)/charset.alias" |
1800 |
- |
1801 |
- # Don't install gdb python macros, bug 291328 |
1802 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
1803 |
- |
1804 |
- # Completely useless with or without USE static-libs, people need to use pkg-config |
1805 |
- find "${ED}" -name '*.la' -delete || die |
1806 |
-} |
1807 |
- |
1808 |
-pkg_preinst() { |
1809 |
- gnome2_pkg_preinst |
1810 |
- |
1811 |
- # Make gschemas.compiled belong to glib alone |
1812 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
1813 |
- |
1814 |
- if [[ -e ${EROOT}${cache} ]]; then |
1815 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1816 |
- else |
1817 |
- touch "${ED}"/${cache} || die |
1818 |
- fi |
1819 |
- |
1820 |
- multilib_pkg_preinst() { |
1821 |
- # Make giomodule.cache belong to glib alone |
1822 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
1823 |
- |
1824 |
- if [[ -e ${EROOT}${cache} ]]; then |
1825 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1826 |
- else |
1827 |
- touch "${ED}"/${cache} || die |
1828 |
- fi |
1829 |
- } |
1830 |
- |
1831 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
1832 |
- # file due to inability to create it and GIO might not look at any of the modules there |
1833 |
- if ! tc-is-cross-compiler ; then |
1834 |
- multilib_foreach_abi multilib_pkg_preinst |
1835 |
- fi |
1836 |
-} |
1837 |
- |
1838 |
-pkg_postinst() { |
1839 |
- # force (re)generation of gschemas.compiled |
1840 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
1841 |
- |
1842 |
- gnome2_pkg_postinst |
1843 |
- |
1844 |
- multilib_pkg_postinst() { |
1845 |
- gnome2_giomodule_cache_update \ |
1846 |
- || die "Update GIO modules cache failed (for ${ABI})" |
1847 |
- } |
1848 |
- if ! tc-is-cross-compiler ; then |
1849 |
- multilib_foreach_abi multilib_pkg_postinst |
1850 |
- else |
1851 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
1852 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
1853 |
- ewarn "your final image for performance reasons and re-run it when packages" |
1854 |
- ewarn "installing GIO modules get upgraded or added to the image." |
1855 |
- fi |
1856 |
-} |
1857 |
- |
1858 |
-pkg_postrm() { |
1859 |
- gnome2_pkg_postrm |
1860 |
- |
1861 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
1862 |
- multilib_pkg_postrm() { |
1863 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
1864 |
- } |
1865 |
- multilib_foreach_abi multilib_pkg_postrm |
1866 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
1867 |
- fi |
1868 |
-} |
1869 |
|
1870 |
diff --git a/dev-libs/glib/glib-2.58.3.ebuild b/dev-libs/glib/glib-2.58.3.ebuild |
1871 |
deleted file mode 100644 |
1872 |
index fb3099f..0000000 |
1873 |
--- a/dev-libs/glib/glib-2.58.3.ebuild |
1874 |
+++ /dev/null |
1875 |
@@ -1,315 +0,0 @@ |
1876 |
-# Copyright 1999-2018 Gentoo Authors |
1877 |
-# Distributed under the terms of the GNU General Public License v2 |
1878 |
- |
1879 |
-EAPI=6 |
1880 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
1881 |
-GNOME2_EAUTORECONF=yes |
1882 |
- |
1883 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
1884 |
- multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx |
1885 |
- |
1886 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
1887 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
1888 |
-# then to be think very closely. |
1889 |
- |
1890 |
-DESCRIPTION="The GLib library of C routines" |
1891 |
-HOMEPAGE="https://www.gtk.org/" |
1892 |
-SRC_URI="${SRC_URI} |
1893 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
1894 |
- |
1895 |
-LICENSE="LGPL-2.1+" |
1896 |
-SLOT="2" |
1897 |
-IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr" |
1898 |
- |
1899 |
-KEYWORDS="amd64 arm arm64 ~mips ppc x86" |
1900 |
- |
1901 |
-# Added util-linux multilib dependency to have libmount support (which |
1902 |
-# is always turned on on linux systems, unless explicitly disabled, but |
1903 |
-# this ebuild does not do that anyway) (bug #599586) |
1904 |
- |
1905 |
-RDEPEND=" |
1906 |
- !<dev-util/gdbus-codegen-${PV} |
1907 |
- >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] |
1908 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
1909 |
- >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] |
1910 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
1911 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
1912 |
- kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) |
1913 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
1914 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
1915 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
1916 |
- utils? ( |
1917 |
- >=dev-util/gdbus-codegen-${PV} |
1918 |
- virtual/libelf:0= |
1919 |
- ) |
1920 |
-" |
1921 |
-DEPEND="${RDEPEND} |
1922 |
- app-text/docbook-xml-dtd:4.1.2 |
1923 |
- app-text/docbook-xsl-stylesheets |
1924 |
- >=dev-libs/libxslt-1.0 |
1925 |
- >=sys-devel/gettext-0.11 |
1926 |
- gtk-doc? ( >=dev-util/gtk-doc-1.20 ) |
1927 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
1928 |
- ${PYTHON_DEPS} |
1929 |
- test? ( |
1930 |
- sys-devel/gdb |
1931 |
- >=dev-util/gdbus-codegen-${PV} |
1932 |
- >=sys-apps/dbus-1.2.14 ) |
1933 |
-" |
1934 |
-# configure.ac has gtk-doc-am stuff behind m4_ifdef, so we don't need a gtk-doc-am build dep |
1935 |
- |
1936 |
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate |
1937 |
-# python depending package, which can be buildtime depended in packages that |
1938 |
-# need these tools, without pulling in python at runtime. |
1939 |
-RDEPEND="${RDEPEND} |
1940 |
- >=dev-util/glib-utils-${PV}" |
1941 |
-PDEPEND=" |
1942 |
- dbus? ( gnome-base/dconf ) |
1943 |
- mime? ( x11-misc/shared-mime-info ) |
1944 |
-" |
1945 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
1946 |
-# dconf is needed to be able to save settings, bug #498436 |
1947 |
- |
1948 |
-MULTILIB_CHOST_TOOLS=( |
1949 |
- /usr/bin/gio-querymodules$(get_exeext) |
1950 |
-) |
1951 |
- |
1952 |
-pkg_setup() { |
1953 |
- if use kernel_linux ; then |
1954 |
- CONFIG_CHECK="~INOTIFY_USER" |
1955 |
- if use test ; then |
1956 |
- CONFIG_CHECK="~IPV6" |
1957 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
1958 |
- fi |
1959 |
- linux-info_pkg_setup |
1960 |
- fi |
1961 |
- python-any-r1_pkg_setup |
1962 |
-} |
1963 |
- |
1964 |
-src_prepare() { |
1965 |
- |
1966 |
- # Musl fix |
1967 |
- eapply "${FILESDIR}/2.56.2-quark_init_on_demand.patch" |
1968 |
- eapply "${FILESDIR}/2.56.2-gobject_init_on_demand.patch" |
1969 |
- |
1970 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
1971 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
1972 |
- |
1973 |
- if use test; then |
1974 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
1975 |
- if ! has_version dev-util/desktop-file-utils ; then |
1976 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
1977 |
- ewarn "think on installing it to get these tests run." |
1978 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
1979 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
1980 |
- fi |
1981 |
- |
1982 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
1983 |
- # other), falling back to xterm if one doesn't exist |
1984 |
- #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
1985 |
- # ewarn "Some tests will be skipped due to missing terminal program" |
1986 |
- # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson |
1987 |
- # 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 |
1988 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
1989 |
- # desktop-app-info/launch* might fail similarly |
1990 |
- sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die |
1991 |
- #fi |
1992 |
- |
1993 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
1994 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
1995 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
1996 |
- |
1997 |
- ewarn "Tests for search-utils have been skipped" |
1998 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
1999 |
- else |
2000 |
- # Don't build tests, also prevents extra deps, bug #512022 |
2001 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
2002 |
- fi |
2003 |
- |
2004 |
- # gdbus-codegen is a separate package |
2005 |
- eapply "${FILESDIR}"/${PN}-2.58.2-external-gdbus-codegen.patch |
2006 |
- |
2007 |
- # Tarball doesn't come with gtk-doc.make and we can't unconditionally depend on dev-util/gtk-doc due |
2008 |
- # to circular deps during bootstramp. If actually not building gtk-doc, an almost empty file will do |
2009 |
- # fine as well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is |
2010 |
- # installed, eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy. |
2011 |
- cat > gtk-doc.make << EOF |
2012 |
-EXTRA_DIST = |
2013 |
-CLEANFILES = |
2014 |
-EOF |
2015 |
- |
2016 |
- gnome2_src_prepare |
2017 |
- epunt_cxx |
2018 |
-} |
2019 |
- |
2020 |
-multilib_src_configure() { |
2021 |
- # Avoid circular depend with dev-util/pkgconfig and |
2022 |
- # native builds (cross-compiles won't need pkg-config |
2023 |
- # in the target ROOT to work here) |
2024 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
2025 |
- if has_version sys-apps/dbus; then |
2026 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
2027 |
- export DBUS1_LIBS="-ldbus-1" |
2028 |
- fi |
2029 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
2030 |
- export LIBFFI_LIBS="-lffi" |
2031 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
2032 |
- export PCRE_LIBS="-lpcre" |
2033 |
- fi |
2034 |
- |
2035 |
- # These configure tests don't work when cross-compiling. |
2036 |
- if tc-is-cross-compiler ; then |
2037 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
2038 |
- case ${CHOST} in |
2039 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
2040 |
- *) export glib_cv_stack_grows=no ;; |
2041 |
- esac |
2042 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
2043 |
- export glib_cv_uscore=no |
2044 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
2045 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
2046 |
- fi |
2047 |
- |
2048 |
- local myconf |
2049 |
- |
2050 |
- case "${CHOST}" in |
2051 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
2052 |
- *) myconf="${myconf} --with-threads=posix" ;; |
2053 |
- esac |
2054 |
- |
2055 |
- # libelf used only by the gresource bin |
2056 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
2057 |
- $(usex debug --enable-debug=yes ' ') \ |
2058 |
- $(use_enable xattr) \ |
2059 |
- $(use_enable fam) \ |
2060 |
- $(multilib_native_use_enable gtk-doc) \ |
2061 |
- $(use_enable kernel_linux libmount) \ |
2062 |
- $(use_enable selinux) \ |
2063 |
- $(use_enable static-libs static) \ |
2064 |
- $(use_enable systemtap dtrace) \ |
2065 |
- $(use_enable systemtap systemtap) \ |
2066 |
- $(multilib_native_use_enable utils libelf) \ |
2067 |
- --with-python=${EPYTHON} \ |
2068 |
- --disable-compile-warnings \ |
2069 |
- --enable-man \ |
2070 |
- --with-pcre=system \ |
2071 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
2072 |
- |
2073 |
- if multilib_is_native_abi; then |
2074 |
- local d |
2075 |
- for d in glib gio gobject; do |
2076 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
2077 |
- done |
2078 |
- fi |
2079 |
-} |
2080 |
- |
2081 |
-multilib_src_test() { |
2082 |
- export XDG_CONFIG_DIRS=/etc/xdg |
2083 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
2084 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
2085 |
- export LC_TIME=C # bug #411967 |
2086 |
- unset GSETTINGS_BACKEND # bug #596380 |
2087 |
- python_setup |
2088 |
- |
2089 |
- # Related test is a bit nitpicking |
2090 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
2091 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
2092 |
- |
2093 |
- # Hardened: gdb needs this, bug #338891 |
2094 |
- if host-is-pax ; then |
2095 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
2096 |
- || die "Hardened adjustment failed" |
2097 |
- fi |
2098 |
- |
2099 |
- # Need X for dbus-launch session X11 initialization |
2100 |
- virtx emake check |
2101 |
-} |
2102 |
- |
2103 |
-multilib_src_install() { |
2104 |
- emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install |
2105 |
- keepdir /usr/$(get_libdir)/gio/modules |
2106 |
-} |
2107 |
- |
2108 |
-multilib_src_install_all() { |
2109 |
- einstalldocs |
2110 |
- |
2111 |
- # These are installed by dev-util/glib-utils |
2112 |
- # 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 |
2113 |
- rm "${ED}usr/bin/glib-genmarshal" || die |
2114 |
- rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die |
2115 |
- rm "${ED}usr/bin/glib-mkenums" || die |
2116 |
- rm "${ED}usr/share/man/man1/glib-mkenums.1" || die |
2117 |
- rm "${ED}usr/bin/gtester-report" || die |
2118 |
- rm "${ED}usr/share/man/man1/gtester-report.1" || die |
2119 |
- |
2120 |
- # Do not install charset.alias even if generated, leave it to libiconv |
2121 |
- rm -f "${ED}/usr/$(get_libdir)/charset.alias" |
2122 |
- |
2123 |
- # Don't install gdb python macros, bug 291328 |
2124 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
2125 |
- |
2126 |
- # Completely useless with or without USE static-libs, people need to use pkg-config |
2127 |
- find "${ED}" -name '*.la' -delete || die |
2128 |
-} |
2129 |
- |
2130 |
-pkg_preinst() { |
2131 |
- gnome2_pkg_preinst |
2132 |
- |
2133 |
- # Make gschemas.compiled belong to glib alone |
2134 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
2135 |
- |
2136 |
- if [[ -e ${EROOT}${cache} ]]; then |
2137 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
2138 |
- else |
2139 |
- touch "${ED}"/${cache} || die |
2140 |
- fi |
2141 |
- |
2142 |
- multilib_pkg_preinst() { |
2143 |
- # Make giomodule.cache belong to glib alone |
2144 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
2145 |
- |
2146 |
- if [[ -e ${EROOT}${cache} ]]; then |
2147 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
2148 |
- else |
2149 |
- touch "${ED}"/${cache} || die |
2150 |
- fi |
2151 |
- } |
2152 |
- |
2153 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
2154 |
- # file due to inability to create it and GIO might not look at any of the modules there |
2155 |
- if ! tc-is-cross-compiler ; then |
2156 |
- multilib_foreach_abi multilib_pkg_preinst |
2157 |
- fi |
2158 |
-} |
2159 |
- |
2160 |
-pkg_postinst() { |
2161 |
- # force (re)generation of gschemas.compiled |
2162 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
2163 |
- |
2164 |
- gnome2_pkg_postinst |
2165 |
- |
2166 |
- multilib_pkg_postinst() { |
2167 |
- gnome2_giomodule_cache_update \ |
2168 |
- || die "Update GIO modules cache failed (for ${ABI})" |
2169 |
- } |
2170 |
- if ! tc-is-cross-compiler ; then |
2171 |
- multilib_foreach_abi multilib_pkg_postinst |
2172 |
- else |
2173 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
2174 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
2175 |
- ewarn "your final image for performance reasons and re-run it when packages" |
2176 |
- ewarn "installing GIO modules get upgraded or added to the image." |
2177 |
- fi |
2178 |
-} |
2179 |
- |
2180 |
-pkg_postrm() { |
2181 |
- gnome2_pkg_postrm |
2182 |
- |
2183 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
2184 |
- multilib_pkg_postrm() { |
2185 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
2186 |
- } |
2187 |
- multilib_foreach_abi multilib_pkg_postrm |
2188 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
2189 |
- fi |
2190 |
-} |
2191 |
|
2192 |
diff --git a/dev-libs/glib/glib-2.60.6.ebuild b/dev-libs/glib/glib-2.60.6.ebuild |
2193 |
index 29e02fd..dc77804 100644 |
2194 |
--- a/dev-libs/glib/glib-2.60.6.ebuild |
2195 |
+++ b/dev-libs/glib/glib-2.60.6.ebuild |
2196 |
@@ -1,4 +1,4 @@ |
2197 |
-# Copyright 1999-2019 Gentoo Authors |
2198 |
+# Copyright 1999-2020 Gentoo Authors |
2199 |
# Distributed under the terms of the GNU General Public License v2 |
2200 |
|
2201 |
EAPI=7 |
2202 |
@@ -14,7 +14,7 @@ SLOT="2" |
2203 |
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr" |
2204 |
RESTRICT="!test? ( test )" |
2205 |
|
2206 |
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux" |
2207 |
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" |
2208 |
|
2209 |
# * libelf isn't strictly necessary, but makes gresource tool more useful, and |
2210 |
# the check is automagic in gio/meson.build. gresource is not a multilib tool |