diff --git a/0001-Fix-a-alloc-free-mismatch.patch b/0001-Fix-a-alloc-free-mismatch.patch new file mode 100644 index 0000000..2365479 --- /dev/null +++ b/0001-Fix-a-alloc-free-mismatch.patch @@ -0,0 +1,27 @@ +From eb454a1cb4d8ea16f6b5575c69e58c2877ea350e Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sun, 27 Jun 2010 19:27:04 -0400 +Subject: [PATCH] Fix a alloc/free mismatch + +Pointed out in http://bugzilla.redhat.com/show_bug.cgi?id=608453 +by David Tardon. +--- + glib/gbuffer.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/glib/gbuffer.c b/glib/gbuffer.c +index 4eb83df..5830f04 100644 +--- a/glib/gbuffer.c ++++ b/glib/gbuffer.c +@@ -138,7 +138,7 @@ g_buffer_free_usernotify (GBuffer *buffer) + GUserNotifyBuffer *ubuffer = (GUserNotifyBuffer *) buffer; + + ubuffer->user_destroy (ubuffer->user_data); +- g_slice_free (GBuffer, buffer); ++ g_slice_free (GUserNotifyBuffer, ubuffer); + } + + /* < private > +-- +1.7.1 + diff --git a/glib2.spec b/glib2.spec index 05f184a..58a0505 100644 --- a/glib2.spec +++ b/glib2.spec @@ -3,7 +3,7 @@ Summary: A library of handy utility functions Name: glib2 Version: 2.25.10 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -27,6 +27,9 @@ BuildRequires: chrpath # required for GIO content-type support Requires: shared-mime-info +# upstream fix +Patch0: 0001-Fix-a-alloc-free-mismatch.patch + %description GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, @@ -53,6 +56,7 @@ The glib2-static package includes static libraries of the GLib library. %prep %setup -q -n glib-%{version} +%patch0 -p1 -b .free-mismatch %build %configure --disable-gtk-doc \ @@ -157,6 +161,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules %{_libdir}/lib*.a %changelog +* Sun Jun 27 2010 Matthias Clasen - 2.25.10-2 +- Fix an evince crash + * Sat Jun 26 2010 Matthias Clasen - 2.25.10-1 - Update to 2.25.10