Le vendredi 28 septembre 2012 à 12:56 +0200, Niels Thykier a écrit :
> The diff looks mostly reasonable, though I have one case where it seems
> to me that the new version introduces a leak (see attached glib.leak).
Thanks for the thorough review.
I have committed a fix for the leak in our SVN and reported it upstream.
Note that it has a small impact since it only affects
glib-compile-resources, not the library itself.
Changes currently sitting in our svn are attached (since they also
target wheezy).
> Other than that, I think it may have to wait until the next d-i beta is
> out. Personally I do not mind the extra couple of days in unstable as
> the diff is rather large and I could quite possibly have missed something.
Sure.
> Also, on the part of (re-)uploading it as 2.32.{4,5}-1 via t-p-u. I am
> not sure it is an acceptable use of t-p-u, so my default would be "no"
> on this.
As you wish. It is mostly a cosmetic issue.
Cheers,
--
.''`. Josselin Mouette
: :' :
`. `'
`-
Index: debian/libglib2.0-doc.links
===================================================================
--- debian/libglib2.0-doc.links (révision 35787)
+++ debian/libglib2.0-doc.links (copie de travail)
@@ -2,4 +2,3 @@
usr/share/doc/libglib2.0-doc/gio usr/share/gtk-doc/html/gio
usr/share/doc/libglib2.0-doc/glib usr/share/gtk-doc/html/glib
usr/share/doc/libglib2.0-doc/gobject usr/share/gtk-doc/html/gobject
-usr/share/doc/libglib2.0-doc/gdbus-object-manager-example usr/share/gtk-doc/html/gdbus-object-manager-example
Index: debian/patches/20_glib-compile-resources_leak.patch
===================================================================
--- debian/patches/20_glib-compile-resources_leak.patch (révision 0)
+++ debian/patches/20_glib-compile-resources_leak.patch (révision 35834)
@@ -0,0 +1,36 @@
+Index: glib2.0-2.33.12+really2.32.4/gio/glib-compile-resources.c
+===================================================================
+--- glib2.0-2.33.12+really2.32.4.orig/gio/glib-compile-resources.c 2012-07-14 22:33:11.000000000 +0200
++++ glib2.0-2.33.12+really2.32.4/gio/glib-compile-resources.c 2012-09-28 21:32:32.168548276 +0200
+@@ -272,7 +272,6 @@ end_element (GMarkupParseContext *conte
+ if (state->preproc_options)
+ {
+ gchar **options;
+- gchar *stderr_child = NULL;
+ guint i;
+ gboolean xml_stripblanks = FALSE;
+ gboolean to_pixdata = FALSE;
+@@ -298,6 +297,7 @@ end_element (GMarkupParseContext *conte
+ if (xml_stripblanks && xmllint != NULL)
+ {
+ gchar *argv[8];
++ gchar *stderr_child = NULL;
+ int status, fd, argc;
+
+ tmp_file = g_strdup ("resource-XXXXXXXX");
+@@ -336,6 +336,7 @@ end_element (GMarkupParseContext *conte
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Error processing input file with xmllint:\n%s"), stderr_child);
++ g_free (stderr_child);
+ goto cleanup;
+ }
+ #endif
+@@ -392,6 +393,7 @@ end_element (GMarkupParseContext *conte
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Error processing input file with to-pixdata:\n%s"), stderr_child);
++ g_free (stderr_child);
+ goto cleanup;
+ }
+ #endif
Index: debian/patches/series
===================================================================
--- debian/patches/series (révision 35787)
+++ debian/patches/series (copie de travail)
@@ -4,6 +4,7 @@
04_homedir_env.patch
05_run-gio-tests-with-a-dbus-session.patch
10_gdbus_race.patch
+20_glib-compile-resources_leak.patch
61_glib-compile-binaries-path.patch
90_gio-modules-multiarch-compat.patch
91_revert_schema_path_warning.patch
Index: debian/changelog
===================================================================
--- debian/changelog (révision 35787)
+++ debian/changelog (copie de travail)
@@ -1,3 +1,13 @@
+glib2.0 (2.33.12+really2.32.4-2) UNRELEASED; urgency=low
+
+ * Revert link adding for gdbus-object-manager-example. While it is
+ useful to have in /usr/share/doc as an example, it must not be
+ shipped with the system documentation.
+ * 20_glib-compile-resources_leak.patch: new patch. Fix a leak
+ introduced in version 2.32.4. Thanks Niels Thykier!
+
+ -- Josselin Mouette <j...@debian.org> Sun, 23 Sep 2012 13:26:33 +0200
+
glib2.0 (2.33.12+really2.32.4-1) unstable; urgency=low
* New upstream bugfix release.
