From 1982ae8d63ab142a2a16bdf1b055110d9c9f40fd Mon Sep 17 00:00:00 2001 From: root Date: Thu, 12 May 2011 22:37:15 +0000 Subject: Thu May 12 22:37:08 UTC 2011 --- extra/mutter/PKGBUILD | 11 +++--- extra/mutter/squash_some_leaks.patch | 70 ++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 extra/mutter/squash_some_leaks.patch (limited to 'extra/mutter') diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 4add473fa..0f40309d1 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120688 2011-04-25 23:12:25Z ibiru $ +# $Id: PKGBUILD 123610 2011-05-11 18:27:48Z ibiru $ # Maintainer: Jan "heftig" Steffens # Maintainer: Ionut Biru # Contributor: Michael Kanis pkgname=mutter pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A window manager for GNOME3" arch=(i686 x86_64) license=('GPL') @@ -15,11 +15,14 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + squash_some_leaks.patch) +sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708' + 'dda962cfd884ffbe2c3c4a86641964228d7b04ef30e19bb2894c4398fa4c296a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/squash_some_leaks.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/mutter \ --localstatedir=/var --disable-static diff --git a/extra/mutter/squash_some_leaks.patch b/extra/mutter/squash_some_leaks.patch new file mode 100644 index 000000000..0e6b506bc --- /dev/null +++ b/extra/mutter/squash_some_leaks.patch @@ -0,0 +1,70 @@ +From 65963748860aec8e3d7ee939b3b16876f4117904 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 05 May 2011 20:11:02 +0000 +Subject: region-utils.c: Squash a memory leak + +"chunk" was an allocated but unused variable. + +https://bugzilla.gnome.org/show_bug.cgi?id=649504 +--- +diff --git a/src/compositor/region-utils.c b/src/compositor/region-utils.c +index b4071ca..cf3c64e 100644 +--- a/src/compositor/region-utils.c ++++ b/src/compositor/region-utils.c +@@ -248,7 +248,6 @@ expand_region_inverse (cairo_region_t *region, + MetaRegionBuilder builder; + MetaRegionIterator iter; + cairo_rectangle_int_t extents; +- cairo_region_t *chunk; + + int last_x; + +@@ -268,16 +267,11 @@ expand_region_inverse (cairo_region_t *region, + extents.x, extents.y + extents.height, extents.width, 1, + x_amount, y_amount, flip); + +- chunk = NULL; +- + last_x = extents.x; + for (meta_region_iterator_init (&iter, region); + !meta_region_iterator_at_end (&iter); + meta_region_iterator_next (&iter)) + { +- if (chunk == NULL) +- chunk = cairo_region_create (); +- + if (iter.rectangle.x > last_x) + add_expanded_rect (&builder, + last_x, iter.rectangle.y, +-- +cgit v0.9 +From d0414a3ea697738dcdf2641b6a8000df35215862 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 05 May 2011 20:46:00 +0000 +Subject: theme.c: Squash memory leak + +When converting a token to a different type, we need to free its +string. + +https://bugzilla.gnome.org/show_bug.cgi?id=649500 +--- +diff --git a/src/ui/theme.c b/src/ui/theme.c +index 0077388..9305645 100644 +--- a/src/ui/theme.c ++++ b/src/ui/theme.c +@@ -2639,11 +2639,13 @@ meta_theme_replace_constants (MetaTheme *theme, + { + if (meta_theme_lookup_int_constant (theme, t->d.v.name, &ival)) + { ++ g_free (t->d.v.name); + t->type = POS_TOKEN_INT; + t->d.i.val = ival; + } + else if (meta_theme_lookup_float_constant (theme, t->d.v.name, &dval)) + { ++ g_free (t->d.v.name); + t->type = POS_TOKEN_DOUBLE; + t->d.d.val = dval; + } +-- +cgit v0.9 -- cgit v1.2.3-54-g00ecf