From 1bf334c4bfd11c064691b8fa90220bc46de11c53 Mon Sep 17 00:00:00 2001 From: Soren Sandmann Pedersen Date: Wed, 25 Jun 2008 17:06:50 +0000 Subject: [PATCH] - Upgrade to 0.11.6. Drop fix for leak. --- .cvsignore | 1 + leakfix.patch | 56 --------------------------------------------------- pixman.spec | 13 ++++++------ sources | 4 +--- 4 files changed, 9 insertions(+), 65 deletions(-) delete mode 100644 leakfix.patch diff --git a/.cvsignore b/.cvsignore index b3cbb3d..7863844 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ pixman-0.9.6.tar.bz2 pixman-0.10.0.tar.gz pixman-0.11.2.tar.gz pixman-0.11.4.tar.gz +pixman-0.11.6.tar.gz diff --git a/leakfix.patch b/leakfix.patch deleted file mode 100644 index e69cec2..0000000 --- a/leakfix.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 29d144712e558aaeb49f4384028dd669d76a410b -Author: Maximilian Grothusmann -Date: Fri Jun 13 12:44:50 2008 -0700 - - Fix memory leak by freeing boxes{16,32}. - - After calling pixman_region_init_rects() or - pixman_region32_init_rects(), boxes{16,32} were not freed before - returning. Fixes bug 16312. - -diff --git a/pixman/pixman-region16.c b/pixman/pixman-region16.c -index 1a0edfe..869e18d 100644 ---- a/pixman/pixman-region16.c -+++ b/pixman/pixman-region16.c -@@ -47,6 +47,7 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst, - int n_boxes, i; - pixman_box32_t *boxes32; - pixman_box16_t *boxes16; -+ pixman_bool_t retval; - - boxes32 = pixman_region32_rectangles (src, &n_boxes); - -@@ -64,7 +65,9 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst, - } - - pixman_region_fini (dst); -- return pixman_region_init_rects (dst, boxes16, n_boxes); -+ retval = pixman_region_init_rects (dst, boxes16, n_boxes); -+ free (boxes16); -+ return retval; - } - - #include "pixman-region.c" -diff --git a/pixman/pixman-region32.c b/pixman/pixman-region32.c -index 4b5598d..6e083b5 100644 ---- a/pixman/pixman-region32.c -+++ b/pixman/pixman-region32.c -@@ -45,6 +45,7 @@ pixman_region32_copy_from_region16 (pixman_region32_t *dst, - int n_boxes, i; - pixman_box16_t *boxes16; - pixman_box32_t *boxes32; -+ pixman_bool_t retval; - - boxes16 = pixman_region_rectangles (src, &n_boxes); - -@@ -62,7 +63,9 @@ pixman_region32_copy_from_region16 (pixman_region32_t *dst, - } - - pixman_region32_fini (dst); -- return pixman_region32_init_rects (dst, boxes32, n_boxes); -+ retval = pixman_region32_init_rects (dst, boxes32, n_boxes); -+ free (boxes32); -+ return retval; - } - - #include "pixman-region.c" diff --git a/pixman.spec b/pixman.spec index 736f575..3e45892 100644 --- a/pixman.spec +++ b/pixman.spec @@ -2,8 +2,8 @@ %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d Name: pixman -Version: 0.11.4 -Release: 3%{?dist} +Version: 0.11.6 +Release: 1%{?dist} Summary: Pixel manipulation library Group: System Environment/Libraries @@ -16,8 +16,7 @@ Source0: pixman-%{version}.tar.gz Source1: make-pixman-snapshot.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: leakfix.patch -Patch1: pixman-0.11.4-altivec.patch +Patch0: pixman-0.11.4-altivec.patch # BuildRequires: automake autoconf libtool pkgconfig @@ -35,8 +34,7 @@ Development library for pixman. %prep %setup -q -%patch0 -p1 -b .leakfix -%patch1 -p1 -b .altivec +%patch0 -p1 -b .altivec %build %configure --disable-static @@ -66,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/pixman-1.pc %changelog +* Wed Jun 25 2008 Soren Sandmann 0.11.6-1 +- Upgrade to 0.11.6. Drop fix for leak. + * Tue Jun 17 2008 David Woodhouse 0.11.4-3 - Fix Altivec detection breakage (#451831) diff --git a/sources b/sources index 802a17e..146549d 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -41804ac38025102dcc9891dfd4a3d105 pixman-0.10.0.tar.gz -1c9008358b86d1ea72ef31ff46510b3c pixman-0.11.2.tar.gz -8c8afc259af61d42aa9b3d8ec5a9a03b pixman-0.11.4.tar.gz +1b404bb31bf419a86531927492b5b95d pixman-0.11.6.tar.gz