1 |
pacho 11/01/17 17:58:59 |
2 |
|
3 |
Added: glib-2.26.1-gsettings-rules.patch |
4 |
glib-2.26.1-deprecation-tests.patch |
5 |
glib-2.26.1-locked-message.patch |
6 |
glib-2.26.1-gdbus-flushes.patch |
7 |
glib-2.26.1-gsettings-read.patch |
8 |
Removed: glib-2.26.0-unref-null.patch |
9 |
glib-2.26.0-not-close.patch |
10 |
glib-2.26.0-error-pileup.patch |
11 |
Log: |
12 |
Revision bump to include upstream patches from 2.32 branch and fix gsettings.m4 rules to work when there are no schemas, bug #350020. Remove old testing. |
13 |
|
14 |
(Portage version: 2.1.9.31/cvs/Linux x86_64) |
15 |
|
16 |
Revision Changes Path |
17 |
1.1 dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch |
18 |
|
19 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch?rev=1.1&view=markup |
20 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch?rev=1.1&content-type=text/plain |
21 |
|
22 |
Index: glib-2.26.1-gsettings-rules.patch |
23 |
=================================================================== |
24 |
From 393834ac6f32633a31e52441b051dc7d3969a530 Mon Sep 17 00:00:00 2001 |
25 |
From: Dan Winship <danw@×××××.org> |
26 |
Date: Thu, 04 Nov 2010 19:23:22 +0000 |
27 |
Subject: gsettings.m4: Fix rules to work when there are no schemas |
28 |
|
29 |
If there are no schemas, don't try to install "" at install time. |
30 |
(In particular, automake conditionals don't work properly with |
31 |
@-expanded rules, so if you conditionally build a schema, you'll |
32 |
still unconditionally get the install rule.) |
33 |
|
34 |
https://bugzilla.gnome.org/show_bug.cgi?id=633381 |
35 |
--- |
36 |
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4 |
37 |
index 4e4352f..f0ed838 100644 |
38 |
--- a/m4macros/gsettings.m4 |
39 |
+++ b/m4macros/gsettings.m4 |
40 |
@@ -47,9 +47,11 @@ install-data-am: install-gsettings-schemas |
41 |
|
42 |
install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) |
43 |
@$(NORMAL_INSTALL) |
44 |
- test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" |
45 |
- $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)" |
46 |
- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) |
47 |
+ if test -n "$^"; then \ |
48 |
+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ |
49 |
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ |
50 |
+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ |
51 |
+ fi |
52 |
|
53 |
uninstall-gsettings-schemas: |
54 |
@$(NORMAL_UNINSTALL) |
55 |
-- |
56 |
cgit v0.8.3.1 |
57 |
|
58 |
|
59 |
|
60 |
1.1 dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch |
61 |
|
62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch?rev=1.1&view=markup |
63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch?rev=1.1&content-type=text/plain |
64 |
|
65 |
Index: glib-2.26.1-deprecation-tests.patch |
66 |
=================================================================== |
67 |
From cae0b1c57f0f8ce73f4f117f8abb61c68e34a0e7 Mon Sep 17 00:00:00 2001 |
68 |
From: Chun-wei Fan <fanchunwei@×××××××××.org> |
69 |
Date: Tue, 30 Nov 2010 02:28:00 +0000 |
70 |
Subject: Bug635093: Deprecation check in tests/testglib.c |
71 |
|
72 |
The Relation API in glib/grel.h has been marked as |
73 |
deprecated (G_DISABLE_DEPRECATED), so added check for |
74 |
that macro in this source file and added label to indicate |
75 |
deprecation |
76 |
--- |
77 |
diff --git a/tests/testglib.c b/tests/testglib.c |
78 |
index b4e29f0..158808a 100644 |
79 |
--- a/tests/testglib.c |
80 |
+++ b/tests/testglib.c |
81 |
@@ -1038,6 +1038,7 @@ hash_table_tests (void) |
82 |
g_hash_table_destroy (hash_table); |
83 |
} |
84 |
|
85 |
+#ifndef G_DISABLE_DEPRECATED |
86 |
static void |
87 |
relation_test (void) |
88 |
{ |
89 |
@@ -1110,6 +1111,7 @@ relation_test (void) |
90 |
|
91 |
relation = NULL; |
92 |
} |
93 |
+#endif |
94 |
|
95 |
static void |
96 |
gstring_tests (void) |
97 |
@@ -1539,7 +1541,9 @@ main (int argc, |
98 |
g_test_add_func ("/testglib/GTree", binary_tree_test); |
99 |
g_test_add_func ("/testglib/Arrays", test_arrays); |
100 |
g_test_add_func ("/testglib/GHashTable", hash_table_tests); |
101 |
- g_test_add_func ("/testglib/Relation", relation_test); |
102 |
+#ifndef G_DISABLE_DEPRECATED |
103 |
+ g_test_add_func ("/testglib/Relation (deprecated)", relation_test); |
104 |
+#endif |
105 |
g_test_add_func ("/testglib/File Paths", test_paths); |
106 |
g_test_add_func ("/testglib/File Functions", test_file_functions); |
107 |
g_test_add_func ("/testglib/Parse Debug Strings", test_g_parse_debug_string); |
108 |
-- |
109 |
cgit v0.8.3.1 |
110 |
|
111 |
|
112 |
|
113 |
1.1 dev-libs/glib/files/glib-2.26.1-locked-message.patch |
114 |
|
115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.1-locked-message.patch?rev=1.1&view=markup |
116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.1-locked-message.patch?rev=1.1&content-type=text/plain |
117 |
|
118 |
Index: glib-2.26.1-locked-message.patch |
119 |
=================================================================== |
120 |
From 62476cd0f7ca7d3becf81243fb7ac1b97cf7db51 Mon Sep 17 00:00:00 2001 |
121 |
From: Peng Huang <shawn.p.huang@×××××.com> |
122 |
Date: Mon, 13 Dec 2010 18:09:38 +0000 |
123 |
Subject: Bug 632544 – Cannot send a locked message with PRESERVE_SERIAL flag |
124 |
|
125 |
https://bugzilla.gnome.org/show_bug.cgi?id=632544 |
126 |
|
127 |
Signed-off-by: David Zeuthen <davidz@××××××.com> |
128 |
--- |
129 |
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c |
130 |
index da2b9f9..cf12f41 100644 |
131 |
--- a/gio/gdbusconnection.c |
132 |
+++ b/gio/gdbusconnection.c |
133 |
@@ -1449,7 +1449,8 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection, |
134 |
if (out_serial != NULL) |
135 |
*out_serial = serial_to_use; |
136 |
|
137 |
- g_dbus_message_set_serial (message, serial_to_use); |
138 |
+ if (!(flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL)) |
139 |
+ g_dbus_message_set_serial (message, serial_to_use); |
140 |
|
141 |
g_dbus_message_lock (message); |
142 |
_g_dbus_worker_send_message (connection->worker, |
143 |
diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c |
144 |
index 866e27c..5c2939e 100644 |
145 |
--- a/gio/tests/gdbus-connection.c |
146 |
+++ b/gio/tests/gdbus-connection.c |
147 |
@@ -880,6 +880,18 @@ test_connection_filter (void) |
148 |
|
149 |
m2 = g_dbus_message_copy (m, &error); |
150 |
g_assert_no_error (error); |
151 |
+ g_dbus_message_set_serial (m2, data.serial); |
152 |
+ /* lock the message to test PRESERVE_SERIAL flag. */ |
153 |
+ g_dbus_message_lock (m2); |
154 |
+ g_dbus_connection_send_message (c, m2, G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL, &data.serial, &error); |
155 |
+ g_object_unref (m2); |
156 |
+ g_assert_no_error (error); |
157 |
+ |
158 |
+ while (data.num_handled == 2) |
159 |
+ g_thread_yield (); |
160 |
+ |
161 |
+ m2 = g_dbus_message_copy (m, &error); |
162 |
+ g_assert_no_error (error); |
163 |
r = g_dbus_connection_send_message_with_reply_sync (c, |
164 |
m2, |
165 |
G_DBUS_SEND_MESSAGE_FLAGS_NONE, |
166 |
@@ -891,7 +903,7 @@ test_connection_filter (void) |
167 |
g_assert_no_error (error); |
168 |
g_assert (r != NULL); |
169 |
g_object_unref (r); |
170 |
- g_assert_cmpint (data.num_handled, ==, 3); |
171 |
+ g_assert_cmpint (data.num_handled, ==, 4); |
172 |
|
173 |
g_dbus_connection_remove_filter (c, filter_id); |
174 |
|
175 |
@@ -908,8 +920,8 @@ test_connection_filter (void) |
176 |
g_assert_no_error (error); |
177 |
g_assert (r != NULL); |
178 |
g_object_unref (r); |
179 |
- g_assert_cmpint (data.num_handled, ==, 3); |
180 |
- g_assert_cmpint (data.num_outgoing, ==, 3); |
181 |
+ g_assert_cmpint (data.num_handled, ==, 4); |
182 |
+ g_assert_cmpint (data.num_outgoing, ==, 4); |
183 |
|
184 |
/* this is safe; testserver will exit once the bus goes away */ |
185 |
g_assert (g_spawn_command_line_async (SRCDIR "/gdbus-testserver.py", NULL)); |
186 |
-- |
187 |
cgit v0.8.3.1 |
188 |
|
189 |
|
190 |
|
191 |
1.1 dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch |
192 |
|
193 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch?rev=1.1&view=markup |
194 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch?rev=1.1&content-type=text/plain |
195 |
|
196 |
Index: glib-2.26.1-gdbus-flushes.patch |
197 |
=================================================================== |
198 |
From b2315084cb21a1ef072a48b0238a2e614af78be3 Mon Sep 17 00:00:00 2001 |
199 |
From: Ted Gould <ted@×××××.cx> |
200 |
Date: Mon, 13 Dec 2010 18:33:15 +0000 |
201 |
Subject: Bug 635626 – GDBus message idle can execute while flushes are pending |
202 |
|
203 |
https://bugzilla.gnome.org/show_bug.cgi?id=635626 |
204 |
|
205 |
Signed-off-by: David Zeuthen <davidz@××××××.com> |
206 |
--- |
207 |
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c |
208 |
index dd9d58a..228c28c 100644 |
209 |
--- a/gio/gdbusprivate.c |
210 |
+++ b/gio/gdbusprivate.c |
211 |
@@ -431,6 +431,7 @@ struct GDBusWorker |
212 |
gint num_writes_pending; |
213 |
guint64 write_num_messages_written; |
214 |
GList *write_pending_flushes; |
215 |
+ gboolean flush_pending; |
216 |
}; |
217 |
|
218 |
/* ---------------------------------------------------------------------------------------------------- */ |
219 |
@@ -1158,6 +1159,12 @@ ostream_flush_cb (GObject *source_object, |
220 |
if (error != NULL) |
221 |
g_error_free (error); |
222 |
|
223 |
+ /* Make sure we tell folks that we don't have additional |
224 |
+ flushes pending */ |
225 |
+ g_mutex_lock (data->worker->write_lock); |
226 |
+ data->worker->flush_pending = FALSE; |
227 |
+ g_mutex_unlock (data->worker->write_lock); |
228 |
+ |
229 |
/* OK, cool, finally kick off the next write */ |
230 |
maybe_write_next_message (data->worker); |
231 |
|
232 |
@@ -1210,6 +1217,10 @@ message_written (GDBusWorker *worker, |
233 |
worker->write_pending_flushes = g_list_delete_link (worker->write_pending_flushes, l); |
234 |
} |
235 |
} |
236 |
+ if (flushers != NULL) |
237 |
+ { |
238 |
+ worker->flush_pending = TRUE; |
239 |
+ } |
240 |
g_mutex_unlock (worker->write_lock); |
241 |
|
242 |
if (flushers != NULL) |
243 |
@@ -1344,7 +1355,7 @@ static gboolean |
244 |
write_message_in_idle_cb (gpointer user_data) |
245 |
{ |
246 |
GDBusWorker *worker = user_data; |
247 |
- if (worker->num_writes_pending == 0) |
248 |
+ if (worker->num_writes_pending == 0 && !worker->flush_pending) |
249 |
maybe_write_next_message (worker); |
250 |
return FALSE; |
251 |
} |
252 |
@@ -1427,6 +1438,7 @@ _g_dbus_worker_new (GIOStream *stream, |
253 |
worker->stream = g_object_ref (stream); |
254 |
worker->capabilities = capabilities; |
255 |
worker->cancellable = g_cancellable_new (); |
256 |
+ worker->flush_pending = FALSE; |
257 |
|
258 |
worker->frozen = initially_frozen; |
259 |
worker->received_messages_while_frozen = g_queue_new (); |
260 |
-- |
261 |
cgit v0.8.3.1 |
262 |
|
263 |
|
264 |
|
265 |
1.1 dev-libs/glib/files/glib-2.26.1-gsettings-read.patch |
266 |
|
267 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.1-gsettings-read.patch?rev=1.1&view=markup |
268 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.1-gsettings-read.patch?rev=1.1&content-type=text/plain |
269 |
|
270 |
Index: glib-2.26.1-gsettings-read.patch |
271 |
=================================================================== |
272 |
From 900a4c853f8dbf0887c66155ba489ff4570e5948 Mon Sep 17 00:00:00 2001 |
273 |
From: Matthew Barnes <mbarnes@××××××.com> |
274 |
Date: Wed, 01 Dec 2010 00:19:12 +0000 |
275 |
Subject: Bug 636100 - Can't read GSettings:backend property |
276 |
|
277 |
The PROP_BACKEND case was missing from the switch statement in |
278 |
g_settings_get_property(). |
279 |
--- |
280 |
diff --git a/gio/gsettings.c b/gio/gsettings.c |
281 |
index 94d1f3a..7f775a0 100644 |
282 |
--- a/gio/gsettings.c |
283 |
+++ b/gio/gsettings.c |
284 |
@@ -417,6 +417,10 @@ g_settings_get_property (GObject *object, |
285 |
g_value_set_string (value, settings->priv->schema_name); |
286 |
break; |
287 |
|
288 |
+ case PROP_BACKEND: |
289 |
+ g_value_set_object (value, settings->priv->backend); |
290 |
+ break; |
291 |
+ |
292 |
case PROP_PATH: |
293 |
g_value_set_string (value, settings->priv->path); |
294 |
break; |
295 |
-- |
296 |
cgit v0.8.3.1 |