[arch-commits] CVS update of extra/lib/pango (2 files)

Jan de Groot jgc at archlinux.org
Thu Jan 10 18:35:08 UTC 2008


    Date: Thursday, January 10, 2008 @ 13:35:08
  Author: jgc
    Path: /home/cvs-extra/extra/lib/pango

   Added: pango-layout-indent-center.patch (1.1)
Modified: PKGBUILD (1.59 -> 1.60)

upgpkg: pango 1.18.4-1
Update to 1.18.4, add patch from 1.18 branch


----------------------------------+
 PKGBUILD                         |   13 ++++++++-----
 pango-layout-indent-center.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)


Index: extra/lib/pango/PKGBUILD
diff -u extra/lib/pango/PKGBUILD:1.59 extra/lib/pango/PKGBUILD:1.60
--- extra/lib/pango/PKGBUILD:1.59	Wed Oct 17 13:42:48 2007
+++ extra/lib/pango/PKGBUILD	Thu Jan 10 13:35:06 2008
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD,v 1.59 2007/10/17 17:42:48 jgc Exp $ 
+# $Id: PKGBUILD,v 1.60 2008/01/10 18:35:06 jgc Exp $ 
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=pango
-pkgver=1.18.3
+pkgver=1.18.4
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('glib2>=2.14.2' 'cairo>=1.4.10' 'libxft>=2.1.10' 'libthai>=0.1.9')
+depends=('glib2>=2.14.4' 'cairo>=1.4.10' 'libxft>=2.1.10' 'libthai>=0.1.9')
 makedepends=('pkgconfig' 'libxt')
 options=('!libtool' '!emptydirs')
 install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.18/${pkgname}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.18/${pkgname}-${pkgver}.tar.bz2
+	pango-layout-indent-center.patch)
 url="http://www.gtk.org/"
-md5sums=('4a9862b5151f16dcad8e30dd6ef08549')
+md5sums=('5f4a24eb03789746a13e41beb7044776' '48db37b84f294e1c1dbe3c90eacbc127')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  # http://bugzilla.gnome.org/show_bug.cgi?id=508381
+  patch -Np2 -i ${startdir}/src/pango-layout-indent-center.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --without-qt
   make || return 1
Index: extra/lib/pango/pango-layout-indent-center.patch
diff -u /dev/null extra/lib/pango/pango-layout-indent-center.patch:1.1
--- /dev/null	Thu Jan 10 13:35:08 2008
+++ extra/lib/pango/pango-layout-indent-center.patch	Thu Jan 10 13:35:07 2008
@@ -0,0 +1,34 @@
+--- branches/pango-1-18/pango/pango-layout.c	2007/10/15 20:12:47	2447
++++ branches/pango-1-18/pango/pango-layout.c	2008/01/09 22:12:59	2540
+@@ -451,6 +451,9 @@
+  * of @indent will produce a hanging indentation. That is, the first line will
+  * have the full width, and subsequent lines will be indented by the
+  * absolute value of @indent.
++ *
++ * The indent setting is ignored if layout alignment is set to
++ * %PANGO_ALIGN_CENTER.
+  **/
+ void
+ pango_layout_set_indent (PangoLayout *layout,
+@@ -3315,10 +3318,18 @@
+ 
+   if (layout->ellipsize != PANGO_ELLIPSIZE_NONE)
+     state->remaining_width = -1;
+-  else if (state->first_line)
+-    state->remaining_width = (layout->indent >= 0) ? layout->width - layout->indent : layout->width;
+   else
+-    state->remaining_width = (layout->indent >= 0) ? layout->width : layout->width + layout->indent;
++    {
++      state->remaining_width = layout->width;
++  
++      if (layout->alignment != PANGO_ALIGN_CENTER)
++        {
++	  if (state->first_line && layout->indent >= 0)
++	    state->remaining_width -= layout->indent;
++	  else if (!state->first_line && layout->indent < 0)
++	    state->remaining_width += layout->indent;
++        }
++    }
+   DEBUG ("starting to fill line", line, state);
+ 
+   while (state->items)




More information about the arch-commits mailing list