[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#771536: marked as done (unblock: glib2.0/2.42.1-1)



Your message dated Fri, 5 Dec 2014 13:36:08 +0100
with message-id <20141205123608.GF14303@ugent.be>
and subject line Re: Bug#771536: unblock: glib2.0/2.42.1-1
has caused the Debian Bug report #771536,
regarding unblock: glib2.0/2.42.1-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
771536: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771536
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi,

please unblock glib2.0 which currently holding back gtk+3.0 (already 
unblocked) from migrating. It also includes interesting bugfixes for 
jessie.

glib2.0 (2.42.1-1) unstable; urgency=medium

  [ Iain Lane ]
  * Pass --enable-debug=minimum not minimal - this is what configure.ac
    expects.

  [ Emilio Pozuelo Monfort ]
  * New upstream bugfix release.
  * d/p/0001-properties-disable-default-deprecation-warnings.patch:
    + Removed, merged upstream.

Attaching upstream diff (without translations) between 2.42.0 and 
2.42.1.

unblock glib2.0/2.42.1-1

Thanks,
-- 
 .''`.        Josselin Mouette
: :' :
`. `'
  `-
Index: debian/control
===================================================================
--- debian/control	(révision 43365)
+++ debian/control	(copie de travail)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas@fatal.se>, Iain Lane <laney@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Iain Lane <laney@debian.org>, Sjoerd Simons <sjoerd@debian.org>
 Build-Depends: debhelper (>= 9),
                cdbs (>= 0.4.93),
                dh-autoreconf,
Index: debian/patches/0001-properties-disable-default-deprecation-warnings.patch
===================================================================
--- debian/patches/0001-properties-disable-default-deprecation-warnings.patch	(révision 43365)
+++ debian/patches/0001-properties-disable-default-deprecation-warnings.patch	(copie de travail)
@@ -1,29 +0,0 @@
-From b12bd1c3dcfbb398d2462dcf584a1f6d5173ca9a Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Thu, 25 Sep 2014 17:18:22 -0400
-Subject: [PATCH] properties: disable default deprecation warnings
-
-Disable the deprecation warnings on GObject properties by default.  This
-change is only being made on the stable branch, and maybe only for this
-one stable series -- the warnings will remain enabled by default on the
-unstable releases.
----
- gobject/gobject.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gobject/gobject.c b/gobject/gobject.c
-index cd00244..b013c12 100644
---- a/gobject/gobject.c
-+++ b/gobject/gobject.c
-@@ -1311,7 +1311,7 @@ consider_issuing_property_deprecation_warning (const GParamSpec *pspec)
-       const gchar *value = g_getenv ("G_ENABLE_DIAGNOSTIC");
- 
-       if (!value)
--        value = "-";
-+        value = "0";
- 
-       g_once_init_leave (&enable_diagnostic, value);
-     }
--- 
-2.1.0
-
Index: debian/patches/series
===================================================================
--- debian/patches/series	(révision 43365)
+++ debian/patches/series	(copie de travail)
@@ -20,4 +20,3 @@
 regex-if-PCRE-is-8.34-or-later-disable-auto-possessi.patch
 regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch
 regex-test-do-not-assert-that-system-PCRE-still-has-.patch
-0001-properties-disable-default-deprecation-warnings.patch
Index: debian/changelog
===================================================================
--- debian/changelog	(révision 43365)
+++ debian/changelog	(copie de travail)
@@ -1,3 +1,16 @@
+glib2.0 (2.42.1-1) unstable; urgency=medium
+
+  [ Iain Lane ]
+  * Pass --enable-debug=minimum not minimal - this is what configure.ac
+    expects.
+
+  [ Emilio Pozuelo Monfort ]
+  * New upstream bugfix release.
+  * d/p/0001-properties-disable-default-deprecation-warnings.patch:
+    + Removed, merged upstream.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 11 Nov 2014 18:53:49 +0100
+
 glib2.0 (2.42.0-2) unstable; urgency=medium
 
   [ Andreas Henriksson ]
Index: debian/rules
===================================================================
--- debian/rules	(révision 43365)
+++ debian/rules	(copie de travail)
@@ -97,7 +97,7 @@
 			--enable-static \
 			--enable-installed-tests \
 			--enable-always-build-tests \
-			--enable-debug=minimal
+			--enable-debug=minimum
 
 DEB_CONFIGURE_FLAGS_udeb := \
 			--disable-selinux
diff --git a/NEWS b/NEWS
index ada836b..6be1131 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+Overview of changes in GLib 2.42.1
+==================================
+
+* This release disables deprecation warnings by default
+
+* Bugs fixed:
+ 728256 gcredentials: add NetBSD support
+ 736806 gtask: Fix reference count loop causing leaks
+ 737143 Include <stdint.h> in glib/valgrind.h
+ 738170 g_byte_array_new_take() doesn't initialize array->alloc
+ 738197 g_cond_timed_wait() doesn't time out on Mac OS X 
+
+* Translation updates:
+ Bengali (India)
+ Bulgarian
+ Gujarati
+ Italian
+ Norwegian bokmål
+ Telugu
+
+
 Overview of changes in GLib 2.42.0
 ===================================
 
diff --git a/configure.ac b/configure.ac
index a0237cb..4a904a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,8 @@ m4_define(glib_configure_ac)
 
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [42])
-m4_define([glib_micro_version], [0])
-m4_define([glib_interface_age], [0])
+m4_define([glib_micro_version], [1])
+m4_define([glib_interface_age], [1])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
 m4_define([glib_version],
diff --git a/gio/gcancellable.c b/gio/gcancellable.c
index fcfca3f..800e8f3 100644
--- a/gio/gcancellable.c
+++ b/gio/gcancellable.c
@@ -244,6 +244,13 @@ g_cancellable_get_current  (void)
  *
  * If cancellable is currently in use by any cancellable operation
  * then the behavior of this function is undefined.
+ *
+ * Note that it is generally not a good idea to reuse an existing
+ * cancellable for more operations after it has been cancelled once,
+ * as this function might tempt you to do. The recommended practice
+ * is to drop the reference to a cancellable after cancelling it,
+ * and let it die with the outstanding async operations. You should
+ * create a fresh cancellable for further async operations.
  **/
 void 
 g_cancellable_reset (GCancellable *cancellable)
diff --git a/gio/gioenums.h b/gio/gioenums.h
index 1ea7c42..1ca5be5 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -1364,9 +1364,9 @@ typedef enum
  * @G_CREDENTIALS_TYPE_INVALID: Indicates an invalid native credential type.
  * @G_CREDENTIALS_TYPE_LINUX_UCRED: The native credentials type is a <type>struct ucred</type>.
  * @G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED: The native credentials type is a <type>struct cmsgcred</type>.
- * @G_CREDENTIALS_TYPE_NETBSD_UNPCBID: The native credentials type is a <type>struct unpcbid</type>.
  * @G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED: The native credentials type is a <type>struct sockpeercred</type>. Added in 2.30.
  * @G_CREDENTIALS_TYPE_SOLARIS_UCRED: The native credentials type is a <type>ucred_t</type>. Added in 2.40.
+ * @G_CREDENTIALS_TYPE_NETBSD_UNPCBID: The native credentials type is a <type>struct unpcbid</type>.
  *
  * Enumeration describing different kinds of native credential types.
  *
@@ -1377,9 +1377,9 @@ typedef enum
   G_CREDENTIALS_TYPE_INVALID,
   G_CREDENTIALS_TYPE_LINUX_UCRED,
   G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
-  G_CREDENTIALS_TYPE_NETBSD_UNPCBID,
   G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
-  G_CREDENTIALS_TYPE_SOLARIS_UCRED
+  G_CREDENTIALS_TYPE_SOLARIS_UCRED,
+  G_CREDENTIALS_TYPE_NETBSD_UNPCBID
 } GCredentialsType;
 
 /**
diff --git a/gio/gtask.c b/gio/gtask.c
index ad6e50f..51259bd 100644
--- a/gio/gtask.c
+++ b/gio/gtask.c
@@ -540,7 +540,7 @@ struct _GTask {
   GDestroyNotify task_data_destroy;
 
   GMainContext *context;
-  guint64 creation_time;
+  gint64 creation_time;
   gint priority;
   GCancellable *cancellable;
   gboolean check_cancellable;
@@ -1274,16 +1274,22 @@ g_task_start_task_thread (GTask           *task,
           return;
         }
 
+      /* This introduces a reference count loop between the GTask and
+       * GCancellable, but is necessary to avoid a race on finalising the GTask
+       * between task_thread_cancelled() (in one thread) and
+       * g_task_thread_complete() (in another).
+       *
+       * Accordingly, the signal handler *must* be removed once the task has
+       * completed.
+       */
       g_signal_connect_data (task->cancellable, "cancelled",
                              G_CALLBACK (task_thread_cancelled),
                              g_object_ref (task),
                              task_thread_cancelled_disconnect_notify, 0);
     }
 
-  g_thread_pool_push (task_pool, g_object_ref (task), &task->error);
-  if (task->error)
-    task->thread_complete = TRUE;
-  else if (g_private_get (&task_private))
+  g_thread_pool_push (task_pool, g_object_ref (task), NULL);
+  if (g_private_get (&task_private))
     {
       /* This thread is being spawned from another GTask thread, so
        * bump up max-threads so we don't starve.
diff --git a/glib/deprecated/gthread-deprecated.c b/glib/deprecated/gthread-deprecated.c
index 47a1fbb..1dec719 100644
--- a/glib/deprecated/gthread-deprecated.c
+++ b/glib/deprecated/gthread-deprecated.c
@@ -1564,16 +1564,10 @@ g_cond_timed_wait (GCond    *cond,
   end_time *= 1000000;
   end_time += abs_time->tv_usec;
 
-#ifdef CLOCK_MONOTONIC
   /* would be nice if we had clock_rtoffset, but that didn't seem to
    * make it into the kernel yet...
    */
   end_time += g_get_monotonic_time () - g_get_real_time ();
-#else
-  /* if CLOCK_MONOTONIC is not defined then g_get_montonic_time() and
-   * g_get_real_time() are returning the same clock, so don't bother...
-   */
-#endif
 
   return g_cond_wait_until (cond, mutex, end_time);
 }
diff --git a/glib/garray.c b/glib/garray.c
index 14e046f..8a94720 100644
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -1589,6 +1589,7 @@ g_byte_array_new_take (guint8 *data,
 
   real->data = data;
   real->len = len;
+  real->alloc = len;
 
   return array;
 }
diff --git a/glib/valgrind.h b/glib/valgrind.h
index bebfd69..376fa74 100644
--- a/glib/valgrind.h
+++ b/glib/valgrind.h
@@ -93,6 +93,9 @@
 
 
 #include <stdarg.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
 /* Nb: this file might be included in a file compiled with -ansi.  So
    we can't use C++ style "//" comments nor the "asm" keyword (instead
diff --git a/gobject/gobject.c b/gobject/gobject.c
index cd00244..b013c12 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -1311,7 +1311,7 @@ consider_issuing_property_deprecation_warning (const GParamSpec *pspec)
       const gchar *value = g_getenv ("G_ENABLE_DIAGNOSTIC");
 
       if (!value)
-        value = "-";
+        value = "0";
 
       g_once_init_leave (&enable_diagnostic, value);
     }
diff --git a/po/bg.po b/po/bg.po
index 297451e..a78feb5 100644
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 6ecf662..a1999d9 100644
diff --git a/po/gu.po b/po/gu.po
index c65302c..27401ee 100644
diff --git a/po/it.po b/po/it.po
index ce50414..0477f04 100644
diff --git a/po/nb.po b/po/nb.po
index 92a2675..ff48ccc 100644
diff --git a/po/te.po b/po/te.po
index 3b37284..1900d6a 100644

--- End Message ---
--- Begin Message ---
Hi,

On Fri, Dec 05, 2014 at 01:09:44PM +0100, Cyril Brulebois wrote:
> > Ok, makes sense.  Ok from my PoV - needs d-i approval though.
> 
> [ Shamelessly copied over from #772035 ]
> 
> I'm slightly unhappy[*] about not being able to give it a shot in a d-i
> context but meh, that's what dailies are for; feel free to unblock-udeb
> it so that it gets a chance to be tested w/o waiting on me.

I added both the unblock and the unblock-udeb.

Cheers,

Ivo

--- End Message ---

Reply to: