[arch-commits] Commit in pango/trunk (PKGBUILD bug586814-fixup.patch)

[Jan de Groot]

    Date: Sunday, July 19, 2009 @ 07:41:03
  Author: jgc
Revision: 46629

upgpkg: pango 1.24.4-2
    "Fix" the invalid weak reference errors by not unreferencing. Valgrind reports no errors, so this should be safe until an official bugfix is applied

Added:
  pango/trunk/bug586814-fixup.patch
Modified:
  pango/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    9 ++++++---
 bug586814-fixup.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-19 10:40:19 UTC (rev 46628)
+++ PKGBUILD	2009-07-19 11:41:03 UTC (rev 46629)
@@ -3,7 +3,7 @@
 
 pkgname=pango
 pkgver=1.24.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for layout and rendering of text"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -12,14 +12,17 @@
 options=('!libtool' '!emptydirs')
 install=pango.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.24/${pkgname}-${pkgver}.tar.bz2
-        bug588678.patch)
+        bug588678.patch
+        bug586814-fixup.patch)
 url="http://www.pango.org/"
 md5sums=('f2eeaf183930e00ed28fca3a6ed1deb0'
-         '5ad2a7ababf8da9c4f5614ad124a8b36')
+         '5ad2a7ababf8da9c4f5614ad124a8b36'
+         '693e2bae80f90a88b692694efa4b9ffe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/bug588678.patch" || return 1
+  patch -Np1 -i "${srcdir}/bug586814-fixup.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-included-modules=basic-fc || return 1
   make || return 1

Added: bug586814-fixup.patch
===================================================================
--- bug586814-fixup.patch	                        (rev 0)
+++ bug586814-fixup.patch	2009-07-19 11:41:03 UTC (rev 46629)
@@ -0,0 +1,11 @@
+--- pango-1.24.4/pango/pangofc-font.c~	2009-07-19 12:50:45.000000000 +0200
++++ pango-1.24.4/pango/pangofc-font.c	2009-07-19 12:51:01.000000000 +0200
+@@ -141,8 +141,7 @@
+ 
+   if (fcfont->fontmap)
+     {
+       _pango_fc_font_map_remove (PANGO_FC_FONT_MAP (fcfont->fontmap), fcfont);
+-      g_object_remove_weak_pointer (G_OBJECT (fcfont->fontmap), (gpointer *) (gpointer) &fcfont->fontmap);
+       fcfont->fontmap = NULL;
+     }
+