Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Pacho Ramos (pacho)" <pacho@g.o>
Subject: gentoo-x86 commit in dev-libs/glib/files: glib-2.26.1-gsettings-rules.patch glib-2.26.1-deprecation-tests.patch glib-2.26.1-locked-message.patch glib-2.26.1-gdbus-flushes.patch glib-2.26.1-gsettings-read.patch glib-2.26.0-unref-null.patch glib-2.26.0-not-close.patch glib-2.26.0-error-pileup.patch
Date: Mon, 17 Jan 2011 17:58:59 +0000 (UTC)
pacho       11/01/17 17:58:59

  Added:                glib-2.26.1-gsettings-rules.patch
                        glib-2.26.1-deprecation-tests.patch
                        glib-2.26.1-locked-message.patch
                        glib-2.26.1-gdbus-flushes.patch
                        glib-2.26.1-gsettings-read.patch
  Removed:              glib-2.26.0-unref-null.patch
                        glib-2.26.0-not-close.patch
                        glib-2.26.0-error-pileup.patch
  Log:
  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.
  
  (Portage version: 2.1.9.31/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch

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
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

Index: glib-2.26.1-gsettings-rules.patch
===================================================================
From 393834ac6f32633a31e52441b051dc7d3969a530 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@...>
Date: Thu, 04 Nov 2010 19:23:22 +0000
Subject: gsettings.m4: Fix rules to work when there are no schemas

If there are no schemas, don't try to install "" at install time.
(In particular, automake conditionals don't work properly with
@-expanded rules, so if you conditionally build a schema, you'll
still unconditionally get the install rule.)

https://bugzilla.gnome.org/show_bug.cgi?id=633381
---
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
index 4e4352f..f0ed838 100644
--- a/m4macros/gsettings.m4
+++ b/m4macros/gsettings.m4
@@ -47,9 +47,11 @@ install-data-am: install-gsettings-schemas
 
 install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
 	@$(NORMAL_INSTALL)
-	test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-	$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
-	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
 
 uninstall-gsettings-schemas:
 	@$(NORMAL_UNINSTALL)
--
cgit v0.8.3.1



1.1                  dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch

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
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

Index: glib-2.26.1-deprecation-tests.patch
===================================================================
From cae0b1c57f0f8ce73f4f117f8abb61c68e34a0e7 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@...>
Date: Tue, 30 Nov 2010 02:28:00 +0000
Subject: Bug635093: Deprecation check in tests/testglib.c

The Relation API in glib/grel.h has been marked as
deprecated (G_DISABLE_DEPRECATED), so added check for
that macro in this source file and added label to indicate
deprecation
---
diff --git a/tests/testglib.c b/tests/testglib.c
index b4e29f0..158808a 100644
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -1038,6 +1038,7 @@ hash_table_tests (void)
   g_hash_table_destroy (hash_table);
 }
 
+#ifndef G_DISABLE_DEPRECATED
 static void
 relation_test (void)
 {
@@ -1110,6 +1111,7 @@ relation_test (void)
 
   relation = NULL;
 }
+#endif
 
 static void
 gstring_tests (void)
@@ -1539,7 +1541,9 @@ main (int   argc,
   g_test_add_func ("/testglib/GTree", binary_tree_test);
   g_test_add_func ("/testglib/Arrays", test_arrays);
   g_test_add_func ("/testglib/GHashTable", hash_table_tests);
-  g_test_add_func ("/testglib/Relation", relation_test);
+#ifndef G_DISABLE_DEPRECATED
+  g_test_add_func ("/testglib/Relation (deprecated)", relation_test);
+#endif
   g_test_add_func ("/testglib/File Paths", test_paths);
   g_test_add_func ("/testglib/File Functions", test_file_functions);
   g_test_add_func ("/testglib/Parse Debug Strings", test_g_parse_debug_string);
--
cgit v0.8.3.1



1.1                  dev-libs/glib/files/glib-2.26.1-locked-message.patch

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
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

Index: glib-2.26.1-locked-message.patch
===================================================================
From 62476cd0f7ca7d3becf81243fb7ac1b97cf7db51 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@...>
Date: Mon, 13 Dec 2010 18:09:38 +0000
Subject: Bug 632544 – Cannot send a locked message with PRESERVE_SERIAL flag

https://bugzilla.gnome.org/show_bug.cgi?id=632544

Signed-off-by: David Zeuthen <davidz@...>
---
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index da2b9f9..cf12f41 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -1449,7 +1449,8 @@ g_dbus_connection_send_message_unlocked (GDBusConnection   *connection,
   if (out_serial != NULL)
     *out_serial = serial_to_use;
 
-  g_dbus_message_set_serial (message, serial_to_use);
+  if (!(flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL))
+    g_dbus_message_set_serial (message, serial_to_use);
 
   g_dbus_message_lock (message);
   _g_dbus_worker_send_message (connection->worker,
diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c
index 866e27c..5c2939e 100644
--- a/gio/tests/gdbus-connection.c
+++ b/gio/tests/gdbus-connection.c
@@ -880,6 +880,18 @@ test_connection_filter (void)
 
   m2 = g_dbus_message_copy (m, &error);
   g_assert_no_error (error);
+  g_dbus_message_set_serial (m2, data.serial);
+  /* lock the message to test PRESERVE_SERIAL flag. */
+  g_dbus_message_lock (m2);
+  g_dbus_connection_send_message (c, m2, G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL, &data.serial, &error);
+  g_object_unref (m2);
+  g_assert_no_error (error);
+
+  while (data.num_handled == 2)
+    g_thread_yield ();
+
+  m2 = g_dbus_message_copy (m, &error);
+  g_assert_no_error (error);
   r = g_dbus_connection_send_message_with_reply_sync (c,
                                                       m2,
                                                       G_DBUS_SEND_MESSAGE_FLAGS_NONE,
@@ -891,7 +903,7 @@ test_connection_filter (void)
   g_assert_no_error (error);
   g_assert (r != NULL);
   g_object_unref (r);
-  g_assert_cmpint (data.num_handled, ==, 3);
+  g_assert_cmpint (data.num_handled, ==, 4);
 
   g_dbus_connection_remove_filter (c, filter_id);
 
@@ -908,8 +920,8 @@ test_connection_filter (void)
   g_assert_no_error (error);
   g_assert (r != NULL);
   g_object_unref (r);
-  g_assert_cmpint (data.num_handled, ==, 3);
-  g_assert_cmpint (data.num_outgoing, ==, 3);
+  g_assert_cmpint (data.num_handled, ==, 4);
+  g_assert_cmpint (data.num_outgoing, ==, 4);
 
   /* this is safe; testserver will exit once the bus goes away */
   g_assert (g_spawn_command_line_async (SRCDIR "/gdbus-testserver.py", NULL));
--
cgit v0.8.3.1



1.1                  dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch

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
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

Index: glib-2.26.1-gdbus-flushes.patch
===================================================================
From b2315084cb21a1ef072a48b0238a2e614af78be3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@...>
Date: Mon, 13 Dec 2010 18:33:15 +0000
Subject: Bug 635626 – GDBus message idle can execute while flushes are pending

https://bugzilla.gnome.org/show_bug.cgi?id=635626

Signed-off-by: David Zeuthen <davidz@...>
---
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index dd9d58a..228c28c 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -431,6 +431,7 @@ struct GDBusWorker
   gint                                num_writes_pending;
   guint64                             write_num_messages_written;
   GList                              *write_pending_flushes;
+  gboolean                            flush_pending;
 };
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -1158,6 +1159,12 @@ ostream_flush_cb (GObject      *source_object,
   if (error != NULL)
     g_error_free (error);
 
+  /* Make sure we tell folks that we don't have additional
+     flushes pending */
+  g_mutex_lock (data->worker->write_lock);
+  data->worker->flush_pending = FALSE;
+  g_mutex_unlock (data->worker->write_lock);
+
   /* OK, cool, finally kick off the next write */
   maybe_write_next_message (data->worker);
 
@@ -1210,6 +1217,10 @@ message_written (GDBusWorker *worker,
           worker->write_pending_flushes = g_list_delete_link (worker->write_pending_flushes, l);
         }
     }
+  if (flushers != NULL)
+    {
+      worker->flush_pending = TRUE;
+    }
   g_mutex_unlock (worker->write_lock);
 
   if (flushers != NULL)
@@ -1344,7 +1355,7 @@ static gboolean
 write_message_in_idle_cb (gpointer user_data)
 {
   GDBusWorker *worker = user_data;
-  if (worker->num_writes_pending == 0)
+  if (worker->num_writes_pending == 0 && !worker->flush_pending)
     maybe_write_next_message (worker);
   return FALSE;
 }
@@ -1427,6 +1438,7 @@ _g_dbus_worker_new (GIOStream                              *stream,
   worker->stream = g_object_ref (stream);
   worker->capabilities = capabilities;
   worker->cancellable = g_cancellable_new ();
+  worker->flush_pending = FALSE;
 
   worker->frozen = initially_frozen;
   worker->received_messages_while_frozen = g_queue_new ();
--
cgit v0.8.3.1



1.1                  dev-libs/glib/files/glib-2.26.1-gsettings-read.patch

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
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

Index: glib-2.26.1-gsettings-read.patch
===================================================================
From 900a4c853f8dbf0887c66155ba489ff4570e5948 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@...>
Date: Wed, 01 Dec 2010 00:19:12 +0000
Subject: Bug 636100 - Can't read GSettings:backend property

The PROP_BACKEND case was missing from the switch statement in
g_settings_get_property().
---
diff --git a/gio/gsettings.c b/gio/gsettings.c
index 94d1f3a..7f775a0 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -417,6 +417,10 @@ g_settings_get_property (GObject    *object,
       g_value_set_string (value, settings->priv->schema_name);
       break;
 
+     case PROP_BACKEND:
+      g_value_set_object (value, settings->priv->backend);
+      break;
+
      case PROP_PATH:
       g_value_set_string (value, settings->priv->path);
       break;
--
cgit v0.8.3.1





Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
gentoo-x86 commit in dev-python/logilab-common/files: logilab-common-0.51.1-python-2.7.patch
Next by thread:
gentoo-x86 commit in dev-libs/glib: glib-2.26.1-r1.ebuild ChangeLog glib-2.26.0-r1.ebuild
Previous by date:
gentoo-x86 commit in dev-python/logilab-common/files: logilab-common-0.51.1-python-2.7.patch
Next by date:
gentoo-x86 commit in dev-libs/glib: glib-2.26.1-r1.ebuild ChangeLog glib-2.26.0-r1.ebuild


Updated Jun 26, 2012

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.