r30889 - in /desktop/experimental/gobject-introspection/debian: changelog control control.in patches/02_fix_unresolved_info_freeing.patch patches/series
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Fri Oct 21 09:31:52 UTC 2011
Author: sjoerd
Date: Fri Oct 21 09:31:51 2011
New Revision: 30889
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30889
Log:
* debian/patches/02_fix_unresolved_info_freeing.patch:
+ Added. Use the correct size when freeing some type of GIBaseInfo to
prevent memory corruption and gnome-shell 3.0 crashes (from upstream git)
* debian/control.in:
+ Add Breaks for gnome-shell << 3.0.2-6. g_file_get_contents is annotated
now to return a byte-arry which can't be used in the way gnome-shell
used to.
Added:
desktop/experimental/gobject-introspection/debian/patches/02_fix_unresolved_info_freeing.patch
Modified:
desktop/experimental/gobject-introspection/debian/changelog
desktop/experimental/gobject-introspection/debian/control
desktop/experimental/gobject-introspection/debian/control.in
desktop/experimental/gobject-introspection/debian/patches/series
Modified: desktop/experimental/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/changelog?rev=30889&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/changelog [utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/changelog [utf-8] Fri Oct 21 09:31:51 2011
@@ -1,3 +1,15 @@
+gobject-introspection (1.30.0-2) UNRELEASED; urgency=low
+
+ * debian/patches/02_fix_unresolved_info_freeing.patch:
+ + Added. Use the correct size when freeing some type of GIBaseInfo to
+ prevent memory corruption and gnome-shell 3.0 crashes (from upstream git)
+ * debian/control.in:
+ + Add Breaks for gnome-shell << 3.0.2-6. g_file_get_contents is annotated
+ now to return a byte-arry which can't be used in the way gnome-shell
+ used to.
+
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 21 Oct 2011 11:30:20 +0200
+
gobject-introspection (1.30.0-1) experimental; urgency=low
[ Martin Pitt ]
Modified: desktop/experimental/gobject-introspection/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/control?rev=30889&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/control [utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/control [utf-8] Fri Oct 21 09:31:51 2011
@@ -7,7 +7,7 @@
Section: devel
Priority: optional
Maintainer: Sebastian Dröge <slomo at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 8),
cdbs (>= 0.4.90~),
gnome-pkg-tools (>= 0.10),
@@ -23,8 +23,8 @@
Standards-Version: 3.9.2
X-Python-Version: >= 2.5
Homepage: http://live.gnome.org/GObjectIntrospection
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gobject-introspection
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/gobject-introspection/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gobject-introspection
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gobject-introspection/
Package: libgirepository-1.0-1
Section: libs
@@ -120,7 +120,7 @@
${misc:Depends}
Conflicts: gobject-introspection-glib-2.0,
gir1.0-glib-2.0
-Breaks: python-gobject (<< 2.90)
+Breaks: gnome-shell (<< 3.0.2-6)
Description: Introspection data for GLib, GObject, Gio and GModule
GObject Introspection is a project for providing machine readable
introspection data of the API of C libraries. This introspection
Modified: desktop/experimental/gobject-introspection/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/control.in?rev=30889&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/control.in [utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/control.in [utf-8] Fri Oct 21 09:31:51 2011
@@ -115,7 +115,7 @@
${misc:Depends}
Conflicts: gobject-introspection-glib-2.0,
gir1.0-glib-2.0
-Breaks: python-gobject (<< 2.90)
+Breaks: python-gobject (<< 2.90), gnome-shell (<< 3.0.2-6)
Description: Introspection data for GLib, GObject, Gio and GModule
GObject Introspection is a project for providing machine readable
introspection data of the API of C libraries. This introspection
Added: desktop/experimental/gobject-introspection/debian/patches/02_fix_unresolved_info_freeing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/patches/02_fix_unresolved_info_freeing.patch?rev=30889&op=file
==============================================================================
--- desktop/experimental/gobject-introspection/debian/patches/02_fix_unresolved_info_freeing.patch (added)
+++ desktop/experimental/gobject-introspection/debian/patches/02_fix_unresolved_info_freeing.patch [utf-8] Fri Oct 21 09:31:51 2011
@@ -1,0 +1,16 @@
+diff --git a/girepository/gibaseinfo.c b/girepository/gibaseinfo.c
+index bfb7743..48af5c2 100644
+--- a/girepository/gibaseinfo.c
++++ b/girepository/gibaseinfo.c
+@@ -253,7 +253,10 @@ g_base_info_unref (GIBaseInfo *info)
+ if (rinfo->repository)
+ g_object_unref (rinfo->repository);
+
+- g_slice_free (GIRealInfo, rinfo);
++ if (rinfo->type == GI_INFO_TYPE_UNRESOLVED)
++ g_slice_free (GIUnresolvedInfo, rinfo);
++ else
++ g_slice_free (GIRealInfo, rinfo);
+ }
+ }
+
Modified: desktop/experimental/gobject-introspection/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/patches/series?rev=30889&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/patches/series [utf-8] Fri Oct 21 09:31:51 2011
@@ -1,1 +1,2 @@
00git-account_for_padding_in_struct_size_check.patch
+02_fix_unresolved_info_freeing.patch
More information about the pkg-gnome-commits
mailing list