[gentoo-commits] gentoo-x86 commit in dev-libs/glib/files: glib-2.26.0-not-close.patch glib-2.26.0-error-pileup.patch glib-2.26.0-unref-null.patch

[gentoo-commits] gentoo-x86 commit in dev-libs/glib/files: glib-2.26.0-not-close.patch glib-2.26.0-error-pileup.patch glib-2.26.0-unref-null.patch

[Pacho Ramos (pacho)]

pacho       10/10/17 15:12:35

  Added:                glib-2.26.0-not-close.patch
                        glib-2.26.0-error-pileup.patch
                        glib-2.26.0-unref-null.patch
  Log:
  Revision bump to include one important upstream fix to prevent evince crash at startup, also fix test and prevent error pileup. Remove previous broken version.
  
  (Portage version: 2.1.9.19/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-libs/glib/files/glib-2.26.0-not-close.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.0-not-close.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.0-not-close.patch?rev=1.1&content-type=text/plain

Index: glib-2.26.0-not-close.patch
===================================================================
From e01a20ceb958a9a43383a2ef236524ba9f79b6d9 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Thu, 07 Oct 2010 09:04:52 +0000
Subject: Don't call close() on -1

Of course, a proper implementation of close() will just ignore an
invalid parameter silently, and set errno. But apparently the "debug"
version of the Microsoft C library generates some noise in this
case. So avoid that. Thanks to John Emmas for reporting.
---
diff --git a/tests/testglib.c b/tests/testglib.c
index 7625928..b4e29f0 100644
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -886,7 +886,8 @@ test_file_functions (void)
   fd = g_mkstemp (template);
   if (g_test_verbose() && fd != -1)
     g_print ("g_mkstemp works even if template doesn't end in XXXXXX\n");
-  close (fd);
+  if (fd != -1)
+    close (fd);
   strcpy (template, "fooXXXXXX");
   fd = g_mkstemp (template);
   if (fd == -1)
--
cgit v0.8.3.1



1.1                  dev-libs/glib/files/glib-2.26.0-error-pileup.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.0-error-pileup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.0-error-pileup.patch?rev=1.1&content-type=text/plain

Index: glib-2.26.0-error-pileup.patch
===================================================================
From 1c6fd63f60ffa24aa9ea29d2ac13bb0b2b5b9d4e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 17 Oct 2010 03:30:30 +0000
Subject: Prevent error pileup

---
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index c2725b4..22681d0 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -497,8 +497,7 @@ key_state_start_aliases (KeyState  *state,
     g_set_error_literal (error, G_MARKUP_ERROR,
                          G_MARKUP_ERROR_INVALID_CONTENT,
                          "<aliases> already specified for this key");
-
-  if (!state->is_flags && !state->is_enum && !state->has_choices)
+  else if (!state->is_flags && !state->is_enum && !state->has_choices)
     g_set_error_literal (error, G_MARKUP_ERROR,
                          G_MARKUP_ERROR_INVALID_CONTENT,
                          "<aliases> can only be specified for keys with "
@@ -1634,6 +1633,7 @@ parse_gschema_files (gchar    **files,
 
           /* let them know */
           fprintf (stderr, "%s: %s.  ", filename, error->message);
+          g_clear_error (&error);
 
           if (strict)
             {
--
cgit v0.8.3.1



1.1                  dev-libs/glib/files/glib-2.26.0-unref-null.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.0-unref-null.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.26.0-unref-null.patch?rev=1.1&content-type=text/plain

Index: glib-2.26.0-unref-null.patch
===================================================================
From 2a9b14c015a05cd8dc16a2c5bce2d531c76824c8 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 30 Sep 2010 18:40:50 +0000
Subject: message_to_write_data_free: Don't unref data->message if it is NULL

After the recent changes to message filtering, it can happen that
data->message is NULL when we get here.
(cherry picked from commit fe1186a842458dcc647c5f9ab03f17c762354e95)
---
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index 442d5e1..dd9d58a 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -876,7 +876,8 @@ static void
 message_to_write_data_free (MessageToWriteData *data)
 {
   _g_dbus_worker_unref (data->worker);
-  g_object_unref (data->message);
+  if (data->message)
+    g_object_unref (data->message);
   g_free (data->blob);
   g_free (data);
 }
--
cgit v0.8.3.1